Merge branch 'develop' into release

54 files changed, 250 insertions, 77 deletions

diff --git a/.all-contributorsrc b/.all-contributorsrc
index f03adbd5b..7b0d8d38d 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2310,6 +2310,15 @@
       "contributions": [
         "review"
       ]
+    },
+    {
+      "login": "jamesandariese",
+      "name": "James Andariese",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2583421?v=4",
+      "profile": "https://github.com/jamesandariese",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 16,
diff --git a/README.md b/README.md
index 9ab504002..02a5f77c4 100644
--- a/README.md
+++ b/README.md
@@ -12,11 +12,10 @@
 # Ferdi
 
 <p>
-<a href="https://guardrails.io/"><img alt="GuardRails" src="https://img.shields.io/badge/GuardRails-enabled-default.svg"></a>
 <a href="https://github.com/getferdi/ferdi/actions/workflows/builds.yml"><img alt="Build Status" src="https://github.com/getferdi/ferdi/actions/workflows/builds.yml/badge.svg?branch=develop&event=push"></a>
 <a title="Crowdin" target="_blank" href="https://crowdin.com/project/getferdi"><img src="https://badges.crowdin.net/getferdi/localized.svg"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-245-default.svg?logo=github' alt='Contributors'/></a>
+<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-246-default.svg?logo=github' alt='Contributors'/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a>
 </p>
diff --git a/package-lock.json b/package-lock.json
index 562e4a801..4c03b4232 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ferdi",
-  "version": "5.7.0",
+  "version": "5.7.1-nightly.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ferdi",
-      "version": "5.7.0",
+      "version": "5.7.1-nightly.18",
       "license": "Apache-2.0",
       "dependencies": {
         "@adonisjs/ace": "^5.0.8",
@@ -8303,9 +8303,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001298",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001298.tgz",
-      "integrity": "sha512-AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ==",
+      "version": "1.0.30001312",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz",
+      "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -28640,9 +28640,9 @@
       }
     },
     "node_modules/url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
       "dependencies": {
         "querystringify": "^2.1.1",
@@ -37287,9 +37287,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001298",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001298.tgz",
-      "integrity": "sha512-AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ==",
+      "version": "1.0.30001312",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz",
+      "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==",
       "dev": true
     },
     "caseless": {
@@ -53428,9 +53428,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
diff --git a/package.json b/package.json
index 7ebf05988..7d2b2a66f 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.7.0",
+  "version": "5.7.1-nightly.18",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 3ea36ae97..a9a013ced 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -96,7 +96,7 @@ class ServiceView extends Component {
     }
 
     return (
-      <div className={webviewClasses} data-name={service.name}>
+      <div className={webviewClasses} data-name={service.name} style={{order: service.order}}>
         {service.isActive && service.isEnabled && (
           <>
             {service.hasCrashed && (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index bdb8484d4..c92bde346 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -424,6 +424,8 @@ class EditSettingsForm extends Component {
                 </p>
 
                 <Select field={form.$('wakeUpStrategy')} />
+                <Select field={form.$('wakeUpHibernationStrategy')} />
+                <Toggle field={form.$('wakeUpHibernationSplay')} />
 
                 <Hr />
 
diff --git a/src/config.ts b/src/config.ts
index 5c9fbaee4..3dbcd809b 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -58,6 +58,17 @@ export const WAKE_UP_STRATEGIES = {
   3600: 'Wake up after 1hour',
 };
 
+export const WAKE_UP_HIBERNATION_STRATEGIES = {
+  0: 'Use main hibernation strategy',
+  10: 'Extremely Fast Hibernation (10sec)',
+  30: 'Very Fast Hibernation (30sec)',
+  60: 'Fast Hibernation (1min)',
+  300: 'Normal Hibernation (5min)',
+  600: 'Slow Hibernation (10min)',
+  1800: 'Very Slow Hibernation (30min)',
+  3600: 'Extremely Slow Hibernation (1hour)',
+};
+
 export const NAVIGATION_BAR_BEHAVIOURS = {
   custom: 'Show navigation bar on custom websites only',
   always: 'Show navigation bar on all services',
@@ -217,6 +228,8 @@ export const DEFAULT_APP_SETTINGS = {
   hibernateOnStartup: true,
   hibernationStrategy: '300', // seconds
   wakeUpStrategy: '300', // seconds
+  wakeUpHibernationStrategy: '0', // seconds -- 0 means do the same as hibernationStrategy
+  wakeUpHibernationSplay: true,
   inactivityLock: 0,
   automaticUpdates: true,
   universalDarkMode: true,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index eff5f20ff..6e405cd92 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -20,6 +20,7 @@ import {
   DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
   DEFAULT_IS_FEATURE_ENABLED_BY_USER,
   WAKE_UP_STRATEGIES,
+  WAKE_UP_HIBERNATION_STRATEGIES,
   SPLIT_COLUMNS_MIN,
   SPLIT_COLUMNS_MAX,
 } from '../../config';
@@ -115,6 +116,14 @@ const messages = defineMessages({
     id: 'settings.app.form.wakeUpStrategy',
     defaultMessage: 'Wake up strategy',
   },
+  wakeUpHibernationStrategy: {
+    id: 'settings.app.form.wakeUpHibernationStrategy',
+    defaultMessage: 'Hibernation strategy after automatic wake up',
+  },
+  wakeUpHibernationSplay: {
+    id: 'settings.app.form.wakeUpHibernationSplay',
+    defaultMessage: 'Splay hibernate/wake cycles to reduce load',
+  },
   predefinedTodoServer: {
     id: 'settings.app.form.predefinedTodoServer',
     defaultMessage: 'Todo Server',
@@ -295,6 +304,8 @@ class EditSettingsScreen extends Component {
         hibernateOnStartup: Boolean(settingsData.hibernateOnStartup),
         hibernationStrategy: Number(settingsData.hibernationStrategy),
         wakeUpStrategy: Number(settingsData.wakeUpStrategy),
+        wakeUpHibernationStrategy: Number(settingsData.wakeUpHibernationStrategy),
+        wakeUpHibernationSplay: Boolean(settingsData.wakeUpHibernationSplay),
         predefinedTodoServer: settingsData.predefinedTodoServer,
         customTodoServer: settingsData.customTodoServer,
         lockingFeatureEnabled: Boolean(settingsData.lockingFeatureEnabled),
@@ -391,6 +402,11 @@ class EditSettingsScreen extends Component {
       sort: false,
     });
 
+    const wakeUpHibernationStrategies = getSelectOptions({
+      locales: WAKE_UP_HIBERNATION_STRATEGIES,
+      sort: false,
+    });
+
     const todoApp = getSelectOptions({
       locales: TODO_APPS,
       sort: false,
@@ -511,6 +527,17 @@ class EditSettingsScreen extends Component {
           options: wakeUpStrategies,
           default: DEFAULT_APP_SETTINGS.wakeUpStrategy,
         },
+        wakeUpHibernationStrategy: {
+          label: intl.formatMessage(messages.wakeUpHibernationStrategy),
+          value: settings.all.app.wakeUpHibernationStrategy,
+          options: wakeUpHibernationStrategies,
+          default: DEFAULT_APP_SETTINGS.wakeUpHibernationStrategy,
+        },
+        wakeUpHibernationSplay: {
+          label: intl.formatMessage(messages.wakeUpHibernationSplay),
+          value: settings.all.app.wakeUpHibernationSplay,
+          default: DEFAULT_APP_SETTINGS.wakeUpHibernationSplay,
+        },
         predefinedTodoServer: {
           label: intl.formatMessage(messages.predefinedTodoServer),
           value: settings.all.app.predefinedTodoServer,
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 491239210..fbe46facb 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 5848ff784..6f0a08bfe 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل",
   "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID لفتح فردي",
   "settings.app.form.useVerticalStyle": "استخدام النمط الأفقي",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "استراتيجية الإيقاظ",
   "settings.app.headlineAdvanced": "متقدم",
   "settings.app.headlineAppearance": "المظهر",
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index a81ffcee7..a26c180ff 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 491239210..fbe46facb 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index e90f70b24..4ae7acad5 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Avançat",
   "settings.app.headlineAppearance": "Aparença",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index cdee7f3f3..e46fe75df 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Povolit univerzální tmavý režim",
   "settings.app.form.useTouchIdToUnlock": "Povolit použití TouchID k odemčení Ferdi",
   "settings.app.form.useVerticalStyle": "Použít horizontální styl",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Strategie probuzení",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhled",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "Otevřít složku",
   "settings.recipes.headline": "Dostupné služby",
   "settings.recipes.missingService": "Chybějící služba?",
-  "settings.recipes.mostPopular": "Nejobl��benější",
+  "settings.recipes.mostPopular": "Nejpopul��rnější",
   "settings.recipes.nothingFound": "Omlouváme se, ale žádná služba neodpovídá vašemu hledanému výrazu - ale stále jej můžete přidat pomocí volby \"Vlastní webová stránka\". Vezměte prosím na vědomí, že webové stránky mohou zobrazovat více služeb, které byly přidány do Ferdi od verze, ve které se právě nacházíte. Chcete-li získat tyto nové služby, zvažte prosím upgrade na novější verzi Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Služba byla úspěšně přidána",
   "settings.searchService": "Vyhledat službu",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 3cdab793d..9181dc3d4 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Aktiver universel mørk tilstand",
   "settings.app.form.useTouchIdToUnlock": "Tillad brug af TouchID for at låse Ferdi op",
   "settings.app.form.useVerticalStyle": "Brug vandret stil",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Vågn op strategi",
   "settings.app.headlineAdvanced": "Avanceret",
   "settings.app.headlineAppearance": "Udseende",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 485070ffa..a28cabb8c 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
   "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
   "settings.app.form.useVerticalStyle": "Horizontaler Stil verwenden",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Aufwachstrategie",
   "settings.app.headlineAdvanced": "Erweitert",
   "settings.app.headlineAppearance": "Darstellung",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "Ordner öffnen",
   "settings.recipes.headline": "Verfügbare Dienste",
   "settings.recipes.missingService": "Fehlt ein Dienst?",
-  "settings.recipes.mostPopular": "Beliebteste",
+  "settings.recipes.mostPopular": "Am beliebtesten",
   "settings.recipes.nothingFound": "Leider hat kein Dienst zu deinem Suchbegriff gepasst - aber du kannst ihn wahrscheinlich trotzdem über die Option \"Eigene Website\" hinzufügen. Bitte beachte, dass die Website möglicherweise weitere Dienste anzeigt, die seit deiner aktuellen Version zu Ferdi hinzugefügt wurden. Um diese neuen Dienste zu erhalten, erwäge bitte ein Upgrade auf eine neuere Version von Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Dienst erfolgreich hinzugefügt",
   "settings.searchService": "Dienst suchen",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 715bb3a85..76ea11b95 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Ενεργοποίηση καθολικής σκοτεινής λειτουργίας",
   "settings.app.form.useTouchIdToUnlock": "Να επιτρέπεται η χρήση του TouchID για ξεκλείδωμα Ferdi",
   "settings.app.form.useVerticalStyle": "Χρήση οριζόντιου στυλ",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Στρατηγική αφύπνισης",
   "settings.app.headlineAdvanced": "Για προχωρημένους",
   "settings.app.headlineAppearance": "Εμφάνιση",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "Άνοιγμα φακέλου",
   "settings.recipes.headline": "Διαθέσιμες υπηρεσίες",
   "settings.recipes.missingService": "Λείπει κάποια υπηρεσία;",
-  "settings.recipes.mostPopular": "��ιο δημοφιλή",
+  "settings.recipes.mostPopular": "���� π��ο δημοφιλή",
   "settings.recipes.nothingFound": "Λυπούμαστε, αλλά καμία υπηρεσία δεν ταιριάζει με τον όρο αναζήτησής σας - αλλά μπορείτε να τον προσθέσετε πιθανώς χρησιμοποιώντας την επιλογή \"Προσαρμοσμένη Ιστοσελίδα\". Παρακαλείστε να σημειώσετε ότι η ιστοσελίδα μπορεί να δείξει περισσότερες υπηρεσίες που έχουν προστεθεί στο Ferdi από την έκδοση στην οποία βρίσκεστε. Για να αποκτήσετε αυτές τις νέες υπηρεσίες, παρακαλούμε σκεφτείτε την αναβάθμιση σε μια νεότερη έκδοση του Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Η υπηρεσία προστέθηκε με επιτυχία",
   "settings.searchService": "Αναζήτηση υπηρεσίας",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 3f1e5728f..f6b53d501 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index c6308dfb1..566310fe8 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Usar estilo horizontal",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Estrategia para despertar",
   "settings.app.headlineAdvanced": "Avanzado",
   "settings.app.headlineAppearance": "Apariencia",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "Abrir carpeta",
   "settings.recipes.headline": "Servicios disponibles",
   "settings.recipes.missingService": "¿Echas de menos algún servicio?",
-  "settings.recipes.mostPopular": "Más popular",
+  "settings.recipes.mostPopular": "Más populares",
   "settings.recipes.nothingFound": "Lo sentimos, pero no pudimos encontrar ningún servicio similar a tu búsqueda, sin embargo: puedes agregarlo utilizando la opción de \"Sitio web personalizado\". \nRecuerda que pueden aparecer más servicios de los que has agregado a Ferdi desde la versión que estás utilizando. Para poder utilizar los nuevos servicios disponibles, considera actualizar a la versión más reciente.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Servicio añadido con éxito",
   "settings.searchService": "Buscar servicio",
diff --git a/src/i18n/locales/fa.json b/src/i18n/locales/fa.json
index 3f1e5728f..f6b53d501 100644
--- a/src/i18n/locales/fa.json
+++ b/src/i18n/locales/fa.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 2ef6bc3e5..da4422c2b 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Ota käyttöön yleinen tumma tila",
   "settings.app.form.useTouchIdToUnlock": "Salli TouchID:n käyttö Ferdin avaamiseksi",
   "settings.app.form.useVerticalStyle": "Käytä vaakasuuntaista tyyliä",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Sovelluksen herätys",
   "settings.app.headlineAdvanced": "Lisäasetukset",
   "settings.app.headlineAppearance": "Ulkoasu",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 41af0be49..4753bf430 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -83,7 +83,7 @@
   "menu.app.checkForUpdates": "Vérifier les mises à jour",
   "menu.app.hide": "Masquer",
   "menu.app.hideOthers": "Masquer les autres",
-  "menu.app.unhide": "Afficher l’élément masqué",
+  "menu.app.unhide": "Afficher",
   "menu.edit": "Éditer",
   "menu.edit.copy": "Copier",
   "menu.edit.cut": "Couper",
@@ -125,7 +125,7 @@
   "menu.view.openQuickSwitch": "Ouvrir le changement rapide",
   "menu.view.reloadFerdi": "Recharger Ferdi",
   "menu.view.reloadService": "Redémarrer le service",
-  "menu.view.reloadTodos": "Recharger les tâches à accomplir",
+  "menu.view.reloadTodos": "Recharger les tâches",
   "menu.view.resetZoom": "Taille actuelle",
   "menu.view.toggleDarkMode": "Activer le mode sombre",
   "menu.view.toggleDevTools": "Activer les outils de développeur",
@@ -147,7 +147,7 @@
   "password.link.login": "Connectez-vous à votre compte",
   "password.link.signup": "Créer un compte gratuit",
   "password.noUser": "Aucun utilisateur n'a été trouvé avec cette adresse de courriel",
-  "password.successInfo": "Votre nouveau mot de passe a été envoyé à votre adresse de courriel",
+  "password.successInfo": "Votre nouveau mot de passe a été envoyé à votre adresse email",
   "service.crashHandler.action": "Recharger {name}",
   "service.crashHandler.autoReload": "Tentative de restauration automatique de {name} dans {seconds} secondes",
   "service.crashHandler.headline": "Oh non!",
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
   "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation du système de lecture d'empreinte digitale pour déverrouiller Ferdi",
   "settings.app.form.useVerticalStyle": "Utiliser un style horizontal",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Stratégie de réveil",
   "settings.app.headlineAdvanced": "Paramètres avancés",
   "settings.app.headlineAppearance": "Apparence",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index feebb343b..0a132cb76 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Casta",
   "settings.app.headlineAppearance": "Dealramh",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 3ec3ef975..119606669 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "מתקדם",
   "settings.app.headlineAppearance": "תצוגה",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index 3f1e5728f..f6b53d501 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 2dfaa5a54..e0f4ba86b 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index f08fb140c..4fb5f2d83 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Haladó",
   "settings.app.headlineAppearance": "Megjelenés",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 8ed1597b0..3f8e9007a 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Tingkat Lanjut",
   "settings.app.headlineAppearance": "Tampilan",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 3111080fc..a8a9c898e 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Abilita la modalità scura universale",
   "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdi",
   "settings.app.form.useVerticalStyle": "Usa stile orizzontale",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Strategia di risveglio",
   "settings.app.headlineAdvanced": "Avanzate",
   "settings.app.headlineAppearance": "Aspetto",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 512a49f0c..7eb7043ba 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "ユニバーサルダークモードを有効にする",
   "settings.app.form.useTouchIdToUnlock": "Ferdiのロックを解除にTouch IDを使用できるようにする",
   "settings.app.form.useVerticalStyle": "水平レイアウトを使用する",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "起動方法",
   "settings.app.headlineAdvanced": "詳細",
   "settings.app.headlineAppearance": "表示スタイル",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 3c7aa78f8..0a08cd51f 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index c20159c00..6bb5e1249 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "전체 다크 모드 활성화",
   "settings.app.form.useTouchIdToUnlock": "TouchID로 Ferdi 여는 것을 허용",
   "settings.app.form.useVerticalStyle": "가로 스타일 사용",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "고급",
   "settings.app.headlineAppearance": "모양",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 383b825e3..3aaf2bc64 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index e831f1c26..17aaaffbd 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Universele donkere modus inschakelen",
   "settings.app.form.useTouchIdToUnlock": "Gebruik van Touch ID toestaan om Ferdi te ontgrendelen",
   "settings.app.form.useVerticalStyle": "Horizontale stijl gebruiken",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wakker maken strategie",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 2f8df12ab..7acccfde2 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Aktiver universelt mørkt tema",
   "settings.app.form.useTouchIdToUnlock": "Tillat å bruke TouchID for å låse opp Ferdi",
   "settings.app.form.useVerticalStyle": "Bruk horisontal stil",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Vekke strategi",
   "settings.app.headlineAdvanced": "Avansert",
   "settings.app.headlineAppearance": "Utseende",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index f1973c33c..8f6f3c9da 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Włącz uniwersalny tryb ciemny",
   "settings.app.form.useTouchIdToUnlock": "Zezwól na użycie TouchID do odblokowania Ferdi",
   "settings.app.form.useVerticalStyle": "Użyj stylu poziomego",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Strategia wybudzania",
   "settings.app.headlineAdvanced": "Zaawansowane",
   "settings.app.headlineAppearance": "Wygląd",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 5f46b31ab..0094e4627 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear o Ferdi",
   "settings.app.form.useVerticalStyle": "Usar estilo horizontal",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Estratégia de despertar",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "Abrir pasta",
   "settings.recipes.headline": "Serviços disponíveis",
   "settings.recipes.missingService": "Falta um serviço?",
-  "settings.recipes.mostPopular": "Mais popular",
+  "settings.recipes.mostPopular": "Os mais populares",
   "settings.recipes.nothingFound": "Desculpe, mas nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente do Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Serviço adicionado com sucesso",
   "settings.searchService": "Pesquisar serviço",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 05bddcfc7..2bc07dac5 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Ativar o Modo Noturno Universal",
   "settings.app.form.useTouchIdToUnlock": "Permite usar TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Usar estilo horizontal",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Estratégia de despertar",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "Abrir pasta",
   "settings.recipes.headline": "Serviços disponíveis",
   "settings.recipes.missingService": "Sente falta de algum serviço?",
-  "settings.recipes.mostPopular": "Mais popular",
+  "settings.recipes.mostPopular": "Mais populares",
   "settings.recipes.nothingFound": "Desculpe, mas nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente da Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Serviço adicionado com sucesso",
   "settings.searchService": "Procurar serviço",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index adf5ce1b8..1c032d169 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Activați modul universal de întunecat",
   "settings.app.form.useTouchIdToUnlock": "Permiteți utilizarea TouchID pentru a debloca Ferdi",
   "settings.app.form.useVerticalStyle": "Folosește stil orizontal",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Strategia de trezire",
   "settings.app.headlineAdvanced": "Avansat",
   "settings.app.headlineAppearance": "Aspectul",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 4eaff3b7f..6e3993207 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -8,7 +8,7 @@
   "changeserver.warning": "Дополнительные настройки, предлагаемые Ферди, не будут сохранены",
   "connectionLostBanner.cta": "Перезапустить сервис",
   "connectionLostBanner.informationLink": "Что случилось?",
-  "connectionLostBanner.message": "��пс! ��е��ди потерял связь с {name}.",
+  "connectionLostBanner.message": "�� ��е��! Ferdi потерял связь с {name}.",
   "feature.basicAuth.signIn": "Войти",
   "feature.publishDebugInfo.error": "При попытке опубликовать отладочную информацию произошла ошибка. Пожалуйста, повторите попытку позже или просмотрите консоль для получения дополнительной информации.",
   "feature.publishDebugInfo.info": "Публикация вашей отладочной информации помогает нам найти проблемы и ошибки в Ferdi. Публикуя вашу отладочную информацию, вы принимаете политику конфиденциальности Ferdi Debugger'ов и условия предоставления услуг",
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Включить универсальный темный режим",
   "settings.app.form.useTouchIdToUnlock": "Разрешить разблокировку Ferdi по TouchID",
   "settings.app.form.useVerticalStyle": "Использовать горизонтальный стиль",
+  "settings.app.form.wakeUpHibernationSplay": "Чередование циклов cна/пробуждения для уменьшения нагрузки",
+  "settings.app.form.wakeUpHibernationStrategy": "Действия после автоматического просыпания",
   "settings.app.form.wakeUpStrategy": "Стратегия пробуждения",
   "settings.app.headlineAdvanced": "Дополнительно",
   "settings.app.headlineAppearance": "Внешний вид",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "Открыть папку",
   "settings.recipes.headline": "Доступные сервисы",
   "settings.recipes.missingService": "Не можете найти сервис?",
-  "settings.recipes.mostPopular": "��а��ые популярные",
+  "settings.recipes.mostPopular": "��а����ол��е популярн����",
   "settings.recipes.nothingFound": "Извините, но сервис не соответствует вашему поисковому запросу - но вы все еще можете добавить его, используя опцию \"Пользовательский сайт\". Пожалуйста, обратите внимание, что на сайте может отображаться больше служб, которые могли быть добавлены в новых версиях Ferdi. Для получения новых сервисов, пожалуйста, обновите Ferdi до актуальной версии.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Сервис успешно добавлен",
   "settings.searchService": "Найти сервис",
diff --git a/src/i18n/locales/si.json b/src/i18n/locales/si.json
index 184ada48b..10b448e6d 100644
--- a/src/i18n/locales/si.json
+++ b/src/i18n/locales/si.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "වැඩිදුර",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 67306589e..cd1f2a6dd 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Použiť univerzálny tmavý režim",
   "settings.app.form.useTouchIdToUnlock": "Povoliť TouchID na odomknutie Ferdi",
   "settings.app.form.useVerticalStyle": "Vodorovný štýl",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Stratégia prebudenia",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhľad",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 491239210..fbe46facb 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 92dd6234c..f1100f718 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index cf44ed792..3f1655899 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Aktivera globalt mörkt läge",
   "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi",
   "settings.app.form.useVerticalStyle": "Använd horisontell stil",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Vakna strategi",
   "settings.app.headlineAdvanced": "Avancerat",
   "settings.app.headlineAppearance": "Utseende",
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
index 3f1e5728f..f6b53d501 100644
--- a/src/i18n/locales/te.json
+++ b/src/i18n/locales/te.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index d975628f9..6de3995b0 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,5 +1,5 @@
 {
-  "app.errorHandler.action": "Tekrar Yükle",
+  "app.errorHandler.action": "Yenile",
   "app.errorHandler.headline": "Bilinmeyen bir hata oluştu.",
   "changeserver.customServerLabel": "Özel sunucu",
   "changeserver.headline": "Sunucuyu değiştir",
@@ -8,15 +8,15 @@
   "changeserver.warning": "Ferdi'nin sunduğu ekstra ayarlar kaydedilmeyecektir",
   "connectionLostBanner.cta": "Servisi Tekrar Yükle",
   "connectionLostBanner.informationLink": "Ne oldu?",
-  "connectionLostBanner.message": "Nayır, nolamaz! Ferdi {name} ile bağlantısını yitirdi.",
+  "connectionLostBanner.message": "Hayır, olamaz! Ferdi {name} ile bağlantısını yitirdi.",
   "feature.basicAuth.signIn": "Giriş Yap",
   "feature.publishDebugInfo.error": "Hata ayıklama bilgisi oluşturulurken hata oluştu. Lütfen daha sonra tekrar deneyin veya daha fazla bilgi için konsolu görüntüleyin.",
   "feature.publishDebugInfo.info": "Hata ayıklama bilgilerinizi yayınlamak, Ferdi'deki sorunları ve hataları bulmamıza yardımcı olur. Hata ayıklama bilgilerinizi yayınlayarak Ferdi Hata Ayıklayıcı'nın gizlilik politikasını ve hizmet şartlarını kabul etmiş olursunuz.",
   "feature.publishDebugInfo.privacy": "Gizlilik ilkesi",
   "feature.publishDebugInfo.publish": "Onayla ve yayımla",
-  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
+  "feature.publishDebugInfo.published": "Hata ayıklama günlüğünüz hazır ve burada mevcut",
   "feature.publishDebugInfo.terms": "Kullanım Koşulları",
-  "feature.publishDebugInfo.title": "Publish debug information",
+  "feature.publishDebugInfo.title": "Hata ayıklama bilgisini yayımla",
   "feature.quickSwitch.info": "TAB, ↑ ve ↓ ile bir servis seç. ENTER ile bir servisi aç.",
   "feature.quickSwitch.search": "Ara...",
   "feature.quickSwitch.title": "QuickSwitch",
@@ -35,13 +35,13 @@
   "global.spellchecking.autodetect.short": "Otomatik",
   "global.spellchecking.language": "İmla kontrol dili",
   "global.submit": "Gönder",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+  "global.userAgentHelp": "Kullanıcı aracısını 'https://whatmyuseragent.com/' adresinden öğrenebilir, 'https://developers.whatismybrowser.com/useragents/explore/' adresinden istediğinizi seçebilirsiniz; aracı bilgisini kopyalayıp buraya yapıştırınız.",
   "global.userAgentPref": "Tarayıcı Tanımı",
   "global.yes": "Evet",
   "import.headline": "Ferdi 4 servislerinizi içeri aktarın",
   "import.notSupportedHeadline": "Henüz Ferdi 5'te desteklenmeyen servisler",
   "import.skip.label": "Servisleri kendim eklemek istiyorum",
-  "import.submit.label": "Import {count} services",
+  "import.submit.label": "{count} hizmeti içeri aktar",
   "infobar.authRequestFailed": "Yetkili bir işlem yapılmaya çalışırken hatalar ortaya çıktı. Lütfen bu hata tekrarlarsa çıkış yapıp tekrar girmeyi dene.",
   "infobar.buttonChangelog": "Yeni olan ne?",
   "infobar.buttonInstallUpdate": "Yeniden Başlat ve Güncelleştirmeleri Kur",
@@ -162,7 +162,7 @@
   "service.webviewLoader.loading": "{service} yükleniyor",
   "services.getStarted": "Haydi başlayalım",
   "services.login": "Ferdi'yi kullanmak için lütfen oturum açın.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "İsterseniz sol alt köşedeki çarka tıklayarak Ferdi sunucunuzu değiştirebilirsiniz. (Barındırılan sunuculardan) hesapsız Ferdi kullanımına geçiyorsanız, tüm çalışma alanlarınızı ve yapılandırılmış hizmetlerinizi yeniden aktif etmek için verilerinizi o sunucudan dışa aktarabileceğinizi ve tekrar Yardım menüsünü kullanarak içe aktarabileceğinizi unutmayın!",
   "services.serverless": "Ferdi'yi bir hesap olmadan kullan",
   "settings.account.account.editButton": "Hesabı düzenle",
   "settings.account.accountUnavailable": "Hesap kullanılamıyor",
@@ -182,23 +182,23 @@
   "settings.account.tryReloadUserInfoRequest": "Tekrar deneyin",
   "settings.account.userInfoRequestFailed": "Kullanıcı bilgisi yüklenemedi",
   "settings.account.yourLicense": "Ferdi Lisansınız:",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
+  "settings.app.accentColorInfo": "Vurgu renginizi CSS uyumlu bir biçimde yazın. (Varsayılan: {defaultAccentColor})",
   "settings.app.buttonClearAllCache": "Önbelleği temizle",
   "settings.app.buttonInstallUpdate": "Yeniden Başlat ve Güncelleştirmeleri Kur",
   "settings.app.buttonOpenFerdiProfileFolder": "Profil Dizinini aç",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Servisler klasörünü açın",
   "settings.app.buttonSearchForUpdate": "Güncellemeleri kontrol et",
   "settings.app.cacheInfo": "Ferdi önbelleği şu anda {size} disk alanı kullanıyor.",
   "settings.app.cacheNotCleared": "Önbellek tamamen temizlenemedi",
   "settings.app.closeSettings": "Ayarları kapat",
   "settings.app.currentVersion": "Geçerli sürüm:",
   "settings.app.form.accentColor": "Vurgu Rengi",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
-  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
+  "settings.app.form.adaptableDarkMode": "Sistemin tema modu ile senkronize et",
+  "settings.app.form.alwaysShowWorkspaces": "Her zaman çalışma alanı çekmecesini göster",
   "settings.app.form.autoLaunchInBackground": "Arka planda aç",
   "settings.app.form.autoLaunchOnStart": "Ferdi'ı başlangıçta aç",
   "settings.app.form.automaticUpdates": "Güncellemeleri etkinleştir",
-  "settings.app.form.beta": "Include pre-releases",
+  "settings.app.form.beta": "Beta güncellemelerini dahil et",
   "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
   "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
@@ -206,7 +206,7 @@
   "settings.app.form.darkMode": "Karanlık modu aç",
   "settings.app.form.enableGPUAcceleration": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
   "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdi",
-  "settings.app.form.enableLock": "Enable Password Lock",
+  "settings.app.form.enableLock": "Parola Kilidini Etkinleştir",
   "settings.app.form.enableLongPressServiceHint": "Enable service shortcut hint on long press",
   "settings.app.form.enableMenuBar": "Ferdi'yi her zaman Menü Çubuğunda göster",
   "settings.app.form.enableSpellchecking": "Yazım denetimini etkinleştir",
@@ -230,25 +230,27 @@
   "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
   "settings.app.form.scheduledDNDEnd": "Kime:",
   "settings.app.form.scheduledDNDStart": "Kimden:",
-  "settings.app.form.searchEngine": "Search engine",
+  "settings.app.form.searchEngine": "Arama motoru",
   "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.serviceRibbonWidth": "Sidebar width",
+  "settings.app.form.serviceRibbonWidth": "Kenar çubuğu genişliği",
   "settings.app.form.showDisabledServices": "Devre dışı bırakılan servis sekmelerini göster",
   "settings.app.form.showDragArea": "Show draggable area on window",
   "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
   "settings.app.form.showServiceName": "Display service name under the icon",
-  "settings.app.form.splitColumns": "Number of columns",
-  "settings.app.form.splitMode": "Enable Split View Mode",
-  "settings.app.form.startMinimized": "Start minimized",
+  "settings.app.form.splitColumns": "Sütun sayısı",
+  "settings.app.form.splitMode": "Bölünmüş Görünüm Modunu Etkinleştir",
+  "settings.app.form.startMinimized": "Arka planda başla",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Gelişmiş",
   "settings.app.headlineAppearance": "Görünüm",
   "settings.app.headlineGeneral": "Genel",
   "settings.app.headlineLanguage": "Dil",
-  "settings.app.headlinePrivacy": "Privacy",
+  "settings.app.headlinePrivacy": "Gizlilik",
   "settings.app.headlineUpdates": "Güncellemeler",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
@@ -266,7 +268,7 @@
   "settings.app.translationHelp": "Ferdi'ı senin diline tercüme etmemiz için yardım et.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Güncelleme mevcut, indiriliyor...",
-  "settings.app.updateStatusSearching": "Searching for updates...",
+  "settings.app.updateStatusSearching": "Güncelleştirmeleri ara",
   "settings.app.updateStatusUpToDate": "Ferdi'ın son versiyonunu kullanıyorsun",
   "settings.invite.headline": "Arkadaşlarını davet et",
   "settings.navigation.account": "Hesap",
@@ -419,7 +421,7 @@
   "tabs.item.enableNotification": "Bildirimleri etkinleştir",
   "tabs.item.enableService": "Servisi etkinleştir",
   "tabs.item.hibernateService": "Hibernate service",
-  "tabs.item.reload": "Tekrar Yükle",
+  "tabs.item.reload": "Yenile",
   "tabs.item.wakeUpService": "Cihazı uyandır",
   "validation.email": "{field} geçerli değil",
   "validation.minLength": "{field} en az {length} karakter uzunluğunda olmalı",
@@ -430,7 +432,7 @@
   "webControls.forward": "İleri",
   "webControls.goHome": "Ana Sayfa",
   "webControls.openInBrowser": "Tarayıcıda Aç",
-  "webControls.reload": "Tekrar Yükle",
+  "webControls.reload": "Yenile",
   "welcome.loginButton": "Hesabına giriş yap",
   "welcome.signupButton": "Ücretsiz hesap oluştur",
   "workspaceDrawer.addNewWorkspaceLabel": "Yeni Çalışma Alanı ekle",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 029bff0bb..cd5f2341a 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Увімкнути універсальний темний режим",
   "settings.app.form.useTouchIdToUnlock": "Дозволити використання TouchID для розблокування Ferdi",
   "settings.app.form.useVerticalStyle": "Використовувати горизонтальний стиль",
+  "settings.app.form.wakeUpHibernationSplay": "Чергування циклів гібернації/пробудження для зменшення навантаження",
+  "settings.app.form.wakeUpHibernationStrategy": "Стратегія режиму гібернації після автоматичного пробудження",
   "settings.app.form.wakeUpStrategy": "Стратегія пробудження",
   "settings.app.headlineAdvanced": "Додаткові налаштування",
   "settings.app.headlineAppearance": "Вигляд",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "Відкрити папку",
   "settings.recipes.headline": "Доступні сервіси",
   "settings.recipes.missingService": "Не знайшли сервіс?",
-  "settings.recipes.mostPopular": "Найпопулярніші",
+  "settings.recipes.mostPopular": "Най��ільш ��опулярні",
   "settings.recipes.nothingFound": "Вибачте, але жоден сервіс не відповідає вашому пошуковому запиту. Але, можливо, ви можете додати його за допомогою опції «Custom Website». Зауважте, що на веб-сайті може відображатися більше сервісів, які могли бути додані у нових версіях Ferdi. Щоб отримати ці нові сервіси, оновіть Ferdi до новішої версії.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Сервіс успішно додано",
   "settings.searchService": "Знайти сервіс",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 1a72725b1..8653a87e8 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Bật Chế độ tối chung",
   "settings.app.form.useTouchIdToUnlock": "Cho phép sử dụng TouchID để mở khóa Ferdi",
   "settings.app.form.useVerticalStyle": "Sử dụng kiểu ngang",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Chiến lược đánh thức",
   "settings.app.headlineAdvanced": "Nâng cao",
   "settings.app.headlineAppearance": "Giao diện",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index e13eb1665..71e4b2eac 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "高級設置",
   "settings.app.headlineAppearance": "外觀",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 0b37868d3..dd00ce4a4 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -18,7 +18,7 @@
   "feature.publishDebugInfo.terms": "服务条款",
   "feature.publishDebugInfo.title": "发布调试信息",
   "feature.quickSwitch.info": "使用 TAB ，↑ 和 ↓ 选择服务。使用回车键（ENTER）打开服务",
-  "feature.quickSwitch.search": "搜索...",
+  "feature.quickSwitch.search": "搜索……",
   "feature.quickSwitch.title": "快速切换",
   "global.api.unhealthy": "无法链接到 Ferdi 在线服务",
   "global.cancel": "取消",
@@ -243,6 +243,8 @@
   "settings.app.form.universalDarkMode": "启用通用暗色模式",
   "settings.app.form.useTouchIdToUnlock": "允许使用 TouchID 解锁Ferdi",
   "settings.app.form.useVerticalStyle": "使用水平样式",
+  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
+  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "唤醒策略",
   "settings.app.headlineAdvanced": "高级",
   "settings.app.headlineAppearance": "外观",
@@ -286,7 +288,7 @@
   "settings.recipes.customService.openFolder": "打开文件夹",
   "settings.recipes.headline": "可用的服务",
   "settings.recipes.missingService": "找不到服务？",
-  "settings.recipes.mostPopular": "最受欢迎的",
+  "settings.recipes.mostPopular": "最受欢迎",
   "settings.recipes.nothingFound": "对不起，没有任何服务匹配您的搜索词 - 但您仍然可以使用“自定义网站”选项添加它。 请注意，网站可能会显示自您当前使用的版本以来添加到Ferdi的更多服务。 为了获得这些新服务，请考虑升级为较新版本的费尔迪。",
   "settings.recipes.servicesSuccessfulAddedInfo": "服务添加成功",
   "settings.searchService": "搜索服务",
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index e546850f9..e2bfd22f3 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -239,7 +239,7 @@ export default class ServicesStore extends Store {
             ms(`${this.stores.settings.all.app.wakeUpStrategy}s`)
         ) {
           // If service is in hibernation and the wakeup time has elapsed, wake it.
-          this._awake({ serviceId: service.id });
+          this._awake({ serviceId: service.id, automatic: true });
         }
       }
 
@@ -1043,11 +1043,59 @@ export default class ServicesStore extends Store {
     service.lastHibernated = Date.now();
   }
 
-  @action _awake({ serviceId }) {
+  @action _awake({ serviceId, automatic }) {
+    const now = Date.now();
     const service = this.one(serviceId);
-    debug(`Waking up from service hibernation for ${service.name}`);
+    const automaticTag = automatic ? ' automatically ' : ' ';
+    debug(
+      `Waking up${automaticTag}from service hibernation for ${service.name}`,
+    );
+
+    if (automatic) {
+      // if this is an automatic wake up, use the wakeUpHibernationStrategy
+      // which sets the lastUsed time to an offset from now rather than to now.
+      // Also add an optional random splay to desync the wakeups and
+      // potentially reduce load.
+      //
+      // offsetNow = now - (hibernationStrategy - wakeUpHibernationStrategy)
+      //
+      // if wUHS = hS = 60, offsetNow = now.  hibernation again in 60 seconds.
+      //
+      // if wUHS = 20 and hS = 60, offsetNow = now - 40.  hibernation again in
+      // 20 seconds.
+      //
+      // possibly also include splay in wUHS before subtracting from hS.
+      //
+      const mainStrategy = this.stores.settings.all.app.hibernationStrategy;
+      let strategy = this.stores.settings.all.app.wakeUpHibernationStrategy;
+      debug(`wakeUpHibernationStrategy = ${strategy}`);
+      debug(`hibernationStrategy = ${mainStrategy}`);
+      if (!strategy || strategy < 1) {
+        strategy = this.stores.settings.all.app.hibernationStrategy;
+      }
+      let splay = 0;
+      // Add splay.  This will keep the service awake a little longer.
+      if (
+        this.stores.settings.all.app.wakeUpHibernationSplay &&
+        Math.random() >= 0.5
+      ) {
+        // Add 10 additional seconds 50% of the time.
+        splay = 10;
+        debug('Added splay');
+      } else {
+        debug('skipping splay');
+      }
+      // wake up again in strategy + splay seconds instead of mainStrategy seconds.
+      service.lastUsed = now - ms(`${mainStrategy - (strategy + splay)}s`);
+    } else {
+      service.lastUsed = now;
+    }
+    debug(
+      `Setting service.lastUsed to ${service.lastUsed} (${
+        (now - service.lastUsed) / 1000
+      }s ago)`,
+    );
     service.isHibernationRequested = false;
-    service.lastUsed = Date.now();
     service.lastHibernated = null;
   }
 
diff --git a/src/styles/config.scss b/src/styles/config.scss
index 7aa2d674f..6316acbe3 100644
--- a/src/styles/config.scss
+++ b/src/styles/config.scss
@@ -1 +1,4 @@
 @import './colors.scss';
+
+$split-columns-min: 1;
+$split-columns-max: 5;
diff --git a/src/styles/services.scss b/src/styles/services.scss
index cedfcbdd1..d8f8b9327 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -25,28 +25,14 @@
 
     .services__webview {
       position: relative;
-      flex: 1 0 33.33%;
+      flex: 1 0 33.3333%;
     }
   }
 
-  &[data-columns="1"] .services .services__webview {
-    flex-basis: 100%;
-  }
-
-  &[data-columns="2"] .services .services__webview {
-    flex-basis: 50%;
-  }
-
-  &[data-columns="3"] .services .services__webview {
-    flex-basis: 33.33%;
-  }
-
-  &[data-columns="4"] .services .services__webview {
-    flex-basis: 25%;
-  }
-
-  &[data-columns="5"] .services .services__webview {
-    flex-basis: 20%;
+  @for $i from $split-columns-min through $split-columns-max {
+    &[data-columns="#{$i}"] .services .services__webview {
+      flex-basis: calc(100% / $i);
+    }
   }
 }