1 files changed, 91 insertions, 3 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 59d83235d..6292c1e03 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -508,6 +508,10 @@
     "translation": "Could not find file."
   },
   {
+    "id": "api.file.get_file.public_disabled.app_error",
+    "translation": "Public links have been disabled by the system administrator"
+  },
+  {
     "id": "api.file.get_file.public_invalid.app_error",
     "translation": "The public link does not appear to be valid"
   },
@@ -729,11 +733,11 @@
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} and {{.LastUsername}} were mentioned, but they do not belong to this channel."
+    "translation": "{{.Usernames}} and {{.LastUsername}} were mentioned, but they did not receive notifications because they do not belong to this channel."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} was mentioned, but does not belong to this channel."
+    "translation": "{{.Username}} was mentioned, but they did not receive a notification because they do not belong to this channel."
   },
   {
     "id": "api.post.create_post.bad_filename.error",
@@ -1364,6 +1368,14 @@
     "translation": "Your account is locked because of too many failed password attempts. Please reset your password."
   },
   {
+    "id": "api.user.check_user_mfa.bad_code.app_error",
+    "translation": "Invalid MFA token."
+  },
+  {
+    "id": "api.user.check_user_mfa.not_available.app_error",
+    "translation": "MFA is not configured or supported on this server"
+  },
+  {
     "id": "api.user.check_user_password.invalid.app_error",
     "translation": "Login failed because of invalid password"
   },
@@ -1448,6 +1460,10 @@
     "translation": "LDAP not available on this server"
   },
   {
+    "id": "api.user.generate_mfa_qr.not_available.app_error",
+    "translation": "MFA not configured or available on this server"
+  },
+  {
     "id": "api.user.get_authorization_code.unsupported.app_error",
     "translation": "Unsupported OAuth service provider"
   },
@@ -1465,7 +1481,7 @@
   },
   {
     "id": "api.user.ldap_to_email.not_ldap_account.app_error",
-    "translation": "This user account does use LDAP"
+    "translation": "This user account does not use LDAP"
   },
   {
     "id": "api.user.login.blank_pwd.app_error",
@@ -1592,6 +1608,10 @@
     "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"
+  },
+  {
     "id": "api.user.update_password.context.app_error",
     "translation": "Update password failed because context user_id did not match props user_id"
   },
@@ -1804,6 +1824,42 @@
     "translation": "User not registered on LDAP server"
   },
   {
+    "id": "ent.mfa.activate.authenticate.app_error",
+    "translation": "Error attempting to authenticate MFA token"
+  },
+  {
+    "id": "ent.mfa.activate.bad_token.app_error",
+    "translation": "Invalid MFA token"
+  },
+  {
+    "id": "ent.mfa.activate.save_active.app_erro",
+    "translation": "Unable to update MFA active status for the user"
+  },
+  {
+    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "translation": "Unable to update MFA active status for the user"
+  },
+  {
+    "id": "ent.mfa.deactivate.save_secret.app_error",
+    "translation": "Error clearing the MFA secret"
+  },
+  {
+    "id": "ent.mfa.generate_qr_code.create_code.app_error",
+    "translation": "Error generating QR code"
+  },
+  {
+    "id": "ent.mfa.generate_qr_code.save_secret.app_error",
+    "translation": "Error saving the MFA secret"
+  },
+  {
+    "id": "ent.mfa.license_disable.app_error",
+    "translation": "Your license does not support using multi-factor authentication"
+  },
+  {
+    "id": "ent.mfa.validate_token.authenticate.app_error",
+    "translation": "Error trying to authenticate MFA token"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Could not find channel: %v, %v possibilites searched"
   },
@@ -3292,6 +3348,14 @@
     "translation": "We couldn't update the last_ping_at"
   },
   {
+    "id": "store.sql_user.update_mfa_active.app_error",
+    "translation": "We encountered an error updating the user's MFA active status"
+  },
+  {
+    "id": "store.sql_user.update_mfa_secret.app_error",
+    "translation": "We encountered an error updating the user's MFA secret"
+  },
+  {
     "id": "store.sql_user.update_password.app_error",
     "translation": "We couldn't update the user password"
   },
@@ -3706,5 +3770,29 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
+  },
+  {
+    "id": "error.not_found.title",
+    "translation": "Page not found"
+  },
+  {
+    "id": "error.not_found.message",
+    "translation": "The page you where trying to reach does not exist."
+  },
+  {
+    "id": "error.not_found.link_message",
+    "translation": "Back to Mattermost"
+  },
+  {
+    "id": "error.generic.title",
+    "translation": "Error"
+  },
+  {
+    "id": "error.generic.message",
+    "translation": "An error has occoured."
+  },
+  {
+    "id": "error.generic.link_message",
+    "translation": "Back to Mattermost"
   }
 ]