translations PR 20180730 (#9191)

* translations PR 20180730

* Fix japanese

i18n/en.json

@@ -167,14 +167,6 @@
     "id": "api.channel.join_channel.already_deleted.app_error",
     "translation": "Channel is already deleted"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch is already started"
-  },
-  {
-    "id": "ent.elasticsearch.stop.already_stopped.app_error",
-    "translation": "Elasticsearch is already stopped"
-  },
   {
     "id": "api.channel.join_channel.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
@@ -1746,14 +1738,14 @@
     "id": "api.templates.deactivate_body.info",
     "translation": "You deactivated your account on {{ .SiteURL }}."
   },
-  {
-    "id": "api.templates.deactivate_body.warning",
-    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
-  },
   {
     "id": "api.templates.deactivate_body.title",
     "translation": "Your account has been deactivated at {{ .ServerURL }}"
   },
+  {
+    "id": "api.templates.deactivate_body.warning",
+    "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator."
+  },
   {
     "id": "api.templates.deactivate_subject",
     "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
@@ -2186,30 +2178,30 @@
     "id": "api.user.reset_password.sso.app_error",
     "translation": "Cannot reset password for SSO accounts"
   },
-  {
-    "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML 2.0 is not configured or supported on this server."
-  },
-  {
-    "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
-  },
   {
     "id": "api.user.saml.app_error",
     "translation": "Unable to process SAML login request."
   },
-  {
-    "id": "api.user.saml.extension_unsupported",
-    "translation": "Extensions are not supported."
-  },
   {
     "id": "api.user.saml.extension_id.app_error",
     "translation": "Invalid extension id"
   },
+  {
+    "id": "api.user.saml.extension_unsupported",
+    "translation": "Extensions are not supported."
+  },
   {
     "id": "api.user.saml.invalid_extension",
     "translation": "Extension with extension_id={{.ExtensionId}} is not supported."
   },
+  {
+    "id": "api.user.saml.not_available.app_error",
+    "translation": "SAML 2.0 is not configured or supported on this server."
+  },
+  {
+    "id": "api.user.send_deactivate_email_and_forget.failed.error",
+    "translation": "Failed to send the deactivate account email successfully"
+  },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
     "translation": "Failed to send email change notification email successfully"
@@ -2438,6 +2430,14 @@
     "id": "app.cluster.404.app_error",
     "translation": "Cluster API endpoint not found."
   },
+  {
+    "id": "app.import.attachment.bad_file.error",
+    "translation": "Error reading the file at: \"{{.FilePath}}\""
+  },
+  {
+    "id": "app.import.attachment.file_upload.error",
+    "translation": "Error uploading the file: \"{{.FilePath}}\""
+  },
   {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Error reading import data file."
@@ -2954,14 +2954,6 @@
     "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
     "translation": "Team name missing from User's Team Membership."
   },
-  {
-    "id": "app.import.attachment.bad_file.error",
-    "translation": "Error reading the file at: \"{{.FilePath}}\""
-  },
-  {
-    "id": "app.import.attachment.file_upload.error",
-    "translation": "Error uploading the file: \"{{.FilePath}}\""
-  },
   {
     "id": "app.notification.body.intro.direct.full",
     "translation": "You have a new Direct Message."
@@ -3226,6 +3218,10 @@
     "id": "ent.compliance.global_relay.attachments_removed.appError",
     "translation": "Uploaded file was removed from Global Relay export because it was too large to send."
   },
+  {
+    "id": "ent.compliance.global_relay.open_temporary_file.appError",
+    "translation": "Unable to open the temporary export file."
+  },
   {
     "id": "ent.compliance.licence_disable.app_error",
     "translation": "Compliance functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
@@ -3322,6 +3318,10 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Failed to decode search results"
   },
+  {
+    "id": "ent.elasticsearch.start.already_started.app_error",
+    "translation": "Elasticsearch is already started"
+  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor"
@@ -3330,6 +3330,10 @@
     "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
     "translation": "Failed to start Elasticsearch bulk processor"
   },
+  {
+    "id": "ent.elasticsearch.stop.already_stopped.app_error",
+    "translation": "Elasticsearch is already stopped"
+  },
   {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
@@ -3398,10 +3402,6 @@
     "id": "ent.ldap.validate_filter.app_error",
     "translation": "Invalid AD/LDAP Filter"
   },
-  {
-    "id": "ent.compliance.global_relay.open_temporary_file.appError",
-    "translation": "Unable to open the temporary export file."
-  },
   {
     "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
     "translation": "Unable to create the eml file."
@@ -4410,6 +4410,10 @@
     "id": "model.oauth.is_valid.update_at.app_error",
     "translation": "Update at must be a valid time"
   },
+  {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "Invalid icon"
+  },
   {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Invalid callback URLs"
@@ -4469,9 +4473,6 @@
   {
     "id": "model.outgoing_hook.username.app_error",
     "translation": "Invalid username"
-  },{
-    "id": "model.outgoing_hook.icon_url.app_error",
-    "translation": "Invalid icon"
   },
   {
     "id": "model.plugin_command.error.app_error",