From af758c8e5df3d80e0910c5549660ffd6b16e6af2 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 7 Mar 2018 18:42:40 +0000
Subject: translations PR 20180306 (#8414)

---
 i18n/en.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 37639ba60..8457d6d3d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1814,14 +1814,14 @@
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "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 "
@@ -4190,6 +4190,10 @@
     "id": "ent.migration.migratetoldap.user_not_found",
     "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."
@@ -4198,10 +4202,6 @@
     "id": "ent.migration.migratetosaml.username_already_used_by_other_user",
     "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."
@@ -4978,10 +4978,6 @@
     "id": "model.config.is_valid.site_url.app_error",
     "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."
@@ -5050,6 +5046,10 @@
     "id": "model.config.is_valid.webserver_security.app_error",
     "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."
-- 
cgit v1.2.3-1-g7c22


From 5ed3b42629fa9ac4d1a9c237292afcf98e61b994 Mon Sep 17 00:00:00 2001
From: Jonathan <jonfritz@gmail.com>
Date: Thu, 8 Mar 2018 06:45:36 -0500
Subject: MM-8840: Add GlobalRelay Configuration Settings (#8304)

* Added new GlobalRelay config settings

* Adding default values to global relay config

* Migrate global relay config tests to table driven tests
---
 i18n/en.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 2efb13375..a6f0eb30b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4946,6 +4946,30 @@
     "id": "model.config.is_valid.message_export.batch_size.app_error",
     "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."
-- 
cgit v1.2.3-1-g7c22