Merge branch 'release-4.6'

i18n/en.json

@@ -5046,18 +5046,14 @@
     "id": "model.incoming_hook.display_name.app_error",
     "translation": "Invalid title"
   },
-  {
-    "id": "model.incoming_hook.id.app_error",
-    "translation": "Invalid Id"
-  },
-  {
-    "id": "model.incoming_hook.username.app_error",
-    "translation": "Invalid username"
-  },
   {
     "id": "model.incoming_hook.icon_url.app_error",
     "translation": "Invalid post icon"
   },
+  {
+    "id": "model.incoming_hook.id.app_error",
+    "translation": "Invalid Id"
+  },
   {
     "id": "model.incoming_hook.team_id.app_error",
     "translation": "Invalid team ID"
@@ -5070,6 +5066,10 @@
     "id": "model.incoming_hook.user_id.app_error",
     "translation": "Invalid user id"
   },
+  {
+    "id": "model.incoming_hook.username.app_error",
+    "translation": "Invalid username"
+  },
   {
     "id": "model.job.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"