diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2018-01-23 15:07:31 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-01-23 15:07:31 -0500 |
| commit | 195ad5620402f1a3239e75ef140e64c3731abf29 (patch) | |
| tree | 611c43ec55391747333c0bf62e67090861f2a183 /i18n/en.json | |
| parent | 3dad6320432c1cbeb032b57619ba78f29433dce3 (diff) | |
| parent | 2bdd44cce9dc922959dcf51d329a0039eba8debd (diff) | |
| download | chat-195ad5620402f1a3239e75ef140e64c3731abf29.tar.gz chat-195ad5620402f1a3239e75ef140e64c3731abf29.tar.bz2 chat-195ad5620402f1a3239e75ef140e64c3731abf29.zip | |
Merge branch 'release-4.6'
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 e40d4bc67..eed106197 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5047,18 +5047,14 @@ "translation": "Invalid title" }, { - "id": "model.incoming_hook.id.app_error", - "translation": "Invalid Id" - }, - { - "id": "model.incoming_hook.username.app_error", - "translation": "Invalid username" - }, - { "id": "model.incoming_hook.icon_url.app_error", "translation": "Invalid post icon" }, { + "id": "model.incoming_hook.id.app_error", + "translation": "Invalid Id" + }, + { "id": "model.incoming_hook.team_id.app_error", "translation": "Invalid team ID" }, @@ -5071,6 +5067,10 @@ "translation": "Invalid user id" }, { + "id": "model.incoming_hook.username.app_error", + "translation": "Invalid username" + }, + { "id": "model.job.is_valid.create_at.app_error", "translation": "Create at must be a valid time" }, |