Merge branch 'develop' into feature/mute-service

# Conflicts:
#	src/components/services/content/ServiceWebview.js
#	src/components/services/content/Services.js
#	src/components/services/tabs/TabItem.js
#	src/containers/layout/AppLayoutContainer.js

1 files changed, 6 insertions, 1 deletions

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index aa66d4bd0..fd8ba0fef 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -131,6 +131,7 @@
   "settings.app.headlineGeneral": "General",
   "settings.app.headlineLanguage": "Language",
   "settings.app.headlineUpdates": "Updates",
+  "settings.app.headlineAppearance": "Appearance",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.buttonInstallUpdate": "Restart & install update",
   "settings.app.updateStatusSearching": "Is searching for update",
@@ -142,6 +143,7 @@
   "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray",
   "settings.app.form.runInBackground": "Keep Franz in background when closing the window",
   "settings.app.form.language": "Language",
+  "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.beta": "Include beta versions",
   "settings.app.currentVersion": "Current version:",
   "settings.user.form.firstname": "Firstname",
@@ -172,9 +174,12 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.disableService": "Disable service",
+  "tabs.item.enableService": "Enable service",
   "tabs.item.deleteService": "Delete service",
   "service.crashHandler.headline": "Oh no!",
   "service.crashHandler.text": "{name} has caused an error.",
   "service.crashHandler.action": "Reload {name}",
-  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds"
+  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
+  "service.disabledHandler.headline": "{name} is disabled",
+  "service.disabledHandler.action": "Enable {name}"    
 }