diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2018-06-20 08:19:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 08:19:57 -0400 |
| commit | 8e24dd78fb868cb01dd626bca3e3d756b67fddc8 (patch) | |
| tree | 75a922e109beb6fd9494e01c5ac1e269ed939c54 /i18n/en.json | |
| parent | 344836dfb22fb36d4d2740c5ec226de78d9dcd3c (diff) | |
| download | chat-8e24dd78fb868cb01dd626bca3e3d756b67fddc8.tar.gz chat-8e24dd78fb868cb01dd626bca3e3d756b67fddc8.tar.bz2 chat-8e24dd78fb868cb01dd626bca3e3d756b67fddc8.zip | |
translations PR 20180619 (#8963)
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/i18n/en.json b/i18n/en.json index 9964670bf..543c308bd 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2847,10 +2847,6 @@ "translation": "Blank email" }, { - "id": "oauth.gitlab.tos.error", - "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again." - }, - { "id": "api.user.complete_switch_with_oauth.parse.app_error", "translation": "Could not parse auth data out of {{.Service}} user object" }, @@ -4303,14 +4299,14 @@ "translation": "Elasticsearch searching is disabled on this server" }, { - "id": "ent.elasticsearch.search_posts.search_failed", - "translation": "Search failed to complete" - }, - { "id": "ent.elasticsearch.search_posts.parse_matches_failed", "translation": "Failed to parse search result matches" }, { + "id": "ent.elasticsearch.search_posts.search_failed", + "translation": "Search failed to complete" + }, + { "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Failed to decode search results" }, @@ -5915,6 +5911,10 @@ "translation": "could not decode" }, { + "id": "oauth.gitlab.tos.error", + "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again." + }, + { "id": "plugin.rpcplugin.invocation.error", "translation": "Error invoking plugin RPC" }, |