aboutsummaryrefslogtreecommitdiffstats
path: root/src/i18n/locales/en-US.json
diff options
context:
space:
mode:
authorLibravatar kytwb <412895+kytwb@users.noreply.github.com>2021-07-23 10:04:43 +0100
committerLibravatar GitHub <noreply@github.com>2021-07-23 11:04:43 +0200
commit012e55ebf87559f2d782e5400fb885df8b80a445 (patch)
tree1966e58defe2bcd9541ca9a3f4db67a95a6b4249 /src/i18n/locales/en-US.json
parentRemoved references to 'premium' i18n keys that are no longer used. (diff)
downloadferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.gz
ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.zst
ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.zip
Fix hibernation mode (#1486)
* Use hibernation strategy from settings instead of hardcoded 5 minutes * Fix conditions with isHibernationEnabled, previously disableHibernation * Make service hibernation obey global setting Also refactors hibernation to move some hibernation enablement logic into the Service model * Remove global hibernation enable switch Implements option 4 from https://github.com/getferdi/ferdi/pull/1486#issuecomment-860290992 according to https://github.com/getferdi/ferdi/pull/1486#issuecomment-876558694 * Implements #865 : Add 'hibernate service' and 'wake up service' in the sidebar context menu. * Removed 'hibernationEnabled' check on main settings screen Since this is an (imo) incongruous behavior for the first time user. They will see a message, but with no ability to choose the hibernation strategy. * Autogenerated files from conflict fixes Co-authored-by: Kristóf Marussy <kristof@marussy.com> Co-authored-by: Vijay A <avijayr@protonmail.com>
Diffstat (limited to 'src/i18n/locales/en-US.json')
-rw-r--r--src/i18n/locales/en-US.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 5ff146ea5..76fc7cfc2 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -453,7 +453,9 @@
453 "tabs.item.enableAudio": "Enable audio", 453 "tabs.item.enableAudio": "Enable audio",
454 "tabs.item.enableNotification": "Enable notifications", 454 "tabs.item.enableNotification": "Enable notifications",
455 "tabs.item.enableService": "Enable service", 455 "tabs.item.enableService": "Enable service",
456 "tabs.item.hibernateService": "Hibernate service",
456 "tabs.item.reload": "Reload", 457 "tabs.item.reload": "Reload",
458 "tabs.item.wakeUpService": "Wake up service",
457 "validation.email": "{field} is not valid", 459 "validation.email": "{field} is not valid",
458 "validation.minLength": "{field} should be at least {length} characters long", 460 "validation.minLength": "{field} should be at least {length} characters long",
459 "validation.oneRequired": "At least one is required", 461 "validation.oneRequired": "At least one is required",