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 | |
| 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')
| -rw-r--r-- | i18n/de.json | 2 | ||||
| -rw-r--r-- | i18n/en.json | 2 | ||||
| -rw-r--r-- | i18n/es.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/i18n/de.json b/i18n/de.json index 289cec3b6..17691b02b 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -165,7 +165,7 @@ }, { "id": "api.channel.add_user.to.channel.failed.deleted.app_error", - "translation": "Failed to add user to channel because they have been removed from the team." + "translation": "Fehler beim Hinzufügen des Benutzers zum Kanal, da dieser aus dem Team entfernt worden ist." }, { "id": "api.channel.add_user_to_channel.deleted.app_error", 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", diff --git a/i18n/es.json b/i18n/es.json index 30ea90ad5..9ea63a7d0 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -165,7 +165,7 @@ }, { "id": "api.channel.add_user.to.channel.failed.deleted.app_error", - "translation": "Failed to add user to channel because they have been removed from the team." + "translation": "Error al agregar el usuario al canal porque ha sido removido del equipo." }, { "id": "api.channel.add_user_to_channel.deleted.app_error", |