Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1

1 files changed, 20 insertions, 0 deletions

diff --git a/i18n/en.json b/i18n/en.json
index b6dcced2a..a63ee2af6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1959,6 +1959,14 @@
     "translation": "Server is initializing..."
   },
   {
+    "id": "api.server.start_server.forward80to443.disabled_while_using_lets_encrypt",
+    "translation": "Must enable Forward80To443 when using LetsEncrypt"
+  },
+  {
+    "id": "api.server.start_server.forward80to443.enabled_but_listening_on_wrong_port",
+    "translation": "Cannot forward port 80 to port 443 while listening on port %s: disable Forward80To443 if using a proxy server"
+  },
+  {
     "id": "api.server.start_server.listening.info",
     "translation": "Server is listening on %v"
   },
@@ -6451,6 +6459,18 @@
     "translation": "We couldn't select the posts to delete for the user (too many), please re-run"
   },
   {
+    "id": "store.sql_post.query_max_post_size.error",
+    "translation": "We couldn't determine the maximum supported post size"
+  },
+  {
+    "id": "store.sql_post.query_max_post_size.unrecognized_driver",
+    "translation": "No implementation found to determine the maximum supported post size"
+  },
+  {
+    "id": "store.sql_post.query_max_post_size.max_post_size_bytes",
+    "translation": "Post.Message supports at most %d bytes"
+  },
+  {
     "id": "store.sql_post.save.app_error",
     "translation": "We couldn't save the Post"
   },