summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-04-27 10:55:03 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-04-27 10:55:03 -0400
commit9a87bb3af68216b53ee8f89d6604c715c7b85b2d (patch)
tree8c06aed890f388b228f3aefb8e398309bc73c0b9 /i18n/en.json
parent0e007e344bf10993529711f14c4168365c3504c3 (diff)
downloadchat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.tar.gz
chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.tar.bz2
chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.zip
Creating common token store and moving email invites and verification to it (#6213)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json16
1 files changed, 12 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 83d0b83e2..06fb3528c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3576,6 +3576,14 @@
"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"
},
@@ -4412,6 +4420,10 @@
"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"
},
@@ -4592,10 +4604,6 @@
"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"
},