translations PR 20161025 (#4328)

1 files changed, 10 insertions, 10 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 3cdffafea..e6b444370 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3268,6 +3268,10 @@
     "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."
   },
@@ -3276,10 +3280,6 @@
     "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}}."
   },
@@ -4640,20 +4640,20 @@
     "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",