Automatic i18n update (i18n.meetfranz.com)

author: FranzBot <i18n@meetfranz.com> 2019-09-06 12:44:00 +0000
committer: FranzBot <i18n@meetfranz.com> 2019-09-06 12:44:00 +0000
commit: df9986d6502bd552235e305caf3c420938fb8254 (patch)
tree: c9ae1935f047f82e723423846333da57ccdd1adf /src/i18n/locales
parent: Update strings (diff)
download: ferdium-app-df9986d6502bd552235e305caf3c420938fb8254.tar.gz
ferdium-app-df9986d6502bd552235e305caf3c420938fb8254.tar.zst
ferdium-app-df9986d6502bd552235e305caf3c420938fb8254.zip
24 files changed, 1749 insertions, 573 deletions
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 50d2223dd..692271686 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Recarrega",
   "app.errorHandler.headline" : "Quelcom ha anat malament",
   "feature.announcements.changelog.headline" : "Canvis en Franz {version}",
-   "feature.delayApp.action" : "Aconsegueix una llicència de suport per a Franz",
   "feature.delayApp.headline" : "Si us plau, compra una llicència de suport per a Franz per saltar l'espera",
   "feature.delayApp.text" : "Franz continuarà en {seconds} segons",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Aconsegueix una llicència de suport per a Franz",
+   "feature.delayApp.upgrade.actionShort" : "Millorar el teu compte",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Envia com a correu",
   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
   "feature.shareFranz.action.twitter" : "Compartir a Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "He afegit {count} serveis a Franz! Obtén l'aplicació gratuïta per a Whatsapp, Messenger, Slack, Skype a www,meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "He afegit {count} serveis a Franz! Obtén l'aplicació gratuïta  de Whatsapp, Messenger, Slack, Skype i altres a www.meetfranz.com\/cc @FranzMessenger",
   "feature.shareFranz.text" : "Digues als teus amics i col·legues l'increïble que és Franz i ajuda'ns a còrrer la veu ",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "No es pot connectar amb els serveis en línia de Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
   "global.spellchecker.useDefault" : "Utilitzar el predeterminat del sistema ({default})",
   "global.spellchecking.autodetect" : "Detectar l'idioma automàticament",
   "global.spellchecking.autodetect.short" : "Automàtic",
   "global.spellchecking.language" : "Corrector ortogràfic",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importa els teus serveis Franz 4",
   "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Franz 5",
   "import.skip.label" : "Vull afegir serveis manualment",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Recarrega els serveis",
   "infobar.requiredRequestsFailed" : "No s'han pogut carregar els serveis i la informació de l'usuari",
   "infobar.servicesUpdated" : "Els teus serveis s'han actualitzat.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Hi ha disponible una nova actualització per a Franz.",
   "invite.email.label" : "Correu electrònic",
   "invite.headline.friends" : "Convida a tres dels teus amics o companys",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "La teva sessió ha caducat, torna-la a iniciar.",
   "login.submit.label" : "Accedir",
   "login.tokenExpired" : "La teva sessió ha caducat, torna a iniciar la sessió.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Sobre Franz",
   "menu.app.announcement" : "Què hi ha de nou?",
   "menu.app.checkForUpdates" : "Comprova si hi ha actualitzacions",
@@ -68,6 +81,9 @@
   "menu.file" : "Fitxer",
   "menu.help" : "Ajuda",
   "menu.help.changelog" : "Registre de canvis",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Conegueu-ne més detalls",
   "menu.help.privacy" : "Declaració de privacitat",
   "menu.help.support" : "Suport",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Afegeix un servei...",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "Visualitza",
   "menu.view.enterFullScreen" : "Inicia la pantalla completa",
   "menu.view.exitFullScreen" : "Surt de pantalla completa",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Activa serveis per a desenvolupadors",
   "menu.view.toggleFullScreen" : "Activa la pantalla completa",
   "menu.view.toggleServiceDevTools" : "Habilita les eines de desenvolupador de serveis",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Amplia",
   "menu.view.zoomOut" : "Redueix",
   "menu.window" : "Finestra",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Enviar",
   "password.successInfo" : "Comproveu el vostre correu electrònic",
   "premiumFeature.button.upgradeAccount" : "Millorar el teu compte",
-   "pricing.headline" : "Donar suport a Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "No vull donar suport al desenvolupament de Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Vull donar suport al desenvolupament de Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Seleccioneu el vostre pla de suport",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Recarrega {name}",
   "service.crashHandler.autoReload" : "Intentant restablir automàticament {name} en {seconds} segons",
   "service.crashHandler.headline" : "Oh no!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh no!",
   "service.errorHandler.message" : "Error",
   "service.errorHandler.text" : "{name} ha fallat al carregar",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Introducció",
   "services.welcome" : "Benvingut a Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Canvia la contrasenya",
   "settings.account.headlineProfile" : "Actualitza el perfil",
   "settings.account.headlineSubscription" : "La vostra subscripció",
-   "settings.account.headlineUpgrade" : "Actualitzeu el vostre compte i doneu suport a Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Descarregar",
   "settings.account.manageSubscription.label" : "Gestioneu la vostra subscripció",
   "settings.account.successInfo" : "S'han desat els canvis",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Torna a provar-ho",
   "settings.account.tryReloadUserInfoRequest" : "Torna a provar-ho",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "No s'ha pogut carregar la informació de l'usuari",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Buida la memòria cau",
   "settings.app.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
   "settings.app.buttonSearchForUpdate" : "Comprova si hi ha actualitzacions",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Els vostres serveis",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Tots els serveis",
-   "settings.recipes.dev" : "Desenvolupament",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Serveis disponibles",
   "settings.recipes.missingService" : "Trobes a faltar algun servei?",
   "settings.recipes.mostPopular" : "Els més populars",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Configuració",
   "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",
   "signup.firstname.label" : "Nom",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Ja teniu un compte, iniciar la sessió?",
   "signup.password.label" : "Contrasenya",
   "signup.submit.label" : "Crea un compte",
-   "subscription.euTaxInfo" : "Residents d'EU: es poden aplicar impostos locals",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Sense anuncis, mai!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "properament",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Sense retards ni molestes actualitzacions de llicències ",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Afegir serveis allotjats com Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Suport de Proxy per a serveis",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Suport per corrector ortogràfic",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "El compte de pagament Franz Premium Supporter inclou",
-   "subscription.paymentSessionError" : "No s'ha pogut inicialitzar el formulari de pagament",
-   "subscription.submit.label" : "Vull donar suport al desenvolupament de Franz",
-   "subscription.type.free" : "gratuït",
-   "subscription.type.month" : "mes",
-   "subscription.type.year" : "any",
   "subscriptionPopup.buttonCancel" : "Cancel·la",
   "subscriptionPopup.buttonDone" : "Fet",
   "tabs.item.deleteService" : "Suprimeix el servei",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 36732b44d..8c7affaa9 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Obnovit",
   "app.errorHandler.headline" : "Něco se pokazilo",
   "feature.announcements.changelog.headline" : "Změny ve Franz {version}",
-   "feature.delayApp.action" : "Podpoř Franz a získej Supporter licenci",
   "feature.delayApp.headline" : "Kup si Franz Supporter licenci a nebudeš už muset čekat",
   "feature.delayApp.text" : "Franz bude pokračovat v {seconds} sekundách.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Podpoř Franz a získej Supporter licenci",
+   "feature.delayApp.upgrade.actionShort" : "Vylepši si svůj účet",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Poslat jako e-mail",
   "feature.shareFranz.action.facebook" : "Sdílet na Facebooku",
   "feature.shareFranz.action.twitter" : "Sdílet na Twitteru",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Přidali jsme {count} služeb do Franze. Získejte zdarma aplikace pro WhatsApp, Messenger, SLack, Skype a další na www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Nemůžeme připojit Franz k online službám",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Připojení k internetu není k dispozici.",
   "global.spellchecker.useDefault" : "Use System Default ({default})",
   "global.spellchecking.autodetect" : "Detect language automatically",
   "global.spellchecking.autodetect.short" : "Automatic",
   "global.spellchecking.language" : "Oprava překlepů jazyka",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importovat služby z Franz 4",
   "import.notSupportedHeadline" : "Služby nejsou podporovány ve verzi Franz 5",
   "import.skip.label" : "Chci přidat službu ručně",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Obnovit služby",
   "infobar.requiredRequestsFailed" : "Není možné nahrát služby a informace o uživateli",
   "infobar.servicesUpdated" : "Vaše služby byly aktualizovány",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Nová aktualizace Franz je k dispozici",
   "invite.email.label" : "E-mailová adresa",
   "invite.headline.friends" : "Pozvěte 3 přátele nebo kolegy",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Sezení vypršelo, je třeba se znovu přihlásit.",
   "login.submit.label" : "Přihlásit se",
   "login.tokenExpired" : "Sezení vypršelo, prosím přihlaste se znovu",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "O aplikaci",
   "menu.app.announcement" : "What's new?",
   "menu.app.checkForUpdates" : "Zkontrolovat aktualizace",
@@ -68,6 +81,9 @@
   "menu.file" : "Soubor",
   "menu.help" : "Nápověda",
   "menu.help.changelog" : "Seznam změn",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Dozvědět se více",
   "menu.help.privacy" : "Prohlášení o ochraně soukromí",
   "menu.help.support" : "Podpora",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Přidat novou službu...",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "Zobrazení",
   "menu.view.enterFullScreen" : "Spustit režim celé obrazovky",
   "menu.view.exitFullScreen" : "Ukončit celoobrazovkový režim",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Zobrazit Vývojářské nástroje",
   "menu.view.toggleFullScreen" : "Přepnout na celou obrazovku",
   "menu.view.toggleServiceDevTools" : "Zobrazit Vývojářské nástroje pro službu",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Přiblížit",
   "menu.view.zoomOut" : "Oddálit",
   "menu.window" : "Okno",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Odeslat",
   "password.successInfo" : "Prosím, zkontrolujte svůj e-mail",
   "premiumFeature.button.upgradeAccount" : "Vylepši si svůj účet",
-   "pricing.headline" : "Podpořit Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Nechci podporovat vývoj aplikace Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Chci podpořit vývoj aplikace Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Vyberte váš plán podpory",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Načíst znovu {name}",
   "service.crashHandler.autoReload" : "Pokus o automatické obnovení {name} za {seconds} sekund",
   "service.crashHandler.headline" : "Ale ne!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Ale ne!",
   "service.errorHandler.message" : "Chyba",
   "service.errorHandler.text" : "{name} se nepodařilo načíst.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Začněme",
   "services.welcome" : "Vítejte v programu Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Změnit heslo",
   "settings.account.headlineProfile" : "Aktualizovat profil",
   "settings.account.headlineSubscription" : "Vaše předplatné",
-   "settings.account.headlineUpgrade" : "Aktualizujte svůj účet a podpořte Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Stáhnout",
   "settings.account.manageSubscription.label" : "Spravovat vaše předplatné",
   "settings.account.successInfo" : "Vaše změny byly uloženy",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Zkusit opět",
   "settings.account.tryReloadUserInfoRequest" : "Zkusit znovu",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Nelze načíst informace o uživateli.",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Vyprázdnit mezipaměti",
   "settings.app.buttonInstallUpdate" : "Restartovat a nainstalovat aktualizace",
   "settings.app.buttonSearchForUpdate" : "Zkontrolovat aktualizace",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Vaše služby",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Všechny služby",
-   "settings.recipes.dev" : "Vývoj",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Dostupné služby",
   "settings.recipes.missingService" : "Chybějící služba?",
   "settings.recipes.mostPopular" : "Nejpopulárnější",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Nastavení",
   "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",
   "signup.firstname.label" : "Jméno",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Již máte účet, přihlásit se?",
   "signup.password.label" : "Heslo",
   "signup.submit.label" : "Vytvořit účet",
-   "subscription.euTaxInfo" : "Pro obyvatelé EU: mohou být aplikovány lokální daně",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Žádné reklamy, nikdy!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "již brzy",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Placený účet Premium Supporter Franz zahrnuje",
-   "subscription.paymentSessionError" : "Nebylo možné inicializovat platbu od",
-   "subscription.submit.label" : "Chci podpořit vývoj aplikace Franz",
-   "subscription.type.free" : "zdarma",
-   "subscription.type.month" : "měsíc",
-   "subscription.type.year" : "rok",
   "subscriptionPopup.buttonCancel" : "Zrušit",
   "subscriptionPopup.buttonDone" : "Dokončit",
   "tabs.item.deleteService" : "Odstranit službu",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 4d06e17e4..b7c2e0ac9 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Neu laden",
   "app.errorHandler.headline" : "Es ist ein Fehler aufgetreten",
   "feature.announcements.changelog.headline" : "Was ist neu in Franz {version}",
-   "feature.delayApp.action" : "Hol dir Franz Premium!",
   "feature.delayApp.headline" : "Erspare dir das Warten mit Franz Premium!",
   "feature.delayApp.text" : "In {seconds} Sekunden geht's weiter!",
+   "feature.delayApp.trial.action" : "Ja, ich möchte Franz Professional 14 Tage gratis testen",
+   "feature.delayApp.trial.actionShort" : "Aktiviere die kostenlose Franz Professional Testlizenz",
+   "feature.delayApp.trial.headline" : "Hol dir die kostenlose Franz Professional Testlizenz und es geht ohne Warten weiter!",
+   "feature.delayApp.upgrade.action" : "Hol dir Franz Premium!",
+   "feature.delayApp.upgrade.actionShort" : "Account upgraden",
+   "feature.serviceLimit.limitReached" : "Du hast {amount} von {limit} in deiner Lizenz inkludierten Services hinzugefügt. Bitte führe ein Upgrade deines Accounts durch, um mehr Services hinzuzufügen.",
   "feature.shareFranz.action.email" : "Als E-Mail senden",
   "feature.shareFranz.action.facebook" : "Auf Facebook teilen",
   "feature.shareFranz.action.twitter" : "Auf Twitter teilen",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Ich habe {count} Services zu Franz hinzugefügt! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Ich habe {count} Services zu Franz hinzugefügt! Hol dir die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Bitte erzähle deinen Freunden und Kolleginnen, warum du Franz toll findest.",
+   "feature.todos.premium.info" : "Franz ToDos sind jetzt für Premium User verfügbar!",
+   "feature.todos.premium.rollout" : "Alle anderen müssen sich noch ein wenig gedulden.",
+   "feature.todos.premium.upgrade" : "Account Upgrade",
   "global.api.unhealthy" : "Verbindung zum Franz-Online-Service fehlgeschlagen",
+   "global.franzProRequired" : "Franz Professional benötigt",
   "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
   "global.spellchecker.useDefault" : "Standard benutzen ({default})",
   "global.spellchecking.autodetect" : "Sprache automatisch erkennen",
   "global.spellchecking.autodetect.short" : "Automatisch",
   "global.spellchecking.language" : "Sprache für Rechtschreibprüfung",
+   "global.upgradeButton.upgradeToPro" : "Upgrade zu Franz Professional",
   "import.headline" : "Deine Franz-4-Dienste importieren",
   "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
   "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Dienste neu laden",
   "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
   "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
+   "infobar.trialActivated" : "Deine kostenlose Testlizenz wurde erfolgreich aktiviert. Viel Spaß!",
   "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar!",
   "invite.email.label" : "E-Mail-Adresse",
   "invite.headline.friends" : "Lade drei Freunde oder Kolleginnen ein!",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
   "login.submit.label" : "Anmelden",
   "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
+   "menu.Todoss.closeTodosDrawer" : "ToDos schließen",
+   "menu.Todoss.openTodosDrawer" : "ToDos öffnen",
   "menu.app.about" : "Über Franz",
   "menu.app.announcement" : "Was ist neu?",
   "menu.app.checkForUpdates" : "Nach Updates suchen",
@@ -68,6 +81,9 @@
   "menu.file" : "Datei",
   "menu.help" : "Hilfe",
   "menu.help.changelog" : "Changelog",
+   "menu.help.debugInfo" : "Debugging-Information anzeigen",
+   "menu.help.debugInfoCopiedBody" : "Deine Debugging-Information wurde in die Zwischenablage kopiert.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debugging-Information",
   "menu.help.learnMore" : "Mehr erfahren",
   "menu.help.privacy" : "Datenschutzerklärung",
   "menu.help.support" : "Hilfe",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Vorheriger Dienst",
   "menu.services.addNewService" : "Dienst hinzufügen",
   "menu.services.setNextServiceActive" : "Nächster Dienst",
+   "menu.todos" : "ToDos",
   "menu.view" : "Darstellung",
   "menu.view.enterFullScreen" : "Vollbildmodus",
   "menu.view.exitFullScreen" : "Vollbildmodus aus",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Entwicklertools anzeigen",
   "menu.view.toggleFullScreen" : "Vollbildmodus umschalten",
   "menu.view.toggleServiceDevTools" : "Entwicklertools für Dienst anzeigen",
+   "menu.view.toggleTodosDevTools" : "ToDos Developer Tools umschalten",
   "menu.view.zoomIn" : "Vergrößern",
   "menu.view.zoomOut" : "Verkleinern",
   "menu.window" : "Fenster",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Absenden",
   "password.successInfo" : "Wir haben Dir eine E-Mail mit weiteren Anweisungen geschickt.",
   "premiumFeature.button.upgradeAccount" : "Account upgraden",
-   "pricing.headline" : "Franz unterstützen",
+   "pricing.features.adFree" : "Keine Werbung",
-   "pricing.link.skipPayment" : "Ich möchte die Entwicklung von Franz nicht unterstützen.",
+   "pricing.features.appDelays" : "Keine unnötigen Unterbrechungen",
-   "pricing.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen.",
+   "pricing.features.customWebsites" : "Hinzufügen von eigenen Websites",
-   "pricing.support.label" : "Wie möchtest Du Franz unterstützen?",
+   "pricing.features.onPremise" : "On-premise & andere Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Rechtschreibprüfung",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Integration von Services über Drittanbieter",
+   "pricing.features.unlimitedServices" : "Unbegrenztes hinzufügen von Services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal monatlich",
+   "pricing.plan.personal-yearly" : "Franz Personal jährlich",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional monatlich",
+   "pricing.plan.pro-yearly" : "Franz Professional jährlich",
+   "pricing.trial.cta.accept" : "Ja, Upgrade zu Franz Professional durchführen",
+   "pricing.trial.cta.skip" : "Weiter zu Franz!",
+   "pricing.trial.error" : "Tut uns leid, wir konnten deine kostenlose Testlizenz nicht aktivieren.",
+   "pricing.trial.features.headline" : "Franz Professional beinhaltet:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Dein persönliches Willkommensangebot:",
+   "pricing.trial.terms.automaticTrialEnd" : "Deine kostenlose Testlizenz endet automatisch nach 14 Tagen",
+   "pricing.trial.terms.headline" : "Ohne Bindung, ohne Haken",
+   "pricing.trial.terms.noCreditCard" : "Keine Kreditkarte notwendig",
   "service.crashHandler.action" : "{name} neu laden",
   "service.crashHandler.autoReload" : "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
   "service.crashHandler.headline" : "Oh nein!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh nein!",
   "service.errorHandler.message" : "Fehler",
   "service.errorHandler.text" : "{name} konnte nicht geladen werden.",
+   "service.restrictedHandler.action" : "Account Upgrade",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional benötigt",
+   "service.restrictedHandler.customUrl.text" : "Bitte ein Upgrade zu Franz Professional durchführen um benutzerdefinierte URLs und Self Hosted Services verwenden zu können.",
+   "service.restrictedHandler.serviceLimit.headline" : "Du hast deine maximale Anzahl an Services erreicht.",
+   "service.restrictedHandler.serviceLimit.text" : "Bitte führe eine Upgrade deines Accounts durch um mehr als {count} Services verwenden zu können.",
   "service.webviewLoader.loading" : "Lade",
   "services.getStarted" : "Los geht's!",
   "services.welcome" : "Willkommen bei Franz!",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Passwort ändern",
   "settings.account.headlineProfile" : "Profil aktualisieren",
   "settings.account.headlineSubscription" : "Dein Abonnement",
-   "settings.account.headlineUpgrade" : "Dein Konto upgraden & Franz unterstützen",
+   "settings.account.headlineTrialUpgrade" : "Hol dir die kostenlose 14-tägige Franz Professional Testlizenz!",
+   "settings.account.headlineUpgradeAccount" : "Hol dir ein Upgrade deines Accounts und bekomme alle Features von Franz!",
   "settings.account.invoiceDownload" : "Herunterladen",
   "settings.account.manageSubscription.label" : "Dein Abonnement verwalten",
   "settings.account.successInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.account.trial" : "Kostenlose Testlizenz",
+   "settings.account.trialEndsIn" : "Deine kostenlose Testlizenz endet in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Bitte aktualisiere deine Zahlungsinformation damit du {license} nach der kostenlosen Testphase weiter nutzen kannst.",
   "settings.account.tryReloadServices" : "Erneut versuchen",
   "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
+   "settings.account.upgradeToPro.label" : "Upgrade zu Franz Professional",
   "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
+   "settings.account.yourLicense" : "Deine Franz Lizenz",
   "settings.app.buttonClearAllCache" : "Cache leeren",
   "settings.app.buttonInstallUpdate" : "Neu starten & Update installieren",
   "settings.app.buttonSearchForUpdate" : "Nach Updates suchen",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Deine Dienste",
   "settings.navigation.yourWorkspaces" : "Deine Workspaces",
   "settings.recipes.all" : "Alle Dienste",
-   "settings.recipes.dev" : "Entwicklung",
+   "settings.recipes.custom" : "Eigene Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Benutzerdefinierte Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Eigene Recipes",
+   "settings.recipes.customService.intro" : "Um ein benutzerdefiniertes Service hinzuzufügen, kopiere das Service Recipe nach:",
+   "settings.recipes.customService.openDevDocs" : "Entwicklerdokumentation",
+   "settings.recipes.customService.openFolder" : "Ordner öffnen",
   "settings.recipes.headline" : "Verfügbare Dienste",
   "settings.recipes.missingService" : "Fehlt ein Dienst?",
   "settings.recipes.mostPopular" : "Am beliebtesten",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Workspaces öffnen",
   "sidebar.settings" : "Einstellungen",
   "sidebar.unmuteApp" : "Benachrichtigungen & Audio aktivieren",
-   "signup.company.label" : "Firma",
   "signup.email.label" : "E-Mail-Adresse",
   "signup.emailDuplicate" : "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
   "signup.firstname.label" : "Vorname",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Du hast bereits ein Konto? Melde Dich an.",
   "signup.password.label" : "Passwort",
   "signup.submit.label" : "Konto erstellen",
-   "subscription.euTaxInfo" : "Preise zuzüglich allfälliger Steuern",
+   "subscription.cta.activateTrial" : "Ja, kostenlose Franz Professional Testlizenz starten",
-   "subscription.features.ads" : "Werbefrei auf Lebenszeit!",
+   "subscription.cta.allOptions" : "Alle Optionen anzeigen",
-   "subscription.features.comingSoon" : "folgt bald",
+   "subscription.cta.choosePlan" : "Wähle deine Lizenz",
-   "subscription.features.noInterruptions" : "Verwende Franz ohne Wartezeiten",
+   "subscription.includedProFeatures" : "Die Franz Professional Lizenz beinhaltet:",
-   "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten wie Mattermost",
+   "subscription.teaser.includedFeatures" : "Bezahlte Franz Lizenzen beinhalten:",
-   "subscription.features.proxy" : "Proxy Support für Dienste",
+   "subscription.teaser.intro" : "Franz 5 ist voll gepackt mit vielen neuen Features, damit du für jegliche kommunikative Eventualität gerüstet bist. Nimm dir was du brauchst und leg los!",
-   "subscription.features.spellchecker" : "Unterstützung für Rechtschreibprüfung",
-   "subscription.features.workspaces" : "Organisiere deine Services in Workspaces",
-   "subscription.includedFeatures" : "Bezahlte Franz Premium Lizenzen beinhalten",
-   "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.month" : "Monat",
-   "subscription.type.year" : "Jahr",
   "subscriptionPopup.buttonCancel" : "Abbrechen",
   "subscriptionPopup.buttonDone" : "Fertig",
   "tabs.item.deleteService" : "Dienst löschen",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index a083964d4..13643839d 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Επαναφόρτωση",
   "app.errorHandler.headline" : "Κάτι δεν λειτουργεί",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz θα συνεχίσει σε {seconds} δευτερόλεπτα.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Get a Franz Supporter License",
+   "feature.delayApp.upgrade.actionShort" : "Upgrade account",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Send as email",
   "feature.shareFranz.action.facebook" : "Share on Facebook",
   "feature.shareFranz.action.twitter" : "Share on Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Δεν είναι δυνατή η σύνδεση με τις ζωντανές υπηρεσίες του Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Έχετε αποσυνδεθεί από το Διαδίκτυο",
   "global.spellchecker.useDefault" : "Use System Default ({default})",
   "global.spellchecking.autodetect" : "Detect language automatically",
   "global.spellchecking.autodetect.short" : "Automatic",
   "global.spellchecking.language" : "Spell checking language",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Εισαγάγετε τις υπηρεσίες σας Franz 4",
   "import.notSupportedHeadline" : "Υπηρεσίες που δεν υποστηρίζονται ακόμα στο Franz 5",
   "import.skip.label" : "Θέλω να προσθέσω υπηρεσίες χειροκίνητα",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Ανανέωση υπηρεσιών",
   "infobar.requiredRequestsFailed" : "Δεν ήταν δυνατή η φόρτωση υπηρεσιών και πληροφοριών χρηστών",
   "infobar.servicesUpdated" : "Οι υπηρεσίες σας έχουν ενημερωθεί.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Υπάρχει διαθέσιμη μια νέα ενημέρωση για τον Franz.",
   "invite.email.label" : "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
   "invite.headline.friends" : "Προσκαλέστε 3 από τους φίλους ή τους συναδέλφους σας",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
   "login.submit.label" : "Σύνδεση",
   "login.tokenExpired" : "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Σχετικά με το Franz",
   "menu.app.announcement" : "What's new?",
   "menu.app.checkForUpdates" : "Έλεγχος για ενημερώσεις",
@@ -68,6 +81,9 @@
   "menu.file" : "Αρχείο",
   "menu.help" : "Βοήθεια",
   "menu.help.changelog" : "Πρόσφατες αλλαγές",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Μάθετε περισσότερα",
   "menu.help.privacy" : "Δήλωση απορρήτου",
   "menu.help.support" : "Υποστήριξη",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Νέα Υπηρεσία",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "Προβολή",
   "menu.view.enterFullScreen" : "Πλήρης Οθόνη",
   "menu.view.exitFullScreen" : "Έξοδος από πλήρη οθόνη",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Άνοιγμα Εργαλειοθήκη Προγραμματιστών",
   "menu.view.toggleFullScreen" : "Λειτουργία πλήρους οθόνης",
   "menu.view.toggleServiceDevTools" : "Λειτουργεία Υπηρεσίασ Εργαλειοθήκης Προγραμματιστών",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Μεγέθυνση",
   "menu.view.zoomOut" : "Σμίκρυνση",
   "menu.window" : "Παράθυρο",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Υποβολή",
   "password.successInfo" : "Ελέγξτε το email σας",
   "premiumFeature.button.upgradeAccount" : "Upgrade account",
-   "pricing.headline" : "Υποστηρίξτε το Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Δεν θέλω να βοηθήσω στην ανάπτυξη του Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Επιλέξτε το πακέτο υποστήριξης",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Επαναφόρτωση {name}",
   "service.crashHandler.autoReload" : "Γίνεται προσπάθεια αυτόματης ανάκτησης του {name} σε {seconds} δευτερόλεπτα",
   "service.crashHandler.headline" : "Ω, όχι!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Ω, όχι!",
   "service.errorHandler.message" : "Σφάλμα",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Ξεκινήστε",
   "services.welcome" : "Καλώς ορίσατε στον Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Αλλαγή κωδικού πρόσβασης",
   "settings.account.headlineProfile" : "Ενημέρωση προφίλ",
   "settings.account.headlineSubscription" : "Η συνδρομή σας",
-   "settings.account.headlineUpgrade" : "Αναβάθμιση του λογαριασμού σας και υποστήριξη Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Λήψη",
   "settings.account.manageSubscription.label" : "Διαχείριση της συνδρομής σας",
   "settings.account.successInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Δοκιμάστε ξανά",
   "settings.account.tryReloadUserInfoRequest" : "Δοκιμάστε ξανά",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Δεν ήταν δυνατή η φόρτωση πληροφοριών χρήστη",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Καθαρισμός λανθάνουσας μνήμης",
   "settings.app.buttonInstallUpdate" : "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
   "settings.app.buttonSearchForUpdate" : "Έλεγχος για ενημερώσεις",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Οι υπηρεσίες σας",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Όλες οι υπηρεσίες",
-   "settings.recipes.dev" : "Ανάπτυξη",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Διαθέσιμες υπηρεσίες",
   "settings.recipes.missingService" : "Λείπει κάποια υπηρεσία;",
   "settings.recipes.mostPopular" : "Τα πιο δημοφιλή",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Ρυθμίσεις",
   "sidebar.unmuteApp" : "Ενεργοποίηση ειδοποιήσεων & ήχου",
-   "signup.company.label" : "Εταιρεία",
   "signup.email.label" : "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
   "signup.emailDuplicate" : "Ένας χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου υπάρχει ήδη",
   "signup.firstname.label" : "Όνομα",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Έχετε ήδη λογαριασμό? Συνδεθείτε.",
   "signup.password.label" : "Κωδικός πρόσβασης",
   "signup.submit.label" : "Δημιουργία λογαριασμού",
-   "subscription.euTaxInfo" : "Πολίτες Ε.Ε.: Στις τιμές δεν περιλαμβάνονται τυχόν φόροι και άλλες τοπικές επιβαρύνσεις",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Τέλος στις διαφημίσεις",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "σύντομα",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Ο Premium λογαριασμός υποστήριξης Franz περιλαμβάνει",
-   "subscription.paymentSessionError" : "Δεν ήταν δυνατή η προετοιμασία της φόρμας πληρωμής",
-   "subscription.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
-   "subscription.type.free" : "δωρεάν",
-   "subscription.type.month" : "μήνας",
-   "subscription.type.year" : "έτος",
   "subscriptionPopup.buttonCancel" : "Ακύρωση",
   "subscriptionPopup.buttonDone" : "Έγινε",
   "tabs.item.deleteService" : "Διαγραφή υπηρεσίας",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 15ade7941..b3a4f2ea4 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Actualizar",
   "app.errorHandler.headline" : "Algo salió mal",
   "feature.announcements.changelog.headline" : "Cambios en Franz {version}",
-   "feature.delayApp.action" : "Consigue una Licencia de Soporte de Franz",
   "feature.delayApp.headline" : "Por favor compra una Licencia de Soporte de Franz para omitir la espera",
   "feature.delayApp.text" : "Franz continuará en {seconds} segundos.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Consigue una Licencia de Soporte de Franz",
+   "feature.delayApp.upgrade.actionShort" : "Mejora tu cuenta",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Enviar como correo",
   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
   "feature.shareFranz.action.twitter" : "Compartir en Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "¡He añadido {count} servicios a Franz! Obtén la aplicación gratuita para WhatsApp, Messenger, Slack, Skype en www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "He agregado {count} servicios a Franz! Obtené la aplicación gratuita de WhatsApp, Messenger, Slack, Skype y co en www.meetfranz.com\/cc @FranzMessenger",
   "feature.shareFranz.text" : "Dile a tus amigos y colegas lo asombroso que es Franz y ayúdanos a correr la voz.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "No es posible conectarse a los servicios en línea de Franz.",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "No estás conectado a Internet",
   "global.spellchecker.useDefault" : "Utilizar estándar del sistema ({default})",
   "global.spellchecking.autodetect" : "Detectar el idioma automáticamente",
   "global.spellchecking.autodetect.short" : "Automático",
   "global.spellchecking.language" : "Corrector de ortografía",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importa tus servicios de Franz 4",
   "import.notSupportedHeadline" : "Servicios aún no admitidos en Franz 5",
   "import.skip.label" : "Quiero agregar servicios manualmente",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Recargar servicios",
   "infobar.requiredRequestsFailed" : "No se han podido cargar los servicios ni la información de usuario",
   "infobar.servicesUpdated" : "Tus servicios han sido actualizados.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Una nueva actualización de Franz está disponible",
   "invite.email.label" : "Dirección de correo electrónico",
   "invite.headline.friends" : "Invita a 3 de tus amigos o compañeros",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Tu sesión ha expirado, por favor inicia la sesión de nuevo.",
   "login.submit.label" : "Iniciar sesión",
   "login.tokenExpired" : "Tu sesión ha expirado, por favor inicia sesión de nuevo.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Acerca de Franz",
   "menu.app.announcement" : "¿Qué hay de nuevo?",
   "menu.app.checkForUpdates" : "Comprobar actualizaciones",
@@ -68,6 +81,9 @@
   "menu.file" : "Archivo",
   "menu.help" : "Ayuda",
   "menu.help.changelog" : "Registro de cambios",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Conocer más",
   "menu.help.privacy" : "Declaración de privacidad",
   "menu.help.support" : "Soporte",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activa el servicio previo",
   "menu.services.addNewService" : "Añadir Nuevo Servicio...",
   "menu.services.setNextServiceActive" : "Activa el siguiente servicio",
+   "menu.todos" : "Todos",
   "menu.view" : "Mostrar",
   "menu.view.enterFullScreen" : "Pasar a pantalla completa",
   "menu.view.exitFullScreen" : "Salir de Pantalla Completa",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Activar las Herramientas para Desarrolladores",
   "menu.view.toggleFullScreen" : "Cambiar a Pantalla Completa",
   "menu.view.toggleServiceDevTools" : "Mostrar Herramientas de Servicios para Desarrolladores",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Ampliar",
   "menu.view.zoomOut" : "Reducir",
   "menu.window" : "Ventana",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Enviar",
   "password.successInfo" : "Por favor revisa tu correo electrónico",
   "premiumFeature.button.upgradeAccount" : "Mejora tu cuenta",
-   "pricing.headline" : "Apoya a Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "No quiero apoyar el desarrollo de Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Quiero apoyar el desarrollo de Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Selecciona tu plan de soporte",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Espacios de trabajo",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Recargar {name}",
   "service.crashHandler.autoReload" : "Intentando recuperar automáticamente {name} en {seconds} segundos",
   "service.crashHandler.headline" : "¡Oh, no!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "¡Oh, no!",
   "service.errorHandler.message" : "Error",
   "service.errorHandler.text" : "{name} ha fallado la carga",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Cargando",
   "services.getStarted" : "Primeros pasos",
   "services.welcome" : "Bienvenido a Franz",
@@ -135,13 +181,19 @@
   "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.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Descargar",
   "settings.account.manageSubscription.label" : "Administra tu suscripción",
   "settings.account.successInfo" : "Tus cambios han sido guardados",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Intentar de nuevo",
   "settings.account.tryReloadUserInfoRequest" : "Intenta de nuevo",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "No se pudo cargar la información de usuario",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Limpiar caché",
   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
   "settings.app.buttonSearchForUpdate" : "Buscar actualizaciones",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Tus servicios",
   "settings.navigation.yourWorkspaces" : "Tus espacios de trabajo",
   "settings.recipes.all" : "Todos los servicios",
-   "settings.recipes.dev" : "Desarrollo",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Servicios disponibles",
   "settings.recipes.missingService" : "¿Echas de menos algún servicio?",
   "settings.recipes.mostPopular" : "Más populares",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Configuración",
   "sidebar.unmuteApp" : "Activar notificaciones y sonido",
-   "signup.company.label" : "Compañía",
   "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",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Ya tienes una cuenta, ¿Iniciar sesión?",
   "signup.password.label" : "Contraseña",
   "signup.submit.label" : "Crear cuenta",
-   "subscription.euTaxInfo" : "Residentes de la UE: pueden aplicarse impuestos locales",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "¡Sin publicidad, para siempre!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "próximamente",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Sin retrasos en la app ni molestas actualizaciones de licencias",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Agregar servicios de almacenamiento como Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Soporte Proxy para servicios",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Soporte para corrector de ortografía",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "La Cuenta pagada de Colaborador Premium de Franz incluye",
-   "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
-   "subscription.submit.label" : "Quiero apoyar el desarrollo de Franz",
-   "subscription.type.free" : "gratis",
-   "subscription.type.month" : "mes",
-   "subscription.type.year" : "año",
   "subscriptionPopup.buttonCancel" : "Cancelar",
   "subscriptionPopup.buttonDone" : "Listo",
   "tabs.item.deleteService" : "Borrar servicio",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 451247c8b..5324de613 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,23 +1,33 @@
 {
-   "app.errorHandler.action" : "Rafraîchir",
+   "app.errorHandler.action" : "Actualiser",
-   "app.errorHandler.headline" : "Une erreur s'est produite",
+   "app.errorHandler.headline" : "On dirait que quelque chose ne va pas",
-   "feature.announcements.changelog.headline" : "Changements dans Franz {version}",
+   "feature.announcements.changelog.headline" : "Les nouveaux changements dans Franz {version}",
-   "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
+   "feature.delayApp.headline" : "Achetez la licence Franz pour ne plus avoir de temps d'attente",
-   "feature.delayApp.headline" : "Achetez une licence de Supporter Franz pour ne plus avoir de temps d'attente",
+   "feature.delayApp.text" : "Franz s'ouvrira dans {seconds} secondes.",
-   "feature.delayApp.text" : "Franz reprendra dans {seconds} secondes.",
+   "feature.delayApp.trial.action" : "Oui, je veux les 14 jours d'essai gratuits de Franz Professionnel",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Acheter une license Franz",
+   "feature.delayApp.upgrade.actionShort" : "Augmenter le niveau de mon compte",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Envoyer par mail",
   "feature.shareFranz.action.facebook" : "Partager sur Facebook",
   "feature.shareFranz.action.twitter" : "Partager sur Twitter",
-   "feature.shareFranz.headline" : "Franz est meilleur quand on est tous ensemble !",
+   "feature.shareFranz.headline" : "Franz est meilleur quand on est ensemble !",
-   "feature.shareFranz.shareText.email" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "J'ai ajouté {count} services sur Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et autres sur www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz! Télécharge l'application gratuite pour WhatsApp, Messenger, Slack, Skype et compagnie sur www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz! Télécharge l'application gratuite pour WhatsApp, Messenger, Slack, Skype et autres sur www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Dites à vos amis et collègues a quel point Franz est super et aidez nous à faire passer le mot.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
   "global.spellchecker.useDefault" : "Par défaut ({default})",
   "global.spellchecking.autodetect" : "Detecter automatiquement la langue",
   "global.spellchecking.autodetect.short" : "Automatiquement",
   "global.spellchecking.language" : "Langue de la vérification orthographique",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importez vos services depuis la version 4 de Franz.",
   "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par la version 5 de Franz",
   "import.skip.label" : "Je veux ajouter des services manuellement",
@@ -27,6 +37,7 @@
   "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.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Une nouvelle mise à jour de Franz est disponible.",
   "invite.email.label" : "Adresse Email",
   "invite.headline.friends" : "Invitez 3 amis ou collègues",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Votre session a expiré. Reconnectez-vous s'il vous plaît.",
   "login.submit.label" : "Se connecter",
   "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "À propos de Franz",
   "menu.app.announcement" : "Quoi de neuf ? ",
   "menu.app.checkForUpdates" : "Vérifier les mises à jour",
@@ -68,6 +81,9 @@
   "menu.file" : "Fichier",
   "menu.help" : "Aide",
   "menu.help.changelog" : "Liste des modifications",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "En savoir plus",
   "menu.help.privacy" : "Déclaration de confidentialité",
   "menu.help.support" : "Assistance",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activer le service précédent",
   "menu.services.addNewService" : "Ajouter un nouveau service...",
   "menu.services.setNextServiceActive" : "Activer le service suivant",
+   "menu.todos" : "Todos",
   "menu.view" : "Aperçu",
   "menu.view.enterFullScreen" : "Entrer en mode plein écran",
   "menu.view.exitFullScreen" : "Sortir du mode plein écran",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Activer les outils développeur",
   "menu.view.toggleFullScreen" : "Activer \/ désactiver le mode plein écran",
   "menu.view.toggleServiceDevTools" : "Activer les outils de développement WebKit",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Zoom Avant",
   "menu.view.zoomOut" : "Zoom Arrière",
   "menu.window" : "Fenêtre",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Soumettre",
   "password.successInfo" : "Merci de consulter vos emails",
   "premiumFeature.button.upgradeAccount" : "Augmenter le niveau de mon compte",
-   "pricing.headline" : "Soutenez Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Je veux soutenir le développement de Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Sélectionnez votre plan de soutien",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Espace de travail",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Recharger {name}",
   "service.crashHandler.autoReload" : "Tentative de restauration automatique de {name} dans {seconds} secondes",
   "service.crashHandler.headline" : "Oh non !",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh non !",
   "service.errorHandler.message" : "Erreur",
   "service.errorHandler.text" : "Le chargement de {name} a échoué.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Chargement (c'est l'heure du café...)",
   "services.getStarted" : "Commencer",
   "services.welcome" : "Bienvenue dans Franz",
@@ -135,13 +181,19 @@
   "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 soutenez Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Télécharger",
   "settings.account.manageSubscription.label" : "Gérer votre abonnement",
   "settings.account.successInfo" : "Vos modifications ont été enregistrées",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Réessayer",
   "settings.account.tryReloadUserInfoRequest" : "Réessayer",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Impossible de charger les informations de l'utilisateur",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Vider le cache",
   "settings.app.buttonInstallUpdate" : "Redémarrer et installer la mise à jour",
   "settings.app.buttonSearchForUpdate" : "Vérifier les mises à jour",
@@ -150,7 +202,7 @@
   "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
   "settings.app.form.autoLaunchOnStart" : "Lancer Franz au démarrage",
   "settings.app.form.beta" : "Accepter les versions bêta",
-   "settings.app.form.darkMode" : "Rejoins le côt�� obscur",
+   "settings.app.form.darkMode" : "Activer le th��me sombre",
   "settings.app.form.enableGPUAcceleration" : "Activer l'accélération GPU",
   "settings.app.form.enableSpellchecking" : "Activer la vérification orthographique",
   "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Vos services",
   "settings.navigation.yourWorkspaces" : "Tes espaces de travail",
   "settings.recipes.all" : "Tous les services",
-   "settings.recipes.dev" : "Développement",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Services disponibles",
   "settings.recipes.missingService" : "Un service est manquant ?",
   "settings.recipes.mostPopular" : "Les plus populaires",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Ouvrir l'espace de travail",
   "sidebar.settings" : "Paramètres",
   "sidebar.unmuteApp" : "Activer les notifications et les sons",
-   "signup.company.label" : "Entreprise",
   "signup.email.label" : "Adresse email",
   "signup.emailDuplicate" : "Cette adresse email est déjà utilisée",
   "signup.firstname.label" : "Prénom",
@@ -286,20 +343,12 @@
   "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.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Plus de pubs !",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "Bientôt disponible",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Aucun délai dans l'application ni de harcèlement pour mettre à niveau la licence",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Ajouter des services auto-hébergés comme Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Support proxy pour les services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Prise en charge du correcteur orthographique",
-   "subscription.features.workspaces" : "Organisez vos services en espaces de travail",
-   "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
-   "subscription.paymentSessionError" : "Initialisation du paiement impossible",
-   "subscription.submit.label" : "Je souhaite aider au développement de Franz",
-   "subscription.type.free" : "gratuit",
-   "subscription.type.month" : "mois",
-   "subscription.type.year" : "année",
   "subscriptionPopup.buttonCancel" : "Annuler",
   "subscriptionPopup.buttonDone" : "Terminé",
   "tabs.item.deleteService" : "Supprimer le service",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 97a39d2e6..fe465235f 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Athlódáil",
   "app.errorHandler.headline" : "Something went wrong",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Get a Franz Supporter License",
+   "feature.delayApp.upgrade.actionShort" : "Upgrade account",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Send as email",
   "feature.shareFranz.action.facebook" : "Share on Facebook",
   "feature.shareFranz.action.twitter" : "Share on Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Ní féidir nascadh le seirbhísí Franz ar líne",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Níl tú nasctha leis an Idirlíon.",
   "global.spellchecker.useDefault" : "Use System Default ({default})",
   "global.spellchecking.autodetect" : "Detect language automatically",
   "global.spellchecking.autodetect.short" : "Automatic",
   "global.spellchecking.language" : "Spell checking language",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Iompórtáil do sheirbhísí Franz 4",
   "import.notSupportedHeadline" : "Níl na seirbhísí seo taca ag Franz 5 go fóill",
   "import.skip.label" : "Ba mhaith liom seirbhísí a chur de láimh",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Athlódáil seirbhísí",
   "infobar.requiredRequestsFailed" : "Ní féidir seirbhísí agus eolas úsáideora a lódáil",
   "infobar.servicesUpdated" : "Nuashonraíodh do sheirbhísí.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Tá nuashonrú nua do Franz ar fáil.",
   "invite.email.label" : "Seoladh ríomhphoist",
   "invite.headline.friends" : "Tabhair cuireadh do thriúr chara nó chomhghleacaí",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
   "login.submit.label" : "Logáil isteach",
   "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Faoi Franz",
   "menu.app.announcement" : "What's new?",
   "menu.app.checkForUpdates" : "Cuardaigh le nuashonruithe",
@@ -68,6 +81,9 @@
   "menu.file" : "Comhad",
   "menu.help" : "Cabhair",
   "menu.help.changelog" : "Athruithe",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Tuilleadh eolais",
   "menu.help.privacy" : "Ráiteas phríobháideachais",
   "menu.help.support" : "Tacaíocht",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Cuir seirbhís nua leis",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "Amharc",
   "menu.view.enterFullScreen" : "Cuir isteach mód lánscáileáin",
   "menu.view.exitFullScreen" : "Scoir mód lánscáileáin",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Scoránaigh uirlis forbróra",
   "menu.view.toggleFullScreen" : "Scoránaigh mód lánscáileáin",
   "menu.view.toggleServiceDevTools" : "Scoránaigh uirlis forbróra seirbhíse",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Zúmáil isteach",
   "menu.view.zoomOut" : "Zúmáil amach",
   "menu.window" : "Fuinneog",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Cuir isteach",
   "password.successInfo" : "Seiceáil do chuid ríomhphoist le do thoil",
   "premiumFeature.button.upgradeAccount" : "Upgrade account",
-   "pricing.headline" : "Tabhair tacaíocht do Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Níor mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Conas ar mhaith leat tacú le Franz?",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Athlódáil {name}",
   "service.crashHandler.autoReload" : "Ag iarraidh {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
   "service.crashHandler.headline" : "Oró, ní hea!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oró, ní hea!",
   "service.errorHandler.message" : "Earráid",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Cuir tús",
   "services.welcome" : "Fáilte go Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Athraigh pasfhocal",
   "settings.account.headlineProfile" : "Nuashonraigh próifíl",
   "settings.account.headlineSubscription" : "Do shíntiús",
-   "settings.account.headlineUpgrade" : "Uasghrádaigh do chuntas chun tacaíocht a thabhairt do Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Íoslódáil",
   "settings.account.manageSubscription.label" : "Bainistigh do shíntiús",
   "settings.account.successInfo" : "Sábháladh do chuid athruithe",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Atriail",
   "settings.account.tryReloadUserInfoRequest" : "Atriail",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Ní féidir eolas úsáideora a lódáil",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Glan taisce",
   "settings.app.buttonInstallUpdate" : "Atosaigh ⁊ suiteáil nuashonrú",
   "settings.app.buttonSearchForUpdate" : "Cuardaigh le nuashonruithe",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Do sheirbhísí",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Gach seirbhís",
-   "settings.recipes.dev" : "Forbairt",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Seirbhísí le fáil",
   "settings.recipes.missingService" : "Seirbhís ar iarraidh?",
   "settings.recipes.mostPopular" : "Is coitianta",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Socruithe",
   "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 cheana féin",
   "signup.firstname.label" : "Céadainm",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Cuntas agat cheana féin, logáil isteach?",
   "signup.password.label" : "Pasfhocal",
   "signup.submit.label" : "Cruthaigh cuntas",
-   "subscription.euTaxInfo" : "Áithritheoirí an tAÉ: is féidir cáin díolacháin áitiúla a chur i bhfeidhm",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Fógraí ar bith, choíche!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "ag teacht go luath",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhthacadóra Franz san áireamh",
-   "subscription.paymentSessionError" : "Ní féidir an bhfoirm íocaíochta a lódáil",
-   "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
-   "subscription.type.free" : "saor in aisce",
-   "subscription.type.month" : "mí",
-   "subscription.type.year" : "bliain",
   "subscriptionPopup.buttonCancel" : "Cealaigh",
   "subscriptionPopup.buttonDone" : "Déanta",
   "tabs.item.deleteService" : "Scrios seirbhís",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index d48c8bdac..0fd67f0bd 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Ponovno učitavanje",
   "app.errorHandler.headline" : "Something went wrong",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Get a Franz Supporter License",
+   "feature.delayApp.upgrade.actionShort" : "Upgrade account",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Send as email",
   "feature.shareFranz.action.facebook" : "Share on Facebook",
   "feature.shareFranz.action.twitter" : "Share on Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Nije se moguće povezati na Francove on-line servise. ",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Sada ste povezani s internetom. ",
   "global.spellchecker.useDefault" : "Use System Default ({default})",
   "global.spellchecking.autodetect" : "Detect language automatically",
   "global.spellchecking.autodetect.short" : "Automatic",
   "global.spellchecking.language" : "Spell checking language",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Uvezite svoje Franc 4 servise. ",
   "import.notSupportedHeadline" : "Franc 5 trenutno ne podržava taj servis",
   "import.skip.label" : "Želim ručno dodati ove usluge",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Ponovo učitaj servise",
   "infobar.requiredRequestsFailed" : "Nemoguće učitati servise i korisničke informacije",
   "infobar.servicesUpdated" : "Vaši servisi su ažurirani. ",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Novo ažuriranje Franz-a je dostupno. ",
   "invite.email.label" : "Vaša e-adresa:",
   "invite.headline.friends" : "Pozovite 3 vaša prijatelja ili kolege",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Vaša sesija je istekla, prijavite se ponovo.",
   "login.submit.label" : "Prijavite se",
   "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "O aplikaciji",
   "menu.app.announcement" : "What's new?",
   "menu.app.checkForUpdates" : "Potraži ažuriranja",
@@ -68,6 +81,9 @@
   "menu.file" : "File",
   "menu.help" : "Help",
   "menu.help.changelog" : "Changelog",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Learn More",
   "menu.help.privacy" : "Izjava o privatnosti ",
   "menu.help.support" : "Support",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Add New Service...",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "View",
   "menu.view.enterFullScreen" : "Enter Full Screen",
   "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Toggle Developer Tools",
   "menu.view.toggleFullScreen" : "Toggle Full Screen",
   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Zoom In",
   "menu.view.zoomOut" : "Zoom Out",
   "menu.window" : "Window",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Pošalji",
   "password.successInfo" : "Molimo Vas da provjerite svoju e-mail adresu",
   "premiumFeature.button.upgradeAccount" : "Upgrade account",
-   "pricing.headline" : "Podržite Franz aplikaciju",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Ne želim da podržim razvoj Franz-a.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Želim da podržim razvoj Franz-a.",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Izaberite vaš plan za podržavanje",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Osvježi okvir",
   "service.crashHandler.autoReload" : "Pokušati ću automatski povratiti {ime} u {sekundi} sekundi",
   "service.crashHandler.headline" : "O, ne! ",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "O, ne! ",
   "service.errorHandler.message" : "Greška",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Započnimo!",
   "services.welcome" : "Dobrodošli u Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Promijenite lozinku",
   "settings.account.headlineProfile" : "Ažurirajte profil",
   "settings.account.headlineSubscription" : "Vaša pretplata",
-   "settings.account.headlineUpgrade" : "Nadogradite račun i podržite Franc",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Preuzmite",
   "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
   "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Pokušajte ponovno",
   "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Nije moguće učitati informacije o korisniku",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Očisti memoriju",
   "settings.app.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
   "settings.app.buttonSearchForUpdate" : "Potraži ažuriranja",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Vaše usluge",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Sve usluge",
-   "settings.recipes.dev" : "Razvoj",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Dostupne usluge",
   "settings.recipes.missingService" : "Da li neki servis nedostaje?",
   "settings.recipes.mostPopular" : "Najpopularniji",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Postavke",
   "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",
   "signup.firstname.label" : "Ime",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Imate račun? Prijavite se.",
   "signup.password.label" : "Lozinka",
   "signup.submit.label" : "Napravite novi račun",
-   "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje ",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Bez reklama, doživotno!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "Dolazi uskoro",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Plaćeni\/Premium račun uključuje sljedeće: ",
-   "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
-   "subscription.submit.label" : "Želim da podržim razvoj Franca. ",
-   "subscription.type.free" : "Slobodno",
-   "subscription.type.month" : "mjesec",
-   "subscription.type.year" : "godina",
   "subscriptionPopup.buttonCancel" : "Odustani",
   "subscriptionPopup.buttonDone" : "Završeno",
   "tabs.item.deleteService" : "Izbriši servis",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 43e0da91a..0f410b880 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Újratöltés",
   "app.errorHandler.headline" : "Valami nem jött össze",
   "feature.announcements.changelog.headline" : "Franz {version} változásai",
-   "feature.delayApp.action" : "Szerezz egy Franz Támogatói Liszencet",
   "feature.delayApp.headline" : "Kérjük vásárolj egy Franc Támogatói Liszencet a várakozás átugrásához",
   "feature.delayApp.text" : "A Franz továbblép {seconds} másodperc múlva.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Szerezz egy Franz Támogatói Liszencet",
+   "feature.delayApp.upgrade.actionShort" : "Fiók frissítése",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Küldés email-ben",
   "feature.shareFranz.action.facebook" : "Megosztás Facebook-on",
   "feature.shareFranz.action.twitter" : "Megosztás Twitter-en",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatáshoz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Nincs hálózati kapcsolat.",
   "global.spellchecker.useDefault" : "Rendszer alapbeállítás használata ({default})",
   "global.spellchecking.autodetect" : "Automatikus nyelvdetektálás",
   "global.spellchecking.autodetect.short" : "Automatikus",
   "global.spellchecking.language" : "Helyesírás-ellenőrző nyelve",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importáld szolgáltatásaidat a Franz 4-ből",
   "import.notSupportedHeadline" : "Még nem támogatott szolgáltatások a Franz 5-ben",
   "import.skip.label" : "Manuálisan szeretném hozzáadni a szolgáltatásokat",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Szolgáltatások újratöltése",
   "infobar.requiredRequestsFailed" : "Szolgáltatások és felhasználói információk nem tölthetők be",
   "infobar.servicesUpdated" : "A szolgáltatások frissítésre kerültek.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Új frissítés érhető el a Franz-hoz.",
   "invite.email.label" : "Email cím",
   "invite.headline.friends" : "Hívd meg 3 barátodat vagy kollégádat",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "A munkamenet lejárt, kérlek lépj be újra.",
   "login.submit.label" : "Bejelentkezés",
   "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Névjegy",
   "menu.app.announcement" : "Mi újság?",
   "menu.app.checkForUpdates" : "Frissítések keresése",
@@ -68,6 +81,9 @@
   "menu.file" : "Fájl",
   "menu.help" : "Súgó",
   "menu.help.changelog" : "Változások listája",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Tudjon meg többet",
   "menu.help.privacy" : "Adatvédelmi Nyilatkozatot",
   "menu.help.support" : "Támogatás",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Előző szolgáltatás",
   "menu.services.addNewService" : "Új szolgáltatás hozzáadása...",
   "menu.services.setNextServiceActive" : "Következő szolgáltatás",
+   "menu.todos" : "Todos",
   "menu.view" : "Nézet",
   "menu.view.enterFullScreen" : "Kilépés a teljes képernyős módból",
   "menu.view.exitFullScreen" : "Kilépés a teljes képernyős módból",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Fejlesztői eszközök ki\/bekapcsolása",
   "menu.view.toggleFullScreen" : "Teljes képernyős mód ki\/bekapcsolása",
   "menu.view.toggleServiceDevTools" : "Szolgáltatás Fejlesztői Eszközök ki\/bekapcsolása",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Nagyítás",
   "menu.view.zoomOut" : "Kicsinyítés",
   "menu.window" : "Ablak",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Küldés",
   "password.successInfo" : "Ellenőrizd az email fiókodat",
   "premiumFeature.button.upgradeAccount" : "Fiók frissítése",
-   "pricing.headline" : "Támogasd a Franz-ot",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Nem szeretném támogatni a Franz fejlesztését.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Támogatni szeretném a Franz fejlesztését",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Válaszd ki a támogatás módját",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Munkaterületek",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "{name} újratöltése",
   "service.crashHandler.autoReload" : "{name} automatikusan helyreállítása {seconds} másodpercen belül",
   "service.crashHandler.headline" : "Jajj ne!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Jajj ne!",
   "service.errorHandler.message" : "Hiba",
   "service.errorHandler.text" : "{name} nem tudott betöltődni.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Betöltés",
   "services.getStarted" : "Kezdj hozzá",
   "services.welcome" : "Üdvözöl a Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Jelszócsere",
   "settings.account.headlineProfile" : "Profil frissítése",
   "settings.account.headlineSubscription" : "Előfizetésed",
-   "settings.account.headlineUpgrade" : "Frissítsd fiókod és támogasd a Franz-ot",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Letöltés",
   "settings.account.manageSubscription.label" : "Előfizetés kezelése",
   "settings.account.successInfo" : "A módosításokat elmentettük",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Próbáld újra",
   "settings.account.tryReloadUserInfoRequest" : "Próbáld újra",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "A felhasználói adatok betöltése sikertelen",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Gyorsítótár törlése",
   "settings.app.buttonInstallUpdate" : "Újraindítás és frissítések telepítése",
   "settings.app.buttonSearchForUpdate" : "Frissítések keresése",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Szolgáltatásaid",
   "settings.navigation.yourWorkspaces" : "Munkaterületeid",
   "settings.recipes.all" : "Összes szolgáltatás",
-   "settings.recipes.dev" : "Fejlesztés",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Elérhető szolgáltatások",
   "settings.recipes.missingService" : "Hiányzik egy szolgáltatás?",
   "settings.recipes.mostPopular" : "Legnépszerűbb",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Munkaterület panel megnyitása",
   "sidebar.settings" : "Beállítások",
   "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ó",
   "signup.firstname.label" : "Keresztnév",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Már van fiókod? Lépj be!",
   "signup.password.label" : "Jelszó",
   "signup.submit.label" : "Fiók létrehozása",
-   "subscription.euTaxInfo" : "EU állampolgárok: helyi vásárlás esetén adók kerülhetnek felszámolásra",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Hirdetésmentes, mindig!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "hamarosan",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Nincs több app késlekedés és liszencfrissítési piszkálás",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Saját kiszolgálós szolgáltatások hozzáadása, pl.: Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy támogatás a szolgáltatásokhoz",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Támogatás a Helyesírás-ellenőrzőhöz",
-   "subscription.features.workspaces" : "Rendezd szolgáltatásaidat Munkaterületekbe",
-   "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
-   "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
-   "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
-   "subscription.type.free" : "ingyenes",
-   "subscription.type.month" : "hónap",
-   "subscription.type.year" : "év",
   "subscriptionPopup.buttonCancel" : "Mégsem",
   "subscriptionPopup.buttonDone" : "Kész",
   "tabs.item.deleteService" : "Szolgáltatás törlése",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index fb6434869..f098c984a 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Muat Ulang",
   "app.errorHandler.headline" : "Terjadi kesalahan",
   "feature.announcements.changelog.headline" : "Perubahan dalam Franz {version}",
-   "feature.delayApp.action" : "Dapatkan Lisensi Pendukung Franz",
   "feature.delayApp.headline" : "Beli Lisensi Pendukung Franz agar tidak perlu menunggu",
   "feature.delayApp.text" : "Franz akan melanjutkan dalam {seconds} detik.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Dapatkan Lisensi Pendukung Franz",
+   "feature.delayApp.upgrade.actionShort" : "Tingkatkan akun",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Kirim sebagai email",
   "feature.shareFranz.action.facebook" : "Bagikan di Facebook",
   "feature.shareFranz.action.twitter" : "Bagikan di Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Saya telah menambahkan layanan {count} ke Franz! Dapatkan aplikasi gratis untuk WhatsApp, Messenger, Slack, Skype dan co di www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Saya telah menambahkan {count} layanan di Franz! Dapatkan aplikasi gratis untuk WhatsApp, Messenger, Slack, Skype dan lainnya di www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Beri tahu teman dan kolega Anda betapa hebatnya Franz dan bantu kami menyebarkan berita.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Tidak dapat tersambung ke layanan Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
   "global.spellchecker.useDefault" : "Gunakan Bawaan Sistem ({default})",
   "global.spellchecking.autodetect" : "Deteksi bahasa secara otomatis",
   "global.spellchecking.autodetect.short" : "Otomatis",
   "global.spellchecking.language" : "Periksa ejaan",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Impor layanan Franz 4 Anda",
   "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
   "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Muat ulang layanan",
   "infobar.requiredRequestsFailed" : "Gagal memuat layanan dan informasi pengguna",
   "infobar.servicesUpdated" : "Layanan Anda telah diperbarui",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Versi baru Franz tersedia.",
   "invite.email.label" : "Alamat email",
   "invite.headline.friends" : "Undang 3 teman atau kolega Anda",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Sesi Anda telah berakhir, silakan masuk kembali.",
   "login.submit.label" : "Masuk",
   "login.tokenExpired" : "Sesi Anda telah kedaluwarsa, silakan masuk kembali.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Tentang Franz",
   "menu.app.announcement" : "Yang baru",
   "menu.app.checkForUpdates" : "Periksa versi baru",
@@ -68,6 +81,9 @@
   "menu.file" : "Berkas",
   "menu.help" : "Bantuan",
   "menu.help.changelog" : "Log Perubahan",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Pelajari Lebih Lanjut",
   "menu.help.privacy" : "Pernyataan Privasi",
   "menu.help.support" : "Dukungan",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Aktifkan layanan sebelumnya",
   "menu.services.addNewService" : "Tambahkan Layanan Baru...",
   "menu.services.setNextServiceActive" : "Aktifkan layanan berikutnya",
+   "menu.todos" : "Todos",
   "menu.view" : "Tampilan",
   "menu.view.enterFullScreen" : "Masuk ke Mode Layar Penuh",
   "menu.view.exitFullScreen" : "Keluar dari Layar Penuh",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Aktif\/Nonaktifkan alat pengembang",
   "menu.view.toggleFullScreen" : "Aktif\/Nonaktifkan Layar Penuh",
   "menu.view.toggleServiceDevTools" : "Aktif\/Nonaktifkan layanan alat pengembang",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Perbesar",
   "menu.view.zoomOut" : "Perkecil",
   "menu.window" : "Jendela",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Kirim",
   "password.successInfo" : "Periksa email Anda",
   "premiumFeature.button.upgradeAccount" : "Tingkatkan akun",
-   "pricing.headline" : "Dukung Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Saya tidak ingin mendukung pengembangan Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Saya ingin mendukung pengembangan Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Pilih paket dukungan Anda",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Ruang kerja",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Muat Ulang {name}",
   "service.crashHandler.autoReload" : "Mencoba memulihkan {name} secara otomatis dalam {seconds} detik",
   "service.crashHandler.headline" : "Ya Ampun!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh tidak!",
   "service.errorHandler.message" : "Kesalahan",
   "service.errorHandler.text" : "{name} gagal dimuat",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Memuat",
   "services.getStarted" : "Memulai",
   "services.welcome" : "Selamat datang di Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Ubah sandi",
   "settings.account.headlineProfile" : "Perbarui profil",
   "settings.account.headlineSubscription" : "Langganan Anda",
-   "settings.account.headlineUpgrade" : "Tingkatkan akun Anda & dukung Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Unduh",
   "settings.account.manageSubscription.label" : "Kelola langganan Anda",
   "settings.account.successInfo" : "Perubahan Anda telah disimpan",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Coba lagi",
   "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Gagal memuat informasi pengguna",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Bersihkan singgahan",
   "settings.app.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
   "settings.app.buttonSearchForUpdate" : "Periksa pembaruan",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Layanan Anda",
   "settings.navigation.yourWorkspaces" : "Ruang kerja Anda",
   "settings.recipes.all" : "Semua layanan",
-   "settings.recipes.dev" : "Pengembangan",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Layanan tersedia",
   "settings.recipes.missingService" : "Layanan tidak tersedia?",
   "settings.recipes.mostPopular" : "Terpopuler",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Buka laci ruang kerja",
   "sidebar.settings" : "Pengaturan",
   "sidebar.unmuteApp" : "Aktifkan pemberitahuan",
-   "signup.company.label" : "Perusahaan",
   "signup.email.label" : "Alamat email",
   "signup.emailDuplicate" : "Pengguna dengan alamat email ini sudah ada",
   "signup.firstname.label" : "Nama Depan",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Sudah punya akun, masuk?",
   "signup.password.label" : "Sandi",
   "signup.submit.label" : "Buat akun",
-   "subscription.euTaxInfo" : "Warga UE: pajak penjualan lokal mungkin berlaku",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Tanpa iklan, selamanya!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "segera hadir",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Tanpa menunggu dan ditanya untuk meningkatkan lisensi",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Dukungan proksi untuk layanan",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Dukungan pengecek ejaan",
-   "subscription.features.workspaces" : "Kelola layanan Anda dalam ruang kerja",
-   "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
-   "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
-   "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
-   "subscription.type.free" : "gratis",
-   "subscription.type.month" : "bulan",
-   "subscription.type.year" : "tahun",
   "subscriptionPopup.buttonCancel" : "Batalkan",
   "subscriptionPopup.buttonDone" : "Selesai",
   "tabs.item.deleteService" : "Hapus layanan",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 7bda822bb..b91dac13a 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Ricarica",
   "app.errorHandler.headline" : "Qualcosa è andato storto",
   "feature.announcements.changelog.headline" : "Modifiche in Franz {Version}",
-   "feature.delayApp.action" : "Ricevi una Licenza Supporter di Franz",
   "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Franz per saltare l'attesa",
   "feature.delayApp.text" : "Franz continuerà tra {seconds} secondi.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Ricevi una Licenza Supporter di Franz",
+   "feature.delayApp.upgrade.actionShort" : "Effettua l'upgrade del tuo account",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Manda come email",
   "feature.shareFranz.action.facebook" : "Condividi su Facebook",
   "feature.shareFranz.action.twitter" : "Condividi su Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Ho aggiunto {count} nuovi servizi a Franz! Scarica ora l'app gratuita per WhatsApp, Messenger, Slack, Skype e altri all'indirizzo www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Ho aggiunto {count} nuovi servizi a Franz! Scarica ora l’app gratuita per WhatsApp, Messenger, Slack, Skype e altri all’indirizzo www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Di’ ai tuoi amici e colleghi quanto Franz è fantastico e aiutaci a diffondere la parola.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
   "global.spellchecker.useDefault" : "Usa le impostazioni predefinite di sistema ({default})",
   "global.spellchecking.autodetect" : "Rileva automaticamente la lingua",
   "global.spellchecking.autodetect.short" : "Automatico",
   "global.spellchecking.language" : "Lingua per controllo ortografico",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importa i servizi di Franz 4",
   "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
   "import.skip.label" : "Voglio aggiungere i servizi manualmente",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Ricarica servizi",
   "infobar.requiredRequestsFailed" : "Impossibile caricare i servizi e le informazioni dell'utente",
   "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "È disponibile un nuovo aggiornamento di Franz.",
   "invite.email.label" : "Indirizzo email",
   "invite.headline.friends" : "Invita 3 dei tuoi amici o colleghi",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "La tua sessione è scaduta, per favore accedi di nuovo.",
   "login.submit.label" : "Accedi",
   "login.tokenExpired" : "La tua sessione è scaduta, per favore accedi di nuovo.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Info su Franz",
   "menu.app.announcement" : "Cosa c'è di nuovo?",
   "menu.app.checkForUpdates" : "Controlla aggiornamenti",
@@ -68,6 +81,9 @@
   "menu.file" : "File",
   "menu.help" : "Aiuto",
   "menu.help.changelog" : "Changelog",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Maggiori Informazioni",
   "menu.help.privacy" : "Dichiarazione della Privacy",
   "menu.help.support" : "Supporto",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Attiva servizio precedente",
   "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
   "menu.services.setNextServiceActive" : "Attiva servizio seguente",
+   "menu.todos" : "Todos",
   "menu.view" : "Visualizza",
   "menu.view.enterFullScreen" : "Visualizza a Schermo Intero",
   "menu.view.exitFullScreen" : "Esci da Schermo Intero",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Attiva\/Disattiva Strumenti Sviluppo",
   "menu.view.toggleFullScreen" : "Attiva\/Disattiva Schermo Intero",
   "menu.view.toggleServiceDevTools" : "Attiva\/Disattiva Strumenti per Sviluppatori di Servizi",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Aumenta Zoom",
   "menu.view.zoomOut" : "Diminuisci Zoom",
   "menu.window" : "Finestra",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Invia",
   "password.successInfo" : "Per favore controlla la tua email",
   "premiumFeature.button.upgradeAccount" : "Effettua l'upgrade del tuo account",
-   "pricing.headline" : "Supporta Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Seleziona la modalità di supporto",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Ricarica {name}",
   "service.crashHandler.autoReload" : "Tentativo di ripristino automatico di {name} in {seconds} secondi",
   "service.crashHandler.headline" : "Oh no!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh no!",
   "service.errorHandler.message" : "Errore",
   "service.errorHandler.text" : "{name} non si è caricato correttamente.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Caricamento",
   "services.getStarted" : "Iniziamo",
   "services.welcome" : "Benvenuto su Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Cambia password",
   "settings.account.headlineProfile" : "Aggiorna profilo",
   "settings.account.headlineSubscription" : "Il tuo abbonamento",
-   "settings.account.headlineUpgrade" : "Aggiorna il tuo account e supporta Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Scarica",
   "settings.account.manageSubscription.label" : "Gestisci il tuo abbonamento",
   "settings.account.successInfo" : "Le tue modifiche sono state salvate",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Prova di nuovo",
   "settings.account.tryReloadUserInfoRequest" : "Riprova",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Impossibile caricare le informazioni dell'utente.",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Svuota la cache",
   "settings.app.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
   "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "I tuoi servizi",
   "settings.navigation.yourWorkspaces" : "I tuoi workspaces",
   "settings.recipes.all" : "Tutti i servizi",
-   "settings.recipes.dev" : "Sviluppo",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Servizi disponibili",
   "settings.recipes.missingService" : "Manca un servizio?",
   "settings.recipes.mostPopular" : "Più popolari",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Apri il menu dei workspace",
   "sidebar.settings" : "Impostazioni",
   "sidebar.unmuteApp" : "Attiva notifiche e audio",
-   "signup.company.label" : "Società",
   "signup.email.label" : "Indirizzo email",
   "signup.emailDuplicate" : "Esiste già un utente con lo stesso indirizzo email",
   "signup.firstname.label" : "Nome",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Hai già un account, vuoi accedere?",
   "signup.password.label" : "Password",
   "signup.submit.label" : "Crea un account",
-   "subscription.euTaxInfo" : "Per i residenti UE: possono essere applicate tasse locali",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Nessuna pubblicità, mai!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "in arrivo",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "L'upgrade della licenza avrà impatti sull'utilizzo dell'App",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Aggiungi servizi on-premise\/hosted come \"Mattermost\"",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Supporto proxy per i servizi",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Supporto per il correttore ortografico",
-   "subscription.features.workspaces" : "Organizza i tuoi servizi in workspace",
-   "subscription.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
-   "subscription.paymentSessionError" : "Impossibile inizializzare il modulo per il pagamento",
-   "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
-   "subscription.type.free" : "gratis",
-   "subscription.type.month" : "mese",
-   "subscription.type.year" : "anno",
   "subscriptionPopup.buttonCancel" : "Annulla",
   "subscriptionPopup.buttonDone" : "Fatto",
   "tabs.item.deleteService" : "Elimina servizio",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index f9989ff7e..511057b61 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "再読み込み",
   "app.errorHandler.headline" : "間違えている部分があります",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Franzサポーターライセンスを購入する",
   "feature.delayApp.headline" : "Franzをすぐに起動するには、Franz サポーターライセンスを購入してください。",
   "feature.delayApp.text" : "Franzはあと{seconds}秒後に起動します。",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Franzサポーターライセンスを購入する",
+   "feature.delayApp.upgrade.actionShort" : "アカウントをアップグレード",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "メールで送信",
   "feature.shareFranz.action.facebook" : "Facebookでシェア",
   "feature.shareFranz.action.twitter" : "Twitterでシェア",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Franzで{count}個のサービスを使っています！あなたもGmail, Messenger, Slack, SkypeなどのサービスをFranzで一元管理しましょう！ www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "あなたのお友達にFranzを教えてあげましょう。",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Franzのオンラインサービスに接続できません。",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "インターネットに接続されていません。",
   "global.spellchecker.useDefault" : " {default}を初期設定で使用してください",
   "global.spellchecking.autodetect" : "言語を自動的に検出する",
   "global.spellchecking.autodetect.short" : "自動",
   "global.spellchecking.language" : "スペルチェックする言語",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Franz 4のサービスをインポートして下さい",
   "import.notSupportedHeadline" : "Franz 5ではこのサービスにまだ対応していません",
   "import.skip.label" : "手動でサービスを追加する",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "サービスの再読み込み",
   "infobar.requiredRequestsFailed" : "サービスとユーザー情報を読み込めませんでした",
   "infobar.servicesUpdated" : "サービスが更新されました。",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Franzの更新があります。",
   "invite.email.label" : "メールアドレス",
   "invite.headline.friends" : "あなたの友人や同僚の方を3名までFranzに招待できます",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "セッションの期限が切れました。ログインし直して下さい。",
   "login.submit.label" : "サインイン",
   "login.tokenExpired" : "セッションの期限が切れました。ログインし直して下さい。",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "バージョン情報",
   "menu.app.announcement" : "What's new?",
   "menu.app.checkForUpdates" : "更新の確認",
@@ -68,6 +81,9 @@
   "menu.file" : "ファイル",
   "menu.help" : "ヘルプ",
   "menu.help.changelog" : "更新履歴",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Franzについて",
   "menu.help.privacy" : "プライバシーについて",
   "menu.help.support" : "サポート",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "前のサービスを有効にする",
   "menu.services.addNewService" : "サービスを追加",
   "menu.services.setNextServiceActive" : "次のサービスを有効にする",
+   "menu.todos" : "Todos",
   "menu.view" : "表示",
   "menu.view.enterFullScreen" : "全画面表示",
   "menu.view.exitFullScreen" : "全画面表示を終了する",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "開発者ツールを切り替え",
   "menu.view.toggleFullScreen" : "全画面表示の切り替え",
   "menu.view.toggleServiceDevTools" : "サービス開発者ツールを切り替え",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "表示を拡大する",
   "menu.view.zoomOut" : "表示を縮小する",
   "menu.window" : "ウィンドウ",
@@ -103,10 +121,33 @@
   "password.submit.label" : "送信",
   "password.successInfo" : "メールを確認して下さい",
   "premiumFeature.button.upgradeAccount" : "アカウントをアップグレード",
-   "pricing.headline" : "Franzを支援する",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Franzの開発を支援したくない。",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Franzの開発を支援したい。",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "プランを選択してください",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "{name}を再読み込み",
   "service.crashHandler.autoReload" : "{seconds}秒後、自動的に{name}の復旧を試みます",
   "service.crashHandler.headline" : "しまった！",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "しまった！",
   "service.errorHandler.message" : "エラー",
   "service.errorHandler.text" : "{name} はロードに失敗しました",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "はじめる",
   "services.welcome" : "Franzにようこそ",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "パスワードの変更",
   "settings.account.headlineProfile" : "プロフィールの更新",
   "settings.account.headlineSubscription" : "あなたの登録内容",
-   "settings.account.headlineUpgrade" : "アカウントをアップグレードし、Franzを支援する",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "ダウンロード",
   "settings.account.manageSubscription.label" : "サブスクリプションの管理",
   "settings.account.successInfo" : "変更内容が保存されました",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "もう一度試す",
   "settings.account.tryReloadUserInfoRequest" : "もう一度試す",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "ユーザ情報を読み込めませんでした",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "キャッシュを消去する",
   "settings.app.buttonInstallUpdate" : "再起動して更新をインストールする",
   "settings.app.buttonSearchForUpdate" : "更新の確認",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "利用中のサービス",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "すべてのサービス",
-   "settings.recipes.dev" : "開発版",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "利用可能なサービス",
   "settings.recipes.missingService" : "使いたいサービスが一覧にありませんか?",
   "settings.recipes.mostPopular" : "最も人気",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "設定",
   "sidebar.unmuteApp" : "通知とオーディオを有効化",
-   "signup.company.label" : "法人",
   "signup.email.label" : "メールアドレス",
   "signup.emailDuplicate" : "このメールアドレスは既に登録されています",
   "signup.firstname.label" : "名",
@@ -286,20 +343,12 @@
   "signup.link.login" : "アカウントを既に持っていますか? こちらからサインイン",
   "signup.password.label" : "パスワード",
   "signup.submit.label" : "アカウントの作成",
-   "subscription.euTaxInfo" : "EU在住者 : 地域の消費税が適用される可能性があります",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "広告は一切ありません!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "まもなく登場",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "待ち時間なしでFranz をお使いいただけます",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Mattermost のようなオンプレミス（自社運用）型のサービスを追加できるようになります",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "プロキシ設定が利用可能",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "スペルチェック機能をお使いいただけます",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Franz Premium Supporter有料アカウントには以下が含まれます",
-   "subscription.paymentSessionError" : "支払いフォームを初期化出来ません",
-   "subscription.submit.label" : "Franzの開発を支援したい",
-   "subscription.type.free" : "無料",
-   "subscription.type.month" : "月間",
-   "subscription.type.year" : "年間",
   "subscriptionPopup.buttonCancel" : "キャンセル",
   "subscriptionPopup.buttonDone" : "完了",
   "tabs.item.deleteService" : "サービスを削除する",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 5193ac8cf..fe807675f 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "ჩატვირთვა",
   "app.errorHandler.headline" : "Something went wrong",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Get a Franz Supporter License",
+   "feature.delayApp.upgrade.actionShort" : "Upgrade account",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Send as email",
   "feature.shareFranz.action.facebook" : "Share on Facebook",
   "feature.shareFranz.action.twitter" : "Share on Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Franz-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
   "global.spellchecker.useDefault" : "Use System Default ({default})",
   "global.spellchecking.autodetect" : "Detect language automatically",
   "global.spellchecking.autodetect.short" : "Automatic",
   "global.spellchecking.language" : "Spell checking language",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "შემოიტანე Franz 4-ის სერვისები",
   "import.notSupportedHeadline" : "სერვისები ჯერ არ არის მხარდაჭერილი Franz 5-ში",
   "import.skip.label" : "I want to add services manually",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "სერვისების გადატვირთვა ",
   "infobar.requiredRequestsFailed" : "სერვისებისა და მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
   "infobar.servicesUpdated" : "თქვენი სერვისები განახლებულია.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "განახლება Franz-ისთვის ხელმისაწვდომია.",
   "invite.email.label" : "მეილი",
   "invite.headline.friends" : "მოიწვიეთ 3 თქვენი მეგობარი ან კოლეგა",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
   "login.submit.label" : "შესვლა",
   "login.tokenExpired" : "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Franz-ის შესახებ",
   "menu.app.announcement" : "What's new?",
   "menu.app.checkForUpdates" : "განახლებების შემოწმება",
@@ -68,6 +81,9 @@
   "menu.file" : "File",
   "menu.help" : "Help",
   "menu.help.changelog" : "Changelog",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Learn More",
   "menu.help.privacy" : "კონფიდენციალურობის შესახებ",
   "menu.help.support" : "Support",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Add New Service...",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "View",
   "menu.view.enterFullScreen" : "Enter Full Screen",
   "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Toggle Developer Tools",
   "menu.view.toggleFullScreen" : "Toggle Full Screen",
   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Zoom In",
   "menu.view.zoomOut" : "Zoom Out",
   "menu.window" : "Window",
@@ -103,10 +121,33 @@
   "password.submit.label" : "დადასტურება",
   "password.successInfo" : "გთხოვთ შეამოწმეთ მეილი",
   "premiumFeature.button.upgradeAccount" : "Upgrade account",
-   "pricing.headline" : "Franz-ის მხარდაჭერა",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "არ მინდა ხელი შევუწყო Franz-ის განვითარებას.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "მინდა ხელი შევუწყო Franz-ის განვითარებას",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "აირჩიეთ თქვენი მხარდაჭერის გეგმა",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Reload {name}",
   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline" : "Oh no!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh no!",
   "service.errorHandler.message" : "შეცდომა",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "დაწყება",
   "services.welcome" : "მოგესალმებით Franz-ზე",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "პაროლის შეცვლა",
   "settings.account.headlineProfile" : "პროფილის განახლება",
   "settings.account.headlineSubscription" : "თქვენი გამოწერა",
-   "settings.account.headlineUpgrade" : "განაახლეთ თქვენი ანგარიში და მხარი დაუჭირეთ Franz-ს",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "გადმოწერა",
   "settings.account.manageSubscription.label" : "თქვენი გამოწერის მართვა",
   "settings.account.successInfo" : "თქვენი ცვლილებები შენახულია",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "სცადეთ ხელახლა",
   "settings.account.tryReloadUserInfoRequest" : "სცადეთ ხელახლა",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Clear cache",
   "settings.app.buttonInstallUpdate" : "გადატვირთეთ და დააყენეთ განახლება",
   "settings.app.buttonSearchForUpdate" : "განახლებების შემოწმება",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "თქვენი სერვისები",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "ყველა სერვისი",
-   "settings.recipes.dev" : "განვითარება",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "ხელმისაწვდომი სერვისები",
   "settings.recipes.missingService" : "Missing a service?",
   "settings.recipes.mostPopular" : "ყველაზე პოპულარული",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "პარამეტრები",
   "sidebar.unmuteApp" : "Enable notifications & audio",
-   "signup.company.label" : "კომპანია",
   "signup.email.label" : "მეილი",
   "signup.emailDuplicate" : "მომხმარებელი ამ მეილით უკვე არსებობს",
   "signup.firstname.label" : "First Name",
@@ -286,20 +343,12 @@
   "signup.link.login" : "უკვე გაქვთ ანგარიში?",
   "signup.password.label" : "პაროლი",
   "signup.submit.label" : "ანგარიშის შექმნა",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "არანაირი რეკლამები, არასდროს!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "მალე",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "ფასიანი Franz-ის პრემიუმ მხარმდამჭერი ანგარიში",
-   "subscription.paymentSessionError" : "გადახდის ფორმატის ინიციალიზაცია ვერ მოხერხდა",
-   "subscription.submit.label" : "მინდა ხელი შევუწყო Franz-ის განვითარებას",
-   "subscription.type.free" : "უფასო",
-   "subscription.type.month" : "თვე",
-   "subscription.type.year" : "წელი",
   "subscriptionPopup.buttonCancel" : "გაუქმება",
   "subscriptionPopup.buttonDone" : "შესრულებულია",
   "tabs.item.deleteService" : "სერვისის წაშლა",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 83e207542..47c24c368 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Herladen",
   "app.errorHandler.headline" : "Er ging iets mis",
   "feature.announcements.changelog.headline" : "Wijzigingen in Franz {versie}",
-   "feature.delayApp.action" : "Neem een Franz Supporter Licentie ",
   "feature.delayApp.headline" : "Neem een Franz Supporter Licentie om niet meer te hoeven wachten",
   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Neem een Franz Supporter Licentie ",
+   "feature.delayApp.upgrade.actionShort" : "Upgrade account",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Verstuur als e-mail",
   "feature.shareFranz.action.facebook" : "Deel op Facebook",
   "feature.shareFranz.action.twitter" : "Deel op Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Ik heb {telling} diensten toegevoegd aan Franz! Download de gratis app voor WhatsApp, Messenger, Slack, Skype, en anderen op www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Ik heb {tel} diensten toegevoegd aan Franz! Download de gratis app voor WhatsApp, Messenger, Slack, Skype, en anderen op www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Vertel je vrienden en collega's hoe geweldig Franz is en help ons het woord te verspreiden.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
   "global.spellchecker.useDefault" : "Gebruik Systeemstandaard ({default})",
   "global.spellchecking.autodetect" : "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short" : "Automatisch",
   "global.spellchecking.language" : "Taal spellingscontrole",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importeer je Franz 4 services",
   "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
   "import.skip.label" : "Ik wil services handmatig toevoegen",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Services opnieuw laden",
   "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
   "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Er is een nieuwe update voor Franz beschikbaar.",
   "invite.email.label" : "E-mailadres",
   "invite.headline.friends" : "Nodig 3 van je vrienden of collega's uit",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
   "login.submit.label" : "Inloggen",
   "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Over Franz",
   "menu.app.announcement" : "Wat is er nieuw?",
   "menu.app.checkForUpdates" : "Controleer op updates",
@@ -68,6 +81,9 @@
   "menu.file" : "Bestand",
   "menu.help" : "Help",
   "menu.help.changelog" : "Logboek",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Meer Weten",
   "menu.help.privacy" : "Privacyverklaring",
   "menu.help.support" : "Ondersteuning",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Vorige dienst activeren",
   "menu.services.addNewService" : "Nieuwe service toevoegen...",
   "menu.services.setNextServiceActive" : "Volgende dienst activeren",
+   "menu.todos" : "Todos",
   "menu.view" : "Weergave",
   "menu.view.enterFullScreen" : "Volledig scherm openen",
   "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Ontwikkelaarstools Aan\/Uit",
   "menu.view.toggleFullScreen" : "Volledig Scherm Aan\/Uit",
   "menu.view.toggleServiceDevTools" : "Service Ontwikkelaarstools Aan\/Uit",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Inzoomen",
   "menu.view.zoomOut" : "Uitzoomen",
   "menu.window" : "Venster",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Verzenden",
   "password.successInfo" : "Controleer alsjeblieft je e-mail",
   "premiumFeature.button.upgradeAccount" : "Upgrade account",
-   "pricing.headline" : "Steun Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz niet ondersteunen.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Selecteer je ondersteuningsplan",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "{naam} herladen",
   "service.crashHandler.autoReload" : "Ga proberen om {name} te herstellen over {seconds} seconden",
   "service.crashHandler.headline" : "Oh nee!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh nee!",
   "service.errorHandler.message" : "Fout",
   "service.errorHandler.text" : "{name} kon niet geladen worden.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Aan het laden",
   "services.getStarted" : "Beginnen",
   "services.welcome" : "Welkom bij Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Wijzig wachtwoord",
   "settings.account.headlineProfile" : "Profiel bijwerken",
   "settings.account.headlineSubscription" : "Je abonnement",
-   "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Download",
   "settings.account.manageSubscription.label" : "Beheer je abonnement",
   "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Probeer opnieuw",
   "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Cache wissen",
   "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
   "settings.app.buttonSearchForUpdate" : "Controleer op updates",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Jouw services",
   "settings.navigation.yourWorkspaces" : "Jouw werkruimtes",
   "settings.recipes.all" : "Alle diensten",
-   "settings.recipes.dev" : "Ontwikkeling",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Beschikbare services",
   "settings.recipes.missingService" : "Mist er een service?",
   "settings.recipes.mostPopular" : "Meest populair",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Werkruimtelade openen",
   "sidebar.settings" : "Instellingen",
   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
-   "signup.company.label" : "Bedrijf",
   "signup.email.label" : "E-mailadres",
   "signup.emailDuplicate" : "Er bestaat al een gebruiker met dat e-mailadres",
   "signup.firstname.label" : "Voornaam",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Al een account, inloggen?",
   "signup.password.label" : "Wachtwoord",
   "signup.submit.label" : "Account aanmaken",
-   "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Geen reclame, nooit!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "komt binnenkort",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy ondersteuning voor services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
-   "subscription.features.workspaces" : "Organiseer je diensten in werkruimtes",
-   "subscription.includedFeatures" : "Een betalend account voor Franz omvat",
-   "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
-   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
-   "subscription.type.free" : "gratis",
-   "subscription.type.month" : "maand",
-   "subscription.type.year" : "jaar",
   "subscriptionPopup.buttonCancel" : "Annuleren",
   "subscriptionPopup.buttonDone" : "Klaar",
   "tabs.item.deleteService" : "Service verwijderen",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index fd80dbdb9..af1b2f86f 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Herladen",
   "app.errorHandler.headline" : "Er is iets mis gegaan",
   "feature.announcements.changelog.headline" : "Wijzigingen in Franz {version}",
-   "feature.delayApp.action" : "Sponsor Franz",
   "feature.delayApp.headline" : "Sponsor Franz om wachten over te slaan",
   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Sponsor Franz",
+   "feature.delayApp.upgrade.actionShort" : "Upgrade Account",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Verstuur als e-mail",
   "feature.shareFranz.action.facebook" : "Deel op Facebook",
   "feature.shareFranz.action.twitter" : "Deel op Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Ik heb {count} services toegevoegd aan Franz! Download de gratis app voor Whatsapp, Messenger, Slack, Skype en co op www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Ik heb {count} services toegevoegd aan Franz! Download de gratis app voor Whatsapp, Messenger, Slack, Skype en co op www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Vertel je vrienden en collega's hoe geweldig Franz is en help ons om bekender te worden.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services.",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
   "global.spellchecker.useDefault" : "Gebruik systeemstandaard ({default})",
   "global.spellchecking.autodetect" : "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short" : "Automatisch",
   "global.spellchecking.language" : "Taal voor spellingcontrole",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importeer uw Franz 4-services",
   "import.notSupportedHeadline" : "Services die (nog) niet ondersteund worden in Franz 5",
   "import.skip.label" : "Ik wil diensten handmatig toevoegen",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Services opnieuw laden",
   "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
   "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Een nieuwe update voor Franz is beschikbaar.",
   "invite.email.label" : "E-mailadres",
   "invite.headline.friends" : "Nodig 3 vrienden of collega's uit",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "De sessie is verlopen, log alsjeblieft opnieuw in.",
   "login.submit.label" : "Inloggen",
   "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Over Franz",
   "menu.app.announcement" : "Wat is nieuw?",
   "menu.app.checkForUpdates" : "Controleer op updates",
@@ -68,6 +81,9 @@
   "menu.file" : "Bestand",
   "menu.help" : "Hulp",
   "menu.help.changelog" : "Wijzigingenlogboek",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Meer informatie",
   "menu.help.privacy" : "Privacyvoorwaarden",
   "menu.help.support" : "Ondersteuning",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activeer vorige service",
   "menu.services.addNewService" : "Nieuwe service toevoegen...",
   "menu.services.setNextServiceActive" : "Activeer volgende service",
+   "menu.todos" : "Todos",
   "menu.view" : "Weergave",
   "menu.view.enterFullScreen" : "Gebruik volledig scherm",
   "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Ontwikkelaarstools aan\/uit",
   "menu.view.toggleFullScreen" : "Volledig scherm aan\/uit",
   "menu.view.toggleServiceDevTools" : "Service ontwikkelaarstools aan\/uit",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Inzoomen",
   "menu.view.zoomOut" : "Uitzoomen",
   "menu.window" : "Venster",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Verzenden",
   "password.successInfo" : "Controleer je e-mail",
   "premiumFeature.button.upgradeAccount" : "Upgrade Account",
-   "pricing.headline" : "Steun Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Franz (nog) niet ondersteunen.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Selecteer je ondersteuningsplan",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Werkruimtes",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Laad {name} opnieuw",
   "service.crashHandler.autoReload" : "Bezig om {name} te herstellen over {seconds} seconden",
   "service.crashHandler.headline" : "Oh nee!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh nee!",
   "service.errorHandler.message" : "Fout",
   "service.errorHandler.text" : "{name} kon niet geladen worden.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Aan het laden",
   "services.getStarted" : "Begin",
   "services.welcome" : "Welkom bij Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Wijzig wachtwoord",
   "settings.account.headlineProfile" : "Profiel bijwerken",
   "settings.account.headlineSubscription" : "Je abonnement",
-   "settings.account.headlineUpgrade" : "Upgrade je account & steun Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Download",
   "settings.account.manageSubscription.label" : "Beheer je abonnement",
   "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Probeer opnieuw",
   "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Cache legen",
   "settings.app.buttonInstallUpdate" : "Opnieuw opstarten en updates installeren",
   "settings.app.buttonSearchForUpdate" : "Controleer op updates",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Jouw services",
   "settings.navigation.yourWorkspaces" : "Jouw werkruimtes",
   "settings.recipes.all" : "Alle services",
-   "settings.recipes.dev" : "Ontwikkeling",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Beschikbare services",
   "settings.recipes.missingService" : "Mis je een service?",
   "settings.recipes.mostPopular" : "Meest populair",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Werkruimte pagina openen",
   "sidebar.settings" : "Instellingen",
   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
-   "signup.company.label" : "Bedrijf",
   "signup.email.label" : "E-mailadres",
   "signup.emailDuplicate" : "Er bestaat al een gebruiker met dat e-mailadres",
   "signup.firstname.label" : "Voornaam",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Heb je al een account? Log in!",
   "signup.password.label" : "Wachtwoord",
   "signup.submit.label" : "Account aanmaken",
-   "subscription.euTaxInfo" : "EU-bewoners: lokale belastingen kunnen van toepassing zijn",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Geen advertenties, nooit!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "Binnenkort",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy understeuning voor services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Ondersteuning voor spellingcontrole",
-   "subscription.features.workspaces" : "Beheer je diensten in de werkruimtes",
-   "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
-   "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
-   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
-   "subscription.type.free" : "gratis",
-   "subscription.type.month" : "maand",
-   "subscription.type.year" : "jaar",
   "subscriptionPopup.buttonCancel" : "Annuleer",
   "subscriptionPopup.buttonDone" : "Klaar",
   "tabs.item.deleteService" : "Verwijder service",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 5ade8a5a9..31d0c8dd4 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Odśwież",
   "app.errorHandler.headline" : "Coś poszło nie tak.",
   "feature.announcements.changelog.headline" : "Zmiany we Franzie {version}",
-   "feature.delayApp.action" : "Uzyskaj licencję Franz Supporter",
   "feature.delayApp.headline" : "Aby nie czekać, kup licencję Franz Supporter",
   "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Uzyskaj licencję Franz Supporter",
+   "feature.delayApp.upgrade.actionShort" : "Ulepsz swoje konto",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Wyślij jako email",
   "feature.shareFranz.action.facebook" : "Udostępnij na Facebooku",
   "feature.shareFranz.action.twitter" : "Udostępnij na Twitterze",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikację z WhatsApp, Messenger, Slack, Skype i innymi na www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikację z WhatsApp, Messenger, Slack, Skype i innymi na www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Powiedz znajomym i kolegom o tym, jak odlotowy jest Franz i pomóż nam go spopularyzować.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
   "global.spellchecker.useDefault" : "Użyj domyślnego dla systemu ({default})",
   "global.spellchecking.autodetect" : "Automatycznie wykryj język",
   "global.spellchecking.autodetect.short" : "Automatycznie",
   "global.spellchecking.language" : "Język sprawdzania pisowni",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importuj usługi Franz 4",
   "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Franz 5",
   "import.skip.label" : "Chcę dodać usługi samodzielnie",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Odśwież usługi",
   "infobar.requiredRequestsFailed" : "Nie można załadować usług i informacji użytkownika",
   "infobar.servicesUpdated" : "Usługi zostały zaktualizowane.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Dostępna jest nowa wersja Franza.",
   "invite.email.label" : "Adres email",
   "invite.headline.friends" : "Zaproś 3 znajomych lub kolegów",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Twoja sesja wygasła, zaloguj się ponownie.",
   "login.submit.label" : "Zaloguj się",
   "login.tokenExpired" : "Twoja sesja wygasła, zaloguj się ponownie.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "O Franz",
   "menu.app.announcement" : "Co słychać?",
   "menu.app.checkForUpdates" : "Sprawdź aktualizacje",
@@ -68,6 +81,9 @@
   "menu.file" : "Plik",
   "menu.help" : "Pomoc",
   "menu.help.changelog" : "Lista zmian",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Dowiedz się więcej",
   "menu.help.privacy" : "Polityka prywatności",
   "menu.help.support" : "Wsparcie",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Włącz poprzedni serwis",
   "menu.services.addNewService" : "Dodaj nową usługę...",
   "menu.services.setNextServiceActive" : "Włącz kolejny serwis",
+   "menu.todos" : "Todos",
   "menu.view" : "Widok",
   "menu.view.enterFullScreen" : "Włącz tryb pełnoekranowy",
   "menu.view.exitFullScreen" : "Zakończ tryb pełnoekranowy",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Pokaż narzędzia developerskie",
   "menu.view.toggleFullScreen" : "Przełącz tryb pełnoekranowy",
   "menu.view.toggleServiceDevTools" : "Włącz narzędzia developerskie usługi",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Powiększ",
   "menu.view.zoomOut" : "Pomniejsz",
   "menu.window" : "Okno",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Wyślij",
   "password.successInfo" : "Proszę sprawdzić swój email",
   "premiumFeature.button.upgradeAccount" : "Ulepsz swoje konto",
-   "pricing.headline" : "Wspieraj Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Nie chcę wspierać rozwoju aplikacji Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Wybierz swój plan wsparcia",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Obszary robocze",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Przeładuj {name}",
   "service.crashHandler.autoReload" : "Próba automatycznego odnowienia {name} za {seconds} sekund\/y",
   "service.crashHandler.headline" : "O nie!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "O nie!",
   "service.errorHandler.message" : "Błąd",
   "service.errorHandler.text" : "Nie udało się załadować {name}.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Ładowanie",
   "services.getStarted" : "Zacznij",
   "services.welcome" : "Witaj w programie Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Zmień hasło",
   "settings.account.headlineProfile" : "Uaktualnij profil",
   "settings.account.headlineSubscription" : "Twoja subskrypcja",
-   "settings.account.headlineUpgrade" : "Ulepsz swoje konto i wspieraj aplikację Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Pobierz",
   "settings.account.manageSubscription.label" : "Zarządzaj swoimi subskrypcjami",
   "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Spróbuj ponownie",
   "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Wyczyść pamięć podręczną (cache)",
   "settings.app.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizację",
   "settings.app.buttonSearchForUpdate" : "Sprawdź aktualizacje",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Twoje usługi",
   "settings.navigation.yourWorkspaces" : "Twoje obszary robocze",
   "settings.recipes.all" : "Wszystkie usługi",
-   "settings.recipes.dev" : "Rozwojowe",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Dostępne usługi",
   "settings.recipes.missingService" : "Brak usługi?",
   "settings.recipes.mostPopular" : "Najpopularniejsze",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Otwórz edycję obszaru roboczego",
   "sidebar.settings" : "Ustawienia",
   "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",
   "signup.firstname.label" : "Imię",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Masz już konto, zalogować się?",
   "signup.password.label" : "Hasło",
   "signup.submit.label" : "Stwórz konto",
-   "subscription.euTaxInfo" : "Rezydenci UE: lokalne stawki VAT mogą zostać zaaplikowane",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Brak reklam, na zawsze!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "wkrótce dostępne",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Bez opóźnień i przypominania o ulepszeniu licencji",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Dodaj prywatnie hostowane usługi takie jak Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Obsługa proxy dla usług",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Wsparcie dla sprawdzania pisowni",
-   "subscription.features.workspaces" : "Zarządzaj usługami w obszarach roboczych",
-   "subscription.includedFeatures" : "Płatne konto Franz Premium obejmuje",
-   "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
-   "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
-   "subscription.type.free" : "za darmo",
-   "subscription.type.month" : "miesiąc",
-   "subscription.type.year" : "rok",
   "subscriptionPopup.buttonCancel" : "Anuluj",
   "subscriptionPopup.buttonDone" : "Zrobione",
   "tabs.item.deleteService" : "Usuń usługę",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 60d74495e..8907c185f 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Recarregar",
   "app.errorHandler.headline" : "Opa! Algo deu errado.",
   "feature.announcements.changelog.headline" : "Mudanças no Franz {version}",
-   "feature.delayApp.action" : "Adquira uma licença de suporte Franz",
   "feature.delayApp.headline" : "Por favor, adquira uma licença para pular o tempo de espera",
   "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Adquira uma licença de suporte Franz",
+   "feature.delayApp.upgrade.actionShort" : "Atualizar conta",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Enviar por e-mail",
   "feature.shareFranz.action.facebook" : "Compartilhar no Facebook",
   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Eu adicionei uma contagem de serviços para o Franz! Baixe gratuitamente o aplicativo para WhatsApp, Messenger, Slack, Skype e outros em www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quanto incrível o Franz é e nos ajude a espalhar a mensagem.  ",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Você não está conectado à internet",
   "global.spellchecker.useDefault" : "Use o padrão do sistema ({default})",
   "global.spellchecking.autodetect" : "Detectar idioma automaticamente.",
   "global.spellchecking.autodetect.short" : "Automático",
   "global.spellchecking.language" : "Idioma para verificação ortográfica",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importe seus serviços do Franz 4 ",
   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5 ",
   "import.skip.label" : "Quero adicionar serviços manualmente",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Recarregar serviços",
   "infobar.requiredRequestsFailed" : "Não foi possível carregar os serviços e informações de usuário",
   "infobar.servicesUpdated" : "Seus serviços foram atualizados.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Uma nova atualização do Franz está disponível.",
   "invite.email.label" : "Endereço de E-mail",
   "invite.headline.friends" : "Convide 3 amigos ou colegas",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Sua sessão expirou, faça o login novamente.",
   "login.submit.label" : "Entrar",
   "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Sobre Franz",
   "menu.app.announcement" : "Quais as novidades?",
   "menu.app.checkForUpdates" : "Verificar se há atualizações",
@@ -68,6 +81,9 @@
   "menu.file" : "Arquivo",
   "menu.help" : "Ajuda",
   "menu.help.changelog" : "Registro de Alterações ",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Saiba Mais ",
   "menu.help.privacy" : "Declaração de Privacidade ",
   "menu.help.support" : "Suporte",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Pular para serviço anterior",
   "menu.services.addNewService" : "Adicionar Novo Serviço",
   "menu.services.setNextServiceActive" : "Pular para próximo serviço",
+   "menu.todos" : "Todos",
   "menu.view" : "Visualizar ",
   "menu.view.enterFullScreen" : "Modo Tela Cheia",
   "menu.view.exitFullScreen" : "Sair da Tela Cheia",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Ferramentas de Desenvolvedor",
   "menu.view.toggleFullScreen" : "Modo Tela Cheia",
   "menu.view.toggleServiceDevTools" : "Ferramentas de Serviços de Desenvolvedor",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Ampliar",
   "menu.view.zoomOut" : "Reduzir",
   "menu.window" : "Modo Janela",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Enviar",
   "password.successInfo" : "Por favor, verifique o seu e-mail",
   "premiumFeature.button.upgradeAccount" : "Atualizar conta",
-   "pricing.headline" : "Apoie o Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Eu não quero apoiar o desenvolvimento do Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Selecione uma opção de plano",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Recarregar {name}",
   "service.crashHandler.autoReload" : "Tentando reestabelecer {name} automaticamente em {seconds} segundos",
   "service.crashHandler.headline" : "Ah, não!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Ah, não!",
   "service.errorHandler.message" : "Erro",
   "service.errorHandler.text" : "{name} não pôde ser carregado.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Carregando",
   "services.getStarted" : "Iniciar",
   "services.welcome" : "Bem-vindo ao Franz!",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Mudar senha",
   "settings.account.headlineProfile" : "Atualizar perfil",
   "settings.account.headlineSubscription" : "Sua assinatura",
-   "settings.account.headlineUpgrade" : "Atualize a sua conta e ajude o Franz!",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Baixar",
   "settings.account.manageSubscription.label" : "Gerencie a sua assinatura",
   "settings.account.successInfo" : "Suas alterações foram gravadas",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Tente novamente",
   "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Limpar cache",
   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar atualização",
   "settings.app.buttonSearchForUpdate" : "Verificar por atualizações",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Seus serviços",
   "settings.navigation.yourWorkspaces" : "Suas áreas de trabalho",
   "settings.recipes.all" : "Todos os serviços",
-   "settings.recipes.dev" : "Desenvolvimento",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Serviços disponíveis",
   "settings.recipes.missingService" : "Sentiu falta de algum serviço?",
   "settings.recipes.mostPopular" : "Mais populares",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Abrir menu da área de trabalho",
   "sidebar.settings" : "Ajustes",
   "sidebar.unmuteApp" : "Ativar notificações e áudio",
-   "signup.company.label" : "Empresa",
   "signup.email.label" : "Endereço de e-mail",
   "signup.emailDuplicate" : "Já existe um usuário com este endereço de e-mail",
   "signup.firstname.label" : "Nome",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Já tem uma conta?",
   "signup.password.label" : "Senha",
   "signup.submit.label" : "Criar uma conta",
-   "subscription.euTaxInfo" : "Residentes na União Europeia: taxas locais serão aplicadas",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Sem anúncios, pra sempre!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "em breve",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Sem demora e sem chateação para comprar uma licença. ",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Adicionar serviços locais\/hospedados como o Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Suporte de proxy para serviços",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
-   "subscription.features.workspaces" : "Organize seus serviços em áreas de trabalho",
-   "subscription.includedFeatures" : "A conta Apoiador Franz Premium inclui",
-   "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
-   "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
-   "subscription.type.free" : "grátis",
-   "subscription.type.month" : "mês",
-   "subscription.type.year" : "ano",
   "subscriptionPopup.buttonCancel" : "Cancelar",
   "subscriptionPopup.buttonDone" : "Feito",
   "tabs.item.deleteService" : "Excluir serviço",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 668db12a2..8ab78c2e6 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Recarregar",
   "app.errorHandler.headline" : "Alguma coisa correu mal",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Faz parte do grupo de apoio do Franz",
   "feature.delayApp.headline" : "Por favor compre uma licença Franz Supporter para saltar a fila de espera",
   "feature.delayApp.text" : "Franz irá continuar em {seconds} segundos.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Faz parte do grupo de apoio do Franz",
+   "feature.delayApp.upgrade.actionShort" : "Atualiza a tua conta",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Enviar por e-mail",
   "feature.shareFranz.action.facebook" : "Compartilahr no Facebook",
   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Não foi possível estabelecer ligação aos serviços do Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Não estás ligado à Internet",
   "global.spellchecker.useDefault" : "Utilizar o Sistema por Omissão ({default})",
   "global.spellchecking.autodetect" : "Detectar a lingua automaticamente",
   "global.spellchecking.autodetect.short" : "Automatic",
   "global.spellchecking.language" : "Linguagem para correção ortográfica",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importa os teus serviços do Franz",
   "import.notSupportedHeadline" : "Estes serviços ainda não são suportados pelo Franz 5",
   "import.skip.label" : "Eu quero adicionar serviços manualmente",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Recarregar serviços",
   "infobar.requiredRequestsFailed" : "Não foi possível carregar os serviços e informações do utilizador",
   "infobar.servicesUpdated" : "Os seus serviços foram atualizados.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Está disponível uma nova atualização para o Franz",
   "invite.email.label" : "Endereço de e-mail",
   "invite.headline.friends" : "Convide 3 amigos ou colegas",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "A sua sessão expirou, inicie sessão novamente.",
   "login.submit.label" : "Iniciar sessão",
   "login.tokenExpired" : "A sua sessão expirou, inicie sessão novamente.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Sobre o Franz",
   "menu.app.announcement" : "O que há de novo?",
   "menu.app.checkForUpdates" : "Procurar atualizações",
@@ -68,6 +81,9 @@
   "menu.file" : "Ficheiro",
   "menu.help" : "Ajuda",
   "menu.help.changelog" : "Registo de alterações",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Saber mais",
   "menu.help.privacy" : "Declaração de privacidade",
   "menu.help.support" : "Suporte",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activar o serviço anterior",
   "menu.services.addNewService" : "Adicionar Novo Serviço...",
   "menu.services.setNextServiceActive" : "Activar o próximo serviço",
+   "menu.todos" : "Todos",
   "menu.view" : "Ver",
   "menu.view.enterFullScreen" : "Ativar Modo de Ecrã Completo",
   "menu.view.exitFullScreen" : "Sair do Modo de Ecrã Completo",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Ativar\/Desativar Ferramentas de Desenvolvimento",
   "menu.view.toggleFullScreen" : "Ativar\/Desativar Ecrã Completo",
   "menu.view.toggleServiceDevTools" : "Ativar\/Desativar Ferramentas de Desenvolvimento de Serviços",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Aumentar",
   "menu.view.zoomOut" : "Reduzir",
   "menu.window" : "Janela",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Submeter",
   "password.successInfo" : "Por favor verifique o seu endereço de e-mail",
   "premiumFeature.button.upgradeAccount" : "Atualiza a tua conta",
-   "pricing.headline" : "Apoie o Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Não pretendo patrocinar o desenvolvimento do Franz",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Pretendo patrocinar o desenvolvimento do Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Selecione o seu plano",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Espaços de trabalho",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Recarregar {name}",
   "service.crashHandler.autoReload" : "A tentar restaurar automaticamente {name} em {seconds} segundos",
   "service.crashHandler.headline" : "Oh não!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Oh não!",
   "service.errorHandler.message" : "Erro",
   "service.errorHandler.text" : "{name} falhou o carregamento",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "A ler",
   "services.getStarted" : "Vamos começar",
   "services.welcome" : "Bem-vindo ao Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Alterar palavra-passe",
   "settings.account.headlineProfile" : "Atualizar perfil",
   "settings.account.headlineSubscription" : "A sua subscrição",
-   "settings.account.headlineUpgrade" : "Atualize a sua conta e ajude o Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Transferir",
   "settings.account.manageSubscription.label" : "Gerir as minhas subscrições",
   "settings.account.successInfo" : "As suas alterações foram efetuadas com sucesso",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Tentar novamente",
   "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Limpar cache",
   "settings.app.buttonInstallUpdate" : "Reiniciar & instalar atualização",
   "settings.app.buttonSearchForUpdate" : "Procurar atualizações",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Os seus serviços",
   "settings.navigation.yourWorkspaces" : "Os teus Espaços de trabalho",
   "settings.recipes.all" : "Todos os serviços",
-   "settings.recipes.dev" : "Desenvolvimento",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Serviços disponíveis",
   "settings.recipes.missingService" : "Falta um serviço?",
   "settings.recipes.mostPopular" : "Os mais populares",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Abrir a janela do Espaço de trabalho",
   "sidebar.settings" : "Definições",
   "sidebar.unmuteApp" : "Ativar notificações e áudio",
-   "signup.company.label" : "Empresa",
   "signup.email.label" : "Endereço de email",
   "signup.emailDuplicate" : "Já existe uma conta associada a este endereço de email",
   "signup.firstname.label" : "Primeiro Nome",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Já tem uma conta, iniciar sessão?",
   "signup.password.label" : "Palavra-passe",
   "signup.submit.label" : "Criar uma conta",
-   "subscription.euTaxInfo" : "Residentes EU: Taxas locais podem ser aplicadas",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Sem anúncios, para sempre!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "em breve",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Sem atrasos na aplicação nem mensagens para comprar uma licença",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Adicione serviços como Mattermost no local ou online",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Suporte Proxy para os serviços",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Suporte para correção ortográfica",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Ao subscrever uma Conta Premium, tem acesso a",
-   "subscription.paymentSessionError" : "Erro no serviço de pagamento",
-   "subscription.submit.label" : "Pretendo ajudar o desenvolvimento do Franz",
-   "subscription.type.free" : "gratuito",
-   "subscription.type.month" : "mês",
-   "subscription.type.year" : "ano",
   "subscriptionPopup.buttonCancel" : "Cancelar",
   "subscriptionPopup.buttonDone" : "Concluído",
   "tabs.item.deleteService" : "Apagar serviço",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 4d20d5745..7a0d98c9c 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Перезагрузить",
   "app.errorHandler.headline" : "Что-то пошло не так",
   "feature.announcements.changelog.headline" : "Изменения в версии Franz {version}",
-   "feature.delayApp.action" : "Получите лицензию Franz Supporter",
   "feature.delayApp.headline" : "Пожалуйста приобретите лицензию Franz Supporter чтобы убрать ожидание",
   "feature.delayApp.text" : "Franz продолжит работу через {seconds} секунд.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Получите лицензию Franz Supporter",
+   "feature.delayApp.upgrade.actionShort" : "Перейти на платную подписку",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Отправить email",
   "feature.shareFranz.action.facebook" : "Поделиться на Facebook",
   "feature.shareFranz.action.twitter" : "Поделиться в Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Я добавил {count} сервисов во Franz! Теперь доступны такие мессенджеры как WhatsApp, Messenger, Slack, Skype и другие. Полый список вы найдете на www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Я добавил {count} сервис(ов) в Franz! Скачай бесплатную аппку для WhatsApp, Messenger, Slack, Skype и иже на www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Расскажи своим друзьям и коллегам насколько прелестен Franz и помоги нам развиться",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Невозможно подключиться к онлайн-сервисам Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Вы не подключены к сети Интернет",
   "global.spellchecker.useDefault" : "Использовать системные параметры по умолчанию ({default})",
   "global.spellchecking.autodetect" : "Найти язык автоматически",
   "global.spellchecking.autodetect.short" : "Авто",
   "global.spellchecking.language" : "Проверка правописания",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Импортировать ваши сервисы из Franz 4",
   "import.notSupportedHeadline" : "Сервисы пока ещё не поддерживаются в Franz 5",
   "import.skip.label" : "Я хочу добавить сервисы вручную",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Перезагрузить сервисы",
   "infobar.requiredRequestsFailed" : "Невозможно загрузить сервисы и информацию пользователя",
   "infobar.servicesUpdated" : "Ваши сервисы были обновлены.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Доступно обновление Franz.",
   "invite.email.label" : "Адрес электронной почты",
   "invite.headline.friends" : "Пригласите 3-х друзей или коллег",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Сессия устарела, пожалуйста, войдите снова.",
   "login.submit.label" : "Вход",
   "login.tokenExpired" : "Сессия устарела, пожалуйста, войдите снова.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "О Franz",
   "menu.app.announcement" : "Что нового?",
   "menu.app.checkForUpdates" : "Проверить обновления",
@@ -68,6 +81,9 @@
   "menu.file" : "Файл",
   "menu.help" : "Справка",
   "menu.help.changelog" : "Журнал изменений",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Подробнее",
   "menu.help.privacy" : "Политика конфиденциальности",
   "menu.help.support" : "Поддержка",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Активировать предыдущий сервич",
   "menu.services.addNewService" : "Добавить новый сервис...",
   "menu.services.setNextServiceActive" : "Активировать следующий сервис",
+   "menu.todos" : "Todos",
   "menu.view" : "Вид",
   "menu.view.enterFullScreen" : "На весь экран",
   "menu.view.exitFullScreen" : "В окне",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Показать инструменты разработчика",
   "menu.view.toggleFullScreen" : "Переключиться на полный экран",
   "menu.view.toggleServiceDevTools" : "Показать инструменты разработчика сервиса",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Увеличить масштаб",
   "menu.view.zoomOut" : "Уменьшить масштаб",
   "menu.window" : "Окно",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Принять",
   "password.successInfo" : "Проверьте вашу электронную почту",
   "premiumFeature.button.upgradeAccount" : "Перейти на платную подписку",
-   "pricing.headline" : "Поддержать Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Я хочу поддержать разработку Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Выберите ваш план поддержки",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Окружение",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Перезагрузить {name}",
   "service.crashHandler.autoReload" : "Пытаюсь автоматически восстановить {name} в течение {seconds} секунд",
   "service.crashHandler.headline" : "О, нет!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "О, нет!",
   "service.errorHandler.message" : "Ошибка",
   "service.errorHandler.text" : "{name} не смог загрузиться.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Загрузка",
   "services.getStarted" : "Начать работу",
   "services.welcome" : "Добро пожаловать во Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Сменить пароль",
   "settings.account.headlineProfile" : "Обновить профиль",
   "settings.account.headlineSubscription" : "Ваша подписка",
-   "settings.account.headlineUpgrade" : "Улучшить аккаунт и поддержать Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Скачать",
   "settings.account.manageSubscription.label" : "Управление вашей подпиской",
   "settings.account.successInfo" : "Ваши изменения были сохранены",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Попробовать снова",
   "settings.account.tryReloadUserInfoRequest" : "Попробовать снова",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Невозможно загрузить информацию пользователя",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Очистить кэш",
   "settings.app.buttonInstallUpdate" : "Перезапустить и обновить",
   "settings.app.buttonSearchForUpdate" : "Проверить обновления",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Ваши сервисы",
   "settings.navigation.yourWorkspaces" : "Ваши окружения",
   "settings.recipes.all" : "Все сервисы",
-   "settings.recipes.dev" : "Разработка",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Доступные сервисы",
   "settings.recipes.missingService" : "Не можете найти сервис?",
   "settings.recipes.mostPopular" : "Самые популярные",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Открыть меню окружений",
   "sidebar.settings" : "Настройки",
   "sidebar.unmuteApp" : "Включить уведомления и звук",
-   "signup.company.label" : "Организация",
   "signup.email.label" : "Адрес электронной почты",
   "signup.emailDuplicate" : "Пользователь с таким адресом электронной почты уже существует",
   "signup.firstname.label" : "Имя",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Уже есть аккаунт, войти?",
   "signup.password.label" : "Пароль",
   "signup.submit.label" : "Создать аккаунт",
-   "subscription.euTaxInfo" : "Резидентам ЕвроСоюза: могут применяться местные налоги",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Без рекламы, навсегда!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "скоро",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Никаких задержек и предложений перейти на платную версию",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Локальные\/размещенные на хостинге сервисы, такие как Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Подержка прокси для сервисов",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Поддержка проверки правописания",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Платный премиум аккаунт Franz включает",
-   "subscription.paymentSessionError" : "Невозможно загрузить форму оплаты",
-   "subscription.submit.label" : "Я хочу поддержать разработку Franz",
-   "subscription.type.free" : "бесплатно",
-   "subscription.type.month" : "месяц",
-   "subscription.type.year" : "год",
   "subscriptionPopup.buttonCancel" : "Отмена",
   "subscriptionPopup.buttonDone" : "Готово",
   "tabs.item.deleteService" : "Удалить сервис",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index bd08d5e4d..27681e25f 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Obnoviť",
   "app.errorHandler.headline" : "Niečo sa pokazilo",
   "feature.announcements.changelog.headline" : "Zmeny vo Franz {version}",
-   "feature.delayApp.action" : "Získajte licenciu pre Franz podporu",
   "feature.delayApp.headline" : "Prosím, kúp si licenciu Franz Supporter a nebudeš musieť čakať",
   "feature.delayApp.text" : "Franz bude pokračovať v {seconds} sekundách.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Získajte licenciu pre Franz podporu",
+   "feature.delayApp.upgrade.actionShort" : "Upgradovať účet",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Odoslať ako e-mail",
   "feature.shareFranz.action.facebook" : "Zdielať na Facebook-u",
   "feature.shareFranz.action.twitter" : "Zdieľať na Twitter-i",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Pridali sme {count} služieb do Franz! Získajte zadarmo aplikáciu pre WhatsApp, Messenger, Slack, Skype a iné na www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "Pridal som {count} služieb do Franz! Získajte zadarmo aplikáciu pre WhatsApp, Messenger, Slack, Skype a iné na www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Povedzte vašim priateľom a známym aký je Franz skvelý a pomôžte nám rozšíriť sa do sveta.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Nedá sa pripojiť k online službám Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Nie ste pripojení k internetu.",
   "global.spellchecker.useDefault" : "Použiť predvolené nastavenie systému ({default})",
   "global.spellchecking.autodetect" : "Automaticky rozpoznať jazyk",
   "global.spellchecking.autodetect.short" : "Automatický",
   "global.spellchecking.language" : "Jazyk kontroly pravopisu",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Importovať vaše služby z Franz 4",
   "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Franz 5",
   "import.skip.label" : "Chcem pridať služby ručne",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Obnoviť služby",
   "infobar.requiredRequestsFailed" : "Nie je možné načítať služby a informácie o používateľovi",
   "infobar.servicesUpdated" : "Vaše služby boli aktualizované.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Je k dispozícii nová aktualizácia Franz.",
   "invite.email.label" : "E-mailová adresa",
   "invite.headline.friends" : "Pozvite troch vašich priateľov alebo kolegov",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Vaša relácia vypršala, prihláste sa prosím znovu.",
   "login.submit.label" : "Prihlásiť sa",
   "login.tokenExpired" : "Vaša relácia vypršala, prihláste sa prosím znovu.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "O aplikácii",
   "menu.app.announcement" : "Čo je nové?",
   "menu.app.checkForUpdates" : "Skontrolovať aktualizácie",
@@ -68,6 +81,9 @@
   "menu.file" : "Súbor",
   "menu.help" : "Pomocník",
   "menu.help.changelog" : "Záznam zmien",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Zistiť viac",
   "menu.help.privacy" : "Vyhlásenie o ochrane súkromia",
   "menu.help.support" : "Podpora",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Aktivovať predchádzajúcu službu",
   "menu.services.addNewService" : "Pridať novú službu...",
   "menu.services.setNextServiceActive" : "Aktivujte ďalšiu službu",
+   "menu.todos" : "Todos",
   "menu.view" : "Zobraziť",
   "menu.view.enterFullScreen" : "Na celú obrazovku",
   "menu.view.exitFullScreen" : "Ukončiť režim na celú obrazovku",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Prepnúť vývojárske nástroje",
   "menu.view.toggleFullScreen" : "Prepnúť na celú obrazovku",
   "menu.view.toggleServiceDevTools" : "Prepnúť vývojárske nástroje služby",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Priblížiť",
   "menu.view.zoomOut" : "Oddialiť",
   "menu.window" : "Okno",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Odoslať",
   "password.successInfo" : "Skontrolujte prosím váš e-mail",
   "premiumFeature.button.upgradeAccount" : "Upgradovať účet",
-   "pricing.headline" : "Podporiť Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Nechcem podporiť vývoj aplikácie Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Vyberte si váš plán podpory",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Znovu načítať {name}",
   "service.crashHandler.autoReload" : "Najbližší pokus o automatické obnovenie {name} o {seconds} sekúnd",
   "service.crashHandler.headline" : "Ale nie!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Ale nie!",
   "service.errorHandler.message" : "Chyba",
   "service.errorHandler.text" : "{name} sa nepodarilo načítať.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Načítava",
   "services.getStarted" : "Začíname",
   "services.welcome" : "Vítajte v aplikácii Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Zmeniť heslo",
   "settings.account.headlineProfile" : "Aktualizovať profil",
   "settings.account.headlineSubscription" : "Vaše odoberanie",
-   "settings.account.headlineUpgrade" : "Povýšte svoj účet a podporte Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Prevziať",
   "settings.account.manageSubscription.label" : "Spravovať vaše odoberanie",
   "settings.account.successInfo" : "Vaše zmeny boli uložené",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Skúsiť znova",
   "settings.account.tryReloadUserInfoRequest" : "Skúsiť znova",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Nebolo možné načítať informácie o používateľovi",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Vyčistiť vyrovnávaciu pamäť",
   "settings.app.buttonInstallUpdate" : "Reštartovať a nainštalovať aktualizáciu",
   "settings.app.buttonSearchForUpdate" : "Skontrolovať aktualizácie",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Vaše služby",
   "settings.navigation.yourWorkspaces" : "Tvoje pracovné priestory",
   "settings.recipes.all" : "Všetky služby",
-   "settings.recipes.dev" : "Vývoj",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Dostupné služby",
   "settings.recipes.missingService" : "Chýba vám služba?",
   "settings.recipes.mostPopular" : "Najpopulárnejšie",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Otvoriť workspace záložku",
   "sidebar.settings" : "Nastavenia",
   "sidebar.unmuteApp" : "Povoliť oznámenia a zvuky",
-   "signup.company.label" : "Spoločnosť",
   "signup.email.label" : "E-mailová adresa",
   "signup.emailDuplicate" : "Používateľ s touto e-mailovou adresou už jestvuje",
   "signup.firstname.label" : "Krstné meno",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Už máte účet, chcete sa prihlásiť?",
   "signup.password.label" : "Heslo",
   "signup.submit.label" : "Vytvoriť účet",
-   "subscription.euTaxInfo" : "Pre obyvateľov EÚ: môže byť aplikovaná miestna daň",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Žiadne reklamy, nikdy!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "už čoskoro",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Žiadne oneskorenia a obťažovania po aktivovaní licencie",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Pridať on-premise\/hostovanú službu ako Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Podpora proxy pre služby",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Podpora pre kontrolovanie pravopisných chýb",
-   "subscription.features.workspaces" : "Organizujte vaše služby vo workspace",
-   "subscription.includedFeatures" : "Platený účet Premium Supporter Franz zahŕňa",
-   "subscription.paymentSessionError" : "Nepodarilo sa inicializovať platbu od",
-   "subscription.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
-   "subscription.type.free" : "zdarma",
-   "subscription.type.month" : "mesiac",
-   "subscription.type.year" : "rok",
   "subscriptionPopup.buttonCancel" : "Zrušiť",
   "subscriptionPopup.buttonDone" : "Dokončiť",
   "tabs.item.deleteService" : "Odstrániť službu",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 6ba059af8..927cf75c7 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Ponovno učitavanje",
   "app.errorHandler.headline" : "Something went wrong",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Get a Franz Supporter License",
+   "feature.delayApp.upgrade.actionShort" : "Upgrade account",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Send as email",
   "feature.shareFranz.action.facebook" : "Share on Facebook",
   "feature.shareFranz.action.twitter" : "Share on Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Nije moguće pristupiti Franz-ovim on-line servisima. ",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Niste povezani sa serverom.",
   "global.spellchecker.useDefault" : "Use System Default ({default})",
   "global.spellchecking.autodetect" : "Detect language automatically",
   "global.spellchecking.autodetect.short" : "Automatic",
   "global.spellchecking.language" : "Spell checking language",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Uvezite svoje Franz 4 servise",
   "import.notSupportedHeadline" : "Servis trenutno nije podržan u Franz 5",
   "import.skip.label" : "Желим да додам услуге ручно",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Ponovo učitaj servise ",
   "infobar.requiredRequestsFailed" : "Nemoguće učitati servise i korisničke informacije",
   "infobar.servicesUpdated" : "Vaši servisi su ažurirani. ",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Novo ažuriranje Franz-a je dostupno.  ",
   "invite.email.label" : "Vaša e-adresa",
   "invite.headline.friends" : "Pozovite 3 vaša prijatelja ili kolege",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Vaša sesija je istekla, prijavite se ponovo.",
   "login.submit.label" : "Prijavite se",
   "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "O Francu",
   "menu.app.announcement" : "What's new?",
   "menu.app.checkForUpdates" : "Potraži ažuriranja",
@@ -68,6 +81,9 @@
   "menu.file" : "Датотека",
   "menu.help" : "Помоћ",
   "menu.help.changelog" : "Дневник измена",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Сазнајте више",
   "menu.help.privacy" : "Izjava o privatnosti",
   "menu.help.support" : "Подршка",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Додај нову услугу",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "Преглед",
   "menu.view.enterFullScreen" : "Отвори у целом екрану",
   "menu.view.exitFullScreen" : "Напусти цео екран",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Промени алатке за развој",
   "menu.view.toggleFullScreen" : "Преко целог екрана",
   "menu.view.toggleServiceDevTools" : "Toggle Service Developer Tools",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Увећај приказ",
   "menu.view.zoomOut" : "Умањи приказ",
   "menu.window" : "У прозору",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Pošalji",
   "password.successInfo" : "Molimo Vas da provjerite vašu e-mail adresu",
   "premiumFeature.button.upgradeAccount" : "Upgrade account",
-   "pricing.headline" : "Podržite Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Ne želim da podržim razvoj Franz-a.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Želim da podržim razvoj Franz-a.",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Izaberite vaš plan za podržavanje",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Osvježi {ime}",
   "service.crashHandler.autoReload" : "Pokušaću automatski povratiti {ime} u {sekundi} sekundi",
   "service.crashHandler.headline" : "O, ne! ",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "O, ne! ",
   "service.errorHandler.message" : "Greška ",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Započnimo! ",
   "services.welcome" : "Dobrodošli u Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Promijenite lozinku",
   "settings.account.headlineProfile" : "Ažurirajte profil",
   "settings.account.headlineSubscription" : "Vaša pretplata",
-   "settings.account.headlineUpgrade" : "Nadogradite račun i podržite Franc",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Preuzmite",
   "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
   "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Pokušajte ponovno",
   "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Nije moguće učitati informacije o korisniku",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Очисти кеш",
   "settings.app.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
   "settings.app.buttonSearchForUpdate" : "Potraži ažuriranja",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Vaše usluge",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Sve usluge",
-   "settings.recipes.dev" : "Razvoj",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Dostupne usluge",
   "settings.recipes.missingService" : "Da li neki servis nedostaje?",
   "settings.recipes.mostPopular" : "Najpopularniji",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Postavke",
   "sidebar.unmuteApp" : "Искључи обавештења и звукове",
-   "signup.company.label" : "Tvrtka",
   "signup.email.label" : "Vaša e-adresa",
   "signup.emailDuplicate" : "Već postoji korisnik s tom e-mail adresom",
   "signup.firstname.label" : "Ime",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Imate račun? Prijavite se.",
   "signup.password.label" : "Lozinka",
   "signup.submit.label" : "Napravite novi račun",
-   "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Bez reklama, doživotno!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "Dolazi uskoro",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Plaćeni\/Premium račun uključuje sljedeće:",
-   "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
-   "subscription.submit.label" : "Želim da podržim razvoj Franca.",
-   "subscription.type.free" : "Slobodno",
-   "subscription.type.month" : "mjesec",
-   "subscription.type.year" : "godina",
   "subscriptionPopup.buttonCancel" : "Odustani",
   "subscriptionPopup.buttonDone" : "Završeno",
   "tabs.item.deleteService" : "Izbriši servis",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 1dc5ce838..d7b2f1cb5 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Tekrar Yükle",
   "app.errorHandler.headline" : "Bir terslik çıktı",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Franz Destek Lisansı'nı alın",
   "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın",
   "feature.delayApp.text" : "Franz {seconds} saniye sonra devam edecek.",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Franz Destek Lisansı'nı alın",
+   "feature.delayApp.upgrade.actionShort" : "Hesabı Yükselt",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Mail olarak gönder",
   "feature.shareFranz.action.facebook" : "Facebook'ta Paylaş",
   "feature.shareFranz.action.twitter" : "Twitter'da Paylaş",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "Franz'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.meetfranz.com adresinden edinin.",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Arkadaşlarına ve meslektaşlarına Franz'ın ne kadar harika olduğunu söyle ve bize bu kelimeyi yaymamızda yardım et.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
   "global.spellchecker.useDefault" : "Sistem Dilini Kullan ({default})",
   "global.spellchecking.autodetect" : "Dili otomatik tespit et",
   "global.spellchecking.autodetect.short" : "Otomatik",
   "global.spellchecking.language" : "İmla kontrol dili",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Franz 4 servislerinizi içeri aktarın",
   "import.notSupportedHeadline" : "Henüz Franz 5'te desteklenmeyen servisler",
   "import.skip.label" : "Servisleri kendim eklemek istiyorum",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Hizmetleri yeniden yükle",
   "infobar.requiredRequestsFailed" : "Hizmetler ve kullanıcı bilgileri yüklenemedi",
   "infobar.servicesUpdated" : "Hizmetleriniz güncellendi.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Yeni Franz güncellemesi mevcut.",
   "invite.email.label" : "E-posta adresi",
   "invite.headline.friends" : "3 arkadaşını ya da çalışma arkadaşını davet et",
@@ -43,8 +54,10 @@
   "login.serverLogout" : "Oturum süreniz dolmuş, lütfen tekrar giriş yapın.",
   "login.submit.label" : "Oturum Aç",
   "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yapın.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Franz Hakkında",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "Neler yeni?",
   "menu.app.checkForUpdates" : "Güncellemeleri kontrol et",
   "menu.app.hide" : "Gizle",
   "menu.app.hideOthers" : "Diğerlerini Gizle",
@@ -68,6 +81,9 @@
   "menu.file" : "Dosya",
   "menu.help" : "Yardım",
   "menu.help.changelog" : "Değişim Günlüğü",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Daha Fazlasını Öğrenin",
   "menu.help.privacy" : "Gizlilik Sözleşmesi",
   "menu.help.support" : "Destek",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Yeni servis ekle...",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "Görünüm",
   "menu.view.enterFullScreen" : "Tam Ekrana Geç",
   "menu.view.exitFullScreen" : "Tam Ekrandan Çık",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Geliştirici Araçlarına Geç",
   "menu.view.toggleFullScreen" : "Tam Ekrana Geç",
   "menu.view.toggleServiceDevTools" : "Hizmet Geliştirici Araçlarını Değiştir",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Yakınlaştır",
   "menu.view.zoomOut" : "Uzaklaştır",
   "menu.window" : "Pencere",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Gönder",
   "password.successInfo" : "E-postanızı kontrol ediniz",
   "premiumFeature.button.upgradeAccount" : "Hesabı Yükselt",
-   "pricing.headline" : "Franz'ı Destekle",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Franz'ın gelişimini desteklemek istemiyorum.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Destek planınızı seçiniz",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "{name} yeniden yükle",
   "service.crashHandler.autoReload" : "{name}'i {seconds} saniye içerisinde otomatik onarmayı deniyoruz",
   "service.crashHandler.headline" : "Aman Tanrım hayır!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "Hayııırrr!",
   "service.errorHandler.message" : "Hata",
   "service.errorHandler.text" : "{name} yüklenemedi.",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Yükleniyor",
   "services.getStarted" : "Haydi başlayalım",
   "services.welcome" : "Franz'a Hoşgeldiniz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Parolayı değiştir",
   "settings.account.headlineProfile" : "Profili güncelle",
   "settings.account.headlineSubscription" : "Aboneliğin",
-   "settings.account.headlineUpgrade" : "Hesabını yükselt & Franz'ı destekle",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "İndir",
   "settings.account.manageSubscription.label" : "Aboneliğini yönet",
   "settings.account.successInfo" : "Değişikliklerin kaydedildi",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Tekrar deneyin",
   "settings.account.tryReloadUserInfoRequest" : "Tekrar deneyin",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Önbelleği temizle",
   "settings.app.buttonInstallUpdate" : "Yeniden Başlat ve Güncelleştirmeleri Kur",
   "settings.app.buttonSearchForUpdate" : "Güncellemeleri kontrol et",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Servislerin",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Tüm servisler",
-   "settings.recipes.dev" : "Geliştirme",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Mevcut servisler",
   "settings.recipes.missingService" : "Aradığın servisi bulamadın mı?",
   "settings.recipes.mostPopular" : "En popüler",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Ayarlar",
   "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",
   "signup.firstname.label" : "Ad",
@@ -286,20 +343,12 @@
   "signup.link.login" : "Hali hazırda hesabınız varsa giriş yapmak ister misiniz?",
   "signup.password.label" : "Şifre",
   "signup.submit.label" : "Hesap oluştur",
-   "subscription.euTaxInfo" : "AB vatandaşları: yerel satış vergileri uygulanabilir",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Reklam yok, asla!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "yakında geliyor",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Uygulama gecikmeleri & yükseltme lisanları için dırdır yok",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Mattermost gibi şirket-içi\/barındırılan servisler ekleyin",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Servisler için proxy desteği",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Yazım denetleyicisi desteği",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
-   "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
-   "subscription.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
-   "subscription.type.free" : "ücretsiz",
-   "subscription.type.month" : "ay",
-   "subscription.type.year" : "yıl",
   "subscriptionPopup.buttonCancel" : "İptal",
   "subscriptionPopup.buttonDone" : "Tamamlandı",
   "tabs.item.deleteService" : "Servisi sil",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 8d68590fb..f112281bb 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -2,9 +2,14 @@
   "app.errorHandler.action" : "Перезавантажити",
   "app.errorHandler.headline" : "Щось пішло не так",
   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
-   "feature.delayApp.action" : "Отримати ліцензію Franz Supporter ",
   "feature.delayApp.headline" : "Будь ласка, придбайте ліцензію Franz Supporter аби пропустити очікування",
   "feature.delayApp.text" : "Franz відновить роботу за {seconds} секунд",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "Отримати ліцензію Franz Supporter ",
+   "feature.delayApp.upgrade.actionShort" : "Преміум акаунт",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email" : "Send as email",
   "feature.shareFranz.action.facebook" : "Share on Facebook",
   "feature.shareFranz.action.twitter" : "Share on Twitter",
@@ -12,12 +17,17 @@
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "Не можливо підключитись до онлайн сервісів Franz",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "Ви не підключені до Інтернету.",
   "global.spellchecker.useDefault" : "Використовувати системні параметри за змовчуванням ({default})",
   "global.spellchecking.autodetect" : "Detect language automatically",
   "global.spellchecking.autodetect.short" : "Automatic",
   "global.spellchecking.language" : "Мова перевірки правопису",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "Імпортувати ваші сервіси з Franz 4",
   "import.notSupportedHeadline" : "Наразі сервіси не підтримуються у Franz 5",
   "import.skip.label" : "Я бажаю додати сервіс вручну",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "Перезавантажити сервіси",
   "infobar.requiredRequestsFailed" : "Не вдалося завантажити сервіси та інформацію користувача",
   "infobar.servicesUpdated" : "Ваші сервіси було оновлено.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Нове оновлення для Franz доступне.",
   "invite.email.label" : "Email адреса",
   "invite.headline.friends" : "Запросіть 3-х ваших друзів або колег",
@@ -43,6 +54,8 @@
   "login.serverLogout" : "Ваша сесія закінчилась, будь ласка, увійдіть знову.",
   "login.submit.label" : "Увійти",
   "login.tokenExpired" : "Ваша сесія закінчилась, будь ласка, увійдіть знову.",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "Про Franz",
   "menu.app.announcement" : "What's new?",
   "menu.app.checkForUpdates" : "Перевірити наявність оновлень",
@@ -68,6 +81,9 @@
   "menu.file" : "Файл",
   "menu.help" : "Довідка",
   "menu.help.changelog" : "Журнал змін",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "Докладніше",
   "menu.help.privacy" : "Заява про конфіденційність",
   "menu.help.support" : "Підтримка",
@@ -76,6 +92,7 @@
   "menu.services.activatePreviousService" : "Activate previous service",
   "menu.services.addNewService" : "Додати сервіс",
   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.todos" : "Todos",
   "menu.view" : "Вигляд",
   "menu.view.enterFullScreen" : "Вікно на повний екран",
   "menu.view.exitFullScreen" : "Вийти з повного екрану",
@@ -85,6 +102,7 @@
   "menu.view.toggleDevTools" : "Переключити інструмент розробника",
   "menu.view.toggleFullScreen" : "Переключитися на повний екран",
   "menu.view.toggleServiceDevTools" : "Переключити інструменти розробника сервісу",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "Збільшити масштаб",
   "menu.view.zoomOut" : "Зменьшити масштаб",
   "menu.window" : "Вікно",
@@ -103,10 +121,33 @@
   "password.submit.label" : "Подати",
   "password.successInfo" : "Будь ласка, перевірте ваш email",
   "premiumFeature.button.upgradeAccount" : "Преміум акаунт",
-   "pricing.headline" : "Підтримайте Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "Я не хочу підтримувати розробку Franz.",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "Я хочу підтримати розробку Franz",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "Виберіть свій план підтримки",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "Workspaces",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "Перезавантажити {name}",
   "service.crashHandler.autoReload" : "Спробую автоматично відновити {name} через {seconds} с",
   "service.crashHandler.headline" : "О, ні!",
@@ -118,6 +159,11 @@
   "service.errorHandler.headline" : "О, ні!",
   "service.errorHandler.message" : "Помилка",
   "service.errorHandler.text" : "{name} не завантажено",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Почати",
   "services.welcome" : "Ласкаво просимо в Franz",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "Змінити пароль",
   "settings.account.headlineProfile" : "Оновити профіль",
   "settings.account.headlineSubscription" : "Ваша підписка",
-   "settings.account.headlineUpgrade" : "Оновити ваш акаунт і підтримати Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "Завантажити",
   "settings.account.manageSubscription.label" : "Керування вашою підпискою",
   "settings.account.successInfo" : "Ваші зміни були збережені",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "Спробуйте ще раз",
   "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "Не вдалося завантажити інформацію користувача",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "Очистити кеш",
   "settings.app.buttonInstallUpdate" : "Перезавантажити і встановити оновлення",
   "settings.app.buttonSearchForUpdate" : "Перевірити наявність оновлень",
@@ -182,7 +234,13 @@
   "settings.navigation.yourServices" : "Ваші сервіси",
   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Всі сервіси",
-   "settings.recipes.dev" : "Розробка",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "Доступні сервіси",
   "settings.recipes.missingService" : "Не знайшли сервісу?",
   "settings.recipes.mostPopular" : "Найбільш популярні",
@@ -274,7 +332,6 @@
   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Налаштування",
   "sidebar.unmuteApp" : "Увімкнути сповіщення та звуки",
-   "signup.company.label" : "Компанія",
   "signup.email.label" : "Email адреса",
   "signup.emailDuplicate" : "Користувач із цією email адресою вже існує",
   "signup.firstname.label" : "Ім`я",
@@ -286,20 +343,12 @@
   "signup.link.login" : "У вас вже є обліковий запис, увійти?",
   "signup.password.label" : "Пароль",
   "signup.submit.label" : "Створити акаунт",
-   "subscription.euTaxInfo" : "Для жителів ЄС: можуть застосовуватися податки",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "Жодної реклами!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "очікуйте незабаром",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "Ніяких затримок та набридливих пропозицій з платних підписок",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "Сервіси, що виконуються локально\/вимагають хостингу, приміром Mattermost",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "Підтримка проксі ",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "Підтримка перевірки правопису",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Платний Преміальний Акаунт Прихильника Franz включає",
-   "subscription.paymentSessionError" : "Не вдалося ініціалізувати форму платежу",
-   "subscription.submit.label" : "Я хочу підтримати розробку Franz",
-   "subscription.type.free" : "безплатно",
-   "subscription.type.month" : "місяць",
-   "subscription.type.year" : "рік",
   "subscriptionPopup.buttonCancel" : "Відмінити",
   "subscriptionPopup.buttonDone" : "Готово",
   "tabs.item.deleteService" : "Видалити сервіс",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index aa6247063..2fbcf7d20 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -1,23 +1,33 @@
 {
-   "app.errorHandler.action" : "重新載入",
+   "app.errorHandler.action" : "重新整理",
-   "app.errorHandler.headline" : "有些東西出錯了",
+   "app.errorHandler.headline" : "糟糕！有些地方出問題了。",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "透過 email 傳送",
-   "feature.delayApp.action" : "取得 Franz 支援授權",
   "feature.delayApp.headline" : "請購買 Franz 支援授權以跳過等候",
   "feature.delayApp.text" : "Franz 會在 {seconds} 秒後繼續。",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
+   "feature.delayApp.upgrade.action" : "取得 Franz 支援授權",
+   "feature.delayApp.upgrade.actionShort" : "升級帳號",
+   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
+   "feature.shareFranz.action.email" : "以電子郵件傳送",
+   "feature.shareFranz.action.facebook" : "透過 Facebook 分享",
+   "feature.shareFranz.action.twitter" : "在 Twitter 上分享",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.text" : "告訴所有朋友和同事Franz有多棒！",
+   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
+   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
+   "feature.todos.premium.upgrade" : "Upgrade Account",
   "global.api.unhealthy" : "無法連線至 Franz 的伺服器",
+   "global.franzProRequired" : "Franz Professional Required",
   "global.notConnectedToTheInternet" : "你沒有連上網路。",
   "global.spellchecker.useDefault" : "使用系統預設 ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "自動偵測語言",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "自動的",
   "global.spellchecking.language" : "拼字檢查語言",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
   "import.headline" : "匯入 Franz 4 的服務",
   "import.notSupportedHeadline" : "Franz 5 尚未支援此服務",
   "import.skip.label" : "手動添加服務",
@@ -27,6 +37,7 @@
   "infobar.buttonReloadServices" : "重新載入服務",
   "infobar.requiredRequestsFailed" : "無法載入服務和使用者資訊",
   "infobar.servicesUpdated" : "已經更新你的服務",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable" : "Franz 有可用的更新",
   "invite.email.label" : "電子郵件地址",
   "invite.headline.friends" : "邀請 3 位朋友或同事",
@@ -43,8 +54,10 @@
   "login.serverLogout" : "您的登入期間已過期，請重新登錄",
   "login.submit.label" : "登入",
   "login.tokenExpired" : "您的登入已過期，請重新登入。",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
   "menu.app.about" : "關於 Franz",
-   "menu.app.announcement" : "What's new?",
+   "menu.app.announcement" : "更新說明",
   "menu.app.checkForUpdates" : "檢查更新",
   "menu.app.hide" : "隱藏",
   "menu.app.hideOthers" : "隱藏其他",
@@ -68,14 +81,18 @@
   "menu.file" : "檔案",
   "menu.help" : "求助",
   "menu.help.changelog" : "變更紀錄",
+   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
+   "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
   "menu.help.learnMore" : "深入瞭解",
   "menu.help.privacy" : "隱私聲明",
   "menu.help.support" : "支援",
   "menu.help.tos" : "服務條款",
   "menu.services" : "服務",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "啟動前一個服務",
   "menu.services.addNewService" : "新增服務",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "啟動下一個服務",
+   "menu.todos" : "Todos",
   "menu.view" : "檢視",
   "menu.view.enterFullScreen" : "進入全螢幕模式",
   "menu.view.exitFullScreen" : "離開全螢幕模式",
@@ -85,16 +102,17 @@
   "menu.view.toggleDevTools" : "切換開發者工具",
   "menu.view.toggleFullScreen" : "切換全螢幕",
   "menu.view.toggleServiceDevTools" : "切換服務開發者工具",
+   "menu.view.toggleTodosDevTools" : "Toggle Todos Developer Tools",
   "menu.view.zoomIn" : "放大",
   "menu.view.zoomOut" : "縮小",
   "menu.window" : "視窗",
   "menu.window.close" : "關閉",
   "menu.window.minimize" : "最小化",
-   "menu.workspaces" : "Workspaces",
+   "menu.workspaces" : "工作區",
-   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.addNewWorkspace" : "新增工作區",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.closeWorkspaceDrawer" : "關閉工作空間",
   "menu.workspaces.defaultWorkspace" : "所有服務",
-   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
+   "menu.workspaces.openWorkspaceDrawer" : "打開工作空間",
   "password.email.label" : "電子郵件地址",
   "password.headline" : "重設密碼",
   "password.link.login" : "登入您的帳號",
@@ -103,10 +121,33 @@
   "password.submit.label" : "送出",
   "password.successInfo" : "請檢查您的電子郵件",
   "premiumFeature.button.upgradeAccount" : "升級帳號",
-   "pricing.headline" : "支持 Franz",
+   "pricing.features.adFree" : "Forever ad-free",
-   "pricing.link.skipPayment" : "我不想支持 Franz 的開發。",
+   "pricing.features.appDelays" : "No Waiting Screens",
-   "pricing.submit.label" : "我想支持 Franz 的開發。",
+   "pricing.features.customWebsites" : "Add Custom Websites",
-   "pricing.support.label" : "選擇您支持的計畫",
+   "pricing.features.onPremise" : "On-premise & other Hosted Services",
+   "pricing.features.serviceProxies" : "Service Proxies",
+   "pricing.features.spellchecker" : "Spellchecker support",
+   "pricing.features.teamManagement" : "Team Management",
+   "pricing.features.thirdPartyServices" : "Install 3rd party services",
+   "pricing.features.unlimitedServices" : "Add unlimited services",
+   "pricing.features.workspaces" : "工作區",
+   "pricing.plan.free" : "Franz Free",
+   "pricing.plan.legacy" : "Franz Premium",
+   "pricing.plan.personal" : "Franz Personal",
+   "pricing.plan.personal-monthly" : "Franz Personal Monthly",
+   "pricing.plan.personal-yearly" : "Franz Personal Yearly",
+   "pricing.plan.pro" : "Franz Professional",
+   "pricing.plan.pro-monthly" : "Franz Professional Monthly",
+   "pricing.plan.pro-yearly" : "Franz Professional Yearly",
+   "pricing.trial.cta.accept" : "Yes, upgrade my account to Franz Professional",
+   "pricing.trial.cta.skip" : "Continue to Franz",
+   "pricing.trial.error" : "Sorry, we could not activate your trial!",
+   "pricing.trial.features.headline" : "Franz Professional includes:",
+   "pricing.trial.headline" : "Franz Professional",
+   "pricing.trial.subheadline" : "Your personal welcome offer:",
+   "pricing.trial.terms.automaticTrialEnd" : "Your free trial ends automatically after 14 days",
+   "pricing.trial.terms.headline" : "No strings attached",
+   "pricing.trial.terms.noCreditCard" : "No credit card required",
   "service.crashHandler.action" : "重新載入{name}",
   "service.crashHandler.autoReload" : "嘗試在{seconds}秒內自動恢復{name}",
   "service.crashHandler.headline" : "噢不!",
@@ -118,7 +159,12 @@
   "service.errorHandler.headline" : "噢不！",
   "service.errorHandler.message" : "錯誤",
   "service.errorHandler.text" : "{name} 載入失敗。",
-   "service.webviewLoader.loading" : "Loading",
+   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
+   "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+   "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
+   "service.restrictedHandler.serviceLimit.text" : "Please upgrade your account to use more than {count} services.",
+   "service.webviewLoader.loading" : "正在載入",
   "services.getStarted" : "開始",
   "services.welcome" : "歡迎使用 Franz",
   "settings.account.account.editButton" : "編輯帳號",
@@ -135,13 +181,19 @@
   "settings.account.headlinePassword" : "變更密碼",
   "settings.account.headlineProfile" : "更新簡介",
   "settings.account.headlineSubscription" : "您的訂閱",
-   "settings.account.headlineUpgrade" : "升級您的帳戶並支持 Franz",
+   "settings.account.headlineTrialUpgrade" : "Get the free 14 day Franz Professional Trial",
+   "settings.account.headlineUpgradeAccount" : "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload" : "下載",
   "settings.account.manageSubscription.label" : "管理您的訂閱",
   "settings.account.successInfo" : "您的更變已經被儲存",
+   "settings.account.trial" : "Free Trial",
+   "settings.account.trialEndsIn" : "Your free trial ends in {duration}.",
+   "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices" : "再試一次",
   "settings.account.tryReloadUserInfoRequest" : "再試一次",
+   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed" : "無法載入使用者資訊。",
+   "settings.account.yourLicense" : "Your Franz License",
   "settings.app.buttonClearAllCache" : "清除快取",
   "settings.app.buttonInstallUpdate" : "重新啟動並安裝更新",
   "settings.app.buttonSearchForUpdate" : "檢查更新",
@@ -165,7 +217,7 @@
   "settings.app.headlineGeneral" : "一般",
   "settings.app.headlineLanguage" : "語言",
   "settings.app.headlineUpdates" : "更新",
-   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
+   "settings.app.languageDisclaimer" : "官方僅提供英語與德語，其他語言由社群提供翻譯。",
   "settings.app.restartRequired" : "需要重啟以更變",
   "settings.app.subheadlineCache" : "快取",
   "settings.app.translationHelp" : "幫助我們將 Franz 翻譯成您的語言。",
@@ -178,11 +230,17 @@
   "settings.navigation.inviteFriends" : "邀請朋友",
   "settings.navigation.logout" : "登出",
   "settings.navigation.settings" : "設定",
-   "settings.navigation.team" : "Manage Team",
+   "settings.navigation.team" : "管理團隊",
   "settings.navigation.yourServices" : "您的服務",
-   "settings.navigation.yourWorkspaces" : "Your workspaces",
+   "settings.navigation.yourWorkspaces" : "所有工作區",
   "settings.recipes.all" : "所有服務",
-   "settings.recipes.dev" : "開發",
+   "settings.recipes.custom" : "Custom Services",
+   "settings.recipes.customService.headline.communityRecipes" : "Community 3rd Party Recipes",
+   "settings.recipes.customService.headline.customRecipes" : "Custom 3rd Party Recipes",
+   "settings.recipes.customService.headline.devRecipes" : "Your Development Service Recipes",
+   "settings.recipes.customService.intro" : "To add a custom service, copy the service recipe to:",
+   "settings.recipes.customService.openDevDocs" : "Developer Documentation",
+   "settings.recipes.customService.openFolder" : "Open folder",
   "settings.recipes.headline" : "可使用的服務",
   "settings.recipes.missingService" : "缺少服務?",
   "settings.recipes.mostPopular" : "最熱門",
@@ -233,17 +291,17 @@
   "settings.services.discoverServices" : "發現服務",
   "settings.services.headline" : "您的服務",
   "settings.services.noServicesAdded" : "你尚未新增任何服務",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "無法載入此服務",
   "settings.services.tooltip.isDisabled" : "服務已停用",
   "settings.services.tooltip.isMuted" : "所有的聲音都是靜音",
   "settings.services.tooltip.notificationsDisabled" : "通知已停用",
   "settings.services.updatedInfo" : "已儲存你的變更",
-   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.contentHeadline" : "Franz 團隊",
   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
   "settings.team.headline" : "團隊",
   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
-   "settings.team.upgradeAction" : "Upgrade your Account",
+   "settings.team.upgradeAction" : "升級你的帳戶",
   "settings.user.form.accountType.company" : "公司",
   "settings.user.form.accountType.individual" : "個人",
   "settings.user.form.accountType.label" : "帳戶類型",
@@ -254,27 +312,26 @@
   "settings.user.form.lastname" : "姓",
   "settings.user.form.newPassword" : "新密碼",
   "settings.workspace.add.form.name" : "名稱",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.add.form.submitButton" : "建立工作區",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonDelete" : "刪除工作區",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.buttonSave" : "儲存工作區",
   "settings.workspace.form.name" : "名稱",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "這個工作區的服務",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspace.form.yourWorkspaces" : "你的工作區",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.deletedInfo" : "成功刪除工作區",
-   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.headline" : "你的工作區",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.noWorkspacesAdded" : "你尚未加入任何工作區",
   "settings.workspaces.tryReloadWorkspaces" : "再試一次",
-   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.updatedInfo" : "成功儲存",
   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "新增新的服務",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "關閉工作空間",
   "sidebar.muteApp" : "關閉通知和通知音效",
-   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
+   "sidebar.openWorkspaceDrawer" : "打開工作空間",
   "sidebar.settings" : "設定",
   "sidebar.unmuteApp" : "開啟通知和通知音效",
-   "signup.company.label" : "公司",
   "signup.email.label" : "電子郵件地址",
   "signup.emailDuplicate" : "該使用者的電子郵件位址已存在",
   "signup.firstname.label" : "名",
@@ -286,20 +343,12 @@
   "signup.link.login" : "已經有一個帳戶，登入？",
   "signup.password.label" : "密碼",
   "signup.submit.label" : "建立帳號",
-   "subscription.euTaxInfo" : "歐盟居民：可能採用當地銷售稅",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
-   "subscription.features.ads" : "無廣告，永遠!",
+   "subscription.cta.allOptions" : "See all options",
-   "subscription.features.comingSoon" : "即將推出",
+   "subscription.cta.choosePlan" : "Choose your plan",
-   "subscription.features.noInterruptions" : "升級授權沒有延遲與打盹",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
-   "subscription.features.onpremise.mattermost" : "加入如 Mattermost 等已預定 \/ 託管的服務",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
-   "subscription.features.proxy" : "服務的代理伺服器支援",
+   "subscription.teaser.intro" : "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-   "subscription.features.spellchecker" : "支援拼字檢查",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Franz 高級支援帳戶包含",
-   "subscription.paymentSessionError" : "無法初始化付款表單",
-   "subscription.submit.label" : "我想支持 Franz 開發",
-   "subscription.type.free" : "自由",
-   "subscription.type.month" : "月",
-   "subscription.type.year" : "年",
   "subscriptionPopup.buttonCancel" : "取消",
   "subscriptionPopup.buttonDone" : "完成",
   "tabs.item.deleteService" : "刪除服務",
@@ -320,7 +369,7 @@
   "welcome.signupButton" : "建立免費帳號",
   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
   "workspaceDrawer.allServices" : "所有服務",
-   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.headline" : "工作區",
   "workspaceDrawer.item.contextMenuEdit" : "edit",
   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
author	FranzBot <i18n@meetfranz.com>	2019-09-06 12:44:00 +0000
committer	FranzBot <i18n@meetfranz.com>	2019-09-06 12:44:00 +0000
commit	df9986d6502bd552235e305caf3c420938fb8254 (patch)
tree	c9ae1935f047f82e723423846333da57ccdd1adf /src/i18n/locales
parent	Update strings (diff)
download	ferdium-app-df9986d6502bd552235e305caf3c420938fb8254.tar.gz ferdium-app-df9986d6502bd552235e305caf3c420938fb8254.tar.zst ferdium-app-df9986d6502bd552235e305caf3c420938fb8254.zip