Merge branch 'develop' into i18n

# Conflicts:
#	src/i18n/languages.js

1 files changed, 12 insertions, 0 deletions

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 48b408e59..7fc9eac1c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -66,6 +66,7 @@
   "sidebar.unmuteApp": "Enable notifications & audio",
   "services.welcome": "Welcome to Franz",
   "services.getStarted": "Get started",
+  "settings.searchService": "Search service",
   "settings.account.headline": "Account",
   "settings.account.headlineSubscription": "Your subscription",
   "settings.account.headlineUpgrade": "Upgrade your account & support Franz",
@@ -110,6 +111,7 @@
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.tabHosted": "Hosted",
   "settings.service.form.tabOnPremise": "Self hosted ⭐️",
+  "settings.service.form.useHostedService": "Use the hosted {name} service.",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
@@ -117,11 +119,18 @@
   "settings.service.form.name": "Name",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.team": "Team",
   "settings.service.form.customUrl": "Custom server",
   "settings.service.form.indirectMessages": "Show message badge for all new messages",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
+  "settings.service.form.headlineNotifications": "Notifications",
+  "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineGeneral": "General",
+  "settings.service.form.icon": "Custom icon",
+  "settings.service.form.iconDelete": "Delete",
+  "settings.service.form.iconUpload": "Drop your image, or click here",
   "settings.service.error.headline": "Error",
   "settings.service.error.goBack": "Back to services",
   "settings.service.error.message": "Could not load service recipe.",
@@ -144,6 +153,9 @@
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
+  "settings.app.subheadlineCache": "Cache",
+  "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.",
+  "settings.app.buttonClearAllCache": "Clear cache",
   "settings.app.form.autoLaunchOnStart": "Launch Franz on start",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.enableSystemTray": "Show Franz in system tray",