Merge Franz 5.5.0 beta.1 and 2 (#549)

* Automatic i18n update (i18n.meetfranz.com)

* Fix zoom not working

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Add environment variable

FRANZ_APPDATA_DIR

* Add environment variable for config

FRANZ_APPDATA_DIR

* fix stuff that shouldn't need fixing in the first place

* notarize app

* bump version to 5.4.1

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* update to electron 7.1.7

* bump version to 5.5.0

* Automatic i18n update (i18n.meetfranz.com)

* Bump electron to 7.1.10

* plan changes

* filter plan variants

* add missing string

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Replace/remove deprecated electron function calls

Electron replaced several function calls with object properties.
Franz still uses some of these deprecated functions, so this commit will replace these with their new property counterpart.

This commit is only transferring the changes made in getferdi/ferdi#371 and getferdi/ferdi#384 into the upstream repository.

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Update to electron 8.0.1

* feat(Service): Add service hibernation to save system resources

* Fix linting issues

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Bump version to electron 8.1.1

* update strings

* update electron-notarize

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* Add audio & video permission request for cataline

* Automatic i18n update (i18n.meetfranz.com)

* bump version to beta 1

* Automatic i18n update (i18n.meetfranz.com)

* enable external links

* Fix main content href

* Automatic i18n update (i18n.meetfranz.com)

* fix(Service): Fix issue with user agent override in service workers

* Automatic i18n update (i18n.meetfranz.com)

* fix macOS string replacement

* Automatic i18n update (i18n.meetfranz.com)

* fix(Experimental): Fix Google signin

* fix(Service): Add integrity checks to prevent services recipes getting lost

* Remove service reload on app-resume

* update strings

* bump version to beta 2

* Automatic i18n update (i18n.meetfranz.com)

* bump electron-builder and electron-updater deps

* test video permissions

* fix `extendInfo` keys

* fix typo

* fix permission request

* update camera/microphone entitlements

* Automatic i18n update (i18n.meetfranz.com)

* Test screen capture permissions

* unpack `mac-screen-capture-permissions`

* don't require localstorage temp key for permissions request

* move macOS permission request to main process

* Fix checking for permissions

* fix(macOS): Ask the user to move Franz to the `/Applications` Folder

* only try to recover recipe when user is online

* update service request link

* Update changelog

* Reset `service.lostRecipeReloadAttempt` once service is alive again

* Update translations

* Fix crash on macOS

* Fix merge errors

* Fix lint

* Disable ConnectionLostBanner

* #551 Add information about Ferdi to the user agent

* Fix requested changes

* Remove tsbuildinfo files

* Add .tsbuildinfo files to gitignore

* Fix "Cannot destructure property 'app' of '_electron.remote' as it is undefined"

Co-authored-by: FranzBot <i18n@meetfranz.com>
Co-authored-by: Makazzz <makazzzpro@live.ca>
Co-authored-by: Stefan Malzner <stefan@adlk.io>

11 files changed, 803 insertions, 86 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 56d0b1971..f3ff7caf3 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -1193,6 +1193,190 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.goHome",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in Browser",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.openInBrowser",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.back",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Forward",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.forward",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/services/content/ConnectionBanner.js",
+        "id": "webControls.reload",
+        "start": {
+          "column": 10,
+          "line": 29
+        }
+      }
+    ],
+    "path": "src/components/services/content/ConnectionBanner.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.goHome",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in Browser",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.openInBrowser",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.back",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Forward",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.forward",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/services/content/ConnectionLost.js",
+        "id": "webControls.reload",
+        "start": {
+          "column": 10,
+          "line": 29
+        }
+      }
+    ],
+    "path": "src/components/services/content/ConnectionLost.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Oh no! Franz lost the connection to {name}.",
+        "end": {
+          "column": 3,
+          "line": 18
+        },
+        "file": "src/components/services/content/ConnectionLostBanner.js",
+        "id": "connectionLostBanner.message",
+        "start": {
+          "column": 8,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!What happened?",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/services/content/ConnectionLostBanner.js",
+        "id": "connectionLostBanner.informationLink",
+        "start": {
+          "column": 19,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload Service",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/services/content/ConnectionLostBanner.js",
+        "id": "connectionLostBanner.cta",
+        "start": {
+          "column": 7,
+          "line": 23
+        }
+      }
+    ],
+    "path": "src/components/services/content/ConnectionLostBanner.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Oh no!",
         "end": {
           "column": 3,
@@ -1434,6 +1618,76 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.goHome",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in Browser",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.openInBrowser",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.back",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Forward",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.forward",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/services/content/WebControls.js",
+        "id": "webControls.reload",
+        "start": {
+          "column": 10,
+          "line": 29
+        }
+      }
+    ],
+    "path": "src/components/services/content/WebControls.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Oh no!",
         "end": {
           "column": 3,
@@ -2421,107 +2675,120 @@
         }
       },
       {
-        "defaultMessage": "!!!Notifications",
+        "defaultMessage": "!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
         "end": {
           "column": 3,
           "line": 99
         },
         "file": "src/components/settings/services/EditServiceForm.js",
+        "id": "settings.service.form.disableHibernationInfo",
+        "start": {
+          "column": 26,
+          "line": 96
+        }
+      },
+      {
+        "defaultMessage": "!!!Notifications",
+        "end": {
+          "column": 3,
+          "line": 103
+        },
+        "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineNotifications",
         "start": {
           "column": 25,
-          "line": 96
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Unread message badges",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 107
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineBadges",
         "start": {
           "column": 18,
-          "line": 100
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 107
+          "line": 111
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 104
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 111
+          "line": 115
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconDelete",
         "start": {
           "column": 14,
-          "line": 108
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Drop your image, or click here",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 119
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconUpload",
         "start": {
           "column": 14,
-          "line": 112
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 123
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.headline",
         "start": {
           "column": 17,
-          "line": 116
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
         "end": {
           "column": 3,
-          "line": 123
+          "line": 127
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.restartInfo",
         "start": {
           "column": 20,
-          "line": 120
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
         "end": {
           "column": 3,
-          "line": 127
+          "line": 131
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.info",
         "start": {
           "column": 13,
-          "line": 124
+          "line": 128
         }
       }
     ],
@@ -3888,6 +4155,19 @@
           "column": 10,
           "line": 65
         }
+      },
+      {
+        "defaultMessage": "!!!Occasional Waiting Screens",
+        "end": {
+          "column": 3,
+          "line": 72
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.appDelaysEnabled",
+        "start": {
+          "column": 19,
+          "line": 69
+        }
       }
     ],
     "path": "src/components/ui/FeatureList.json"
@@ -4006,172 +4286,185 @@
         }
       },
       {
-        "defaultMessage": "!!!Enable Notifications",
+        "defaultMessage": "!!!Disable hibernation",
         "end": {
           "column": 3,
           "line": 39
         },
         "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableNotification",
+        "id": "settings.service.form.disableHibernation",
         "start": {
           "column": 22,
           "line": 36
         }
       },
       {
-        "defaultMessage": "!!!Show unread message badges",
+        "defaultMessage": "!!!Enable Notifications",
         "end": {
           "column": 3,
           "line": 43
         },
         "file": "src/containers/settings/EditServiceScreen.js",
+        "id": "settings.service.form.enableNotification",
+        "start": {
+          "column": 22,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Show unread message badges",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableBadge",
         "start": {
           "column": 15,
-          "line": 40
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Enable audio",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 51
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableAudio",
         "start": {
           "column": 15,
-          "line": 44
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Team",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 55
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.team",
         "start": {
           "column": 8,
-          "line": 48
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Service URL",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 59
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.customUrl",
         "start": {
           "column": 13,
-          "line": 52
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Show message badge for all new messages",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 63
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.indirectMessages",
         "start": {
           "column": 20,
-          "line": 56
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Custom icon",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 67
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.icon",
         "start": {
           "column": 8,
-          "line": 60
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Enable Dark Mode",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 71
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableDarkMode",
         "start": {
           "column": 18,
-          "line": 64
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Use Proxy",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 75
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.isEnabled",
         "start": {
           "column": 15,
-          "line": 68
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Proxy Host/IP",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 79
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.host",
         "start": {
           "column": 13,
-          "line": 72
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Port",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 83
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.port",
         "start": {
           "column": 13,
-          "line": 76
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!User",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 87
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.user",
         "start": {
           "column": 13,
-          "line": 80
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 91
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.password",
         "start": {
           "column": 17,
-          "line": 84
+          "line": 88
         }
       }
     ],
@@ -5327,6 +5620,76 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Home",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.goHome",
+        "start": {
+          "column": 10,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Open in Browser",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.openInBrowser",
+        "start": {
+          "column": 17,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!Back",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.back",
+        "start": {
+          "column": 8,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Forward",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.forward",
+        "start": {
+          "column": 11,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Reload",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/features/recipeConnectionLost/components/WebControls.js",
+        "id": "webControls.reload",
+        "start": {
+          "column": 10,
+          "line": 29
+        }
+      }
+    ],
+    "path": "src/features/recipeConnectionLost/components/WebControls.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Changes in Franz {version}",
         "end": {
           "column": 3,
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 947f927e7..8a95970a2 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -4,6 +4,9 @@
   "changeserver.headline": "Change server",
   "changeserver.label": "Server",
   "changeserver.submit": "Submit",
+  "connectionLostBanner.cta": "Reload Service",
+  "connectionLostBanner.informationLink": "What happened?",
+  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
   "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
@@ -183,6 +186,7 @@
   "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
+  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -305,8 +309,8 @@
   "settings.app.form.sentry": "Send telemetry data",
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -366,6 +370,8 @@
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.deleteButton": "Delete service",
+  "settings.service.form.disableHibernation": "Disable hibernation",
+  "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
diff --git a/src/i18n/messages/src/components/services/content/ConnectionBanner.json b/src/i18n/messages/src/components/services/content/ConnectionBanner.json
new file mode 100644
index 000000000..1047c28b5
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ConnectionBanner.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "webControls.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.openInBrowser",
+    "defaultMessage": "!!!Open in Browser",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/services/content/ConnectionBanner.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLost.json b/src/i18n/messages/src/components/services/content/ConnectionLost.json
new file mode 100644
index 000000000..ee3f7a4ba
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ConnectionLost.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "webControls.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.openInBrowser",
+    "defaultMessage": "!!!Open in Browser",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/services/content/ConnectionLost.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
new file mode 100644
index 000000000..fd7019f41
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
@@ -0,0 +1,41 @@
+[
+  {
+    "id": "connectionLostBanner.message",
+    "defaultMessage": "!!!Oh no! Franz lost the connection to {name}.",
+    "file": "src/components/services/content/ConnectionLostBanner.js",
+    "start": {
+      "line": 15,
+      "column": 8
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "connectionLostBanner.informationLink",
+    "defaultMessage": "!!!What happened?",
+    "file": "src/components/services/content/ConnectionLostBanner.js",
+    "start": {
+      "line": 19,
+      "column": 19
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "connectionLostBanner.cta",
+    "defaultMessage": "!!!Reload Service",
+    "file": "src/components/services/content/ConnectionLostBanner.js",
+    "start": {
+      "line": 23,
+      "column": 7
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebControls.json b/src/i18n/messages/src/components/services/content/WebControls.json
new file mode 100644
index 000000000..5af5143d0
--- /dev/null
+++ b/src/i18n/messages/src/components/services/content/WebControls.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "webControls.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.openInBrowser",
+    "defaultMessage": "!!!Open in Browser",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/components/services/content/WebControls.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index df64c8a5f..811c49498 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -234,15 +234,28 @@
     }
   },
   {
+    "id": "settings.service.form.disableHibernationInfo",
+    "defaultMessage": "!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 96,
+      "column": 26
+    },
+    "end": {
+      "line": 99,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.service.form.headlineNotifications",
     "defaultMessage": "!!!Notifications",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 96,
+      "line": 100,
       "column": 25
     },
     "end": {
-      "line": 99,
+      "line": 103,
       "column": 3
     }
   },
@@ -251,11 +264,11 @@
     "defaultMessage": "!!!Unread message badges",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 100,
+      "line": 104,
       "column": 18
     },
     "end": {
-      "line": 103,
+      "line": 107,
       "column": 3
     }
   },
@@ -264,11 +277,11 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 104,
+      "line": 108,
       "column": 19
     },
     "end": {
-      "line": 107,
+      "line": 111,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 108,
+      "line": 112,
       "column": 14
     },
     "end": {
-      "line": 111,
+      "line": 115,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Drop your image, or click here",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 112,
+      "line": 116,
       "column": 14
     },
     "end": {
-      "line": 115,
+      "line": 119,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 116,
+      "line": 120,
       "column": 17
     },
     "end": {
-      "line": 119,
+      "line": 123,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 120,
+      "line": 124,
       "column": 20
     },
     "end": {
-      "line": 123,
+      "line": 127,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 124,
+      "line": 128,
       "column": 13
     },
     "end": {
-      "line": 127,
+      "line": 131,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/FeatureList.json b/src/i18n/messages/src/components/ui/FeatureList.json
index 3201115b3..8d1dc4360 100644
--- a/src/i18n/messages/src/components/ui/FeatureList.json
+++ b/src/i18n/messages/src/components/ui/FeatureList.json
@@ -193,5 +193,18 @@
       "line": 68,
       "column": 3
     }
+  },
+  {
+    "id": "pricing.features.appDelaysEnabled",
+    "defaultMessage": "!!!Occasional Waiting Screens",
+    "file": "src/components/ui/FeatureList.js",
+    "start": {
+      "line": 69,
+      "column": 19
+    },
+    "end": {
+      "line": 72,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
index 9b46a1e6f..36937ebf8 100644
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -26,8 +26,8 @@
     }
   },
   {
-    "id": "settings.service.form.enableNotification",
-    "defaultMessage": "!!!Enable Notifications",
+    "id": "settings.service.form.disableHibernation",
+    "defaultMessage": "!!!Disable hibernation",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
       "line": 36,
@@ -39,15 +39,28 @@
     }
   },
   {
+    "id": "settings.service.form.enableNotification",
+    "defaultMessage": "!!!Enable Notifications",
+    "file": "src/containers/settings/EditServiceScreen.js",
+    "start": {
+      "line": 40,
+      "column": 22
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.service.form.enableBadge",
     "defaultMessage": "!!!Show unread message badges",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 40,
+      "line": 44,
       "column": 15
     },
     "end": {
-      "line": 43,
+      "line": 47,
       "column": 3
     }
   },
@@ -56,11 +69,11 @@
     "defaultMessage": "!!!Enable audio",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 44,
+      "line": 48,
       "column": 15
     },
     "end": {
-      "line": 47,
+      "line": 51,
       "column": 3
     }
   },
@@ -69,11 +82,11 @@
     "defaultMessage": "!!!Team",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 48,
+      "line": 52,
       "column": 8
     },
     "end": {
-      "line": 51,
+      "line": 55,
       "column": 3
     }
   },
@@ -82,11 +95,11 @@
     "defaultMessage": "!!!Service URL",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 52,
+      "line": 56,
       "column": 13
     },
     "end": {
-      "line": 55,
+      "line": 59,
       "column": 3
     }
   },
@@ -95,11 +108,11 @@
     "defaultMessage": "!!!Show message badge for all new messages",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 56,
+      "line": 60,
       "column": 20
     },
     "end": {
-      "line": 59,
+      "line": 63,
       "column": 3
     }
   },
@@ -108,11 +121,11 @@
     "defaultMessage": "!!!Custom icon",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 60,
+      "line": 64,
       "column": 8
     },
     "end": {
-      "line": 63,
+      "line": 67,
       "column": 3
     }
   },
@@ -121,11 +134,11 @@
     "defaultMessage": "!!!Enable Dark Mode",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 64,
+      "line": 68,
       "column": 18
     },
     "end": {
-      "line": 67,
+      "line": 71,
       "column": 3
     }
   },
@@ -134,11 +147,11 @@
     "defaultMessage": "!!!Use Proxy",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 68,
+      "line": 72,
       "column": 15
     },
     "end": {
-      "line": 71,
+      "line": 75,
       "column": 3
     }
   },
@@ -147,11 +160,11 @@
     "defaultMessage": "!!!Proxy Host/IP",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 72,
+      "line": 76,
       "column": 13
     },
     "end": {
-      "line": 75,
+      "line": 79,
       "column": 3
     }
   },
@@ -160,11 +173,11 @@
     "defaultMessage": "!!!Port",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 76,
+      "line": 80,
       "column": 13
     },
     "end": {
-      "line": 79,
+      "line": 83,
       "column": 3
     }
   },
@@ -173,11 +186,11 @@
     "defaultMessage": "!!!User",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 80,
+      "line": 84,
       "column": 13
     },
     "end": {
-      "line": 83,
+      "line": 87,
       "column": 3
     }
   },
@@ -186,11 +199,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 84,
+      "line": 88,
       "column": 17
     },
     "end": {
-      "line": 87,
+      "line": 91,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 5e084c1e1..42199503b 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -300,7 +300,7 @@
   },
   {
     "id": "settings.app.form.adaptableDarkMode",
-    "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting",
+    "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 121,
diff --git a/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json b/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
new file mode 100644
index 000000000..f3bcaf345
--- /dev/null
+++ b/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "webControls.goHome",
+    "defaultMessage": "!!!Home",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 13,
+      "column": 10
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.openInBrowser",
+    "defaultMessage": "!!!Open in Browser",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 17,
+      "column": 17
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 21,
+      "column": 8
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 25,
+      "column": 11
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "webControls.reload",
+    "defaultMessage": "!!!Reload",
+    "file": "src/features/recipeConnectionLost/components/WebControls.js",
+    "start": {
+      "line": 29,
+      "column": 10
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file