diff options
author | =Corey Hulen <corey@hulen.com> | 2016-03-14 10:23:51 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-03-14 10:23:51 -0700 |
commit | ea3f25924ea64a2dd1e73624c0d30824e1efb240 (patch) | |
tree | a4a2b2bdc37bd675fb89837713995ad44a27427b /i18n/en.json | |
parent | 397ebec88c2db3569efd77238bf877e976492d34 (diff) | |
parent | bf7ae0711743926cfbb031675cc3320d7a942465 (diff) | |
download | chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.tar.gz chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.tar.bz2 chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.zip |
Merge branch 'master' into PLT-2115
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/i18n/en.json b/i18n/en.json index 57d5179b6..e42ade162 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -456,8 +456,8 @@ "translation": "S3 is not supported for local storage export." }, { - "id": "api.export.write_file.app_error", - "translation": "Unable to write to export file" + "id": "api.file.file_upload.exceeds", + "translation": "File exceeds max image size." }, { "id": "api.file.file_upload.exceeds", @@ -508,6 +508,22 @@ "translation": "Initializing file api routes" }, { + "id": "api.file.move_file.configured.app_error", + "translation": "File storage not configured properly. Please configure for either S3 or local server file storage." + }, + { + "id": "api.file.move_file.delete_from_s3.app_error", + "translation": "Unable to delete file from S3." + }, + { + "id": "api.file.move_file.get_from_s3.app_error", + "translation": "Unable to get file from S3." + }, + { + "id": "api.file.move_file.rename.app_error", + "translation": "Unable to move file locally." + }, + { "id": "api.file.open_file_write_stream.configured.app_error", "translation": "File storage not configured properly. Please configure for either S3 or local server file storage." }, @@ -1608,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" }, @@ -3405,22 +3425,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" }, @@ -3553,10 +3557,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" }, @@ -3611,5 +3611,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." } ] |