Merge branch 'update/monetization' into develop

1 files changed, 11 insertions, 2 deletions

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 24e29df18..8d82f98a4 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -50,10 +50,12 @@
   "subscription.paymentSessionError": "Could not initialize payment form",
   "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
   "subscription.features.onpremise": "Add on-premise/hosted services like HipChat",
-  "subscription.features.customServices": "Private services for you and your team",
+  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
   "subscription.features.encryptedSync": "Encrypted session synchronization",
   "subscription.features.vpn": "Proxy & VPN support",
   "subscription.features.ads": "No ads, ever!",
+  "subscription.features.spellchecker": "Support for spellchecker",
+  "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
   "subscription.features.comingSoon": "coming soon",
   "infobar.servicesUpdated": "Your services have been updated.",
   "infobar.updateAvailable": "A new update for Franz is available.",
@@ -131,6 +133,12 @@
   "settings.service.form.iconDelete": "Delete",
   "settings.service.form.iconUpload": "Drop your image, or click here",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
+  "settings.service.form.proxy.headline": "Proxy Settings",
+  "settings.service.form.proxy.isEnabled": "Use Proxy",
+  "settings.service.form.proxy.host": "Proxy Host/IP",
+  "settings.service.form.proxy.user": "User (optional)",
+  "settings.service.form.proxy.password": "Password (optional)",
+  "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.",
   "settings.service.error.headline": "Error",
   "settings.service.error.goBack": "Back to services",
   "settings.service.error.message": "Could not load service recipe.",
@@ -252,5 +260,6 @@
   "validation.minLength": "{field} should be at least {length} characters long",
   "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.action": "Get a Franz Supporter License",
-  "feature.delayApp.text": "Franz will continue in {seconds} seconds."
+  "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
+  "premiumFeature.button.upgradeAccount": "Upgrade account"
 }