From f1be975d7ab17a7da89ddb3cf6fea2c1b282a89e Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 20 Sep 2018 11:53:10 -0300
Subject: translations PR 20180917 (#9428)

---
 i18n/en.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 788469167..bb71f9fcc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -179,14 +179,6 @@
     "id": "api.channel.leave.last_member.app_error",
     "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."
@@ -1016,10 +1008,6 @@
     "id": "api.emoji.upload.image.app_error",
     "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."
@@ -1036,6 +1024,10 @@
     "id": "api.emoji.upload.large_image.gif_encode_error",
     "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."
@@ -2458,6 +2450,14 @@
     "id": "app.cluster.404.app_error",
     "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}}\""
-- 
cgit v1.2.3-1-g7c22