summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-04-01 13:15:34 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-04-01 13:15:34 -0400
commitd9d6a0c7837d585297047e2a606ef20c86bfdfc2 (patch)
treee237f3be8aa6d9a53e3c3ccc33487431a5b00d02 /i18n
parent8adf8ac2eb5c905fb3824be993b5d65670e33940 (diff)
parent7e9c7ce60a90f3628888f178c27642561643abaa (diff)
downloadchat-d9d6a0c7837d585297047e2a606ef20c86bfdfc2.tar.gz
chat-d9d6a0c7837d585297047e2a606ef20c86bfdfc2.tar.bz2
chat-d9d6a0c7837d585297047e2a606ef20c86bfdfc2.zip
Merge pull request #2614 from mattermost/plt-2388
PLT-2388 Visiting invalid URLs and bad APIs causes redirect to error page
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json24
1 files changed, 24 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 52e4fca8a..0e94a80e6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3734,5 +3734,29 @@
{
"id": "web.watcher_fail.error",
"translation": "Failed to add directory to watcher %v"
+ },
+ {
+ "id": "error.not_found.title",
+ "translation": "Page not found"
+ },
+ {
+ "id": "error.not_found.message",
+ "translation": "The page you where trying to reach does not exist."
+ },
+ {
+ "id": "error.not_found.link_message",
+ "translation": "Back to Mattermost"
+ },
+ {
+ "id": "error.generic.title",
+ "translation": "Error"
+ },
+ {
+ "id": "error.generic.message",
+ "translation": "An error has occoured."
+ },
+ {
+ "id": "error.generic.link_message",
+ "translation": "Back to Mattermost"
}
]