translations PR 20180730 (#9191)

* translations PR 20180730

* Fix japanese

1 files changed, 40 insertions, 39 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 9ed77b07d..6ea979932 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -168,14 +168,6 @@
     "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"
   },
@@ -1747,14 +1739,14 @@
     "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"
   },
@@ -2187,30 +2179,30 @@
     "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"
   },
@@ -2439,6 +2431,14 @@
     "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."
   },
@@ -2955,14 +2955,6 @@
     "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."
   },
@@ -3227,6 +3219,10 @@
     "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."
   },
@@ -3323,6 +3319,10 @@
     "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"
   },
@@ -3331,6 +3331,10 @@
     "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."
   },
@@ -3399,10 +3403,6 @@
     "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."
   },
@@ -4411,6 +4411,10 @@
     "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",