9 files changed, 391 insertions, 43 deletions

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