From 4dca84c8b4e38dd13522ddaea5843b276dd77946 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Thu, 27 Oct 2016 10:08:47 -0300
Subject: translations PR 20161025 (#4328)

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

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 3cdffafea..e6b444370 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3267,6 +3267,10 @@
     "id": "model.config.is_valid.max_burst.app_error",
     "translation": "Maximum burst size must be greater than zero."
   },
+  {
+    "id": "model.config.is_valid.max_channels.app_error",
+    "translation": "Invalid maximum channels per team for team settings.  Must be a positive number."
+  },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "Invalid max file size for file settings. Must be a zero or positive number."
@@ -3275,10 +3279,6 @@
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Invalid maximum users per team for team settings.  Must be a positive number."
   },
-  {
-    "id": "model.config.is_valid.max_channels.app_error",
-    "translation": "Invalid maximum channels per team for team settings.  Must be a positive number."
-  },
   {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}."
@@ -4639,21 +4639,21 @@
     "id": "store.sql_team.get_member.app_error",
     "translation": "We couldn't get the team member"
   },
-  {
-    "id": "store.sql_team.get_members_by_ids.app_error",
-    "translation": "We couldn't get the team members"
-  },
   {
     "id": "store.sql_team.get_member.missing.app_error",
     "translation": "No team member found for that user id and team id"
   },
+  {
+    "id": "store.sql_team.get_member_count.app_error",
+    "translation": "We couldn't count the team members"
+  },
   {
     "id": "store.sql_team.get_members.app_error",
     "translation": "We couldn't get the team members"
   },
   {
-    "id": "store.sql_team.get_member_count.app_error",
-    "translation": "We couldn't count the team members"
+    "id": "store.sql_team.get_members_by_ids.app_error",
+    "translation": "We couldn't get the team members"
   },
   {
     "id": "store.sql_team.get_teams_for_email.app_error",
-- 
cgit v1.2.3-1-g7c22