Merge branch 'master' into advanced-permissions-phase-1

1 files changed, 36 insertions, 12 deletions

diff --git a/i18n/en.json b/i18n/en.json
index bb906ae6c..85a09a139 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1831,14 +1831,14 @@
     "translation": " uploaded one or more files in "
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " uploaded one or more files"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
     "translation": " uploaded one or more files in a direct message"
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
+    "translation": " uploaded one or more files"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_in",
     "translation": " in "
   },
@@ -4259,6 +4259,10 @@
     "translation": "Unable to find user on AD/LDAP server: "
   },
   {
+    "id": "ent.migration.migratetosaml.email_already_used_by_other_user",
+    "translation": "Email already used by another SAML user."
+  },
+  {
     "id": "ent.migration.migratetosaml.user_not_found_in_users_mapping_file",
     "translation": "User not found in the users file."
   },
@@ -4267,10 +4271,6 @@
     "translation": "Username already used by another Mattermost user."
   },
   {
-    "id": "ent.migration.migratetosaml.email_already_used_by_other_user",
-    "translation": "Email already used by another SAML user."
-  },
-  {
     "id": "ent.saml.attribute.app_error",
     "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
   },
@@ -4959,6 +4959,30 @@
     "translation": "Message export job BatchSize must be a positive integer"
   },
   {
+    "id": "model.config.is_valid.message_export.export_type.app_error",
+    "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'"
+  },
+  {
+    "id": "model.config.is_valid.message_export.global_relay.config_missing.app_error",
+    "translation": "Message export job ExportFormat is set to 'globalrelay', but GlobalRelaySettings are missing"
+  },
+  {
+    "id": "model.config.is_valid.message_export.global_relay.customer_type.app_error",
+    "translation": "Message export GlobalRelaySettings.CustomerType must be set to one of either 'A9' or 'A10'"
+  },
+  {
+    "id": "model.config.is_valid.message_export.global_relay.email_address.app_error",
+    "translation": "Message export job GlobalRelaySettings.EmailAddress must be set to a valid email address"
+  },
+  {
+    "id": "model.config.is_valid.message_export.global_relay.smtp_username.app_error",
+    "translation": "Message export job GlobalRelaySettings.SmtpUsername must be set"
+  },
+  {
+    "id": "model.config.is_valid.message_export.global_relay.smtp_password.app_error",
+    "translation": "Message export job GlobalRelaySettings.SmtpPassword must be set"
+  },
+  {
     "id": "model.config.is_valid.message_export.daily_runtime.app_error",
     "translation": "Message export job DailyRuntime must be a 24-hour time stamp in the form HH:MM."
   },
@@ -5047,10 +5071,6 @@
     "translation": "Site URL must be a valid URL and start with http:// or https://"
   },
   {
-    "id": "model.config.is_valid.websocket_url.app_error",
-    "translation": "Websocket URL must be a valid URL and start with ws:// or wss://"
-  },
-  {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
     "translation": "Unable to enable email batching when SiteURL isn't set."
   },
@@ -5119,6 +5139,10 @@
     "translation": "Invalid value for webserver connection security."
   },
   {
+    "id": "model.config.is_valid.websocket_url.app_error",
+    "translation": "Websocket URL must be a valid URL and start with ws:// or wss://"
+  },
+  {
     "id": "model.config.is_valid.write_timeout.app_error",
     "translation": "Invalid value for write timeout."
   },