From 9a87bb3af68216b53ee8f89d6604c715c7b85b2d Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 27 Apr 2017 10:55:03 -0400
Subject: Creating common token store and moving email invites and verification
 to it (#6213)

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

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 83d0b83e2..06fb3528c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3575,6 +3575,14 @@
     "id": "mattermost.working_dir",
     "translation": "Current working directory is %v"
   },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "Invalid token."
+  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
+  },
   {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Invalid access token"
@@ -4411,6 +4419,10 @@
     "id": "model.user.is_valid.auth_data.app_error",
     "translation": "Invalid auth data"
   },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 charactors due to the limitations of bcrypt."
+  },
   {
     "id": "model.user.is_valid.auth_data_pwd.app_error",
     "translation": "Invalid user, password and auth data cannot both be set"
@@ -4591,10 +4603,6 @@
     "id": "store.sql.dialect_driver.panic",
     "translation": "Failed to create dialect specific driver %v"
   },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "Failed to drop column %v"
-  },
   {
     "id": "store.sql.incorrect_mac",
     "translation": "Incorrect MAC for the given ciphertext"
-- 
cgit v1.2.3-1-g7c22