summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2017-04-04 12:44:38 -0300
committerGitHub <noreply@github.com>2017-04-04 12:44:38 -0300
commit3a79e451ffe3ffe618311ee15b02dbebde6a77b0 (patch)
tree9c507dc5698ac2f5a9feb8103259786fcb5df509 /i18n/en.json
parent9609a9b89a500448e2623e9a02471f8bca5c050c (diff)
downloadchat-3a79e451ffe3ffe618311ee15b02dbebde6a77b0.tar.gz
chat-3a79e451ffe3ffe618311ee15b02dbebde6a77b0.tar.bz2
chat-3a79e451ffe3ffe618311ee15b02dbebde6a77b0.zip
translations PR 20170403 (#5964)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json68
1 files changed, 34 insertions, 34 deletions
diff --git a/i18n/en.json b/i18n/en.json
index aeec957bd..051631f3c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -72,10 +72,6 @@
"translation": "Image storage is not configured."
},
{
- "id": "api.deprecated.init.debug",
- "translation": "Initializing deprecated API routes"
- },
- {
"id": "api.admin.init.debug",
"translation": "Initializing admin API routes"
},
@@ -148,22 +144,6 @@
"translation": "Error rendering template %v err=%v"
},
{
- "id": "wsapi.user.init.debug",
- "translation": "Initializing user WebSocket API routes"
- },
- {
- "id": "wsapi.system.init.debug",
- "translation": "Initializing system WebSocket API routes"
- },
- {
- "id": "wsapi.status.init.debug",
- "translation": "Initializing status WebSocket API routes"
- },
- {
- "id": "wsapi.webrtc.init.debug",
- "translation": "Initializing webrtc WebSocket API routes"
- },
- {
"id": "api.auth.unable_to_get_user.app_error",
"translation": "Unable to get user to check permissions."
},
@@ -908,6 +888,10 @@
"translation": "An unknown error has occurred. Please contact support."
},
{
+ "id": "api.deprecated.init.debug",
+ "translation": "Initializing deprecated API routes"
+ },
+ {
"id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
"translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
},
@@ -3736,28 +3720,28 @@
"translation": "Unable to write request"
},
{
- "id": "model.client.upload_saml_cert.app_error",
- "translation": "Error creating SAML certificate multipart form request"
- },
- {
- "id": "model.client.upload_post_attachment.writer.app_error",
- "translation": "Error closing multipart writer"
+ "id": "model.client.upload_post_attachment.channel_id.app_error",
+ "translation": "Error writing channel id to multipart form"
},
{
"id": "model.client.upload_post_attachment.file.app_error",
"translation": "Error writing file to multipart form"
},
{
- "id": "model.client.upload_post_attachment.channel_id.app_error",
- "translation": "Error writing channel id to multipart form"
+ "id": "model.client.upload_post_attachment.file_size.app_error",
+ "translation": "Error writing fileSize to multipart form"
},
{
"id": "model.client.upload_post_attachment.import_from.app_error",
"translation": "Error writing importFrom to multipart form"
},
{
- "id": "model.client.upload_post_attachment.file_size.app_error",
- "translation": "Error writing fileSize to multipart form"
+ "id": "model.client.upload_post_attachment.writer.app_error",
+ "translation": "Error closing multipart writer"
+ },
+ {
+ "id": "model.client.upload_saml_cert.app_error",
+ "translation": "Error creating SAML certificate multipart form request"
},
{
"id": "model.command.is_valid.create_at.app_error",
@@ -5512,14 +5496,14 @@
"translation": "We couldn't save the team member"
},
{
- "id": "store.sql_team.search_open_team.app_error",
- "translation": "We encountered an error searching open teams"
- },
- {
"id": "store.sql_team.search_all_team.app_error",
"translation": "We encountered an error searching teams"
},
{
+ "id": "store.sql_team.search_open_team.app_error",
+ "translation": "We encountered an error searching open teams"
+ },
+ {
"id": "store.sql_team.update.app_error",
"translation": "We couldn't update the team"
},
@@ -6090,5 +6074,21 @@
{
"id": "web.watcher_fail.error",
"translation": "Failed to add directory to watcher %v"
+ },
+ {
+ "id": "wsapi.status.init.debug",
+ "translation": "Initializing status WebSocket API routes"
+ },
+ {
+ "id": "wsapi.system.init.debug",
+ "translation": "Initializing system WebSocket API routes"
+ },
+ {
+ "id": "wsapi.user.init.debug",
+ "translation": "Initializing user WebSocket API routes"
+ },
+ {
+ "id": "wsapi.webrtc.init.debug",
+ "translation": "Initializing webrtc WebSocket API routes"
}
]