From 009f72f075ff02c8db151ec2eabd731dd1df8374 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 30 May 2018 10:22:37 -0400
Subject: translations PR 20180528 (#8864)

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

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index e2f67d0ce..4a9532ca3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2514,6 +2514,18 @@
     "id": "api.templates.channel_name.group",
     "translation": "Group Message"
   },
+  {
+    "id": "api.templates.deactivate_body.info",
+    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+  },
+  {
+    "id": "api.templates.deactivate_body.title",
+    "translation": "Your account has been deactivated at {{ .ServerURL }}"
+  },
+  {
+    "id": "api.templates.deactivate_subject",
+    "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
+  },
   {
     "id": "api.templates.email_change_body.info",
     "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}.<br>If you did not make this change, please contact the system administrator."
@@ -2750,22 +2762,6 @@
     "id": "api.templates.welcome_subject",
     "translation": "[{{ .SiteName }}] You joined {{ .ServerURL }}"
   },
-  {
-    "id": "api.templates.deactivate_subject",
-    "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
-  },
-  {
-    "id": "api.templates.deactivate_body.title",
-    "translation": "Your account has been deactivated at {{ .ServerURL }}"
-  },
-  {
-    "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
-  },
-  {
-    "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
-  },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
     "translation": "MFA is not available for this account type"
@@ -3038,6 +3034,10 @@
     "id": "api.user.saml.not_available.app_error",
     "translation": "SAML 2.0 is not configured or supported on this server."
   },
+  {
+    "id": "api.user.send_deactivate_email_and_forget.failed.error",
+    "translation": "Failed to send the deactivate account email successfully"
+  },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
     "translation": "Failed to send email change notification email successfully"
@@ -3086,14 +3086,14 @@
     "id": "api.user.update_active.no_deactivate_sso.app_error",
     "translation": "You can not modify the activation status of SSO accounts. Please modify through the SSO server."
   },
-  {
-    "id": "api.user.update_active.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
-  },
   {
     "id": "api.user.update_active.not_enable.app_error",
     "translation": "You cannot deactivate yourself because this feature is not enabled. Please contact your System Administrator."
   },
+  {
+    "id": "api.user.update_active.permissions.app_error",
+    "translation": "You do not have the appropriate permissions"
+  },
   {
     "id": "api.user.update_mfa.not_available.app_error",
     "translation": "MFA not configured or available on this server"
@@ -6750,10 +6750,6 @@
     "id": "store.sql_role.get_by_names.app_error",
     "translation": "Unable to get roles"
   },
-  {
-    "id": "web.incoming_webhook.channel_locked.app_error",
-    "translation": "This webhook is not permitted to post to the requested channel"
-  },
   {
     "id": "store.sql_role.permanent_delete_all.app_error",
     "translation": "We could not permanently delete all the roles"
@@ -7562,6 +7558,10 @@
     "id": "web.incoming_webhook.channel.app_error",
     "translation": "Couldn't find the channel"
   },
+  {
+    "id": "web.incoming_webhook.channel_locked.app_error",
+    "translation": "This webhook is not permitted to post to the requested channel"
+  },
   {
     "id": "web.incoming_webhook.disabled.app_error",
     "translation": "Incoming webhooks have been disabled by the system admin."
-- 
cgit v1.2.3-1-g7c22