From 6b27b74f0cbd39e5d1400cddbed6437a4df64856 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 18 Jul 2018 11:30:48 -0400
Subject: translations PR 20180718 (#9123)

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

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 2992b2044..9493a36b0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -159,10 +159,6 @@
     "id": "api.channel.delete_channel.deleted.app_error",
     "translation": "The channel has been archived or deleted"
   },
-  {
-    "id": "api.reaction.town_square_read_only",
-    "translation": "Reacting to posts is not possible in read-only channels."
-  },
   {
     "id": "api.channel.delete_channel.type.invalid",
     "translation": "Cannot delete direct or group message channels"
@@ -1446,6 +1442,10 @@
     "id": "api.reaction.save_reaction.user_id.app_error",
     "translation": "You cannot save reaction for the other user."
   },
+  {
+    "id": "api.reaction.town_square_read_only",
+    "translation": "Reacting to posts is not possible in read-only channels."
+  },
   {
     "id": "api.roles.patch_roles.license.error",
     "translation": "Your license does not support advanced permissions."
@@ -2394,22 +2394,6 @@
     "id": "app.cluster.404.app_error",
     "translation": "Cluster API endpoint not found."
   },
-  {
-    "id": "app.import.emoji.bad_file.error",
-    "translation": "Error reading import emoji image file. Emoji with name: \"{{.EmojiName}}\""
-  },
-  {
-    "id": "app.import.validate_emoji_import_data.empty.error",
-    "translation": "Import emoji data empty."
-  },
-  {
-    "id": "app.import.validate_emoji_import_data.name_missing.error",
-    "translation": "Import emoji name field missing or blank."
-  },
-  {
-    "id": "app.import.validate_emoji_import_data.image_missing.error",
-    "translation": "Import emoji image field missing or blank."
-  },
   {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Error reading import data file."
@@ -2422,6 +2406,10 @@
     "id": "app.import.bulk_import.unsupported_version.error",
     "translation": "Incorrect or missing version in the data import file. Make sure version is the first object in your import file and try again."
   },
+  {
+    "id": "app.import.emoji.bad_file.error",
+    "translation": "Error reading import emoji image file. Emoji with name: \"{{.EmojiName}}\""
+  },
   {
     "id": "app.import.import_channel.scheme_deleted.error",
     "translation": "Cannot set a channel to use a deleted scheme."
@@ -2642,6 +2630,18 @@
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Missing required direct post property: user"
   },
+  {
+    "id": "app.import.validate_emoji_import_data.empty.error",
+    "translation": "Import emoji data empty."
+  },
+  {
+    "id": "app.import.validate_emoji_import_data.image_missing.error",
+    "translation": "Import emoji image field missing or blank."
+  },
+  {
+    "id": "app.import.validate_emoji_import_data.name_missing.error",
+    "translation": "Import emoji name field missing or blank."
+  },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
     "translation": "Missing required Post property: Channel."
-- 
cgit v1.2.3-1-g7c22