translations PR 20161212 (#4774)

1 files changed, 20 insertions, 20 deletions

diff --git a/i18n/en.json b/i18n/en.json
index f39b3f4b6..fb68f741e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -704,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [details: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
@@ -712,10 +716,6 @@
     "translation": "Invalid or expired session, please login again."
   },
   {
-    "id": "api.context.mfa_required.app_error",
-    "translation": "Multi-factor authentication is required on this server."
-  },
-  {
     "id": "api.context.system_permissions.app_error",
     "translation": "You do not have the appropriate permissions (system)"
   },
@@ -1980,36 +1980,36 @@
     "translation": "{{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team on {{.SiteName}}"
   },
   {
-    "id": "api.templates.password_change_body.info",
-    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
-  },
-  {
-    "id": "api.templates.password_change_body.title",
-    "translation": "Your password has been updated"
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
-    "id": "api.templates.password_change_subject",
-    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .SiteName }}"
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
   },
   {
-    "id": "api.templates.mfa_activated_body.info",
-    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
     "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
-    "id": "api.templates.mfa_activated_body.title",
-    "translation": "Multi-factor authentication was added"
-  },
-  {
     "id": "api.templates.mfa_deactivated_body.title",
     "translation": "Multi-factor authentication was removed"
   },
   {
-    "id": "api.templates.mfa_change_subject",
-    "translation": "Your MFA has been updated on {{ .SiteName }}"
+    "id": "api.templates.password_change_body.info",
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.password_change_body.title",
+    "translation": "Your password has been updated"
+  },
+  {
+    "id": "api.templates.password_change_subject",
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .SiteName }}"
   },
   {
     "id": "api.templates.post_body.button",