Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.3.0

56 files changed, 4714 insertions, 1642 deletions

diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index adf2cc306..86fb9e18d 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -25,4 +25,8 @@ export default defineMessages({
     id: 'global.spellchecking.autodetect.short',
     defaultMessage: '!!!Automatic',
   },
+  proRequired: {
+    id: 'global.franzProRequired',
+    defaultMessage: '!!!Franz Professional Required',
+  },
 });
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 5b63b97fb..3da31b68e 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Recarrega",
    "app.errorHandler.headline" : "Quelcom ha anat malament",
-   "feature.announcements.changelog.headline" : "Canvis en Ferdi {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 Ferdi per saltar l'espera",
-   "feature.delayApp.text" : "Ferdi continuarà en {seconds} segons",
+   "feature.announcements.changelog.headline" : "Canvis en Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Junts millorem Franz!",
    "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 Ferdi i ajuda'ns a còrrer la veu ",
+   "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",
-   "import.headline" : "Importa els teus serveis Ferdi 4",
-   "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Ferdi 5",
+   "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",
    "import.submit.label" : "Importa serveis",
    "infobar.buttonChangelog" : "Que hi ha de nou?",
@@ -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.link.skipPayment" : "No vull donar suport al desenvolupament de Franz.",
-   "pricing.submit.label" : "Vull donar suport al desenvolupament de Franz",
-   "pricing.support.label" : "Seleccioneu el vostre pla de suport",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Uneix-te al Cantó Fosc",
    "settings.app.form.enableGPUAcceleration" : "Activar acceleració GPU",
    "settings.app.form.enableSpellchecking" : "Habilita la comprobació ortogràfica",
-   "settings.app.form.enableSystemTray" : "Mostra Ferdi a la safata del sistema",
+   "settings.app.form.enableSystemTray" : "Mostra Franz a la safata del sistema",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimitza Ferdi a la safata del sistema",
    "settings.app.form.runInBackground" : "Mantén a Ferdi en segon pla en tancar la finestra",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "gratuït",
    "subscription.type.month" : "mes",
    "subscription.type.year" : "any",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 e36f10d5e..5a4c4c428 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Obnovit",
    "app.errorHandler.headline" : "Něco se pokazilo",
-   "feature.announcements.changelog.headline" : "Změny ve Ferdi {version}",
-   "feature.delayApp.action" : "Podpoř Ferdi a získej Supporter licenci",
-   "feature.delayApp.headline" : "Kup si Ferdi Supporter licenci a nebudeš už muset čekat",
-   "feature.delayApp.text" : "Ferdi bude pokračovat v {seconds} sekundách.",
+   "feature.announcements.changelog.headline" : "Změny ve Franz {version}",
+   "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",
-   "feature.shareFranz.headline" : "Ferdi is better together!",
+   "feature.shareFranz.headline" : "Společně je Franz ještě lepší!",
    "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 Ferdi is and help us to spread the word.",
-   "global.api.unhealthy" : "Nemůžeme připojit Ferdi k online službám",
+   "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",
-   "import.headline" : "Importovat služby z Ferdi 4",
-   "import.notSupportedHeadline" : "Služby nejsou podporovány ve verzi Ferdi 5",
+   "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ě",
    "import.submit.label" : "Importovat služby",
    "infobar.buttonChangelog" : "Co je nového?",
@@ -27,7 +37,8 @@
    "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.updateAvailable" : "Nová aktualizace Ferdi je k dispozici",
+   "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",
    "invite.name.label" : "Jméno",
@@ -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.link.skipPayment" : "Nechci podporovat vývoj aplikace Franz.",
-   "pricing.submit.label" : "Chci podpořit vývoj aplikace Franz",
-   "pricing.support.label" : "Vyberte váš plán podpory",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Připoj se k Temné straně",
    "settings.app.form.enableGPUAcceleration" : "Aktivovat GPU zrychlení",
    "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
-   "settings.app.form.enableSystemTray" : "Zobrazit Ferdi v systémové liště",
+   "settings.app.form.enableSystemTray" : "Zobrazit Franz v systémové liště",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovat Ferdi do systémové lišty",
    "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "zdarma",
    "subscription.type.month" : "měsíc",
    "subscription.type.year" : "rok",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 42cfb9ad1..06bdaabfe 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,23 +1,33 @@
 {
    "app.errorHandler.action" : "Neu laden",
    "app.errorHandler.headline" : "Es ist ein Fehler aufgetreten",
-   "feature.announcements.changelog.headline" : "Was ist neu in Ferdi {version}",
-   "feature.delayApp.action" : "Hol dir Ferdi Premium!",
-   "feature.delayApp.headline" : "Erspare dir das Warten mit Ferdi Premium!",
+   "feature.announcements.changelog.headline" : "Was ist neu in Franz {version}",
+   "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",
-   "feature.shareFranz.headline" : "Gemeinsam ist Ferdi noch besser!",
-   "feature.shareFranz.shareText.email" : "Ich habe {count} Services zu Ferdi 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 Ferdi 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 Ferdi toll findest.",
+   "feature.shareFranz.headline" : "Gemeinsam ist Franz noch besser!",
+   "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 Ferdi 5 unterstützt werden",
    "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
@@ -27,7 +37,8 @@
    "infobar.buttonReloadServices" : "Dienste neu laden",
    "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
    "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
-   "infobar.updateAvailable" : "Eine neue Version von Ferdi ist verfügbar!",
+   "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!",
    "invite.name.label" : "Name",
@@ -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" : "Ferdi unterstützen",
-   "pricing.link.skipPayment" : "Ich möchte die Entwicklung von Ferdi nicht unterstützen.",
-   "pricing.submit.label" : "Ich möchte die Entwicklung von Ferdi unterstützen.",
-   "pricing.support.label" : "Wie möchtest Du Ferdi unterstützen?",
+   "pricing.features.adFree" : "Keine Werbung",
+   "pricing.features.appDelays" : "Keine unnötigen Unterbrechungen",
+   "pricing.features.customWebsites" : "Hinzufügen von eigenen Websites",
+   "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 & Ferdi 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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Die dunkle Seite erwartet dich! (Dark Mode)",
    "settings.app.form.enableGPUAcceleration" : "Hardwarebeschleunigung aktivieren",
    "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
-   "settings.app.form.enableSystemTray" : "Ferdi im Infobereich anzeigen",
+   "settings.app.form.enableSystemTray" : "Franz im Infobereich anzeigen",
+   "settings.app.form.enableTodos" : "Franz Todos aktivieren",
    "settings.app.form.language" : "Sprache",
    "settings.app.form.minimizeToSystemTray" : "Ferdi in den Infobereich minimieren",
    "settings.app.form.runInBackground" : "Ferdi im Hintergrund behalten, wenn das Fenster geschlossen wird",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "kostenlos",
    "subscription.type.month" : "Monat",
    "subscription.type.year" : "Jahr",
+   "subscription.cta.activateTrial" : "Ja, kostenlose Franz Professional Testlizenz starten",
+   "subscription.cta.allOptions" : "Alle Optionen anzeigen",
+   "subscription.cta.choosePlan" : "Wähle deine Lizenz",
+   "subscription.includedProFeatures" : "Die Franz Professional Lizenz beinhaltet:",
+   "subscription.teaser.includedFeatures" : "Bezahlte Franz Lizenzen beinhalten:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "Abbrechen",
    "subscriptionPopup.buttonDone" : "Fertig",
    "tabs.item.deleteService" : "Dienst löschen",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 7d0e075cc..2dd778434 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -443,55 +443,120 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Support Ferdi",
+        "defaultMessage": "!!!Franz Professional",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 18
         },
         "file": "src/components/auth/Pricing.js",
-        "id": "pricing.headline",
+        "id": "pricing.trial.headline",
         "start": {
           "column": 12,
-          "line": 13
+          "line": 15
         }
       },
       {
-        "defaultMessage": "!!!Select your support plan",
+        "defaultMessage": "!!!Your personal welcome offer:",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 22
         },
         "file": "src/components/auth/Pricing.js",
-        "id": "pricing.support.label",
+        "id": "pricing.trial.subheadline",
         "start": {
-          "column": 23,
-          "line": 17
+          "column": 17,
+          "line": 19
         }
       },
       {
-        "defaultMessage": "!!!Support the development of Ferdi",
+        "defaultMessage": "!!!No strings attached",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 26
         },
         "file": "src/components/auth/Pricing.js",
-        "id": "pricing.submit.label",
+        "id": "pricing.trial.terms.headline",
+        "start": {
+          "column": 29,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!No credit card required",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.trial.terms.noCreditCard",
+        "start": {
+          "column": 16,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.trial.terms.automaticTrialEnd",
         "start": {
           "column": 21,
-          "line": 21
+          "line": 31
         }
       },
       {
-        "defaultMessage": "!!!I don't want to support the development of Ferdi.",
+        "defaultMessage": "!!!Sorry, we could not activate your trial!",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 38
         },
         "file": "src/components/auth/Pricing.js",
-        "id": "pricing.link.skipPayment",
+        "id": "pricing.trial.error",
         "start": {
-          "column": 15,
-          "line": 25
+          "column": 19,
+          "line": 35
+        }
+      },
+      {
+        "defaultMessage": "!!!Yes, upgrade my account to Franz Professional",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.trial.cta.accept",
+        "start": {
+          "column": 13,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Continue to Franz",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.trial.cta.skip",
+        "start": {
+          "column": 11,
+          "line": 43
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Professional includes:",
+        "end": {
+          "column": 3,
+          "line": 50
+        },
+        "file": "src/components/auth/Pricing.js",
+        "id": "pricing.trial.features.headline",
+        "start": {
+          "column": 20,
+          "line": 47
         }
       }
     ],
@@ -503,156 +568,143 @@
         "defaultMessage": "!!!Sign up",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 20
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.headline",
         "start": {
           "column": 12,
-          "line": 18
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Firstname",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 24
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.firstname.label",
         "start": {
           "column": 18,
-          "line": 22
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Lastname",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 28
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.lastname.label",
         "start": {
           "column": 17,
-          "line": 26
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Email address",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 32
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.email.label",
         "start": {
           "column": 14,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Company",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.company.label",
-        "start": {
-          "column": 16,
-          "line": 34
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 40
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.password.label",
         "start": {
           "column": 17,
-          "line": 38
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!By creating a Ferdi account you accept the",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 44
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.info",
         "start": {
           "column": 13,
-          "line": 42
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Terms of service",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 48
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.terms",
         "start": {
           "column": 9,
-          "line": 46
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 52
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.legal.privacy",
         "start": {
           "column": 11,
-          "line": 50
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Create account",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 56
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.submit.label",
         "start": {
           "column": 21,
-          "line": 54
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Already have an account, sign in?",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 60
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.link.login",
         "start": {
           "column": 13,
-          "line": 58
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!A user with that email address already exists",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 64
         },
         "file": "src/components/auth/Signup.js",
         "id": "signup.emailDuplicate",
         "start": {
           "column": 18,
-          "line": 62
+          "line": 61
         }
       }
     ],
@@ -695,33 +747,33 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 31
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 25
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 35
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 29
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 39
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
@@ -933,29 +985,99 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Welcome to Ferdi",
+        "defaultMessage": "!!!You have reached your service limit.",
         "end": {
           "column": 3,
           "line": 14
         },
+        "file": "src/components/services/content/ServiceRestricted.js",
+        "id": "service.restrictedHandler.serviceLimit.headline",
+        "start": {
+          "column": 24,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Please upgrade your account to use more than {count} services.",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/services/content/ServiceRestricted.js",
+        "id": "service.restrictedHandler.serviceLimit.text",
+        "start": {
+          "column": 20,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Professional Plan required",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/services/content/ServiceRestricted.js",
+        "id": "service.restrictedHandler.customUrl.headline",
+        "start": {
+          "column": 21,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/services/content/ServiceRestricted.js",
+        "id": "service.restrictedHandler.customUrl.text",
+        "start": {
+          "column": 17,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade Account",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/components/services/content/ServiceRestricted.js",
+        "id": "service.restrictedHandler.action",
+        "start": {
+          "column": 10,
+          "line": 27
+        }
+      }
+    ],
+    "path": "src/components/services/content/ServiceRestricted.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Welcome to Ferdi",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
         "file": "src/components/services/content/Services.js",
         "id": "services.welcome",
         "start": {
           "column": 11,
-          "line": 11
+          "line": 14
         }
       },
       {
         "defaultMessage": "!!!Get started",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 21
         },
         "file": "src/components/services/content/Services.js",
         "id": "services.getStarted",
         "start": {
           "column": 14,
-          "line": 15
+          "line": 18
         }
       },
       {
@@ -1172,38 +1294,25 @@
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 21
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Your Subscription",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 25
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineSubscription",
         "start": {
           "column": 24,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade your Account",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineUpgrade",
-        "start": {
-          "column": 19,
           "line": 22
         }
       },
@@ -1234,133 +1343,198 @@
         }
       },
       {
-        "defaultMessage": "!!!Basic Account",
+        "defaultMessage": "!!!Upgrade to Franz Professional",
         "end": {
           "column": 3,
           "line": 37
         },
         "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.upgradeToPro.label",
+        "start": {
+          "column": 23,
+          "line": 34
+        }
+      },
+      {
+        "defaultMessage": "!!!Basic Account",
+        "end": {
+          "column": 3,
+          "line": 41
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountType.basic",
         "start": {
           "column": 20,
-          "line": 34
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Premium Supporter Account",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 45
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountType.premium",
         "start": {
           "column": 22,
-          "line": 38
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Edit Account",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 49
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.account.editButton",
         "start": {
           "column": 21,
-          "line": 42
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!Invoices",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 53
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineInvoices",
         "start": {
           "column": 18,
-          "line": 46
+          "line": 50
         }
       },
       {
         "defaultMessage": "!!!Download",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 57
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.invoiceDownload",
         "start": {
           "column": 19,
-          "line": 50
+          "line": 54
         }
       },
       {
         "defaultMessage": "!!!Could not load user information",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 61
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.userInfoRequestFailed",
         "start": {
           "column": 25,
-          "line": 54
+          "line": 58
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 65
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.tryReloadUserInfoRequest",
         "start": {
           "column": 28,
-          "line": 58
+          "line": 62
         }
       },
       {
         "defaultMessage": "!!!Delete account",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 69
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteAccount",
         "start": {
           "column": 17,
-          "line": 62
+          "line": 66
         }
       },
       {
         "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 73
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteInfo",
         "start": {
           "column": 14,
-          "line": 66
+          "line": 70
         }
       },
       {
         "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
         "end": {
           "column": 3,
-          "line": 73
+          "line": 77
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteEmailSent",
         "start": {
           "column": 19,
-          "line": 70
+          "line": 74
+        }
+      },
+      {
+        "defaultMessage": "!!!Free Trial",
+        "end": {
+          "column": 3,
+          "line": 81
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.trial",
+        "start": {
+          "column": 9,
+          "line": 78
+        }
+      },
+      {
+        "defaultMessage": "!!!Your Franz License:",
+        "end": {
+          "column": 3,
+          "line": 85
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.yourLicense",
+        "start": {
+          "column": 15,
+          "line": 82
+        }
+      },
+      {
+        "defaultMessage": "!!!Your free trial ends in {duration}.",
+        "end": {
+          "column": 3,
+          "line": 89
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.trialEndsIn",
+        "start": {
+          "column": 15,
+          "line": 86
+        }
+      },
+      {
+        "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
+        "end": {
+          "column": 3,
+          "line": 93
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.trialUpdateBillingInfo",
+        "start": {
+          "column": 33,
+          "line": 90
         }
       }
     ],
@@ -1372,104 +1546,104 @@
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 17
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.availableServices",
         "start": {
           "column": 21,
-          "line": 13
+          "line": 14
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 21
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourServices",
         "start": {
           "column": 16,
-          "line": 17
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 25
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourWorkspaces",
         "start": {
           "column": 18,
-          "line": 21
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 29
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 25
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Manage Team",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 33
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.team",
         "start": {
           "column": 8,
-          "line": 29
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 37
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.settings",
         "start": {
           "column": 12,
-          "line": 33
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Invite Friends",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 41
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.inviteFriends",
         "start": {
           "column": 17,
-          "line": 37
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 45
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 41
+          "line": 42
         }
       }
     ],
@@ -1481,104 +1655,182 @@
         "defaultMessage": "!!!Available Services",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 23
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.headline",
         "start": {
           "column": 12,
-          "line": 15
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Search service",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 27
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.searchService",
         "start": {
           "column": 17,
-          "line": 19
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Most popular",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 31
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.mostPopular",
         "start": {
           "column": 22,
-          "line": 23
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!All services",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 35
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.all",
         "start": {
           "column": 14,
-          "line": 27
+          "line": 32
         }
       },
       {
-        "defaultMessage": "!!!Development",
+        "defaultMessage": "!!!Custom Services",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 39
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.dev",
+        "id": "settings.recipes.custom",
         "start": {
-          "column": 14,
-          "line": 31
+          "column": 17,
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Sorry, but no service matched your search term.",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 43
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.nothingFound",
         "start": {
           "column": 16,
-          "line": 35
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Service successfully added",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 47
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.servicesSuccessfulAddedInfo",
         "start": {
           "column": 31,
-          "line": 39
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Missing a service?",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 51
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.missingService",
         "start": {
           "column": 18,
-          "line": 43
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.customService.intro",
+        "start": {
+          "column": 21,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Open directory",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.customService.openFolder",
+        "start": {
+          "column": 14,
+          "line": 56
+        }
+      },
+      {
+        "defaultMessage": "!!!Developer Documentation",
+        "end": {
+          "column": 3,
+          "line": 63
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.customService.openDevDocs",
+        "start": {
+          "column": 15,
+          "line": 60
+        }
+      },
+      {
+        "defaultMessage": "!!!Custom 3rd Party Recipes",
+        "end": {
+          "column": 3,
+          "line": 67
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.customService.headline.customRecipes",
+        "start": {
+          "column": 25,
+          "line": 64
+        }
+      },
+      {
+        "defaultMessage": "!!!Community 3rd Party Recipes",
+        "end": {
+          "column": 3,
+          "line": 71
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.customService.headline.communityRecipes",
+        "start": {
+          "column": 28,
+          "line": 68
+        }
+      },
+      {
+        "defaultMessage": "!!!Your Development Service Recipes",
+        "end": {
+          "column": 3,
+          "line": 75
+        },
+        "file": "src/components/settings/recipes/RecipesDashboard.js",
+        "id": "settings.recipes.customService.headline.devRecipes",
+        "start": {
+          "column": 22,
+          "line": 72
         }
       }
     ],
@@ -1590,286 +1842,286 @@
         "defaultMessage": "!!!Save service",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 27
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.saveButton",
         "start": {
           "column": 15,
-          "line": 22
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Delete Service",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 31
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.deleteButton",
         "start": {
           "column": 17,
-          "line": 26
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 35
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.availableServices",
         "start": {
           "column": 21,
-          "line": 30
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 39
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.yourServices",
         "start": {
           "column": 16,
-          "line": 34
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Add {name}",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 43
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.addServiceHeadline",
         "start": {
           "column": 22,
-          "line": 38
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Edit {name}",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 47
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.editServiceHeadline",
         "start": {
           "column": 23,
-          "line": 42
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Hosted",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 51
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.tabHosted",
         "start": {
           "column": 13,
-          "line": 46
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Self hosted ⭐️",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 55
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.tabOnPremise",
         "start": {
           "column": 16,
-          "line": 50
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Use the hosted {name} service.",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 59
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.useHostedService",
         "start": {
           "column": 20,
-          "line": 54
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Could not validate custom {name} server.",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 63
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.customUrlValidationError",
         "start": {
           "column": 28,
-          "line": 58
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 67
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.customUrlPremiumInfo",
         "start": {
           "column": 24,
-          "line": 62
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Upgrade your account",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 71
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.customUrlUpgradeAccount",
         "start": {
           "column": 27,
-          "line": 66
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
         "end": {
           "column": 3,
-          "line": 73
+          "line": 75
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.indirectMessageInfo",
         "start": {
           "column": 23,
-          "line": 70
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
         "end": {
           "column": 3,
-          "line": 77
+          "line": 79
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.isMutedInfo",
         "start": {
           "column": 15,
-          "line": 74
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Notifications",
         "end": {
           "column": 3,
-          "line": 81
+          "line": 83
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineNotifications",
         "start": {
           "column": 25,
-          "line": 78
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Unread message badges",
         "end": {
           "column": 3,
-          "line": 85
+          "line": 87
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineBadges",
         "start": {
           "column": 18,
-          "line": 82
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 89
+          "line": 91
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 86
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 93
+          "line": 95
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconDelete",
         "start": {
           "column": 14,
-          "line": 90
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Drop your image, or click here",
         "end": {
           "column": 3,
-          "line": 97
+          "line": 99
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconUpload",
         "start": {
           "column": 14,
-          "line": 94
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
         "end": {
           "column": 3,
-          "line": 101
+          "line": 103
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.headline",
         "start": {
           "column": 17,
-          "line": 98
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
         "end": {
           "column": 3,
-          "line": 105
+          "line": 107
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.restartInfo",
         "start": {
           "column": 20,
-          "line": 102
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
         "end": {
           "column": 3,
-          "line": 109
+          "line": 111
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.info",
         "start": {
           "column": 13,
-          "line": 106
+          "line": 108
         }
       }
     ],
@@ -1982,117 +2234,117 @@
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Search service",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 22
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.searchService",
         "start": {
           "column": 17,
-          "line": 18
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!You haven't added any services yet.",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 26
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.noServicesAdded",
         "start": {
           "column": 19,
-          "line": 22
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Sorry, but no service matched your search term.",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 30
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.recipes.nothingFound",
         "start": {
           "column": 18,
-          "line": 26
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Discover services",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 34
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.discoverServices",
         "start": {
           "column": 20,
-          "line": 30
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Could not load your services",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 38
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.servicesRequestFailed",
         "start": {
           "column": 25,
-          "line": 34
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 42
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.account.tryReloadServices",
         "start": {
           "column": 21,
-          "line": 38
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Your changes have been saved",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 46
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.updatedInfo",
         "start": {
           "column": 15,
-          "line": 42
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Service has been deleted",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 50
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.deletedInfo",
         "start": {
           "column": 15,
-          "line": 46
+          "line": 47
         }
       }
     ],
@@ -2356,78 +2608,78 @@
         "defaultMessage": "!!!Team",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 20
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Ferdi for Teams",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 24
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.contentHeadline",
         "start": {
           "column": 19,
-          "line": 18
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!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.",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 28
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.intro",
         "start": {
           "column": 9,
-          "line": 22
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Ferdi 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!",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 32
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.copy",
         "start": {
           "column": 8,
-          "line": 26
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Manage your Team on meetfranz.com",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 36
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.manageAction",
         "start": {
           "column": 16,
-          "line": 30
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Upgrade your Account",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 40
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.upgradeAction",
         "start": {
           "column": 17,
-          "line": 34
+          "line": 37
         }
       }
     ],
@@ -2519,220 +2771,435 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Support the development of Franz",
+        "defaultMessage": "!!!Choose your plan",
         "end": {
           "column": 3,
+          "line": 16
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.cta.choosePlan",
+        "start": {
+          "column": 21,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade your account and get the full Franz experience",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "settings.account.headlineUpgradeAccount",
+        "start": {
+          "column": 18,
           "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!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!",
+        "end": {
+          "column": 3,
+          "line": 24
         },
         "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.submit.label",
+        "id": "subscription.teaser.intro",
+        "start": {
+          "column": 14,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Paid Franz Plans include:",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.teaser.includedFeatures",
+        "start": {
+          "column": 20,
+          "line": 25
+        }
+      }
+    ],
+    "path": "src/components/subscription/SubscriptionForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Cancel",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/subscription/SubscriptionPopup.js",
+        "id": "subscriptionPopup.buttonCancel",
+        "start": {
+          "column": 16,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Done",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/subscription/SubscriptionPopup.js",
+        "id": "subscriptionPopup.buttonDone",
+        "start": {
+          "column": 14,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/components/subscription/SubscriptionPopup.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Yes, start the free Franz Professional trial",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "subscription.cta.activateTrial",
         "start": {
           "column": 21,
           "line": 14
         }
       },
       {
-        "defaultMessage": "!!!Could not initialize payment form",
+        "defaultMessage": "!!!See all options",
         "end": {
           "column": 3,
           "line": 21
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.paymentSessionError",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "subscription.cta.allOptions",
         "start": {
-          "column": 23,
+          "column": 20,
           "line": 18
         }
       },
       {
-        "defaultMessage": "!!!free",
+        "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
         "end": {
           "column": 3,
           "line": 25
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.type.free",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "settings.account.headlineTrialUpgrade",
         "start": {
-          "column": 12,
+          "column": 18,
           "line": 22
         }
       },
       {
-        "defaultMessage": "!!!month",
+        "defaultMessage": "!!!The Franz Professional Plan includes:",
         "end": {
           "column": 3,
           "line": 29
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.type.month",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "subscription.includedProFeatures",
         "start": {
-          "column": 15,
+          "column": 20,
           "line": 26
         }
       },
       {
-        "defaultMessage": "!!!year",
+        "defaultMessage": "!!!No strings attached",
         "end": {
           "column": 3,
           "line": 33
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.type.year",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "pricing.trial.terms.headline",
         "start": {
-          "column": 14,
+          "column": 29,
           "line": 30
         }
       },
       {
-        "defaultMessage": "!!!The Ferdi Premium Supporter Account includes",
+        "defaultMessage": "!!!No credit card required",
         "end": {
           "column": 3,
           "line": 37
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.includedFeatures",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "pricing.trial.terms.noCreditCard",
         "start": {
-          "column": 20,
+          "column": 16,
           "line": 34
         }
       },
       {
-        "defaultMessage": "!!!Add on-premise/hosted services like Mattermost",
+        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
         "end": {
           "column": 3,
           "line": 41
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.onpremise.mattermost",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "pricing.trial.terms.automaticTrialEnd",
         "start": {
-          "column": 13,
+          "column": 21,
           "line": 38
         }
-      },
+      }
+    ],
+    "path": "src/components/subscription/TrialForm.json"
+  },
+  {
+    "descriptors": [
       {
-        "defaultMessage": "!!!No app delays & nagging to upgrade license",
+        "defaultMessage": "!!!Your trial was successfully activated. Happy messaging!",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 14
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.noInterruptions",
+        "file": "src/components/TrialActivationInfoBar.js",
+        "id": "infobar.trialActivated",
         "start": {
-          "column": 19,
-          "line": 42
+          "column": 11,
+          "line": 11
+        }
+      }
+    ],
+    "path": "src/components/TrialActivationInfoBar.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Get a Franz Supporter License",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/ui/ActivateTrialButton/index.js",
+        "id": "feature.delayApp.upgrade.action",
+        "start": {
+          "column": 10,
+          "line": 13
         }
       },
       {
-        "defaultMessage": "!!!Proxy support for services",
+        "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 20
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.proxy",
+        "file": "src/components/ui/ActivateTrialButton/index.js",
+        "id": "feature.delayApp.trial.action",
         "start": {
-          "column": 9,
-          "line": 46
+          "column": 15,
+          "line": 17
         }
       },
       {
-        "defaultMessage": "!!!Support for Spellchecker",
+        "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 24
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.spellchecker",
+        "file": "src/components/ui/ActivateTrialButton/index.js",
+        "id": "feature.delayApp.upgrade.actionShort",
         "start": {
-          "column": 16,
-          "line": 50
+          "column": 15,
+          "line": 21
         }
       },
       {
-        "defaultMessage": "!!!Organize your services in workspaces",
+        "defaultMessage": "!!!Activate the free Franz Professional trial",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 28
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.workspaces",
+        "file": "src/components/ui/ActivateTrialButton/index.js",
+        "id": "feature.delayApp.trial.actionShort",
         "start": {
-          "column": 14,
-          "line": 54
+          "column": 20,
+          "line": 25
         }
       },
       {
-        "defaultMessage": "!!!No ads, ever!",
+        "defaultMessage": "!!!No strings attached",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 32
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.ads",
+        "file": "src/components/ui/ActivateTrialButton/index.js",
+        "id": "pricing.trial.terms.headline",
         "start": {
-          "column": 7,
-          "line": 58
+          "column": 29,
+          "line": 29
         }
       },
       {
-        "defaultMessage": "!!!coming soon",
+        "defaultMessage": "!!!No credit card required",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 36
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.comingSoon",
+        "file": "src/components/ui/ActivateTrialButton/index.js",
+        "id": "pricing.trial.terms.noCreditCard",
         "start": {
-          "column": 14,
-          "line": 62
+          "column": 16,
+          "line": 33
         }
       },
       {
-        "defaultMessage": "!!!EU residents: local sales tax may apply",
+        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 40
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.euTaxInfo",
+        "file": "src/components/ui/ActivateTrialButton/index.js",
+        "id": "pricing.trial.terms.automaticTrialEnd",
         "start": {
-          "column": 13,
-          "line": 66
+          "column": 21,
+          "line": 37
         }
       }
     ],
-    "path": "src/components/subscription/SubscriptionForm.json"
+    "path": "src/components/ui/ActivateTrialButton/index.json"
   },
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Cancel",
+        "defaultMessage": "!!!Add unlimited services",
         "end": {
           "column": 3,
-          "line": 14
+          "line": 11
         },
-        "file": "src/components/subscription/SubscriptionPopup.js",
-        "id": "subscriptionPopup.buttonCancel",
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.unlimitedServices",
+        "start": {
+          "column": 21,
+          "line": 8
+        }
+      },
+      {
+        "defaultMessage": "!!!Spellchecker support",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.spellchecker",
         "start": {
           "column": 16,
-          "line": 11
+          "line": 12
         }
       },
       {
-        "defaultMessage": "!!!Done",
+        "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 19
         },
-        "file": "src/components/subscription/SubscriptionPopup.js",
-        "id": "subscriptionPopup.buttonDone",
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.workspaces",
         "start": {
           "column": 14,
-          "line": 15
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Add Custom Websites",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.customWebsites",
+        "start": {
+          "column": 18,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!On-premise & other Hosted Services",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.onPremise",
+        "start": {
+          "column": 13,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Install 3rd party services",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.thirdPartyServices",
+        "start": {
+          "column": 22,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Service Proxies",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.serviceProxies",
+        "start": {
+          "column": 18,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!Team Management",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.teamManagement",
+        "start": {
+          "column": 18,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!No Waiting Screens",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.appDelays",
+        "start": {
+          "column": 13,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Forever ad-free",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.adFree",
+        "start": {
+          "column": 10,
+          "line": 44
         }
       }
     ],
-    "path": "src/components/subscription/SubscriptionPopup.json"
+    "path": "src/components/ui/FeatureList.json"
   },
   {
     "descriptors": [
@@ -2740,13 +3207,13 @@
         "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 19
         },
         "file": "src/components/ui/PremiumFeatureContainer/index.js",
         "id": "premiumFeature.button.upgradeAccount",
         "start": {
           "column": 10,
-          "line": 14
+          "line": 16
         }
       }
     ],
@@ -2755,6 +3222,24 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Upgrade to Franz Professional",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/ui/UpgradeButton/index.js",
+        "id": "global.upgradeButton.upgradeToPro",
+        "start": {
+          "column": 16,
+          "line": 13
+        }
+      }
+    ],
+    "path": "src/components/ui/UpgradeButton/index.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Loading",
         "end": {
           "column": 3,
@@ -3085,90 +3570,103 @@
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 47
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 48
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 51
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 52
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 55
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 56
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 59
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 60
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 63
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 64
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 67
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 68
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 71
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
+          "line": 68
+        }
+      },
+      {
+        "defaultMessage": "!!!Enable Franz Todos",
+        "end": {
+          "column": 3,
+          "line": 75
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.enableTodos",
+        "start": {
+          "column": 15,
           "line": 72
         }
       }
@@ -3321,39 +3819,65 @@
         "defaultMessage": "!!!Please purchase license to skip waiting",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 20
         },
         "file": "src/features/delayApp/Component.js",
         "id": "feature.delayApp.headline",
         "start": {
           "column": 12,
-          "line": 13
+          "line": 17
         }
       },
       {
-        "defaultMessage": "!!!Get a Ferdi Supporter License",
+        "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 24
         },
         "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.action",
+        "id": "feature.delayApp.trial.headline",
+        "start": {
+          "column": 17,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Get a Franz Supporter License",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/features/delayApp/Component.js",
+        "id": "feature.delayApp.upgrade.action",
         "start": {
           "column": 10,
-          "line": 17
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/features/delayApp/Component.js",
+        "id": "feature.delayApp.trial.action",
+        "start": {
+          "column": 15,
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 36
         },
         "file": "src/features/delayApp/Component.js",
         "id": "feature.delayApp.text",
         "start": {
           "column": 8,
-          "line": 21
+          "line": 33
         }
       }
     ],
@@ -3362,94 +3886,143 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Ferdi is better together!",
+        "defaultMessage": "!!!Changes in Franz {version}",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/serviceLimit/components/AnnouncementScreen.js",
+        "id": "feature.announcements.changelog.headline",
+        "start": {
+          "column": 12,
+          "line": 20
+        }
+      }
+    ],
+    "path": "src/features/serviceLimit/components/AnnouncementScreen.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
+        "id": "feature.serviceLimit.limitReached",
+        "start": {
+          "column": 16,
+          "line": 11
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
           "line": 17
         },
+        "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
+        "id": "premiumFeature.button.upgradeAccount",
+        "start": {
+          "column": 10,
+          "line": 15
+        }
+      }
+    ],
+    "path": "src/features/serviceLimit/components/LimitReachedInfobox.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Franz is better together!",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
         "file": "src/features/shareFranz/Component.js",
         "id": "feature.shareFranz.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 25
         },
         "file": "src/features/shareFranz/Component.js",
         "id": "feature.shareFranz.text",
         "start": {
           "column": 8,
-          "line": 18
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Share as email",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 29
         },
         "file": "src/features/shareFranz/Component.js",
         "id": "feature.shareFranz.action.email",
         "start": {
           "column": 16,
-          "line": 22
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Share on Facebook",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 33
         },
         "file": "src/features/shareFranz/Component.js",
         "id": "feature.shareFranz.action.facebook",
         "start": {
           "column": 19,
-          "line": 26
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Share on Twitter",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 37
         },
         "file": "src/features/shareFranz/Component.js",
         "id": "feature.shareFranz.action.twitter",
         "start": {
           "column": 18,
-          "line": 30
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 41
         },
         "file": "src/features/shareFranz/Component.js",
         "id": "feature.shareFranz.shareText.email",
         "start": {
           "column": 18,
-          "line": 34
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 45
         },
         "file": "src/features/shareFranz/Component.js",
         "id": "feature.shareFranz.shareText.twitter",
         "start": {
           "column": 20,
-          "line": 38
+          "line": 42
         }
       }
     ],
@@ -3458,6 +4031,50 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Franz Todos are available to premium users now!",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/features/todos/components/TodosWebview.js",
+        "id": "feature.todos.premium.info",
+        "start": {
+          "column": 15,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade Account",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/features/todos/components/TodosWebview.js",
+        "id": "feature.todos.premium.upgrade",
+        "start": {
+          "column": 14,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Everyone else will have to wait a little longer.",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/features/todos/components/TodosWebview.js",
+        "id": "feature.todos.premium.rollout",
+        "start": {
+          "column": 15,
+          "line": 26
+        }
+      }
+    ],
+    "path": "src/features/todos/components/TodosWebview.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Create workspace",
         "end": {
           "column": 3,
@@ -3588,104 +4205,104 @@
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 20
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.headline",
         "start": {
           "column": 12,
-          "line": 15
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!All services",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 24
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.allServices",
         "start": {
           "column": 15,
-          "line": 19
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Workspaces settings",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 28
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.workspacesSettingsTooltip",
         "start": {
           "column": 29,
-          "line": 23
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Info about workspace feature",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 32
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.workspaceFeatureInfo",
         "start": {
           "column": 24,
-          "line": 27
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Create your first workspace",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 36
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.premiumCtaButtonLabel",
         "start": {
           "column": 25,
-          "line": 31
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Reactivate premium account",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 40
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.reactivatePremiumAccountLabel",
         "start": {
           "column": 28,
-          "line": 35
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!add new workspace",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 44
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.addNewWorkspaceLabel",
         "start": {
           "column": 24,
-          "line": 39
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Premium feature",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 48
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.proFeatureBadge",
         "start": {
           "column": 23,
-          "line": 43
+          "line": 45
         }
       }
     ],
@@ -3728,104 +4345,104 @@
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 22
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.headline",
         "start": {
           "column": 12,
-          "line": 17
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!You haven't added any workspaces yet.",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 26
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.noWorkspacesAdded",
         "start": {
           "column": 19,
-          "line": 21
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Could not load your workspaces",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 30
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspacesRequestFailed",
         "start": {
           "column": 27,
-          "line": 25
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 34
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.tryReloadWorkspaces",
         "start": {
           "column": 23,
-          "line": 29
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Your changes have been saved",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 38
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.updatedInfo",
         "start": {
           "column": 15,
-          "line": 33
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Workspace has been deleted",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 42
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.deletedInfo",
         "start": {
           "column": 15,
-          "line": 37
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Info about workspace feature",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 46
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspaceFeatureInfo",
         "start": {
           "column": 24,
-          "line": 41
+          "line": 43
         }
       },
       {
-        "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
+        "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 50
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspaceFeatureHeadline",
         "start": {
           "column": 28,
-          "line": 45
+          "line": 47
         }
       }
     ],
@@ -3852,6 +4469,146 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Franz Professional",
+        "end": {
+          "column": 3,
+          "line": 8
+        },
+        "file": "src/helpers/plan-helpers.js",
+        "id": "pricing.plan.pro",
+        "start": {
+          "column": 15,
+          "line": 5
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Personal",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/helpers/plan-helpers.js",
+        "id": "pricing.plan.personal",
+        "start": {
+          "column": 20,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Free",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/helpers/plan-helpers.js",
+        "id": "pricing.plan.free",
+        "start": {
+          "column": 16,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Premium",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/helpers/plan-helpers.js",
+        "id": "pricing.plan.legacy",
+        "start": {
+          "column": 18,
+          "line": 17
+        }
+      }
+    ],
+    "path": "src/helpers/plan-helpers.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Franz Professional Yearly",
+        "end": {
+          "column": 3,
+          "line": 8
+        },
+        "file": "src/helpers/pricing-helpers.js",
+        "id": "pricing.plan.pro-yearly",
+        "start": {
+          "column": 22,
+          "line": 5
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Professional Monthly",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/helpers/pricing-helpers.js",
+        "id": "pricing.plan.pro-monthly",
+        "start": {
+          "column": 23,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Personal Yearly",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/helpers/pricing-helpers.js",
+        "id": "pricing.plan.personal-yearly",
+        "start": {
+          "column": 27,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Personal Monthly",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/helpers/pricing-helpers.js",
+        "id": "pricing.plan.personal-monthly",
+        "start": {
+          "column": 28,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Free",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/helpers/pricing-helpers.js",
+        "id": "pricing.plan.free",
+        "start": {
+          "column": 16,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Premium",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/helpers/pricing-helpers.js",
+        "id": "pricing.plan.legacy",
+        "start": {
+          "column": 18,
+          "line": 25
+        }
+      }
+    ],
+    "path": "src/helpers/pricing-helpers.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Field is required",
         "end": {
           "column": 3,
@@ -3998,6 +4755,19 @@
           "column": 39,
           "line": 24
         }
+      },
+      {
+        "defaultMessage": "!!!Franz Professional Required",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.franzProRequired",
+        "start": {
+          "column": 15,
+          "line": 28
+        }
       }
     ],
     "path": "src/i18n/globalMessages.json"
@@ -4008,741 +4778,793 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 21
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 14
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Undo",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 25
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.undo",
         "start": {
           "column": 8,
-          "line": 18
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Redo",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 29
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.redo",
         "start": {
           "column": 8,
-          "line": 22
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Cut",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 33
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.cut",
         "start": {
           "column": 7,
-          "line": 26
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Copy",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 37
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.copy",
         "start": {
           "column": 8,
-          "line": 30
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Paste",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 41
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.paste",
         "start": {
           "column": 9,
-          "line": 34
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Paste And Match Style",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 45
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.pasteAndMatchStyle",
         "start": {
           "column": 22,
-          "line": 38
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 49
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.delete",
         "start": {
           "column": 10,
-          "line": 42
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!!Select All",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 53
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.selectAll",
         "start": {
           "column": 13,
-          "line": 46
+          "line": 50
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 57
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 50
+          "line": 54
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 61
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 54
+          "line": 58
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 65
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 58
+          "line": 62
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 69
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 62
+          "line": 66
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 73
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 66
+          "line": 70
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 73
+          "line": 77
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 70
+          "line": 74
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 77
+          "line": 81
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 74
+          "line": 78
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 81
+          "line": 85
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 78
+          "line": 82
         }
       },
       {
         "defaultMessage": "!!!Enter Full Screen",
         "end": {
           "column": 3,
-          "line": 85
+          "line": 89
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.enterFullScreen",
         "start": {
           "column": 19,
-          "line": 82
+          "line": 86
         }
       },
       {
         "defaultMessage": "!!!Exit Full Screen",
         "end": {
           "column": 3,
-          "line": 89
+          "line": 93
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.exitFullScreen",
         "start": {
           "column": 18,
-          "line": 86
+          "line": 90
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 93
+          "line": 97
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 90
+          "line": 94
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 97
+          "line": 101
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 94
+          "line": 98
+        }
+      },
+      {
+        "defaultMessage": "!!!Toggle Todos Developer Tools",
+        "end": {
+          "column": 3,
+          "line": 105
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.view.toggleTodosDevTools",
+        "start": {
+          "column": 23,
+          "line": 102
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 101
+          "line": 109
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 98
+          "line": 106
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 105
+          "line": 113
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 102
+          "line": 110
         }
       },
       {
         "defaultMessage": "!!!Reload Franz",
         "end": {
           "column": 3,
-          "line": 109
+          "line": 117
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFranz",
         "start": {
           "column": 15,
-          "line": 106
+          "line": 114
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 113
+          "line": 121
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 110
+          "line": 118
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 117
+          "line": 125
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 114
+          "line": 122
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 121
+          "line": 129
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 118
+          "line": 126
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 125
+          "line": 133
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 122
+          "line": 130
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 129
+          "line": 137
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 126
+          "line": 134
         }
       },
       {
         "defaultMessage": "!!!Copy Debug Information",
         "end": {
           "column": 3,
-          "line": 133
+          "line": 141
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfo",
         "start": {
           "column": 13,
-          "line": 130
+          "line": 138
         }
       },
       {
         "defaultMessage": "!!!Ferdi Debug Information",
         "end": {
           "column": 3,
-          "line": 137
+          "line": 145
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedHeadline",
         "start": {
           "column": 27,
-          "line": 134
+          "line": 142
         }
       },
       {
         "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
         "end": {
           "column": 3,
-          "line": 141
+          "line": 149
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.debugInfoCopiedBody",
         "start": {
           "column": 23,
-          "line": 138
+          "line": 146
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 145
+          "line": 153
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 142
+          "line": 150
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 149
+          "line": 157
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 146
+          "line": 154
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 153
+          "line": 161
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 150
+          "line": 158
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 157
+          "line": 165
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 154
+          "line": 162
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 161
+          "line": 169
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 158
+          "line": 166
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 165
+          "line": 173
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 162
+          "line": 170
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 169
+          "line": 177
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 166
+          "line": 174
         }
       },
       {
         "defaultMessage": "!!!About Franz",
         "end": {
           "column": 3,
-          "line": 173
+          "line": 181
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 170
+          "line": 178
         }
       },
       {
         "defaultMessage": "!!!What's new?",
         "end": {
           "column": 3,
-          "line": 177
+          "line": 185
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.announcement",
         "start": {
           "column": 16,
-          "line": 174
+          "line": 182
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 181
+          "line": 189
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 178
+          "line": 186
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 185
+          "line": 193
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 182
+          "line": 190
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 189
+          "line": 197
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 186
+          "line": 194
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 193
+          "line": 201
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 190
+          "line": 198
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 197
+          "line": 205
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 194
+          "line": 202
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 201
+          "line": 209
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 198
+          "line": 206
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 205
+          "line": 213
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 202
+          "line": 210
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 209
+          "line": 217
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 206
+          "line": 214
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 213
+          "line": 221
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 210
+          "line": 218
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 217
+          "line": 225
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 214
+          "line": 222
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 221
+          "line": 229
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 218
+          "line": 226
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 225
+          "line": 233
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 222
+          "line": 230
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 229
+          "line": 237
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 226
+          "line": 234
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 233
+          "line": 241
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 230
+          "line": 238
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 237
+          "line": 245
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 234
+          "line": 242
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 241
+          "line": 249
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 238
+          "line": 246
+        }
+      },
+      {
+        "defaultMessage": "!!!Todos",
+        "end": {
+          "column": 3,
+          "line": 253
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.todos",
+        "start": {
+          "column": 9,
+          "line": 250
+        }
+      },
+      {
+        "defaultMessage": "!!!Open Todos drawer",
+        "end": {
+          "column": 3,
+          "line": 257
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.Todoss.openTodosDrawer",
+        "start": {
+          "column": 19,
+          "line": 254
+        }
+      },
+      {
+        "defaultMessage": "!!!Close Todos drawer",
+        "end": {
+          "column": 3,
+          "line": 261
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.Todoss.closeTodosDrawer",
+        "start": {
+          "column": 20,
+          "line": 258
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index d02f78dbd..40f8eac2f 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Επαναφόρτωση",
    "app.errorHandler.headline" : "Κάτι δεν λειτουργεί",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Get a Ferdi Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Ferdi Supporter License to skip waiting",
-   "feature.delayApp.text" : "Ferdi θα συνεχίσει σε {seconds} δευτερόλεπτα.",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi 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 Ferdi is and help us to spread the word.",
+   "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",
-   "import.headline" : "Εισαγάγετε τις υπηρεσίες σας Ferdi 4",
-   "import.notSupportedHeadline" : "Υπηρεσίες που δεν υποστηρίζονται ακόμα στο Ferdi 5",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "import.headline" : "Εισαγάγετε τις υπηρεσίες σας Franz 4",
+   "import.notSupportedHeadline" : "Υπηρεσίες που δεν υποστηρίζονται ακόμα στο Franz 5",
    "import.skip.label" : "Θέλω να προσθέσω υπηρεσίες χειροκίνητα",
    "import.submit.label" : "Εισαγωγή υπηρεσιών",
    "infobar.buttonChangelog" : "Τι νέο υπάρχει;",
@@ -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.link.skipPayment" : "Δεν θέλω να βοηθήσω στην ανάπτυξη του Franz.",
-   "pricing.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
-   "pricing.support.label" : "Επιλέξτε το πακέτο υποστήριξης",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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" : "Έλεγχος για ενημερώσεις",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Ενεργοποιήση Ενίσχυσης GPU ",
    "settings.app.form.enableSpellchecking" : "Ενεργοποίηση ορθογραφικού ελέγχου",
-   "settings.app.form.enableSystemTray" : "Εμφάνιση του Ferdi στη γραμμή ειδοποιήσεων",
+   "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γραμμή ειδοποιήσεων",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Γλώσσα",
    "settings.app.form.minimizeToSystemTray" : "Ελαχιστοποίηση του Ferdi στη γραμμή ειδοποιήσεων",
    "settings.app.form.runInBackground" : "Κρατήστε το Ferdi στο παρασκήνιο κατά το κλείσιμο του παραθύρου",
@@ -182,7 +235,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 +333,6 @@
    "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Ρυθμίσεις",
    "sidebar.unmuteApp" : "Ενεργοποίηση ειδοποιήσεων & ήχου",
-   "signup.company.label" : "Εταιρεία",
    "signup.email.label" : "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
    "signup.emailDuplicate" : "Ένας χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου υπάρχει ήδη",
    "signup.firstname.label" : "Όνομα",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "δωρεάν",
    "subscription.type.month" : "μήνας",
    "subscription.type.year" : "έτος",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "Ακύρωση",
    "subscriptionPopup.buttonDone" : "Έγινε",
    "tabs.item.deleteService" : "Διαγραφή υπηρεσίας",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 74fc7427a..55de9bdeb 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,25 +1,35 @@
 {
   "app.errorHandler.action": "Reload",
   "app.errorHandler.headline": "Something went wrong",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
+  "feature.announcements.changelog.headline": "Changes in Franz {version}",
+  "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",
   "feature.shareFranz.headline": "Ferdi 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 Ferdi is and help us to spread the word.",
-  "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "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": "Can't connect to Franz online services",
+  "global.franzProRequired": "Franz Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "import.headline": "Import your Ferdi 4 services",
-  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
+  "global.upgradeButton.upgradeToPro": "Upgrade to Franz Professional",
+  "import.headline": "Import your Franz 4 services",
+  "import.notSupportedHeadline": "Services not yet supported in Franz 5",
   "import.skip.label": "I want to add services manually",
   "import.submit.label": "Import services",
   "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
@@ -28,7 +38,8 @@
   "infobar.buttonReloadServices": "Reload services",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.updateAvailable": "A new update for Ferdi is available.",
+  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
+  "infobar.updateAvailable": "A new update for Franz is available.",
   "invite.email.label": "Email address",
   "invite.headline.friends": "Invite 3 of your friends or colleagues",
   "invite.name.label": "Name",
@@ -46,6 +57,8 @@
   "login.serverLogout": "Your session expired, please login again.",
   "login.submit.label": "Sign in",
   "login.tokenExpired": "Your session expired, please login again.",
+  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
+  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
   "menu.app.about": "About Franz",
   "menu.app.announcement": "What's new?",
   "menu.app.checkForUpdates": "Check for updates",
@@ -82,6 +95,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",
@@ -91,6 +105,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",
@@ -109,10 +124,33 @@
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "premiumFeature.button.upgradeAccount": "Upgrade account",
-  "pricing.headline": "Support Ferdi",
-  "pricing.link.skipPayment": "I don't want to support the development of Ferdi.",
-  "pricing.submit.label": "I want to support the development of Ferdi",
-  "pricing.support.label": "Select your support plan",
+  "pricing.features.adFree": "Forever ad-free",
+  "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.customWebsites": "Add Custom Websites",
+  "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!",
@@ -124,6 +162,11 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "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": "Get started",
   "services.login": "Please login to use Ferdi.",
@@ -143,13 +186,19 @@
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
   "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineUpgrade": "Upgrade your account & support Ferdi",
+  "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": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
+  "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": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
+  "settings.account.upgradeToPro.label": "Upgrade to Franz Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
+  "settings.account.yourLicense": "Your Franz License",
   "settings.app.buttonClearAllCache": "Clear cache",
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.buttonSearchForUpdate": "Check for updates",
@@ -161,7 +210,8 @@
   "settings.app.form.darkMode": "Join the Dark Side",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Show Franz in system tray",
+  "settings.app.form.enableTodos": "Enable Franz Todos",
   "settings.app.form.language": "Language",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -192,7 +242,13 @@
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
   "settings.recipes.all": "All services",
-  "settings.recipes.dev": "Development",
+  "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": "Available services",
   "settings.recipes.missingService": "Missing a service?",
   "settings.recipes.mostPopular": "Most popular",
@@ -284,7 +340,6 @@
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
   "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
-  "signup.company.label": "Company",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
   "signup.firstname.label": "First Name",
@@ -310,6 +365,12 @@
   "subscription.type.free": "free",
   "subscription.type.month": "month",
   "subscription.type.year": "year",
+  "subscription.cta.activateTrial": "Yes, start the free Franz Professional trial",
+  "subscription.cta.allOptions": "See all options",
+  "subscription.cta.choosePlan": "Choose your plan",
+  "subscription.includedProFeatures": "The Franz Professional Plan includes:",
+  "subscription.teaser.includedFeatures": "Paid Franz Plans include:",
+  "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!",
   "subscriptionPopup.buttonCancel": "Cancel",
   "subscriptionPopup.buttonDone": "Done",
   "tabs.item.deleteService": "Delete service",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index ebee8bcc5..48b68a893 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Actualizar",
    "app.errorHandler.headline" : "Algo salió mal",
-   "feature.announcements.changelog.headline" : "Cambios en Ferdi {version}",
-   "feature.delayApp.action" : "Consigue una Licencia de Soporte de Franz",
-   "feature.delayApp.headline" : "Por favor compra una Licencia de Soporte de Ferdi para omitir la espera",
-   "feature.delayApp.text" : "Ferdi continuará en {seconds} segundos.",
+   "feature.announcements.changelog.headline" : "Cambios en Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "¡Juntos mejoramos Franz!",
    "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 Ferdi y ayúdanos a correr la voz.",
+   "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",
-   "import.headline" : "Importa tus servicios de Ferdi 4",
-   "import.notSupportedHeadline" : "Servicios aún no admitidos en Ferdi 5",
+   "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",
    "import.submit.label" : "Importar servicios",
    "infobar.buttonChangelog" : "¿Qué hay de nuevo?",
@@ -27,7 +37,8 @@
    "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.updateAvailable" : "Una nueva actualización de Ferdi está disponible",
+   "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",
    "invite.name.label" : "Nombre",
@@ -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.link.skipPayment" : "No quiero apoyar el desarrollo de Franz.",
-   "pricing.submit.label" : "Quiero apoyar el desarrollo de Franz",
-   "pricing.support.label" : "Selecciona tu plan de soporte",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Únete al Lado Oscuro",
    "settings.app.form.enableGPUAcceleration" : "Habilitar aceleración de GPU",
    "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
-   "settings.app.form.enableSystemTray" : "Mostrar Ferdi en la bandeja del sistema",
+   "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar Ferdi a la bandeja del sistema",
    "settings.app.form.runInBackground" : "Mantener Ferdi en segundo plano al cerrar la ventana",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "gratis",
    "subscription.type.month" : "mes",
    "subscription.type.year" : "año",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 608eee52a..f98a060cd 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,23 +1,33 @@
 {
-   "app.errorHandler.action" : "Recharger",
-   "app.errorHandler.headline" : "Une erreur s'est produite",
-   "feature.announcements.changelog.headline" : "Changements dans Ferdi {version}",
-   "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
-   "feature.delayApp.headline" : "Achetez une licence de Supporter Ferdi pour ne plus avoir de temps d'attente",
-   "feature.delayApp.text" : "Ferdi reprendra dans {seconds} secondes.",
+   "app.errorHandler.action" : "Actualiser",
+   "app.errorHandler.headline" : "On dirait que quelque chose ne va pas",
+   "feature.announcements.changelog.headline" : "Les nouveaux changements dans Franz {version}",
+   "feature.delayApp.headline" : "Achetez la licence Franz pour ne plus avoir de temps d'attente",
+   "feature.delayApp.text" : "Franz s'ouvrira 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" : "Ferdi est meilleur quand on est tous ensemble !",
-   "feature.shareFranz.shareText.email" : "J'ai ajouté {count} services à Ferdi ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz! Télécharge l'application gratuite pour WhatsApp, Messenger, Slack, Skype et compagnie sur www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Dites à vos amis et collègues a quel point Ferdi est super et aidez nous à faire passer le mot.",
+   "feature.shareFranz.headline" : "Franz est meilleur quand on est ensemble !",
+   "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 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,7 +37,8 @@
    "infobar.buttonReloadServices" : "Recharger les services",
    "infobar.requiredRequestsFailed" : "Impossible d'accéder aux services et informations de l'utilisateur",
    "infobar.servicesUpdated" : "Vos services ont été mis à jour.",
-   "infobar.updateAvailable" : "Une nouvelle mise à jour de Ferdi est disponible.",
+   "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",
    "invite.name.label" : "Nom",
@@ -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.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
-   "pricing.submit.label" : "Je veux soutenir le développement de Franz",
-   "pricing.support.label" : "Sélectionnez votre plan de soutien",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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,10 +202,11 @@
    "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
    "settings.app.form.autoLaunchOnStart" : "Lancer Ferdi 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 Ferdi dans la barre d'état système",
+   "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Langue",
    "settings.app.form.minimizeToSystemTray" : "Minimiser Ferdi dans la zone de notification",
    "settings.app.form.runInBackground" : "Garder Ferdi ouvert en arrière-plan à la fermeture de la fenêtre",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "gratuit",
    "subscription.type.month" : "mois",
    "subscription.type.year" : "année",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 75c4c268a..f274c6eff 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Athlódáil",
    "app.errorHandler.headline" : "Something went wrong",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Get a Ferdi Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Ferdi Supporter License to skip waiting",
-   "feature.delayApp.text" : "Ferdi will continue in {seconds} seconds.",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi 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 Ferdi is and help us to spread the word.",
-   "global.api.unhealthy" : "Ní féidir nascadh le seirbhísí Ferdi ar líne",
+   "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",
-   "import.headline" : "Iompórtáil do sheirbhísí Ferdi 4",
-   "import.notSupportedHeadline" : "Níl na seirbhísí seo taca ag Ferdi 5 go fóill",
+   "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",
    "import.submit.label" : "Iompórtáil seirbhísí",
    "infobar.buttonChangelog" : "Cad atá nua?",
@@ -27,7 +37,8 @@
    "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.updateAvailable" : "Tá nuashonrú nua do Ferdi ar fáil.",
+   "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í",
    "invite.name.label" : "Ainm",
@@ -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.link.skipPayment" : "Níor mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
-   "pricing.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
-   "pricing.support.label" : "Conas ar mhaith leat tacú le Franz?",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Cumasaigh luasghéarú APG",
    "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
-   "settings.app.form.enableSystemTray" : "Taispeáin Ferdi i dtráidire an chórais",
+   "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtráidire an chórais",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Teanga",
    "settings.app.form.minimizeToSystemTray" : "Íoslaghdaigh Ferdi chuig tráidire an chórais",
    "settings.app.form.runInBackground" : "Coimeád Ferdi sa chúlra nuair a dhúntar an fhuinneog",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "saor in aisce",
    "subscription.type.month" : "mí",
    "subscription.type.year" : "bliain",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 f77c4a185..cb2e3e88c 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,23 +1,33 @@
 {
    "app.errorHandler.action" : "Ponovno učitavanje",
    "app.errorHandler.headline" : "Something went wrong",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Get a Ferdi Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Ferdi Supporter License to skip waiting",
-   "feature.delayApp.text" : "Ferdi will continue in {seconds} seconds.",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi 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 Ferdi is and help us to spread the word.",
+   "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 Ferdi aplikaciju",
-   "pricing.link.skipPayment" : "Ne želim da podržim razvoj Franz-a.",
-   "pricing.submit.label" : "Želim da podržim razvoj Franz-a.",
-   "pricing.support.label" : "Izaberite vaš plan za podržavanje",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -154,6 +206,7 @@
    "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
@@ -182,7 +235,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 +333,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 +344,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.features.ads" : "Bez reklama, doživotno!",
-   "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "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",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 50f5e72d3..d90a7245a 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Újratöltés",
    "app.errorHandler.headline" : "Valami nem jött össze",
-   "feature.announcements.changelog.headline" : "Ferdi {version} változásai",
-   "feature.delayApp.action" : "Szerezz egy Ferdi Támogatói Liszencet",
+   "feature.announcements.changelog.headline" : "Franz {version} változásai",
    "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 Ferdi továbblép {seconds} másodperc múlva.",
+   "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",
    "feature.shareFranz.headline" : "A Ferdi barátokkal együtt mégjobb!",
    "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 Ferdi is and help us to spread the word.",
-   "global.api.unhealthy" : "Nem lehet csatlakozni a Ferdi online szolgáltatáshoz",
+   "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",
-   "import.headline" : "Importáld szolgáltatásaidat a Ferdi 4-ből",
-   "import.notSupportedHeadline" : "Még nem támogatott szolgáltatások a Ferdi 5-ben",
+   "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",
    "import.submit.label" : "Szolgáltatások importálása",
    "infobar.buttonChangelog" : "Mi változott?",
@@ -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.link.skipPayment" : "Nem szeretném támogatni a Ferdi fejlesztését.",
-   "pricing.submit.label" : "Támogatni szeretném a Ferdi fejlesztését",
-   "pricing.support.label" : "Válaszd ki a támogatás módját",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Csatlakozz a Sötét Oldalhoz",
    "settings.app.form.enableGPUAcceleration" : "Hardveres gyorsítás engedélyezése",
    "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
-   "settings.app.form.enableSystemTray" : "Ferdi mutatása a tálcán",
+   "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Nyelv",
    "settings.app.form.minimizeToSystemTray" : "Ferdi kicsinyítése a tálcára",
    "settings.app.form.runInBackground" : "Ferdi fusson a háttérben az ablak bezárásakor",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "ingyenes",
    "subscription.type.month" : "hónap",
    "subscription.type.year" : "év",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 437be8e5c..c27e96acb 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Muat Ulang",
    "app.errorHandler.headline" : "Terjadi kesalahan",
-   "feature.announcements.changelog.headline" : "Perubahan dalam Ferdi {version}",
-   "feature.delayApp.action" : "Dapatkan Lisensi Pendukung Franz",
-   "feature.delayApp.headline" : "Beli Lisensi Pendukung Ferdi agar tidak perlu menunggu",
-   "feature.delayApp.text" : "Ferdi akan melanjutkan dalam {seconds} detik.",
+   "feature.announcements.changelog.headline" : "Perubahan dalam Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi lebih baik bersama!",
    "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 Ferdi dan bantu kami menyebarkan berita.",
+   "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",
-   "import.headline" : "Impor layanan Ferdi 4 Anda",
-   "import.notSupportedHeadline" : "Layanan belum didukung di Ferdi 5",
+   "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",
    "import.submit.label" : "Impor layanan",
    "infobar.buttonChangelog" : "Yang baru",
@@ -27,7 +37,8 @@
    "infobar.buttonReloadServices" : "Muat ulang layanan",
    "infobar.requiredRequestsFailed" : "Gagal memuat layanan dan informasi pengguna",
    "infobar.servicesUpdated" : "Layanan Anda telah diperbarui",
-   "infobar.updateAvailable" : "Versi baru Ferdi tersedia.",
+   "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",
    "invite.name.label" : "Nama",
@@ -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.link.skipPayment" : "Saya tidak ingin mendukung pengembangan Franz.",
-   "pricing.submit.label" : "Saya ingin mendukung pengembangan Franz",
-   "pricing.support.label" : "Pilih paket dukungan Anda",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Sisi Kelam menunggu Anda (Mode Gelap)",
    "settings.app.form.enableGPUAcceleration" : "Aktifkan Akselerasi GPU",
    "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
-   "settings.app.form.enableSystemTray" : "Tampilkan Ferdi di baki sistem",
+   "settings.app.form.enableSystemTray" : "Tampilkan Franz di baki sistem",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Bahasa",
    "settings.app.form.minimizeToSystemTray" : "Perkecil Ferdi ke baki sistem",
    "settings.app.form.runInBackground" : "Tetap jalankan Ferdi di latar belakang saat menutup jendela",
@@ -182,7 +235,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 +333,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 +344,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.features.ads" : "Tanpa iklan, selamanya!",
-   "subscription.features.comingSoon" : "segera hadir",
-   "subscription.features.noInterruptions" : "Tanpa menunggu dan ditanya untuk meningkatkan lisensi",
-   "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost",
-   "subscription.features.proxy" : "Dukungan proksi untuk layanan",
-   "subscription.features.spellchecker" : "Dukungan pengecek ejaan",
-   "subscription.features.workspaces" : "Kelola layanan Anda dalam ruang kerja",
-   "subscription.includedFeatures" : "Ferdi 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",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 8492193fd..4f5cd39ad 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Ricarica",
    "app.errorHandler.headline" : "Qualcosa è andato storto",
-   "feature.announcements.changelog.headline" : "Modifiche in Ferdi {Version}",
-   "feature.delayApp.action" : "Ricevi una Licenza Supporter di Franz",
-   "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Ferdi per saltare l'attesa",
-   "feature.delayApp.text" : "Ferdi continuerà tra {seconds} secondi.",
+   "feature.announcements.changelog.headline" : "Modifiche in Franz {Version}",
+   "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",
    "feature.shareFranz.headline" : "Franze è migliore insieme!",
    "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 Ferdi è fantastico e aiutaci a diffondere la parola.",
+   "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",
-   "import.headline" : "Importa i servizi di Ferdi 4",
-   "import.notSupportedHeadline" : "Servizi non ancora supportati in Ferdi 5",
+   "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",
    "import.submit.label" : "Importa servizi",
    "infobar.buttonChangelog" : "Cosa c'è di nuovo?",
@@ -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.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
-   "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
-   "pricing.support.label" : "Seleziona la modalità di supporto",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Unisciti al Lato Oscuro.",
    "settings.app.form.enableGPUAcceleration" : "Attiva Accelerazione GPU",
    "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
-   "settings.app.form.enableSystemTray" : "Mostra Ferdi nell'area di notifica",
+   "settings.app.form.enableSystemTray" : "Mostra Franz nell'area di notifica",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Lingua",
    "settings.app.form.minimizeToSystemTray" : "Minimizza Ferdi nell'area di notifica",
    "settings.app.form.runInBackground" : "Mantieni Ferdi in esecuzione quando chiudi la finestra",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "gratis",
    "subscription.type.month" : "mese",
    "subscription.type.year" : "anno",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 611c1ec80..490b938d0 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,10 +1,15 @@
 {
    "app.errorHandler.action" : "再読み込み",
    "app.errorHandler.headline" : "間違えている部分があります",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Franzサポーターライセンスを購入する",
-   "feature.delayApp.headline" : "Franzをすぐに起動するには、Ferdi サポーターライセンスを購入してください。",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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,14 +17,19 @@
    "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" : "スペルチェックする言語",
-   "import.headline" : "Ferdi 4のサービスをインポートして下さい",
-   "import.notSupportedHeadline" : "Ferdi 5ではこのサービスにまだ対応していません",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "import.headline" : "Franz 4のサービスをインポートして下さい",
+   "import.notSupportedHeadline" : "Franz 5ではこのサービスにまだ対応していません",
    "import.skip.label" : "手動でサービスを追加する",
    "import.submit.label" : "サービスをインポートして下さい",
    "infobar.buttonChangelog" : "更新履歴を見る",
@@ -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.link.skipPayment" : "Franzの開発を支援したくない。",
-   "pricing.submit.label" : "Franzの開発を支援したい。",
-   "pricing.support.label" : "プランを選択してください",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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" : "更新の確認",
@@ -154,6 +206,7 @@
    "settings.app.form.enableGPUAcceleration" : "GPUアクセラレーションを有効にする",
    "settings.app.form.enableSpellchecking" : "スペルチェックを有効にする",
    "settings.app.form.enableSystemTray" : "Franzをシステムトレイに表示する",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "言語",
    "settings.app.form.minimizeToSystemTray" : "Franzをシステムトレイに最小化する",
    "settings.app.form.runInBackground" : "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
@@ -182,7 +235,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 +333,6 @@
    "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "設定",
    "sidebar.unmuteApp" : "通知とオーディオを有効化",
-   "signup.company.label" : "法人",
    "signup.email.label" : "メールアドレス",
    "signup.emailDuplicate" : "このメールアドレスは既に登録されています",
    "signup.firstname.label" : "名",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "無料",
    "subscription.type.month" : "月間",
    "subscription.type.year" : "年間",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "キャンセル",
    "subscriptionPopup.buttonDone" : "完了",
    "tabs.item.deleteService" : "サービスを削除する",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index b35e273b6..4e2f2ae85 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "ჩატვირთვა",
    "app.errorHandler.headline" : "Something went wrong",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Get a Ferdi Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Ferdi Supporter License to skip waiting",
-   "feature.delayApp.text" : "Ferdi will continue in {seconds} seconds.",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi 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 Ferdi is and help us to spread the word.",
+   "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",
-   "import.headline" : "შემოიტანე Ferdi 4-ის სერვისები",
-   "import.notSupportedHeadline" : "სერვისები ჯერ არ არის მხარდაჭერილი Ferdi 5-ში",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "import.headline" : "შემოიტანე Franz 4-ის სერვისები",
+   "import.notSupportedHeadline" : "სერვისები ჯერ არ არის მხარდაჭერილი Franz 5-ში",
    "import.skip.label" : "I want to add services manually",
    "import.submit.label" : "მოწვევის გაგზავნა",
    "infobar.buttonChangelog" : "What is new?",
@@ -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.link.skipPayment" : "არ მინდა ხელი შევუწყო Franz-ის განვითარებას.",
-   "pricing.submit.label" : "მინდა ხელი შევუწყო Franz-ის განვითარებას",
-   "pricing.support.label" : "აირჩიეთ თქვენი მხარდაჭერის გეგმა",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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" : "განახლებების შემოწმება",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
    "settings.app.form.enableSpellchecking" : "Enable spell checking",
-   "settings.app.form.enableSystemTray" : "აჩვენეთ Ferdi სისტემის უჯრაში",
+   "settings.app.form.enableSystemTray" : "აჩვენეთ Franz სისტემის უჯრაში",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "ენა",
    "settings.app.form.minimizeToSystemTray" : "ჩაკეცეთ Ferdi სისტემის უჯრაში",
    "settings.app.form.runInBackground" : "დატოვეთ Ferdi გაშვებული როდესაც ფანჯარა დაიხურება",
@@ -182,7 +235,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 +333,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 +344,12 @@
    "signup.link.login" : "უკვე გაქვთ ანგარიში?",
    "signup.password.label" : "პაროლი",
    "signup.submit.label" : "ანგარიშის შექმნა",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
-   "subscription.features.ads" : "არანაირი რეკლამები, არასდროს!",
-   "subscription.features.comingSoon" : "მალე",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "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" : "წელი",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "გაუქმება",
    "subscriptionPopup.buttonDone" : "შესრულებულია",
    "tabs.item.deleteService" : "სერვისის წაშლა",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 90d566585..1f3681e5d 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Herladen",
    "app.errorHandler.headline" : "Er ging iets mis",
-   "feature.announcements.changelog.headline" : "Wijzigingen in Ferdi {versie}",
-   "feature.delayApp.action" : "Neem een Ferdi Supporter Licentie ",
-   "feature.delayApp.headline" : "Neem een Ferdi Supporter Licentie om niet meer te hoeven wachten",
-   "feature.delayApp.text" : "Ferdi gaat over {seconds} seconden verder.",
+   "feature.announcements.changelog.headline" : "Wijzigingen in Franz {versie}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi is beter samen!",
    "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 Ferdi is en help ons het woord te verspreiden.",
-   "global.api.unhealthy" : "Kan geen verbinding maken met de Ferdi services",
+   "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",
-   "import.headline" : "Importeer je Ferdi 4 services",
-   "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Ferdi 5",
+   "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",
    "import.submit.label" : "Importeer services",
    "infobar.buttonChangelog" : "Wat is er nieuw?",
@@ -27,7 +37,8 @@
    "infobar.buttonReloadServices" : "Services opnieuw laden",
    "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
    "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
-   "infobar.updateAvailable" : "Er is een nieuwe update voor Ferdi beschikbaar.",
+   "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",
    "invite.name.label" : "Naam",
@@ -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.link.skipPayment" : "Ik wil de ontwikkeling van Ferdi niet ondersteunen.",
-   "pricing.submit.label" : "Ik wil de ontwikkeling van Ferdi ondersteunen",
-   "pricing.support.label" : "Selecteer je ondersteuningsplan",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Word lid van de Dark Side",
    "settings.app.form.enableGPUAcceleration" : "GPU Acceleratie Activeren",
    "settings.app.form.enableSpellchecking" : "Spellingcontrole inschakelen",
-   "settings.app.form.enableSystemTray" : "Toon Ferdi in de systeembalk",
+   "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Taal",
    "settings.app.form.minimizeToSystemTray" : "Minimaliseer Ferdi naar de systeembalk",
    "settings.app.form.runInBackground" : "Houd Ferdi op de achtergrond wanneer het venster gesloten wordt",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "gratis",
    "subscription.type.month" : "maand",
    "subscription.type.year" : "jaar",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 f42524280..457210523 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,35 +1,46 @@
 {
    "app.errorHandler.action" : "Herladen",
-   "app.errorHandler.headline" : "Er ging iets mis",
-   "feature.announcements.changelog.headline" : "Wijzigingen in Ferdi {version}",
-   "feature.delayApp.action" : "Sponsor Franz",
-   "feature.delayApp.headline" : "Sponsor Ferdi om wachten over te slaan",
-   "feature.delayApp.text" : "Ferdi gaat over {seconds} seconden verder.",
+   "app.errorHandler.headline" : "Er is iets mis gegaan",
+   "feature.announcements.changelog.headline" : "Wijzigingen in Franz {version}",
+   "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",
-   "feature.shareFranz.headline" : "Ferdi is leuker samen!",
-   "feature.shareFranz.shareText.email" : "Ik heb {count} diensten 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} diensten 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 Ferdi is en help ons om bekender te worden",
-   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services",
+   "feature.shareFranz.headline" : "Franz is leuker samen!",
+   "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" : "Spelling checken",
-   "import.headline" : "Importeer uw Ferdi 4-services",
-   "import.notSupportedHeadline" : "Services die nog niet ondersteund worden in Ferdi 5",
-   "import.skip.label" : "Ik wil services handmatig toevoegen",
+   "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",
    "import.submit.label" : "Importeer services",
    "infobar.buttonChangelog" : "Wat is er nieuw?",
    "infobar.buttonInstallUpdate" : "Opnieuw opstarten & update installeren",
    "infobar.buttonReloadServices" : "Services opnieuw laden",
    "infobar.requiredRequestsFailed" : "Kan de services en gebruikersinformatie niet laden",
    "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
-   "infobar.updateAvailable" : "Er is een nieuwe update voor Ferdi beschikbaar.",
+   "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 van je vrienden of collega's uit",
+   "invite.headline.friends" : "Nodig 3 vrienden of collega's uit",
    "invite.name.label" : "Naam",
    "invite.skip.label" : "Ik wil dit later doen",
    "invite.submit.label" : "Uitnodigingen verzenden",
@@ -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",
@@ -62,20 +75,24 @@
    "menu.edit.selectAll" : "Selecteer alles",
    "menu.edit.speech" : "Spraak",
    "menu.edit.startDictation" : "Beginnen met dicteren",
-   "menu.edit.startSpeaking" : "Beginnen met praten",
-   "menu.edit.stopSpeaking" : "Stoppen met spreken",
+   "menu.edit.startSpeaking" : "Begin met spreken",
+   "menu.edit.stopSpeaking" : "Stop met spreken",
    "menu.edit.undo" : "Ongedaan maken",
    "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" : "Privacy Voorwaarden",
+   "menu.help.privacy" : "Privacyvoorwaarden",
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
-   "menu.services" : "Diensten",
-   "menu.services.activatePreviousService" : "Activeer vorige dienst",
-   "menu.services.addNewService" : "Nieuwe dienst toevoegen",
-   "menu.services.setNextServiceActive" : "Activeer volgende dienst",
+   "menu.services" : "Services",
+   "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",
@@ -101,14 +119,37 @@
    "password.link.signup" : "Maak een gratis account",
    "password.noUser" : "Geen gebruiker bekend met dat e-mailadres",
    "password.submit.label" : "Verzenden",
-   "password.successInfo" : "Controleer alsjeblieft je e-mail",
+   "password.successInfo" : "Controleer je e-mail",
    "premiumFeature.button.upgradeAccount" : "Upgrade Account",
-   "pricing.headline" : "Steun Franz",
-   "pricing.link.skipPayment" : "Ik wil de ontwikkeling van Ferdi niet ondersteunen.",
-   "pricing.submit.label" : "Ik wil de ontwikkeling van Ferdi steunen",
-   "pricing.support.label" : "Selecteer je ondersteuningsplan",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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" : "Ga proberen om {name} te herstellen over {seconds} seconden",
+   "service.crashHandler.autoReload" : "Bezig om {name} te herstellen over {seconds} seconden",
    "service.crashHandler.headline" : "Oh nee!",
    "service.crashHandler.text" : "{name} heeft een fout veroorzaakt.",
    "service.disabledHandler.action" : "Activeer {name}",
@@ -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",
@@ -126,8 +172,8 @@
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Update profiel",
    "settings.account.deleteAccount" : "Verwijder account",
-   "settings.account.deleteEmailSent" : "Je hebt een e-mail ontvangen met een link om de aanvraag tot verwijderen van het account te bevestigen. Je accountgegevens en -data kunnen niet worden teruggehaald!",
-   "settings.account.deleteInfo" : "Wanneer je je Franz-account niet langer wilt gebruiken, kan je je account en alle gerelateerde data hier verwijderen.",
+   "settings.account.deleteEmailSent" : "Je hebt een e-mail ontvangen met een link om het verwijderen van je account te bevestigen. Je accountgegevens en -data kunnen na verwijderen niet meer worden teruggehaald!",
+   "settings.account.deleteInfo" : "Wanneer je je Franz-account niet langer wilt gebruiken, kun je je account en alle gerelateerde data verwijderen.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Accountinformatie",
    "settings.account.headlineDangerZone" : "Gevarenzone",
@@ -135,28 +181,35 @@
    "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" : "Herstart & installeer update",
+   "settings.app.buttonInstallUpdate" : "Opnieuw opstarten en updates installeren",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
-   "settings.app.cacheInfo" : "De Franz-cache gebruikt op dit moment {size} schijfruimte.",
+   "settings.app.cacheInfo" : "Franz gebruikt op dit moment {size} schijfruimte aan tijdelijke bestanden.",
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Open Ferdi bij opstarten",
    "settings.app.form.beta" : "Inclusief bètaversies",
    "settings.app.form.darkMode" : "Stap over naar de donkere kant",
-   "settings.app.form.enableGPUAcceleration" : "Schakel videokaart acceleratie in ",
+   "settings.app.form.enableGPUAcceleration" : "Schakel videokaart-acceleratie in ",
    "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
-   "settings.app.form.enableSystemTray" : "Toon Ferdi in de systeembalk",
+   "settings.app.form.enableSystemTray" : "Pictogram voor Franz in systeemvak tonen",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Taal",
-   "settings.app.form.minimizeToSystemTray" : "Minimaliseer Ferdi naar de systeembalk",
-   "settings.app.form.runInBackground" : "Houd Ferdi op de achtergrond wanneer het venster gesloten wordt",
+   "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar systeemvak",
+   "settings.app.form.runInBackground" : "Houd Franz open op de achtergrond wanneer het venster gesloten wordt",
    "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
    "settings.app.headline" : "Instellingen",
@@ -165,10 +218,10 @@
    "settings.app.headlineGeneral" : "Algemeen",
    "settings.app.headlineLanguage" : "Taal",
    "settings.app.headlineUpdates" : "Updates",
-   "settings.app.languageDisclaimer" : "Officiële vertalingen zijn in het Engels en Duits. Alle andere talen zijn beheerd door de community.",
+   "settings.app.languageDisclaimer" : "Franz spreekt officieel Engels en Duits. Alle andere talen worden beheerd door de community.",
    "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
    "settings.app.subheadlineCache" : "Cache",
-   "settings.app.translationHelp" : "Help ons om Ferdi te vertalen naar uw taal.",
+   "settings.app.translationHelp" : "Help ons om Franz uw taal te laten spreken.",
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
    "settings.app.updateStatusUpToDate" : "Je gebruikt de laatste versie van Franz",
@@ -182,9 +235,15 @@
    "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" : "Mist er een dienst?",
+   "settings.recipes.missingService" : "Mis je een service?",
    "settings.recipes.mostPopular" : "Meest populair",
    "settings.recipes.nothingFound" : "Sorry, geen service gevonden met deze zoekterm.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
@@ -213,7 +272,7 @@
    "settings.service.form.iconUpload" : "Sleep en drop je afbeelding, of klik hier",
    "settings.service.form.indirectMessageInfo" : "Je ontvangt meldingen van alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Toon berichtenbadge voor alle nieuwe berichten",
-   "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldinggeluiden en afgespeelde audio uitgeschakeld zijn",
+   "settings.service.form.isMutedInfo" : "Indien uitgeschakeld, worden meldingen en audio niet afgespeeld",
    "settings.service.form.name" : "Naam",
    "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy instellingen",
    "settings.service.form.proxy.host" : "Proxy Host\/IP",
@@ -233,15 +292,15 @@
    "settings.services.discoverServices" : "Ontdek services",
    "settings.services.headline" : "Jouw services",
    "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
-   "settings.services.servicesRequestFailed" : "Kan jouw diensten niet laden",
+   "settings.services.servicesRequestFailed" : "Kan jouw services niet laden",
    "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
-   "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
+   "settings.services.tooltip.isMuted" : "Geluid is uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld",
    "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
-   "settings.team.contentHeadline" : "Ferdi voor groepen",
-   "settings.team.copy" : "Ferdi voor Teams geeft je de mogelijkheid om collega's uit te nodigen voor je team door hen een e-mail te sturen en hun inschrijvingen te beheren in je accountvoorkeuren. Verspil geen tijd met het instellen van inschrijvingen voor elk teamlid apart, vergeet meerdere facturen en verschillende afrekeningsperiodes - één team regeert alles!",
+   "settings.team.contentHeadline" : "Franz voor Teams",
+   "settings.team.copy" : "Franz voor Teams geeft je de mogelijkheid om collega's uit te nodigen voor je team door hen een e-mail te sturen en hun inschrijvingen te beheren in je accountvoorkeuren. Verspil geen tijd met het instellen van inschrijvingen voor elk individueel teamlid, vergeet meerdere facturen en verschillende afrekeningsperiodes - één team om alles te regelen!",
    "settings.team.headline" : "Team",
-   "settings.team.intro" : "Gebruiken jij en je team Franz? Je kunt nu Premium inschrijvingen beheren voor zoveel collega's, vrienden, of familieleden als je wilt, allemaal vanaf één account.",
+   "settings.team.intro" : "Gebruiken jij en je team Franz? Je kunt nu Premium inschrijvingen beheren voor zoveel collega's, vrienden, of familieleden als je wilt. En dat alles vanuit één account.",
    "settings.team.manageAction" : "Beheer je Team op meetfranz.com",
    "settings.team.upgradeAction" : "Jouw Account opwaarderen",
    "settings.user.form.accountType.company" : "Bedrijf",
@@ -258,75 +317,66 @@
    "settings.workspace.form.buttonDelete" : "Verwijder werkruimte",
    "settings.workspace.form.buttonSave" : "Sla werkruimte op",
    "settings.workspace.form.name" : "Naam",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Diensten in deze werkruimte",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in deze werkruimte",
    "settings.workspace.form.yourWorkspaces" : "Jouw werkruimtes",
    "settings.workspaces.deletedInfo" : "Werkruimte is verwijderd",
    "settings.workspaces.headline" : "Jouw werkplaatsen",
    "settings.workspaces.noWorkspacesAdded" : "Je hebt nog geen werkruimtes toegevoegd.",
    "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw",
    "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Zie hier Ferdi Werkruimtes",
-   "settings.workspaces.workspaceFeatureInfo" : "Ferdi werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van diensten aan en schakel gelijk wanneer tussen de verschillende sets.Jij beslist welke diensten je wanneer en waar nodig hebt, enkel zo kunnen wij jou helpen je focus te behouden. Of net makkelijk de switch te maken van werk naar ontspanning.",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Zie hier Franz Werkruimtes",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.",
    "settings.workspaces.workspacesRequestFailed" : "Kan jouw werkruimtes niet laden",
    "sidebar.addNewService" : "Voeg service toe",
    "sidebar.closeWorkspaceDrawer" : "Werkruimte pagina sluiten",
-   "sidebar.muteApp" : "Schakel berichten & geluid uit",
+   "sidebar.muteApp" : "Berichten & geluid uitschakelen",
    "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",
    "signup.headline" : "Aanmelden",
    "signup.lastname.label" : "Achternaam",
    "signup.legal.info" : "Door een Franz-account aan te maken ga je akkoord met de",
-   "signup.legal.privacy" : "Privacy Voorwaarden",
+   "signup.legal.privacy" : "Privacyvoorwaarden",
    "signup.legal.terms" : "Gebruiksvoorwaarden",
-   "signup.link.login" : "Al een account? Log in!",
+   "signup.link.login" : "Heb je al een account? Log in!",
    "signup.password.label" : "Wachtwoord",
    "signup.submit.label" : "Account aanmaken",
-   "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
-   "subscription.features.ads" : "Geen advertenties, nooit!",
-   "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
-   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
-   "subscription.features.proxy" : "Proxy understeuning voor diensten",
-   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
-   "subscription.features.workspaces" : "Beheer je diensten in de werkruimtes",
-   "subscription.includedFeatures" : "Betaald Ferdi Premium Supporter Account bevat",
-   "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
-   "subscription.submit.label" : "Ik wil de ontwikkeling van Ferdi ondersteunen",
-   "subscription.type.free" : "gratis",
-   "subscription.type.month" : "maand",
-   "subscription.type.year" : "jaar",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "Annuleer",
    "subscriptionPopup.buttonDone" : "Klaar",
    "tabs.item.deleteService" : "Verwijder service",
-   "tabs.item.disableAudio" : "Schakel audio uit",
-   "tabs.item.disableNotifications" : "Schakel meldingen uit",
-   "tabs.item.disableService" : "Schakel service uit",
+   "tabs.item.disableAudio" : "Audio uitschakelen",
+   "tabs.item.disableNotifications" : "Meldingen uitschakelen",
+   "tabs.item.disableService" : "Service uitschakelen",
    "tabs.item.edit" : "Bewerken",
    "tabs.item.enableAudio" : "Audio inschakelen",
    "tabs.item.enableNotification" : "Meldingen inschakelen",
    "tabs.item.enableService" : "Service inschakelen",
    "tabs.item.reload" : "Herladen",
    "validation.email" : "{field} is niet geldig",
-   "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
-   "validation.oneRequired" : "Er is op zijn minst één vereist",
+   "validation.minLength" : "{field} dient minimaal {length} karakters lang te zijn",
+   "validation.oneRequired" : "Minstens één vereist",
    "validation.required" : "{field} is vereist",
-   "validation.url" : "{field} is niet een geldige URL",
+   "validation.url" : "{field} is geen geldige URL",
    "welcome.loginButton" : "Log in op je account",
    "welcome.signupButton" : "Maak een gratis account",
    "workspaceDrawer.addNewWorkspaceLabel" : "Voeg een nieuwe werkruimte toe",
-   "workspaceDrawer.allServices" : "Alle diensten",
+   "workspaceDrawer.allServices" : "Alle services",
    "workspaceDrawer.headline" : "Werkruimtes",
    "workspaceDrawer.item.contextMenuEdit" : "bewerken",
-   "workspaceDrawer.item.noServicesAddedYet" : "Nog geen diensten toegevoegd",
+   "workspaceDrawer.item.noServicesAddedYet" : "Nog geen services toegevoegd",
    "workspaceDrawer.premiumCtaButtonLabel" : "Maak je eerste werkruimte",
    "workspaceDrawer.proFeatureBadge" : "Premium feature",
-   "workspaceDrawer.reactivatePremiumAccountLabel" : "Heractiveer premium account",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Ferdi werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van diensten aan en schakel gelijk wanneer tussen de verschillende sets.<\/p><p>Jij beslist welke diensten je wanneer en waar nodig hebt, enkel zo kunnen wij jou helpen je focus te behouden. Of net makkelijk de switch te maken van werk naar ontspanning.<\/p>",
-   "workspaceDrawer.workspacesSettingsTooltip" : "Pas werkruimte instellingen aan",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Premium account heractiveren",
+   "workspaceDrawer.workspaceFeatureInfo" : "Franz werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Werkruimte instellingen aanpassen",
    "workspaces.switchingIndicator.switchingTo" : "Overschakelen naar"
 }
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index f94c6e10c..57d25c1f5 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -2,24 +2,34 @@
    "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ę Ferdi Supporter",
-   "feature.delayApp.headline" : "Aby nie czekać, kup licencję Ferdi Supporter",
-   "feature.delayApp.text" : "Ferdi będzie kontynuował za {seconds} sekund.",
+   "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",
    "feature.shareFranz.headline" : "Ferdi jest lepszy, gdy tworzymy go razem!",
    "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 Ferdi i pomóż nam go spopularyzować.",
-   "global.api.unhealthy" : "Nie można połączyć się z usługami Ferdi online",
+   "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",
-   "import.headline" : "Importuj usługi Ferdi 4",
-   "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Ferdi 5",
+   "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",
    "import.submit.label" : "Zaimportuj usługi",
    "infobar.buttonChangelog" : "Co nowego?",
@@ -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.link.skipPayment" : "Nie chcę wspierać rozwoju aplikacji Franz.",
-   "pricing.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
-   "pricing.support.label" : "Wybierz swój plan wsparcia",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -154,6 +206,7 @@
    "settings.app.form.enableGPUAcceleration" : "Włącz akcelerację GPU",
    "settings.app.form.enableSpellchecking" : "Włącz sprawdzanie pisowni",
    "settings.app.form.enableSystemTray" : "Pokaż Franza w obszarze powiadomień",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Język",
    "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikację Franz",
    "settings.app.form.runInBackground" : "Zachowaj aplikację Ferdi w tle po zamknięciu okna",
@@ -182,7 +235,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 +333,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ę",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "za darmo",
    "subscription.type.month" : "miesiąc",
    "subscription.type.year" : "rok",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 1a94c9179..f2c139193 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Recarregar",
    "app.errorHandler.headline" : "Opa! Algo deu errado.",
-   "feature.announcements.changelog.headline" : "Mudanças no Ferdi {version}",
-   "feature.delayApp.action" : "Adquira uma licença de suporte Franz",
+   "feature.announcements.changelog.headline" : "Mudanças no Franz {version}",
    "feature.delayApp.headline" : "Por favor, adquira uma licença para pular o tempo de espera",
-   "feature.delayApp.text" : "Ferdi continuará em {seconds} segundos.",
+   "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",
    "feature.shareFranz.headline" : "Ferdi é melhor em grupo!",
    "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "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 Ferdi é e nos ajude a espalhar a mensagem.  ",
+   "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",
-   "import.headline" : "Importe seus serviços do Ferdi 4 ",
-   "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Ferdi 5 ",
+   "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",
    "import.submit.label" : "Importar serviços",
    "infobar.buttonChangelog" : "O que há de novo?",
@@ -27,7 +37,8 @@
    "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.updateAvailable" : "Uma nova atualização do Ferdi está disponível.",
+   "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",
    "invite.name.label" : "Nome",
@@ -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.link.skipPayment" : "Eu não quero apoiar o desenvolvimento do Franz.",
-   "pricing.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
-   "pricing.support.label" : "Selecione uma opção de plano",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Venha para o Lado Negro da força",
    "settings.app.form.enableGPUAcceleration" : "Ativar Aceleração de GPU",
    "settings.app.form.enableSpellchecking" : "Ativar correção ortográfica",
-   "settings.app.form.enableSystemTray" : "Exibir o Ferdi na barra de sistema",
+   "settings.app.form.enableSystemTray" : "Exibir o Franz na barra de sistema",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Ferdi para a área de sistema",
    "settings.app.form.runInBackground" : "Manter o Ferdi no fundo quando fechar a janela",
@@ -182,7 +235,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 +333,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",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "grátis",
    "subscription.type.month" : "mês",
    "subscription.type.year" : "ano",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 ced5c9183..bad62fdf3 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,23 +1,33 @@
 {
    "app.errorHandler.action" : "Recarregar",
    "app.errorHandler.headline" : "Alguma coisa correu mal",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Faz parte do grupo de apoio do Franz",
-   "feature.delayApp.headline" : "Por favor compre uma licença Ferdi Supporter para saltar a fila de espera",
-   "feature.delayApp.text" : "Ferdi irá continuar em {seconds} segundos.",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi 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 Ferdi is and help us to spread the word.",
+   "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 Ferdi 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.link.skipPayment" : "Não pretendo patrocinar o desenvolvimento do Franz",
-   "pricing.submit.label" : "Pretendo patrocinar o desenvolvimento do Franz",
-   "pricing.support.label" : "Selecione o seu plano",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Junta-te ao Lado Negro",
    "settings.app.form.enableGPUAcceleration" : "Activar Aceleração de GPU",
    "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
-   "settings.app.form.enableSystemTray" : "Mostrar o Ferdi na barra do sistema",
+   "settings.app.form.enableSystemTray" : "Mostrar o Franz na barra do sistema",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Ferdi para a barra do sistema",
    "settings.app.form.runInBackground" : "Manter o Ferdi em segundo plano ao fechar a janela",
@@ -182,7 +235,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 +333,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 +344,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.features.ads" : "Sem anúncios, para sempre!",
-   "subscription.features.comingSoon" : "em breve",
-   "subscription.features.noInterruptions" : "Sem atrasos na aplicação nem mensagens para comprar uma licença",
-   "subscription.features.onpremise.mattermost" : "Adicione serviços como Mattermost no local ou online",
-   "subscription.features.proxy" : "Suporte Proxy para os serviços",
-   "subscription.features.spellchecker" : "Suporte para correção ortográfica",
-   "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",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 369b95a41..03b339dd5 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Перезагрузить",
    "app.errorHandler.headline" : "Что-то пошло не так",
-   "feature.announcements.changelog.headline" : "Изменения в версии Ferdi {version}",
-   "feature.delayApp.action" : "Получите лицензию Ferdi Supporter",
-   "feature.delayApp.headline" : "Пожалуйста приобретите лицензию Ferdi Supporter чтобы убрать ожидание",
-   "feature.delayApp.text" : "Ferdi продолжит работу через {seconds} секунд.",
+   "feature.announcements.changelog.headline" : "Изменения в версии Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Сделаем Ferdi лучше вместе!",
    "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" : "Расскажи своим друзьям и коллегам насколько прелестен Ferdi и помоги нам развиться",
+   "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" : "Проверка правописания",
-   "import.headline" : "Импортировать ваши сервисы из Ferdi 4",
-   "import.notSupportedHeadline" : "Сервисы пока ещё не поддерживаются в Ferdi 5",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "import.headline" : "Импортировать ваши сервисы из Franz 4",
+   "import.notSupportedHeadline" : "Сервисы пока ещё не поддерживаются в Franz 5",
    "import.skip.label" : "Я хочу добавить сервисы вручную",
    "import.submit.label" : "Импортировать сервисы",
    "infobar.buttonChangelog" : "Что новенького?",
@@ -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.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
-   "pricing.submit.label" : "Я хочу поддержать разработку Franz",
-   "pricing.support.label" : "Выберите ваш план поддержки",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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" : "Проверить обновления",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Перейти на Тёмную сторону",
    "settings.app.form.enableGPUAcceleration" : "Включить ускорение GPU",
    "settings.app.form.enableSpellchecking" : "Включить проверку правописания",
-   "settings.app.form.enableSystemTray" : "Показывать Ferdi в системном трее",
+   "settings.app.form.enableSystemTray" : "Показывать Franz в системном трее",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Язык",
    "settings.app.form.minimizeToSystemTray" : "Сворачивать Ferdi в системный трей",
    "settings.app.form.runInBackground" : "Оставлять Ferdi в фоне при закрытии окна",
@@ -182,7 +235,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 +333,6 @@
    "sidebar.openWorkspaceDrawer" : "Открыть меню окружений",
    "sidebar.settings" : "Настройки",
    "sidebar.unmuteApp" : "Включить уведомления и звук",
-   "signup.company.label" : "Организация",
    "signup.email.label" : "Адрес электронной почты",
    "signup.emailDuplicate" : "Пользователь с таким адресом электронной почты уже существует",
    "signup.firstname.label" : "Имя",
@@ -300,6 +358,12 @@
    "subscription.type.free" : "бесплатно",
    "subscription.type.month" : "месяц",
    "subscription.type.year" : "год",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "Отмена",
    "subscriptionPopup.buttonDone" : "Готово",
    "tabs.item.deleteService" : "Удалить сервис",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index a9fd4e9f4..cb1170d00 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Obnoviť",
    "app.errorHandler.headline" : "Niečo sa pokazilo",
-   "feature.announcements.changelog.headline" : "Zmeny vo Ferdi {version}",
-   "feature.delayApp.action" : "Získajte licenciu pre Ferdi podporu",
-   "feature.delayApp.headline" : "Please purchase a Ferdi Supporter License to skip waiting",
-   "feature.delayApp.text" : "Ferdi bude pokračovať v {seconds} seundách.",
+   "feature.announcements.changelog.headline" : "Zmeny vo Franz {version}",
+   "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",
-   "feature.shareFranz.headline" : "Ferdi 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 Ferdi is and help us to spread the word.",
+   "feature.shareFranz.headline" : "Franz je lepší spolu!",
+   "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",
-   "import.headline" : "Importovať vaše služby z Ferdi 4",
-   "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Ferdi 5",
+   "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",
    "import.submit.label" : "Importovať služby",
    "infobar.buttonChangelog" : "Čo je nového?",
@@ -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",
@@ -92,9 +110,9 @@
    "menu.window.minimize" : "Minimalizovať",
    "menu.workspaces" : "Pracovný priestor",
    "menu.workspaces.addNewWorkspace" : "Pridať nový pracovný priestor ...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.closeWorkspaceDrawer" : "Zavrieť workspace záložku",
    "menu.workspaces.defaultWorkspace" : "Všetky služby",
-   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
+   "menu.workspaces.openWorkspaceDrawer" : "Otvoriť workspace záložku",
    "password.email.label" : "E-mailová adresa",
    "password.headline" : "Obnoviť heslo",
    "password.link.login" : "Prihlásiť sa do vášho účtu",
@@ -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.link.skipPayment" : "Nechcem podporiť vývoj aplikácie Franz.",
-   "pricing.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
-   "pricing.support.label" : "Vyberte si váš plán podpory",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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!",
@@ -117,7 +158,12 @@
    "service.errorHandler.editAction" : "Upraviť {name}",
    "service.errorHandler.headline" : "Ale nie!",
    "service.errorHandler.message" : "Chyba",
-   "service.errorHandler.text" : "{name} has failed to load.",
+   "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",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Spustiť Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Zapnúť GPU zrýchlenie",
    "settings.app.form.enableSpellchecking" : "Zapnúť kontrolu pravopisu",
-   "settings.app.form.enableSystemTray" : "Zobrazovať Ferdi v systémovej lište",
+   "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovať Ferdi do systémovej lišty",
    "settings.app.form.runInBackground" : "Po zatvorení okna ponechať Ferdi spustený na pozadí",
@@ -182,7 +235,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",
@@ -265,16 +324,15 @@
    "settings.workspaces.noWorkspacesAdded" : "Zatiaľ si nepridal žiadne pracovné priestory.",
    "settings.workspaces.tryReloadWorkspaces" : "Skúsiť znova",
    "settings.workspaces.updatedInfo" : "Vaše zmeny boli uložené",
-   "settings.workspaces.workspaceFeatureHeadline" : "Menej je viac: Predstavenie Ferdi Pracovné priestory",
-   "settings.workspaces.workspaceFeatureInfo" : "Ferdi 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",
+   "settings.workspaces.workspaceFeatureHeadline" : "Menej je viac: Predstavenie Franz Pracovné priestory",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspace vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte. Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné.",
+   "settings.workspaces.workspacesRequestFailed" : "Nebolo možné načítať vaše workspace",
    "sidebar.addNewService" : "Pridať novú službu",
-   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
+   "sidebar.closeWorkspaceDrawer" : "Zavrieť workspace záložku",
    "sidebar.muteApp" : "Vypnúť upozornenia a zvuky",
-   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
+   "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 +344,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.features.ads" : "Žiadne reklamy, nikdy!",
-   "subscription.features.comingSoon" : "už čoskoro",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Platený účet Premium Supporter Ferdi 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",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "Zrušiť",
    "subscriptionPopup.buttonDone" : "Dokončiť",
    "tabs.item.deleteService" : "Odstrániť službu",
@@ -313,20 +363,20 @@
    "tabs.item.reload" : "Obnoviť",
    "validation.email" : "{field} je neplatný",
    "validation.minLength" : "{field} by malo byť dlhé aspoň {length} znakov",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Je nutné zadať aspoň jeden",
    "validation.required" : "{field} je povinné",
    "validation.url" : "{field} nie je platné URL",
    "welcome.loginButton" : "Prihlásiť sa do vášho účtu",
    "welcome.signupButton" : "Vytvoriť účet zdarma",
-   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Pridať nový workspace",
    "workspaceDrawer.allServices" : "Všetky služby",
-   "workspaceDrawer.headline" : "Pracovn�� priestor",
-   "workspaceDrawer.item.contextMenuEdit" : "edit",
-   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
-   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
-   "workspaceDrawer.proFeatureBadge" : "Premium feature",
-   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
-   "workspaceDrawer.workspaceFeatureInfo" : "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>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.<\/p>",
-   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
-   "workspaces.switchingIndicator.switchingTo" : "Switching to"
+   "workspaceDrawer.headline" : "Pracovn�� plochy",
+   "workspaceDrawer.item.contextMenuEdit" : "Upraviť",
+   "workspaceDrawer.item.noServicesAddedYet" : "Zatiaľ žiadne služby",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Vytvorte váš prvý workspace",
+   "workspaceDrawer.proFeatureBadge" : "Prémiová funkcia",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Obnovte svoj prémiový účet",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspace vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte.<\/p><p>Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné. <\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Upraviť nastavenia workspace",
+   "workspaces.switchingIndicator.switchingTo" : "Prepínanie na"
 }
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 93d94d065..93e3fb139 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Ponovno učitavanje",
    "app.errorHandler.headline" : "Something went wrong",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Get a Ferdi Supporter License",
-   "feature.delayApp.headline" : "Please purchase a Ferdi Supporter License to skip waiting",
-   "feature.delayApp.text" : "Ferdi will continue in {seconds} seconds.",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi 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 Ferdi is and help us to spread the word.",
+   "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",
-   "import.headline" : "Uvezite svoje Ferdi 4 servise",
-   "import.notSupportedHeadline" : "Servis trenutno nije podržan u Ferdi 5",
+   "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" : "Желим да додам услуге ручно",
    "import.submit.label" : "Uvezi servise",
    "infobar.buttonChangelog" : "Šta je novo? ",
@@ -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.link.skipPayment" : "Ne želim da podržim razvoj Franz-a.",
-   "pricing.submit.label" : "Želim da podržim razvoj Franz-a.",
-   "pricing.support.label" : "Izaberite vaš plan za podržavanje",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -154,6 +206,7 @@
    "settings.app.form.enableGPUAcceleration" : "Омогући убрзање графичке јединице",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
@@ -182,7 +235,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 +333,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 +344,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.features.ads" : "Bez reklama, doživotno!",
-   "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
-   "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",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 860030c11..75e43d1ce 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,10 +1,15 @@
 {
    "app.errorHandler.action" : "Tekrar Yükle",
    "app.errorHandler.headline" : "Bir terslik çıktı",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Ferdi Destek Lisansı'nı alın",
-   "feature.delayApp.headline" : "Beklememek için Ferdi Destek Lisansı'nı satın alın",
-   "feature.delayApp.text" : "Ferdi {seconds} saniye sonra devam edecek.",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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,14 +17,19 @@
    "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.",
-   "global.api.unhealthy" : "Ferdi hizmetlerine şu anda erişilemiyor",
+   "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",
-   "import.headline" : "Ferdi 4 servislerinizi içeri aktarın",
-   "import.notSupportedHeadline" : "Henüz Ferdi 5'te desteklenmeyen servisler",
+   "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",
    "import.submit.label" : "Servisleri içe aktar",
    "infobar.buttonChangelog" : "Yeni ne var?",
@@ -27,7 +37,8 @@
    "infobar.buttonReloadServices" : "Hizmetleri yeniden yükle",
    "infobar.requiredRequestsFailed" : "Hizmetler ve kullanıcı bilgileri yüklenemedi",
    "infobar.servicesUpdated" : "Hizmetleriniz güncellendi.",
-   "infobar.updateAvailable" : "Yeni Ferdi güncellemesi mevcut.",
+   "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",
    "invite.name.label" : "Ad",
@@ -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.app.about" : "Ferdi Hakkında",
-   "menu.app.announcement" : "What's new?",
+   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
+   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
+   "menu.app.about" : "Franz Hakkında",
+   "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.link.skipPayment" : "Franz'ın gelişimini desteklemek istemiyorum.",
-   "pricing.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
-   "pricing.support.label" : "Destek planınızı seçiniz",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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",
@@ -154,6 +206,7 @@
    "settings.app.form.enableGPUAcceleration" : "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
    "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
    "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Dil",
    "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
@@ -182,7 +235,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 +333,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 +344,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.features.ads" : "Reklam yok, asla!",
-   "subscription.features.comingSoon" : "yakında geliyor",
-   "subscription.features.noInterruptions" : "Uygulama gecikmeleri & yükseltme lisanları için dırdır yok",
-   "subscription.features.onpremise.mattermost" : "Mattermost gibi şirket-içi\/barındırılan servisler ekleyin",
-   "subscription.features.proxy" : "Servisler için proxy desteği",
-   "subscription.features.spellchecker" : "Yazım denetleyicisi desteği",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Ücretli Ferdi 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",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "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 fe8f44d19..ee53608e6 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,25 +1,35 @@
 {
    "app.errorHandler.action" : "Перезавантажити",
    "app.errorHandler.headline" : "Щось пішло не так",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "Отримати ліцензію Ferdi Supporter ",
-   "feature.delayApp.headline" : "Будь ласка, придбайте ліцензію Ferdi Supporter аби пропустити очікування",
-   "feature.delayApp.text" : "Ferdi відновить роботу за {seconds} секунд",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "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",
    "feature.shareFranz.headline" : "Ferdi 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 Ferdi is and help us to spread the word.",
+   "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" : "Мова перевірки правопису",
-   "import.headline" : "Імпортувати ваші сервіси з Ferdi 4",
-   "import.notSupportedHeadline" : "Наразі сервіси не підтримуються у Ferdi 5",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "import.headline" : "Імпортувати ваші сервіси з Franz 4",
+   "import.notSupportedHeadline" : "Наразі сервіси не підтримуються у Franz 5",
    "import.skip.label" : "Я бажаю додати сервіс вручну",
    "import.submit.label" : "Імпортувати сервіси",
    "infobar.buttonChangelog" : "Що нового?",
@@ -27,7 +37,8 @@
    "infobar.buttonReloadServices" : "Перезавантажити сервіси",
    "infobar.requiredRequestsFailed" : "Не вдалося завантажити сервіси та інформацію користувача",
    "infobar.servicesUpdated" : "Ваші сервіси було оновлено.",
-   "infobar.updateAvailable" : "Нове оновлення для Ferdi доступне.",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
+   "infobar.updateAvailable" : "Нове оновлення для Franz доступне.",
    "invite.email.label" : "Email адреса",
    "invite.headline.friends" : "Запросіть 3-х ваших друзів або колег",
    "invite.name.label" : "Ім'я",
@@ -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.link.skipPayment" : "Я не хочу підтримувати розробку Franz.",
-   "pricing.submit.label" : "Я хочу підтримати розробку Franz",
-   "pricing.support.label" : "Виберіть свій план підтримки",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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" : "Перевірити наявність оновлень",
@@ -153,7 +205,8 @@
    "settings.app.form.darkMode" : "Переходь на Темну Сторону",
    "settings.app.form.enableGPUAcceleration" : "Ввімкнути прискорення GPU",
    "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
-   "settings.app.form.enableSystemTray" : "Показувати Ferdi у системному лотку",
+   "settings.app.form.enableSystemTray" : "Показувати Franz у системному лотку",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Ferdi до системного лотка",
    "settings.app.form.runInBackground" : "Тримати Ferdi в фоні при закритті вікна",
@@ -182,7 +235,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 +333,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 +344,12 @@
    "signup.link.login" : "У вас вже є обліковий запис, увійти?",
    "signup.password.label" : "Пароль",
    "signup.submit.label" : "Створити акаунт",
-   "subscription.euTaxInfo" : "Для жителів ЄС: можуть застосовуватися податки",
-   "subscription.features.ads" : "Жодної реклами!",
-   "subscription.features.comingSoon" : "очікуйте незабаром",
-   "subscription.features.noInterruptions" : "Ніяких затримок та набридливих пропозицій з платних підписок",
-   "subscription.features.onpremise.mattermost" : "Сервіси, що виконуються локально\/вимагають хостингу, приміром Mattermost",
-   "subscription.features.proxy" : "Підтримка проксі ",
-   "subscription.features.spellchecker" : "Підтримка перевірки правопису",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Платний Преміальний Акаунт Прихильника Ferdi включає",
-   "subscription.paymentSessionError" : "Не вдалося ініціалізувати форму платежу",
-   "subscription.submit.label" : "Я хочу підтримати розробку Franz",
-   "subscription.type.free" : "безплатно",
-   "subscription.type.month" : "місяць",
-   "subscription.type.year" : "рік",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "Відмінити",
    "subscriptionPopup.buttonDone" : "Готово",
    "tabs.item.deleteService" : "Видалити сервіс",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index dd004c821..58d1d7b5d 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -1,25 +1,35 @@
 {
-   "app.errorHandler.action" : "重新載入",
-   "app.errorHandler.headline" : "有些東西出錯了",
-   "feature.announcements.changelog.headline" : "Changes in Ferdi {version}",
-   "feature.delayApp.action" : "取得 Ferdi 支援授權",
-   "feature.delayApp.headline" : "請購買 Ferdi 支援授權以跳過等候",
-   "feature.delayApp.text" : "Ferdi 會在 {seconds} 秒後繼續。",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Ferdi is better together!",
+   "app.errorHandler.action" : "重新整理",
+   "app.errorHandler.headline" : "糟糕！有些地方出問題了。",
+   "feature.announcements.changelog.headline" : "透過 email 傳送",
+   "feature.delayApp.headline" : "請購買 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 上分享",
+   "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 Ferdi is and help us to spread the word.",
-   "global.api.unhealthy" : "無法連線至 Ferdi 的伺服器",
+   "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.short" : "Automatic",
+   "global.spellchecking.autodetect" : "自動偵測語言",
+   "global.spellchecking.autodetect.short" : "自動的",
    "global.spellchecking.language" : "拼字檢查語言",
-   "import.headline" : "匯入 Ferdi 4 的服務",
-   "import.notSupportedHeadline" : "Ferdi 5 尚未支援此服務",
+   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "import.headline" : "匯入 Franz 4 的服務",
+   "import.notSupportedHeadline" : "Franz 5 尚未支援此服務",
    "import.skip.label" : "手動添加服務",
    "import.submit.label" : "匯入服務",
    "infobar.buttonChangelog" : "有什麼新功能呢?",
@@ -27,7 +37,8 @@
    "infobar.buttonReloadServices" : "重新載入服務",
    "infobar.requiredRequestsFailed" : "無法載入服務和使用者資訊",
    "infobar.servicesUpdated" : "已經更新你的服務",
-   "infobar.updateAvailable" : "Ferdi 有可用的更新",
+   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
+   "infobar.updateAvailable" : "Franz 有可用的更新",
    "invite.email.label" : "電子郵件地址",
    "invite.headline.friends" : "邀請 3 位朋友或同事",
    "invite.name.label" : "名稱",
@@ -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.addNewWorkspace" : "Add New Workspace...",
-   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces" : "工作區",
+   "menu.workspaces.addNewWorkspace" : "新增工作區",
+   "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.link.skipPayment" : "我不想支持 Ferdi 的開發。",
-   "pricing.submit.label" : "我想支持 Ferdi 的開發。",
-   "pricing.support.label" : "選擇您支持的計畫",
+   "pricing.features.adFree" : "Forever ad-free",
+   "pricing.features.appDelays" : "No Waiting Screens",
+   "pricing.features.customWebsites" : "Add Custom Websites",
+   "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" : "檢查更新",
@@ -154,6 +206,7 @@
    "settings.app.form.enableGPUAcceleration" : "啟用 GPU 加速",
    "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
    "settings.app.form.enableSystemTray" : "在系統列顯示 Franz",
+   "settings.app.form.enableTodos" : "Enable Franz Todos",
    "settings.app.form.language" : "語言",
    "settings.app.form.minimizeToSystemTray" : "最小化 Ferdi 到系統列",
    "settings.app.form.runInBackground" : "當關閉視窗時，保持 Ferdi 在背景運作",
@@ -165,7 +218,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" : "幫助我們將 Ferdi 翻譯成您的語言。",
@@ -178,11 +231,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 +292,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" : "Ferdi for Teams",
-   "settings.team.copy" : "Ferdi 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.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 +313,26 @@
    "settings.user.form.lastname" : "姓",
    "settings.user.form.newPassword" : "新密碼",
    "settings.workspace.add.form.name" : "名稱",
-   "settings.workspace.add.form.submitButton" : "Create workspace",
-   "settings.workspace.form.buttonDelete" : "Delete workspace",
-   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.add.form.submitButton" : "建立工作區",
+   "settings.workspace.form.buttonDelete" : "刪除工作區",
+   "settings.workspace.form.buttonSave" : "儲存工作區",
    "settings.workspace.form.name" : "名稱",
-   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
-   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
-   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
-   "settings.workspaces.headline" : "Your workspaces",
-   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "這個工作區的服務",
+   "settings.workspace.form.yourWorkspaces" : "你的工作區",
+   "settings.workspaces.deletedInfo" : "成功刪除工作區",
+   "settings.workspaces.headline" : "你的工作區",
+   "settings.workspaces.noWorkspacesAdded" : "你尚未加入任何工作區",
    "settings.workspaces.tryReloadWorkspaces" : "再試一次",
-   "settings.workspaces.updatedInfo" : "Your changes have been saved",
-   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Ferdi Workspaces",
-   "settings.workspaces.workspaceFeatureInfo" : "Ferdi 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.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 +344,12 @@
    "signup.link.login" : "已經有一個帳戶，登入？",
    "signup.password.label" : "密碼",
    "signup.submit.label" : "建立帳號",
-   "subscription.euTaxInfo" : "歐盟居民：可能採用當地銷售稅",
-   "subscription.features.ads" : "無廣告，永遠!",
-   "subscription.features.comingSoon" : "即將推出",
-   "subscription.features.noInterruptions" : "升級授權沒有延遲與打盹",
-   "subscription.features.onpremise.mattermost" : "加入如 Mattermost 等已預定 \/ 託管的服務",
-   "subscription.features.proxy" : "服務的代理伺服器支援",
-   "subscription.features.spellchecker" : "支援拼字檢查",
-   "subscription.features.workspaces" : "Organize your services in workspaces",
-   "subscription.includedFeatures" : "Ferdi 高級支援帳戶包含",
-   "subscription.paymentSessionError" : "無法初始化付款表單",
-   "subscription.submit.label" : "我想支持 Ferdi 開發",
-   "subscription.type.free" : "自由",
-   "subscription.type.month" : "月",
-   "subscription.type.year" : "年",
+   "subscription.cta.activateTrial" : "Yes, start the free Franz Professional trial",
+   "subscription.cta.allOptions" : "See all options",
+   "subscription.cta.choosePlan" : "Choose your plan",
+   "subscription.includedProFeatures" : "The Franz Professional Plan includes:",
+   "subscription.teaser.includedFeatures" : "Paid Franz Plans include:",
+   "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!",
    "subscriptionPopup.buttonCancel" : "取消",
    "subscriptionPopup.buttonDone" : "完成",
    "tabs.item.deleteService" : "刪除服務",
@@ -320,7 +370,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",
diff --git a/src/i18n/messages/src/components/TrialActivationInfoBar.json b/src/i18n/messages/src/components/TrialActivationInfoBar.json
new file mode 100644
index 000000000..65dd964a6
--- /dev/null
+++ b/src/i18n/messages/src/components/TrialActivationInfoBar.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "infobar.trialActivated",
+    "defaultMessage": "!!!Your trial was successfully activated. Happy messaging!",
+    "file": "src/components/TrialActivationInfoBar.js",
+    "start": {
+      "line": 11,
+      "column": 11
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Pricing.json b/src/i18n/messages/src/components/auth/Pricing.json
index d3facf8e8..f15617ca5 100644
--- a/src/i18n/messages/src/components/auth/Pricing.json
+++ b/src/i18n/messages/src/components/auth/Pricing.json
@@ -1,53 +1,118 @@
 [
   {
-    "id": "pricing.headline",
-    "defaultMessage": "!!!Support Ferdi",
+    "id": "pricing.trial.headline",
+    "defaultMessage": "!!!Franz Professional",
     "file": "src/components/auth/Pricing.js",
     "start": {
-      "line": 13,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 16,
+      "line": 18,
       "column": 3
     }
   },
   {
-    "id": "pricing.support.label",
-    "defaultMessage": "!!!Select your support plan",
+    "id": "pricing.trial.subheadline",
+    "defaultMessage": "!!!Your personal welcome offer:",
     "file": "src/components/auth/Pricing.js",
     "start": {
-      "line": 17,
-      "column": 23
+      "line": 19,
+      "column": 17
     },
     "end": {
-      "line": 20,
+      "line": 22,
       "column": 3
     }
   },
   {
-    "id": "pricing.submit.label",
-    "defaultMessage": "!!!Support the development of Ferdi",
+    "id": "pricing.trial.terms.headline",
+    "defaultMessage": "!!!No strings attached",
     "file": "src/components/auth/Pricing.js",
     "start": {
-      "line": 21,
+      "line": 23,
+      "column": 29
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.noCreditCard",
+    "defaultMessage": "!!!No credit card required",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 27,
+      "column": 16
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.automaticTrialEnd",
+    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 31,
       "column": 21
     },
     "end": {
-      "line": 24,
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.error",
+    "defaultMessage": "!!!Sorry, we could not activate your trial!",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 35,
+      "column": 19
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.cta.accept",
+    "defaultMessage": "!!!Yes, upgrade my account to Franz Professional",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 39,
+      "column": 13
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.cta.skip",
+    "defaultMessage": "!!!Continue to Franz",
+    "file": "src/components/auth/Pricing.js",
+    "start": {
+      "line": 43,
+      "column": 11
+    },
+    "end": {
+      "line": 46,
       "column": 3
     }
   },
   {
-    "id": "pricing.link.skipPayment",
-    "defaultMessage": "!!!I don't want to support the development of Ferdi.",
+    "id": "pricing.trial.features.headline",
+    "defaultMessage": "!!!Franz Professional includes:",
     "file": "src/components/auth/Pricing.js",
     "start": {
-      "line": 25,
-      "column": 15
+      "line": 47,
+      "column": 20
     },
     "end": {
-      "line": 28,
+      "line": 50,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
index 94daffdde..9aa7b25ab 100644
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Sign up",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 18,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 21,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Firstname",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 22,
+      "line": 21,
       "column": 18
     },
     "end": {
-      "line": 25,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Lastname",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 26,
+      "line": 25,
       "column": 17
     },
     "end": {
-      "line": 29,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,24 +43,11 @@
     "defaultMessage": "!!!Email address",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 30,
+      "line": 29,
       "column": 14
     },
     "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.company.label",
-    "defaultMessage": "!!!Company",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 34,
-      "column": 16
-    },
-    "end": {
-      "line": 37,
+      "line": 32,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 38,
+      "line": 37,
       "column": 17
     },
     "end": {
-      "line": 41,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!By creating a Ferdi account you accept the",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 42,
+      "line": 41,
       "column": 13
     },
     "end": {
-      "line": 45,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Terms of service",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 46,
+      "line": 45,
       "column": 9
     },
     "end": {
-      "line": 49,
+      "line": 48,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 50,
+      "line": 49,
       "column": 11
     },
     "end": {
-      "line": 53,
+      "line": 52,
       "column": 3
     }
   },
@@ -121,11 +108,11 @@
     "defaultMessage": "!!!Create account",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 54,
+      "line": 53,
       "column": 21
     },
     "end": {
-      "line": 57,
+      "line": 56,
       "column": 3
     }
   },
@@ -134,11 +121,11 @@
     "defaultMessage": "!!!Already have an account, sign in?",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 58,
+      "line": 57,
       "column": 13
     },
     "end": {
-      "line": 61,
+      "line": 60,
       "column": 3
     }
   },
@@ -147,11 +134,11 @@
     "defaultMessage": "!!!A user with that email address already exists",
     "file": "src/components/auth/Signup.js",
     "start": {
-      "line": 62,
+      "line": 61,
       "column": 18
     },
     "end": {
-      "line": 65,
+      "line": 64,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index 5bb4ad3ba..593a7bcb3 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your services have been updated.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 25,
+      "line": 28,
       "column": 19
     },
     "end": {
-      "line": 28,
+      "line": 31,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Reload services",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 29,
+      "line": 32,
       "column": 24
     },
     "end": {
-      "line": 32,
+      "line": 35,
       "column": 3
     }
   },
diff --git a/src/i18n/messages/src/components/services/content/ServiceRestricted.json b/src/i18n/messages/src/components/services/content/ServiceRestricted.json
new file mode 100644
index 000000000..c1984afe3
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ServiceRestricted.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "service.restrictedHandler.serviceLimit.headline",
+    "defaultMessage": "!!!You have reached your service limit.",
+    "file": "src/components/services/content/ServiceRestricted.js",
+    "start": {
+      "line": 11,
+      "column": 24
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.restrictedHandler.serviceLimit.text",
+    "defaultMessage": "!!!Please upgrade your account to use more than {count} services.",
+    "file": "src/components/services/content/ServiceRestricted.js",
+    "start": {
+      "line": 15,
+      "column": 20
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.restrictedHandler.customUrl.headline",
+    "defaultMessage": "!!!Franz Professional Plan required",
+    "file": "src/components/services/content/ServiceRestricted.js",
+    "start": {
+      "line": 19,
+      "column": 21
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.restrictedHandler.customUrl.text",
+    "defaultMessage": "!!!Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
+    "file": "src/components/services/content/ServiceRestricted.js",
+    "start": {
+      "line": 23,
+      "column": 17
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "service.restrictedHandler.action",
+    "defaultMessage": "!!!Upgrade Account",
+    "file": "src/components/services/content/ServiceRestricted.js",
+    "start": {
+      "line": 27,
+      "column": 10
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
index fac438178..cee7f42c0 100644
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ b/src/i18n/messages/src/components/services/content/Services.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Welcome to Ferdi",
     "file": "src/components/services/content/Services.js",
     "start": {
-      "line": 11,
+      "line": 14,
       "column": 11
     },
     "end": {
-      "line": 14,
+      "line": 17,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Get started",
     "file": "src/components/services/content/Services.js",
     "start": {
-      "line": 15,
+      "line": 18,
       "column": 14
     },
     "end": {
-      "line": 18,
+      "line": 21,
       "column": 3
     }
   },
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index 2ed4849d2..48078c18d 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 14,
+      "line": 18,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 21,
       "column": 3
     }
   },
@@ -17,21 +17,8 @@
     "defaultMessage": "!!!Your Subscription",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 18,
-      "column": 24
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineUpgrade",
-    "defaultMessage": "!!!Upgrade your Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
       "line": 22,
-      "column": 19
+      "column": 24
     },
     "end": {
       "line": 25,
@@ -65,15 +52,28 @@
     }
   },
   {
+    "id": "settings.account.upgradeToPro.label",
+    "defaultMessage": "!!!Upgrade to Franz Professional",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 34,
+      "column": 23
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.account.accountType.basic",
     "defaultMessage": "!!!Basic Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 34,
+      "line": 38,
       "column": 20
     },
     "end": {
-      "line": 37,
+      "line": 41,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Premium Supporter Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 38,
+      "line": 42,
       "column": 22
     },
     "end": {
-      "line": 41,
+      "line": 45,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Edit Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 42,
+      "line": 46,
       "column": 21
     },
     "end": {
-      "line": 45,
+      "line": 49,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!Invoices",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 46,
+      "line": 50,
       "column": 18
     },
     "end": {
-      "line": 49,
+      "line": 53,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Download",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 50,
+      "line": 54,
       "column": 19
     },
     "end": {
-      "line": 53,
+      "line": 57,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Could not load user information",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 54,
+      "line": 58,
       "column": 25
     },
     "end": {
-      "line": 57,
+      "line": 61,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 58,
+      "line": 62,
       "column": 28
     },
     "end": {
-      "line": 61,
+      "line": 65,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Delete account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 62,
+      "line": 66,
       "column": 17
     },
     "end": {
-      "line": 65,
+      "line": 69,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 66,
+      "line": 70,
       "column": 14
     },
     "end": {
-      "line": 69,
+      "line": 73,
       "column": 3
     }
   },
@@ -186,11 +186,63 @@
     "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 70,
+      "line": 74,
       "column": 19
     },
     "end": {
-      "line": 73,
+      "line": 77,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.trial",
+    "defaultMessage": "!!!Free Trial",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 78,
+      "column": 9
+    },
+    "end": {
+      "line": 81,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.yourLicense",
+    "defaultMessage": "!!!Your Franz License:",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 82,
+      "column": 15
+    },
+    "end": {
+      "line": 85,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.trialEndsIn",
+    "defaultMessage": "!!!Your free trial ends in {duration}.",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 86,
+      "column": 15
+    },
+    "end": {
+      "line": 89,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.trialUpdateBillingInfo",
+    "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 90,
+      "column": 33
+    },
+    "end": {
+      "line": 93,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
index 70a989211..7dfb3ce04 100644
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 13,
+      "line": 14,
       "column": 21
     },
     "end": {
-      "line": 16,
+      "line": 17,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 17,
+      "line": 18,
       "column": 16
     },
     "end": {
-      "line": 20,
+      "line": 21,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 21,
+      "line": 22,
       "column": 18
     },
     "end": {
-      "line": 24,
+      "line": 25,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 25,
+      "line": 26,
       "column": 11
     },
     "end": {
-      "line": 28,
+      "line": 29,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Manage Team",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 29,
+      "line": 30,
       "column": 8
     },
     "end": {
-      "line": 32,
+      "line": 33,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 33,
+      "line": 34,
       "column": 12
     },
     "end": {
-      "line": 36,
+      "line": 37,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Invite Friends",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 37,
+      "line": 38,
       "column": 17
     },
     "end": {
-      "line": 40,
+      "line": 41,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Logout",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 41,
+      "line": 42,
       "column": 10
     },
     "end": {
-      "line": 44,
+      "line": 45,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
index 7d9ed3283..1124f4d6a 100644
--- a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
+++ b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available Services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 15,
+      "line": 20,
       "column": 12
     },
     "end": {
-      "line": 18,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Search service",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 19,
+      "line": 24,
       "column": 17
     },
     "end": {
-      "line": 22,
+      "line": 27,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Most popular",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 23,
+      "line": 28,
       "column": 22
     },
     "end": {
-      "line": 26,
+      "line": 31,
       "column": 3
     }
   },
@@ -43,24 +43,24 @@
     "defaultMessage": "!!!All services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 27,
+      "line": 32,
       "column": 14
     },
     "end": {
-      "line": 30,
+      "line": 35,
       "column": 3
     }
   },
   {
-    "id": "settings.recipes.dev",
-    "defaultMessage": "!!!Development",
+    "id": "settings.recipes.custom",
+    "defaultMessage": "!!!Custom Services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 31,
-      "column": 14
+      "line": 36,
+      "column": 17
     },
     "end": {
-      "line": 34,
+      "line": 39,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Sorry, but no service matched your search term.",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 35,
+      "line": 40,
       "column": 16
     },
     "end": {
-      "line": 38,
+      "line": 43,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Service successfully added",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 39,
+      "line": 44,
       "column": 31
     },
     "end": {
-      "line": 42,
+      "line": 47,
       "column": 3
     }
   },
@@ -95,11 +95,89 @@
     "defaultMessage": "!!!Missing a service?",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 43,
+      "line": 48,
       "column": 18
     },
     "end": {
-      "line": 46,
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.customService.intro",
+    "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 52,
+      "column": 21
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.customService.openFolder",
+    "defaultMessage": "!!!Open directory",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 56,
+      "column": 14
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.customService.openDevDocs",
+    "defaultMessage": "!!!Developer Documentation",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 60,
+      "column": 15
+    },
+    "end": {
+      "line": 63,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.customService.headline.customRecipes",
+    "defaultMessage": "!!!Custom 3rd Party Recipes",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 64,
+      "column": 25
+    },
+    "end": {
+      "line": 67,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.customService.headline.communityRecipes",
+    "defaultMessage": "!!!Community 3rd Party Recipes",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 68,
+      "column": 28
+    },
+    "end": {
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.recipes.customService.headline.devRecipes",
+    "defaultMessage": "!!!Your Development Service Recipes",
+    "file": "src/components/settings/recipes/RecipesDashboard.js",
+    "start": {
+      "line": 72,
+      "column": 22
+    },
+    "end": {
+      "line": 75,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index c59a6129f..45dc7b690 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Save service",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 22,
+      "line": 24,
       "column": 15
     },
     "end": {
-      "line": 25,
+      "line": 27,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 26,
+      "line": 28,
       "column": 17
     },
     "end": {
-      "line": 29,
+      "line": 31,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 30,
+      "line": 32,
       "column": 21
     },
     "end": {
-      "line": 33,
+      "line": 35,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 34,
+      "line": 36,
       "column": 16
     },
     "end": {
-      "line": 37,
+      "line": 39,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Add {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 38,
+      "line": 40,
       "column": 22
     },
     "end": {
-      "line": 41,
+      "line": 43,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Edit {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 42,
+      "line": 44,
       "column": 23
     },
     "end": {
-      "line": 45,
+      "line": 47,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Hosted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 46,
+      "line": 48,
       "column": 13
     },
     "end": {
-      "line": 49,
+      "line": 51,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Self hosted ⭐️",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 50,
+      "line": 52,
       "column": 16
     },
     "end": {
-      "line": 53,
+      "line": 55,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Use the hosted {name} service.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 54,
+      "line": 56,
       "column": 20
     },
     "end": {
-      "line": 57,
+      "line": 59,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Could not validate custom {name} server.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 58,
+      "line": 60,
       "column": 28
     },
     "end": {
-      "line": 61,
+      "line": 63,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 62,
+      "line": 64,
       "column": 24
     },
     "end": {
-      "line": 65,
+      "line": 67,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Upgrade your account",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 66,
+      "line": 68,
       "column": 27
     },
     "end": {
-      "line": 69,
+      "line": 71,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 70,
+      "line": 72,
       "column": 23
     },
     "end": {
-      "line": 73,
+      "line": 75,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 74,
+      "line": 76,
       "column": 15
     },
     "end": {
-      "line": 77,
+      "line": 79,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Notifications",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 78,
+      "line": 80,
       "column": 25
     },
     "end": {
-      "line": 81,
+      "line": 83,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Unread message badges",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 82,
+      "line": 84,
       "column": 18
     },
     "end": {
-      "line": 85,
+      "line": 87,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 86,
+      "line": 88,
       "column": 19
     },
     "end": {
-      "line": 89,
+      "line": 91,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 90,
+      "line": 92,
       "column": 14
     },
     "end": {
-      "line": 93,
+      "line": 95,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Drop your image, or click here",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 94,
+      "line": 96,
       "column": 14
     },
     "end": {
-      "line": 97,
+      "line": 99,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 98,
+      "line": 100,
       "column": 17
     },
     "end": {
-      "line": 101,
+      "line": 103,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 102,
+      "line": 104,
       "column": 20
     },
     "end": {
-      "line": 105,
+      "line": 107,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 106,
+      "line": 108,
       "column": 13
     },
     "end": {
-      "line": 109,
+      "line": 111,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
index 3803c6512..fa661ea2f 100644
--- a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
+++ b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Search service",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 17
     },
     "end": {
-      "line": 21,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!You haven't added any services yet.",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 22,
+      "line": 23,
       "column": 19
     },
     "end": {
-      "line": 25,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Sorry, but no service matched your search term.",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 26,
+      "line": 27,
       "column": 18
     },
     "end": {
-      "line": 29,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Discover services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 30,
+      "line": 31,
       "column": 20
     },
     "end": {
-      "line": 33,
+      "line": 34,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Could not load your services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 34,
+      "line": 35,
       "column": 25
     },
     "end": {
-      "line": 37,
+      "line": 38,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 38,
+      "line": 39,
       "column": 21
     },
     "end": {
-      "line": 41,
+      "line": 42,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Your changes have been saved",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 42,
+      "line": 43,
       "column": 15
     },
     "end": {
-      "line": 45,
+      "line": 46,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Service has been deleted",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 46,
+      "line": 47,
       "column": 15
     },
     "end": {
-      "line": 49,
+      "line": 50,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
index 89d038cf3..80adadb67 100644
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Team",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 14,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Ferdi for Teams",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 18,
+      "line": 21,
       "column": 19
     },
     "end": {
-      "line": 21,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!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.",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 22,
+      "line": 25,
       "column": 9
     },
     "end": {
-      "line": 25,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Ferdi 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!",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 26,
+      "line": 29,
       "column": 8
     },
     "end": {
-      "line": 29,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Manage your Team on meetfranz.com",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 30,
+      "line": 33,
       "column": 16
     },
     "end": {
-      "line": 33,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Upgrade your Account",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 34,
+      "line": 37,
       "column": 17
     },
     "end": {
-      "line": 37,
+      "line": 40,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
index 506408caf..6d235254e 100644
--- a/src/i18n/messages/src/components/subscription/SubscriptionForm.json
+++ b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
@@ -1,183 +1,53 @@
 [
   {
-    "id": "subscription.submit.label",
-    "defaultMessage": "!!!Support the development of Franz",
+    "id": "subscription.cta.choosePlan",
+    "defaultMessage": "!!!Choose your plan",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 14,
+      "line": 13,
       "column": 21
     },
     "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.paymentSessionError",
-    "defaultMessage": "!!!Could not initialize payment form",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 18,
-      "column": 23
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.type.free",
-    "defaultMessage": "!!!free",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 22,
-      "column": 12
-    },
-    "end": {
-      "line": 25,
+      "line": 16,
       "column": 3
     }
   },
   {
-    "id": "subscription.type.month",
-    "defaultMessage": "!!!month",
+    "id": "settings.account.headlineUpgradeAccount",
+    "defaultMessage": "!!!Upgrade your account and get the full Franz experience",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 26,
-      "column": 15
+      "line": 17,
+      "column": 18
     },
     "end": {
-      "line": 29,
+      "line": 20,
       "column": 3
     }
   },
   {
-    "id": "subscription.type.year",
-    "defaultMessage": "!!!year",
+    "id": "subscription.teaser.intro",
+    "defaultMessage": "!!!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!",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 30,
+      "line": 21,
       "column": 14
     },
     "end": {
-      "line": 33,
+      "line": 24,
       "column": 3
     }
   },
   {
-    "id": "subscription.includedFeatures",
-    "defaultMessage": "!!!The Ferdi Premium Supporter Account includes",
+    "id": "subscription.teaser.includedFeatures",
+    "defaultMessage": "!!!Paid Franz Plans include:",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 34,
+      "line": 25,
       "column": 20
     },
     "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.onpremise.mattermost",
-    "defaultMessage": "!!!Add on-premise/hosted services like Mattermost",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 38,
-      "column": 13
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.noInterruptions",
-    "defaultMessage": "!!!No app delays & nagging to upgrade license",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 42,
-      "column": 19
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.proxy",
-    "defaultMessage": "!!!Proxy support for services",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 46,
-      "column": 9
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.spellchecker",
-    "defaultMessage": "!!!Support for Spellchecker",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 50,
-      "column": 16
-    },
-    "end": {
-      "line": 53,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.workspaces",
-    "defaultMessage": "!!!Organize your services in workspaces",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 54,
-      "column": 14
-    },
-    "end": {
-      "line": 57,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.ads",
-    "defaultMessage": "!!!No ads, ever!",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 58,
-      "column": 7
-    },
-    "end": {
-      "line": 61,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.comingSoon",
-    "defaultMessage": "!!!coming soon",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 62,
-      "column": 14
-    },
-    "end": {
-      "line": 65,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.euTaxInfo",
-    "defaultMessage": "!!!EU residents: local sales tax may apply",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 66,
-      "column": 13
-    },
-    "end": {
-      "line": 69,
+      "line": 28,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/subscription/TrialForm.json b/src/i18n/messages/src/components/subscription/TrialForm.json
new file mode 100644
index 000000000..8b387ba36
--- /dev/null
+++ b/src/i18n/messages/src/components/subscription/TrialForm.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "subscription.cta.activateTrial",
+    "defaultMessage": "!!!Yes, start the free Franz Professional trial",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 14,
+      "column": 21
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.cta.allOptions",
+    "defaultMessage": "!!!See all options",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 18,
+      "column": 20
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineTrialUpgrade",
+    "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 22,
+      "column": 18
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.includedProFeatures",
+    "defaultMessage": "!!!The Franz Professional Plan includes:",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 26,
+      "column": 20
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.headline",
+    "defaultMessage": "!!!No strings attached",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 30,
+      "column": 29
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.noCreditCard",
+    "defaultMessage": "!!!No credit card required",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 34,
+      "column": 16
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.automaticTrialEnd",
+    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 38,
+      "column": 21
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
new file mode 100644
index 000000000..fd969da78
--- /dev/null
+++ b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
@@ -0,0 +1,93 @@
+[
+  {
+    "id": "feature.delayApp.upgrade.action",
+    "defaultMessage": "!!!Get a Franz Supporter License",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.trial.action",
+    "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 17,
+      "column": 15
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.upgrade.actionShort",
+    "defaultMessage": "!!!Upgrade account",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 21,
+      "column": 15
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.trial.actionShort",
+    "defaultMessage": "!!!Activate the free Franz Professional trial",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 25,
+      "column": 20
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.headline",
+    "defaultMessage": "!!!No strings attached",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 29,
+      "column": 29
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.noCreditCard",
+    "defaultMessage": "!!!No credit card required",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 33,
+      "column": 16
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.automaticTrialEnd",
+    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 37,
+      "column": 21
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/FeatureList.json b/src/i18n/messages/src/components/ui/FeatureList.json
new file mode 100644
index 000000000..497e299a4
--- /dev/null
+++ b/src/i18n/messages/src/components/ui/FeatureList.json
@@ -0,0 +1,132 @@
+[
+  {
+    "id": "pricing.features.unlimitedServices",
+    "defaultMessage": "!!!Add unlimited services",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 8,
+      "column": 21
+    },
+    "end": {
+      "line": 11,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.spellchecker",
+    "defaultMessage": "!!!Spellchecker support",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 12,
+      "column": 16
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.workspaces",
+    "defaultMessage": "!!!Workspaces",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 16,
+      "column": 14
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.customWebsites",
+    "defaultMessage": "!!!Add Custom Websites",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 20,
+      "column": 18
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.onPremise",
+    "defaultMessage": "!!!On-premise & other Hosted Services",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 24,
+      "column": 13
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.thirdPartyServices",
+    "defaultMessage": "!!!Install 3rd party services",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 28,
+      "column": 22
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.serviceProxies",
+    "defaultMessage": "!!!Service Proxies",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 32,
+      "column": 18
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.teamManagement",
+    "defaultMessage": "!!!Team Management",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 36,
+      "column": 18
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.appDelays",
+    "defaultMessage": "!!!No Waiting Screens",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 40,
+      "column": 13
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.features.adFree",
+    "defaultMessage": "!!!Forever ad-free",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 44,
+      "column": 10
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/UpgradeButton/index.json b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
new file mode 100644
index 000000000..28e44cb66
--- /dev/null
+++ b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "global.upgradeButton.upgradeToPro",
+    "defaultMessage": "!!!Upgrade to Franz Professional",
+    "file": "src/components/ui/UpgradeButton/index.js",
+    "start": {
+      "line": 13,
+      "column": 16
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 7645ae2c2..f802893e8 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 48,
+      "line": 44,
       "column": 12
     },
     "end": {
-      "line": 51,
+      "line": 47,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 52,
+      "line": 48,
       "column": 12
     },
     "end": {
-      "line": 55,
+      "line": 51,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 56,
+      "line": 52,
       "column": 24
     },
     "end": {
-      "line": 59,
+      "line": 55,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 60,
+      "line": 56,
       "column": 29
     },
     "end": {
-      "line": 63,
+      "line": 59,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 64,
+      "line": 60,
       "column": 23
     },
     "end": {
-      "line": 67,
+      "line": 63,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 68,
+      "line": 64,
       "column": 25
     },
     "end": {
-      "line": 71,
+      "line": 67,
       "column": 3
     }
   },
@@ -160,10 +160,23 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 72,
+      "line": 68,
       "column": 8
     },
     "end": {
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.enableTodos",
+    "defaultMessage": "!!!Enable Franz Todos",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 72,
+      "column": 15
+    },
+    "end": {
       "line": 75,
       "column": 3
     }
diff --git a/src/i18n/messages/src/features/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json
index 2a3bd1fb0..6fe8b1334 100644
--- a/src/i18n/messages/src/features/delayApp/Component.json
+++ b/src/i18n/messages/src/features/delayApp/Component.json
@@ -4,24 +4,50 @@
     "defaultMessage": "!!!Please purchase license to skip waiting",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 13,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 16,
+      "line": 20,
       "column": 3
     }
   },
   {
-    "id": "feature.delayApp.action",
-    "defaultMessage": "!!!Get a Ferdi Supporter License",
+    "id": "feature.delayApp.trial.headline",
+    "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 17,
+      "line": 21,
+      "column": 17
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.upgrade.action",
+    "defaultMessage": "!!!Get a Franz Supporter License",
+    "file": "src/features/delayApp/Component.js",
+    "start": {
+      "line": 25,
       "column": 10
     },
     "end": {
-      "line": 20,
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.delayApp.trial.action",
+    "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
+    "file": "src/features/delayApp/Component.js",
+    "start": {
+      "line": 29,
+      "column": 15
+    },
+    "end": {
+      "line": 32,
       "column": 3
     }
   },
@@ -30,11 +56,11 @@
     "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 21,
+      "line": 33,
       "column": 8
     },
     "end": {
-      "line": 24,
+      "line": 36,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json b/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json
new file mode 100644
index 000000000..e6e3cef99
--- /dev/null
+++ b/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "feature.announcements.changelog.headline",
+    "defaultMessage": "!!!Changes in Franz {version}",
+    "file": "src/features/serviceLimit/components/AnnouncementScreen.js",
+    "start": {
+      "line": 20,
+      "column": 12
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json b/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
new file mode 100644
index 000000000..df5bc03e8
--- /dev/null
+++ b/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "feature.serviceLimit.limitReached",
+    "defaultMessage": "!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.",
+    "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
+    "start": {
+      "line": 11,
+      "column": 16
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  },
+  {
+    "id": "premiumFeature.button.upgradeAccount",
+    "defaultMessage": "!!!Upgrade account",
+    "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
+    "start": {
+      "line": 15,
+      "column": 10
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json
index a4ddd37b6..6e3e9ad19 100644
--- a/src/i18n/messages/src/features/shareFranz/Component.json
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Ferdi is better together!",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 14,
+      "line": 18,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 21,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 18,
+      "line": 22,
       "column": 8
     },
     "end": {
-      "line": 21,
+      "line": 25,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Share as email",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 22,
+      "line": 26,
       "column": 16
     },
     "end": {
-      "line": 25,
+      "line": 29,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Share on Facebook",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 26,
+      "line": 30,
       "column": 19
     },
     "end": {
-      "line": 29,
+      "line": 33,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Share on Twitter",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 30,
+      "line": 34,
       "column": 18
     },
     "end": {
-      "line": 33,
+      "line": 37,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 34,
+      "line": 38,
       "column": 18
     },
     "end": {
-      "line": 37,
+      "line": 41,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 38,
+      "line": 42,
       "column": 20
     },
     "end": {
-      "line": 41,
+      "line": 45,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json
new file mode 100644
index 000000000..9cc3325d1
--- /dev/null
+++ b/src/i18n/messages/src/features/todos/components/TodosWebview.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "feature.todos.premium.info",
+    "defaultMessage": "!!!Franz Todos are available to premium users now!",
+    "file": "src/features/todos/components/TodosWebview.js",
+    "start": {
+      "line": 18,
+      "column": 15
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.todos.premium.upgrade",
+    "defaultMessage": "!!!Upgrade Account",
+    "file": "src/features/todos/components/TodosWebview.js",
+    "start": {
+      "line": 22,
+      "column": 14
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.todos.premium.rollout",
+    "defaultMessage": "!!!Everyone else will have to wait a little longer.",
+    "file": "src/features/todos/components/TodosWebview.js",
+    "start": {
+      "line": 26,
+      "column": 15
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
index e91bd85f8..2f340f1e9 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 15,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 18,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!All services",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 19,
+      "line": 21,
       "column": 15
     },
     "end": {
-      "line": 22,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Workspaces settings",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 23,
+      "line": 25,
       "column": 29
     },
     "end": {
-      "line": 26,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Info about workspace feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 27,
+      "line": 29,
       "column": 24
     },
     "end": {
-      "line": 30,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Create your first workspace",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 31,
+      "line": 33,
       "column": 25
     },
     "end": {
-      "line": 34,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Reactivate premium account",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 35,
+      "line": 37,
       "column": 28
     },
     "end": {
-      "line": 38,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!add new workspace",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 39,
+      "line": 41,
       "column": 24
     },
     "end": {
-      "line": 42,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Premium feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 43,
+      "line": 45,
       "column": 23
     },
     "end": {
-      "line": 46,
+      "line": 48,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
index 127bf136b..4111ba760 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 17,
+      "line": 19,
       "column": 12
     },
     "end": {
-      "line": 20,
+      "line": 22,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!You haven't added any workspaces yet.",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 21,
+      "line": 23,
       "column": 19
     },
     "end": {
-      "line": 24,
+      "line": 26,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Could not load your workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 25,
+      "line": 27,
       "column": 27
     },
     "end": {
-      "line": 28,
+      "line": 30,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 29,
+      "line": 31,
       "column": 23
     },
     "end": {
-      "line": 32,
+      "line": 34,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Your changes have been saved",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 33,
+      "line": 35,
       "column": 15
     },
     "end": {
-      "line": 36,
+      "line": 38,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Workspace has been deleted",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 37,
+      "line": 39,
       "column": 15
     },
     "end": {
-      "line": 40,
+      "line": 42,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Info about workspace feature",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 41,
+      "line": 43,
       "column": 24
     },
     "end": {
-      "line": 44,
+      "line": 46,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 45,
+      "line": 47,
       "column": 28
     },
     "end": {
-      "line": 48,
+      "line": 50,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/helpers/plan-helpers.json b/src/i18n/messages/src/helpers/plan-helpers.json
new file mode 100644
index 000000000..df8ee19e3
--- /dev/null
+++ b/src/i18n/messages/src/helpers/plan-helpers.json
@@ -0,0 +1,54 @@
+[
+  {
+    "id": "pricing.plan.pro",
+    "defaultMessage": "!!!Franz Professional",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 5,
+      "column": 15
+    },
+    "end": {
+      "line": 8,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.personal",
+    "defaultMessage": "!!!Franz Personal",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 9,
+      "column": 20
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.free",
+    "defaultMessage": "!!!Franz Free",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 13,
+      "column": 16
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.legacy",
+    "defaultMessage": "!!!Franz Premium",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 17,
+      "column": 18
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/pricing-helpers.json b/src/i18n/messages/src/helpers/pricing-helpers.json
new file mode 100644
index 000000000..4030a3e3b
--- /dev/null
+++ b/src/i18n/messages/src/helpers/pricing-helpers.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "pricing.plan.pro-yearly",
+    "defaultMessage": "!!!Franz Professional Yearly",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 5,
+      "column": 22
+    },
+    "end": {
+      "line": 8,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.pro-monthly",
+    "defaultMessage": "!!!Franz Professional Monthly",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 9,
+      "column": 23
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.personal-yearly",
+    "defaultMessage": "!!!Franz Personal Yearly",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 13,
+      "column": 27
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.personal-monthly",
+    "defaultMessage": "!!!Franz Personal Monthly",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 17,
+      "column": 28
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.free",
+    "defaultMessage": "!!!Franz Free",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 21,
+      "column": 16
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.legacy",
+    "defaultMessage": "!!!Franz Premium",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 25,
+      "column": 18
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index f94dcdf17..903de64cb 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -76,5 +76,18 @@
       "line": 27,
       "column": 3
     }
+  },
+  {
+    "id": "global.franzProRequired",
+    "defaultMessage": "!!!Franz Professional Required",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 28,
+      "column": 15
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index a41c80c1c..43354bfca 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 14,
+      "line": 18,
       "column": 8
     },
     "end": {
-      "line": 17,
+      "line": 21,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Undo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 18,
+      "line": 22,
       "column": 8
     },
     "end": {
-      "line": 21,
+      "line": 25,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Redo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 22,
+      "line": 26,
       "column": 8
     },
     "end": {
-      "line": 25,
+      "line": 29,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Cut",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 26,
+      "line": 30,
       "column": 7
     },
     "end": {
-      "line": 29,
+      "line": 33,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Copy",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 30,
+      "line": 34,
       "column": 8
     },
     "end": {
-      "line": 33,
+      "line": 37,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Paste",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 34,
+      "line": 38,
       "column": 9
     },
     "end": {
-      "line": 37,
+      "line": 41,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Paste And Match Style",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 38,
+      "line": 42,
       "column": 22
     },
     "end": {
-      "line": 41,
+      "line": 45,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 42,
+      "line": 46,
       "column": 10
     },
     "end": {
-      "line": 45,
+      "line": 49,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Select All",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 46,
+      "line": 50,
       "column": 13
     },
     "end": {
-      "line": 49,
+      "line": 53,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 50,
+      "line": 54,
       "column": 10
     },
     "end": {
-      "line": 53,
+      "line": 57,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 54,
+      "line": 58,
       "column": 17
     },
     "end": {
-      "line": 57,
+      "line": 61,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 58,
+      "line": 62,
       "column": 16
     },
     "end": {
-      "line": 61,
+      "line": 65,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 62,
+      "line": 66,
       "column": 18
     },
     "end": {
-      "line": 65,
+      "line": 69,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 66,
+      "line": 70,
       "column": 16
     },
     "end": {
-      "line": 69,
+      "line": 73,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Actual Size",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 70,
+      "line": 74,
       "column": 13
     },
     "end": {
-      "line": 73,
+      "line": 77,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Zoom In",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 74,
+      "line": 78,
       "column": 10
     },
     "end": {
-      "line": 77,
+      "line": 81,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Zoom Out",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 78,
+      "line": 82,
       "column": 11
     },
     "end": {
-      "line": 81,
+      "line": 85,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Enter Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 82,
+      "line": 86,
       "column": 19
     },
     "end": {
-      "line": 85,
+      "line": 89,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Exit Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 86,
+      "line": 90,
       "column": 18
     },
     "end": {
-      "line": 89,
+      "line": 93,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Toggle Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 90,
+      "line": 94,
       "column": 20
     },
     "end": {
-      "line": 93,
+      "line": 97,
       "column": 3
     }
   },
@@ -264,11 +264,24 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 94,
+      "line": 98,
       "column": 18
     },
     "end": {
-      "line": 97,
+      "line": 101,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.toggleTodosDevTools",
+    "defaultMessage": "!!!Toggle Todos Developer Tools",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 102,
+      "column": 23
+    },
+    "end": {
+      "line": 105,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 98,
+      "line": 106,
       "column": 25
     },
     "end": {
-      "line": 101,
+      "line": 109,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 102,
+      "line": 110,
       "column": 17
     },
     "end": {
-      "line": 105,
+      "line": 113,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!Reload Franz",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 106,
+      "line": 114,
       "column": 15
     },
     "end": {
-      "line": 109,
+      "line": 117,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 110,
+      "line": 118,
       "column": 12
     },
     "end": {
-      "line": 113,
+      "line": 121,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 114,
+      "line": 122,
       "column": 9
     },
     "end": {
-      "line": 117,
+      "line": 125,
       "column": 3
     }
   },
@@ -342,11 +355,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 118,
+      "line": 126,
       "column": 13
     },
     "end": {
-      "line": 121,
+      "line": 129,
       "column": 3
     }
   },
@@ -355,11 +368,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 122,
+      "line": 130,
       "column": 13
     },
     "end": {
-      "line": 125,
+      "line": 133,
       "column": 3
     }
   },
@@ -368,11 +381,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 126,
+      "line": 134,
       "column": 11
     },
     "end": {
-      "line": 129,
+      "line": 137,
       "column": 3
     }
   },
@@ -381,11 +394,11 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 130,
+      "line": 138,
       "column": 13
     },
     "end": {
-      "line": 133,
+      "line": 141,
       "column": 3
     }
   },
@@ -394,11 +407,11 @@
     "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 134,
+      "line": 142,
       "column": 27
     },
     "end": {
-      "line": 137,
+      "line": 145,
       "column": 3
     }
   },
@@ -407,11 +420,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 138,
+      "line": 146,
       "column": 23
     },
     "end": {
-      "line": 141,
+      "line": 149,
       "column": 3
     }
   },
@@ -420,11 +433,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 142,
+      "line": 150,
       "column": 7
     },
     "end": {
-      "line": 145,
+      "line": 153,
       "column": 3
     }
   },
@@ -433,11 +446,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 146,
+      "line": 154,
       "column": 11
     },
     "end": {
-      "line": 149,
+      "line": 157,
       "column": 3
     }
   },
@@ -446,11 +459,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 150,
+      "line": 158,
       "column": 8
     },
     "end": {
-      "line": 153,
+      "line": 161,
       "column": 3
     }
   },
@@ -459,11 +472,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 154,
+      "line": 162,
       "column": 8
     },
     "end": {
-      "line": 157,
+      "line": 165,
       "column": 3
     }
   },
@@ -472,11 +485,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 158,
+      "line": 166,
       "column": 12
     },
     "end": {
-      "line": 161,
+      "line": 169,
       "column": 3
     }
   },
@@ -485,11 +498,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 162,
+      "line": 170,
       "column": 10
     },
     "end": {
-      "line": 165,
+      "line": 173,
       "column": 3
     }
   },
@@ -498,11 +511,11 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 166,
+      "line": 174,
       "column": 8
     },
     "end": {
-      "line": 169,
+      "line": 177,
       "column": 3
     }
   },
@@ -511,11 +524,11 @@
     "defaultMessage": "!!!About Franz",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 170,
+      "line": 178,
       "column": 9
     },
     "end": {
-      "line": 173,
+      "line": 181,
       "column": 3
     }
   },
@@ -524,11 +537,11 @@
     "defaultMessage": "!!!What's new?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 174,
+      "line": 182,
       "column": 16
     },
     "end": {
-      "line": 177,
+      "line": 185,
       "column": 3
     }
   },
@@ -537,11 +550,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 178,
+      "line": 186,
       "column": 12
     },
     "end": {
-      "line": 181,
+      "line": 189,
       "column": 3
     }
   },
@@ -550,11 +563,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 182,
+      "line": 190,
       "column": 19
     },
     "end": {
-      "line": 185,
+      "line": 193,
       "column": 3
     }
   },
@@ -563,11 +576,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 186,
+      "line": 194,
       "column": 8
     },
     "end": {
-      "line": 189,
+      "line": 197,
       "column": 3
     }
   },
@@ -576,11 +589,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 190,
+      "line": 198,
       "column": 14
     },
     "end": {
-      "line": 193,
+      "line": 201,
       "column": 3
     }
   },
@@ -589,11 +602,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 194,
+      "line": 202,
       "column": 10
     },
     "end": {
-      "line": 197,
+      "line": 205,
       "column": 3
     }
   },
@@ -602,11 +615,11 @@
     "defaultMessage": "!!!Quit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 198,
+      "line": 206,
       "column": 8
     },
     "end": {
-      "line": 201,
+      "line": 209,
       "column": 3
     }
   },
@@ -615,11 +628,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 202,
+      "line": 210,
       "column": 17
     },
     "end": {
-      "line": 205,
+      "line": 213,
       "column": 3
     }
   },
@@ -628,11 +641,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 206,
+      "line": 214,
       "column": 19
     },
     "end": {
-      "line": 209,
+      "line": 217,
       "column": 3
     }
   },
@@ -641,11 +654,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 210,
+      "line": 218,
       "column": 23
     },
     "end": {
-      "line": 213,
+      "line": 221,
       "column": 3
     }
   },
@@ -654,11 +667,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 214,
+      "line": 222,
       "column": 24
     },
     "end": {
-      "line": 217,
+      "line": 225,
       "column": 3
     }
   },
@@ -667,11 +680,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 218,
+      "line": 226,
       "column": 23
     },
     "end": {
-      "line": 221,
+      "line": 229,
       "column": 3
     }
   },
@@ -680,11 +693,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 222,
+      "line": 230,
       "column": 27
     },
     "end": {
-      "line": 225,
+      "line": 233,
       "column": 3
     }
   },
@@ -693,11 +706,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 226,
+      "line": 234,
       "column": 11
     },
     "end": {
-      "line": 229,
+      "line": 237,
       "column": 3
     }
   },
@@ -706,11 +719,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 230,
+      "line": 238,
       "column": 13
     },
     "end": {
-      "line": 233,
+      "line": 241,
       "column": 3
     }
   },
@@ -719,11 +732,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 234,
+      "line": 242,
       "column": 14
     },
     "end": {
-      "line": 237,
+      "line": 245,
       "column": 3
     }
   },
@@ -732,11 +745,50 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 238,
+      "line": 246,
       "column": 20
     },
     "end": {
-      "line": 241,
+      "line": 249,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.todos",
+    "defaultMessage": "!!!Todos",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 250,
+      "column": 9
+    },
+    "end": {
+      "line": 253,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.Todoss.openTodosDrawer",
+    "defaultMessage": "!!!Open Todos drawer",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 254,
+      "column": 19
+    },
+    "end": {
+      "line": 257,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.Todoss.closeTodosDrawer",
+    "defaultMessage": "!!!Close Todos drawer",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 258,
+      "column": 20
+    },
+    "end": {
+      "line": 261,
       "column": 3
     }
   }