summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-14 00:56:37 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-14 00:56:37 -0400
commit975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165 (patch)
treea0852f9faf6de9962b5478ed3f1bbaccd71062c0 /i18n/en.json
parent160e1a8bea6d8280ef3b41a4a9f80674b75f3eb0 (diff)
parentd7cdcf082fab6c0cb7c2fe4bed821bd1a8000e69 (diff)
downloadchat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.tar.gz
chat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.tar.bz2
chat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.zip
Merge pull request #2331 from mattermost/plt-1680
PLT-1680 Converting client to react-router. Stage 1
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json28
1 files changed, 8 insertions, 20 deletions
diff --git a/i18n/en.json b/i18n/en.json
index bc33fc019..d16de7dbb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1624,6 +1624,10 @@
"translation": "Couldn't upload profile image"
},
{
+ "id": "api.user.verify_email.bad_link.app_error",
+ "translation": "Bad verify email link."
+ },
+ {
"id": "api.web_conn.new_web_conn.last_activity.error",
"translation": "Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v"
},
@@ -3400,22 +3404,6 @@
"translation": "Find Team"
},
{
- "id": "web.footer.about",
- "translation": "About"
- },
- {
- "id": "web.footer.help",
- "translation": "Help"
- },
- {
- "id": "web.footer.privacy",
- "translation": "Privacy"
- },
- {
- "id": "web.footer.terms",
- "translation": "Terms"
- },
- {
"id": "web.get_access_token.bad_client_id.app_error",
"translation": "invalid_request: Bad client_id"
},
@@ -3548,10 +3536,6 @@
"translation": "Home"
},
{
- "id": "web.root.singup_info",
- "translation": "All team communication in one place, searchable and accessible anywhere"
- },
- {
"id": "web.root.singup_title",
"translation": "Signup"
},
@@ -3606,5 +3590,9 @@
{
"id": "web.watcher_fail.error",
"translation": "Failed to add directory to watcher %v"
+ },
+ {
+ "id": "api.team.get_invite_info.not_open_team",
+ "translation": "Invite is invalid because this is not an open team."
}
]