diff options
author | 2017-11-10 15:40:01 +0100 | |
---|---|---|
committer | 2017-11-10 15:40:01 +0100 | |
commit | f39e31af92f3ae6689697685d008f0487a5be351 (patch) | |
tree | c00654dbb28817cbfdca8223c1f86d38c706e163 /src/i18n | |
parent | feat(App): Respect System DoNotDisturb mode for service audio (diff) | |
parent | Merge pull request #248 from meetfranz/feature/192-display-disabled-services (diff) | |
download | ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.gz ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.zst ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.zip |
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
Diffstat (limited to 'src/i18n')
-rw-r--r-- | src/i18n/locales/en-US.json | 7 |
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 @@ | |||
131 | "settings.app.headlineGeneral": "General", | 131 | "settings.app.headlineGeneral": "General", |
132 | "settings.app.headlineLanguage": "Language", | 132 | "settings.app.headlineLanguage": "Language", |
133 | "settings.app.headlineUpdates": "Updates", | 133 | "settings.app.headlineUpdates": "Updates", |
134 | "settings.app.headlineAppearance": "Appearance", | ||
134 | "settings.app.buttonSearchForUpdate": "Check for updates", | 135 | "settings.app.buttonSearchForUpdate": "Check for updates", |
135 | "settings.app.buttonInstallUpdate": "Restart & install update", | 136 | "settings.app.buttonInstallUpdate": "Restart & install update", |
136 | "settings.app.updateStatusSearching": "Is searching for update", | 137 | "settings.app.updateStatusSearching": "Is searching for update", |
@@ -142,6 +143,7 @@ | |||
142 | "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", | 143 | "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", |
143 | "settings.app.form.runInBackground": "Keep Franz in background when closing the window", | 144 | "settings.app.form.runInBackground": "Keep Franz in background when closing the window", |
144 | "settings.app.form.language": "Language", | 145 | "settings.app.form.language": "Language", |
146 | "settings.app.form.showDisabledServices": "Display disabled services tabs", | ||
145 | "settings.app.form.beta": "Include beta versions", | 147 | "settings.app.form.beta": "Include beta versions", |
146 | "settings.app.currentVersion": "Current version:", | 148 | "settings.app.currentVersion": "Current version:", |
147 | "settings.user.form.firstname": "Firstname", | 149 | "settings.user.form.firstname": "Firstname", |
@@ -172,9 +174,12 @@ | |||
172 | "tabs.item.disableAudio": "Disable audio", | 174 | "tabs.item.disableAudio": "Disable audio", |
173 | "tabs.item.enableAudio": "Enable audio", | 175 | "tabs.item.enableAudio": "Enable audio", |
174 | "tabs.item.disableService": "Disable service", | 176 | "tabs.item.disableService": "Disable service", |
177 | "tabs.item.enableService": "Enable service", | ||
175 | "tabs.item.deleteService": "Delete service", | 178 | "tabs.item.deleteService": "Delete service", |
176 | "service.crashHandler.headline": "Oh no!", | 179 | "service.crashHandler.headline": "Oh no!", |
177 | "service.crashHandler.text": "{name} has caused an error.", | 180 | "service.crashHandler.text": "{name} has caused an error.", |
178 | "service.crashHandler.action": "Reload {name}", | 181 | "service.crashHandler.action": "Reload {name}", |
179 | "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds" | 182 | "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds", |
183 | "service.disabledHandler.headline": "{name} is disabled", | ||
184 | "service.disabledHandler.action": "Enable {name}" | ||
180 | } | 185 | } |