summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2018-09-20 11:53:10 -0300
committerGitHub <noreply@github.com>2018-09-20 11:53:10 -0300
commitf1be975d7ab17a7da89ddb3cf6fea2c1b282a89e (patch)
tree1d8be69d95de08fba16fa81d8b4d3d484eb856c2 /i18n/en.json
parent3ea33b76f802b943a942070845d410a985f4235f (diff)
downloadchat-f1be975d7ab17a7da89ddb3cf6fea2c1b282a89e.tar.gz
chat-f1be975d7ab17a7da89ddb3cf6fea2c1b282a89e.tar.bz2
chat-f1be975d7ab17a7da89ddb3cf6fea2c1b282a89e.zip
translations PR 20180917 (#9428)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json24
1 files changed, 12 insertions, 12 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 788469167..bb71f9fcc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -180,14 +180,6 @@
"translation": "You're the only member left, try removing the Private Channel instead of leaving."
},
{
- "id": "app.export.export_write_line.json_marshall.error",
- "translation": "An error occured marshalling the JSON data for export."
- },
- {
- "id": "app.export.export_write_line.io_writer.error",
- "translation": "An error occurred writing the export data."
- },
- {
"id": "api.channel.leave.left",
"translation": "%v left the channel."
},
@@ -1017,10 +1009,6 @@
"translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
},
{
- "id": "api.emoji.upload.large_image.too_large.app_error",
- "translation": "Unable to create emoji. Image must be smaller than {{.MaxWidth}} by {{.MaxHeight}}."
- },
- {
"id": "api.emoji.upload.large_image.decode_error",
"translation": "Unable to create emoji. An error occurred when trying to decode the image."
},
@@ -1037,6 +1025,10 @@
"translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
},
{
+ "id": "api.emoji.upload.large_image.too_large.app_error",
+ "translation": "Unable to create emoji. Image must be smaller than {{.MaxWidth}} by {{.MaxHeight}}."
+ },
+ {
"id": "api.emoji.upload.open.app_error",
"translation": "Unable to create the emoji. An error ocurred when trying to open the attached image."
},
@@ -2459,6 +2451,14 @@
"translation": "Cluster API endpoint not found."
},
{
+ "id": "app.export.export_write_line.io_writer.error",
+ "translation": "An error occurred writing the export data."
+ },
+ {
+ "id": "app.export.export_write_line.json_marshall.error",
+ "translation": "An error occured marshalling the JSON data for export."
+ },
+ {
"id": "app.import.attachment.bad_file.error",
"translation": "Error reading the file at: \"{{.FilePath}}\""
},