diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-15 12:26:32 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-15 12:26:32 -0400 |
| commit | f7b3731b2b2767b0784e1f2e0ce723cae917c47a (patch) | |
| tree | fd00d8da4bcbd671a9b1324dd500d133daf06e19 /i18n/en.json | |
| parent | 942ae4c5278e0a3064ef08937063ec66a6a8e990 (diff) | |
| parent | ab52700aaa76a5623de23cd0156f5dbd9a24e264 (diff) | |
| download | chat-f7b3731b2b2767b0784e1f2e0ce723cae917c47a.tar.gz chat-f7b3731b2b2767b0784e1f2e0ce723cae917c47a.tar.bz2 chat-f7b3731b2b2767b0784e1f2e0ce723cae917c47a.zip | |
Merge branch 'release-3.2' into 'master'
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/i18n/en.json b/i18n/en.json index f8dddfc0b..245ae8d83 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1761,7 +1761,7 @@ }, { "id": "api.user.login.invalid_credentials", - "translation": "Your login credentials are incorrect." + "translation": "User ID or password incorrect." }, { "id": "api.user.login.not_provided.app_error", |