translations PR 20180730 (#9191)

* translations PR 20180730

* Fix japanese

1 files changed, 167 insertions, 47 deletions

diff --git a/i18n/ko.json b/i18n/ko.json
index 9fd11117c..3c94a2aa7 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "actiance.xml.output.formatter.marshalToXml.appError",
+    "id": "actiance.export.marshalToXml.appError",
     "translation": "XML형식으로 변환하여 내보낼 수 없습니다."
   },
   {
@@ -41,7 +41,7 @@
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/> Mattermost 이메일이 잘 설정된 것 같군요!"
+    "translation": "사용자의 Mattermost 이메일이 잘 설정되었습니다!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -193,7 +193,7 @@
   },
   {
     "id": "api.channel.patch_update_channel.forbidden.app_error",
-    "translation": "Failed to update the channel"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "api.channel.post_channel_privacy_message.error",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.command.invite_people.email_invitations_off",
-    "translation": "Email invitations are disabled, no invite(s) sent"
+    "translation": "이메일 초대가 막혀있습니다, 초대가 보내지지 않았습니다."
   },
   {
     "id": "api.command.invite_people.email_off",
@@ -584,7 +584,7 @@
   },
   {
     "id": "api.command_groupmsg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to create a new group message."
+    "translation": "사용자는 새로운 그룹 메시지를 만들 적절한 권한이 없습니다."
   },
   {
     "id": "api.command_help.desc",
@@ -648,7 +648,7 @@
   },
   {
     "id": "api.command_invite_people.permission.app_error",
-    "translation": "You don't have permission to invite new users to this server."
+    "translation": "이 서버로 새로운 사용자를 초대할 권한이 없습니다."
   },
   {
     "id": "api.command_join.desc",
@@ -744,7 +744,7 @@
   },
   {
     "id": "api.command_msg.permission.app_error",
-    "translation": "You don't have the appropriate permissions to direct message this user."
+    "translation": "해당 사용자에게 개인 메시지를 보낼 권한이 없습니다."
   },
   {
     "id": "api.command_mute.desc",
@@ -948,7 +948,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.date",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
@@ -976,7 +976,7 @@
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
     "translation": {
-      "one": "[{{.SiteName}}] 새 알림 {{.Month}} {{.Day}}, {{.Year}}",
+      "one": "[{{.SiteName}}] (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새 알림이 왔습니다[{{.SiteName}}] (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새 알림들이 왔습니다",
       "other": ""
     }
   },
@@ -1444,7 +1444,7 @@
   },
   {
     "id": "api.reaction.town_square_read_only",
-    "translation": "Reacting to posts is not possible in read-only channels."
+    "translation": "읽기 전용 채널에서는 메시지에 응답할 수 없습니다."
   },
   {
     "id": "api.roles.patch_roles.license.error",
@@ -1624,7 +1624,7 @@
   },
   {
     "id": "api.team.invite_members.disabled.app_error",
-    "translation": "Email invitations are disabled."
+    "translation": "이메일 초대가 막혀있습니다."
   },
   {
     "id": "api.team.invite_members.invalid_email.app_error",
@@ -1716,11 +1716,11 @@
   },
   {
     "id": "api.team.set_team_icon.write_file.app_error",
-    "translation": "팀 아이콘을 decode할 수 없습니다."
+    "translation": "팀 아이콘을 저장할 수 없습니다."
   },
   {
     "id": "api.team.team_icon.update.app_error",
-    "translation": "팀을 받아오는 도중에 문제가 발생했습니다."
+    "translation": "팀 아이콘을 업데이트 하는 도중 문제가 발생했습니다."
   },
   {
     "id": "api.team.update_member_roles.not_a_member",
@@ -1728,27 +1728,31 @@
   },
   {
     "id": "api.team.update_team_scheme.license.error",
-    "translation": "지금 라이선스는 고급 퍼미션을 지원하지 않습니다."
+    "translation": "사용자의 라이센스는 팀 스키마의 업데이트를 지원하지 않습니다."
   },
   {
     "id": "api.team.update_team_scheme.scheme_scope.error",
-    "translation": "제공된 스키마는 채널의 스키마가 아니기 때문에 채널에 적용시킬 수 없습니다."
+    "translation": "제공된 스키마가 팀 스키마가 아니기 때문에 해당 스키마를 적용할 수 없습니다."
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "사용자 본인이 {{ .SiteURL }}에서 계정을 정지했습니다."
   },
   {
     "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"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "{{.TeamDisplayName}} 이메일이 {{.NewEmail}}(으)로 변경되었습니다.<br> 잘못 변경된 경우, 시스템 관리자에게 문의하세요."
+    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}."
   },
   {
     "id": "api.templates.email_change_body.title",
@@ -1779,14 +1783,26 @@
     "translation": "알림 설정을 변경하려면, 팀 사이트에 로그인 후 계정 설정> 알림 메뉴를 확인하세요."
   },
   {
-    "id": "api.templates.email_info",
-    "translation": "Any questions at all, mail us any time: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Best wishes,<br>The {{.SiteName}} Team<br>"
+    "id": "api.templates.email_info1",
+    "translation": "Any questions at all, mail us any time: "
+  },
+  {
+    "id": "api.templates.email_info2",
+    "translation": "Best wishes,"
+  },
+  {
+    "id": "api.templates.email_info3",
+    "translation": "The {{.SiteName}} Team"
   },
   {
     "id": "api.templates.email_organization",
     "translation": "발신: "
   },
   {
+    "id": "api.templates.email_warning",
+    "translation": "If you did not make this change, please contact the system administrator."
+  },
+  {
     "id": "api.templates.invite_body.button",
     "translation": "팀 참여하기"
   },
@@ -1796,7 +1812,7 @@
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "The team {{.SenderStatus}} <strong>{{.SenderName}}</strong>, has invited you to join <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -1808,7 +1824,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -1820,7 +1836,7 @@
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
-    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}."
   },
   {
     "id": "api.templates.mfa_deactivated_body.title",
@@ -1828,7 +1844,7 @@
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "{{.TeamDisplayName}}의 비밀번호가 변경되었습니다. {{.TeamURL}} {{.Method}}<br>의도하지 않은 변경인 경우, 시스템 관리자에게 문의해보세요."
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}."
   },
   {
     "id": "api.templates.password_change_body.title",
@@ -1847,8 +1863,12 @@
     "translation": "비밀번호 재설정"
   },
   {
-    "id": "api.templates.reset_body.info",
-    "translation": "비밀번호를 변경하려면, \"비밀번호 재설정\"을 누르세요.<br>이 이메일을 무시하면, 기존 비밀번호가 유지됩니다. 비밀번호 재설정 링크는 24시간 후에 만료됩니다."
+    "id": "api.templates.reset_body.info1",
+    "translation": "To change your password, click \"Reset Password\" below."
+  },
+  {
+    "id": "api.templates.reset_body.info2",
+    "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -1860,7 +1880,7 @@
   },
   {
     "id": "api.templates.signin_change_email.body.info",
-    "translation": "You updated your sign-in method for on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "You updated your sign-in method on {{ .SiteName }}"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1876,7 +1896,7 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account."
   },
   {
     "id": "api.templates.user_access_token_body.title",
@@ -1888,7 +1908,7 @@
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "{{.TeamDisplayName}} 사용자명이 {{.NewUsername}}(으)로 변경되었습니다.<br> 잘못 변경된 경우, 시스템 관리자에게 문의하세요."
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}."
   },
   {
     "id": "api.templates.username_change_body.title",
@@ -2159,6 +2179,22 @@
     "translation": "SSO 계정의 비밀번호를 재설정 할 수 없습니다."
   },
   {
+    "id": "api.user.saml.app_error",
+    "translation": "Unable to process SAML login request."
+  },
+  {
+    "id": "api.user.saml.extension_id.app_error",
+    "translation": "유효하지 않은 액션 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이 설정되지 않았거나 서버에서 지원하지 않습니다"
   },
@@ -2395,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."
   },
@@ -2436,7 +2480,7 @@
   },
   {
     "id": "app.import.import_direct_channel.update_header_failed.error",
-    "translation": "Failed to update direct channel header"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "app.import.import_direct_post.channel_member_not_found.error",
@@ -2936,43 +2980,51 @@
   },
   {
     "id": "app.notification.body.text.direct.full",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.direct.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "채널: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.group_message.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "채널: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "Channel: {{.ChannelName}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full2",
+    "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.body.text.notification.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}일"
   },
   {
     "id": "app.notification.subject.direct.full",
-    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
+    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}일, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
   },
   {
     "id": "app.notification.subject.group_message.full",
-    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
+    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}일, {{.Year}} 에 새로운 그룹 메시지가 왔습니다."
   },
   {
     "id": "app.notification.subject.group_message.generic",
-    "translation": "[{{.SiteName}}] 새 알림 {{.Month}} {{.Day}}, {{.Year}}"
+    "translation": "[{{.SiteName}}] (으)로부터 {{.Month}} {{.Day}}일, {{.Year}}에 새로운 그룹 메시지가 왔습니다."
   },
   {
     "id": "app.notification.subject.notification.full",
-    "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다."
+    "translation": "[{{.SiteName}}] {{.TeamName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 알림이 왔습니다."
   },
   {
     "id": "app.plugin.activate.app_error",
@@ -3011,6 +3063,10 @@
     "translation": "Unable to get active plugins"
   },
   {
+    "id": "app.plugin.get_statuses.app_error",
+    "translation": "Unable to get plugin statuses"
+  },
+  {
     "id": "app.plugin.install.app_error",
     "translation": "Unable to install plugin."
   },
@@ -3019,6 +3075,10 @@
     "translation": "Unable to install plugin. A plugin with the same ID is already installed."
   },
   {
+    "id": "app.plugin.install_id_failed_remove.app_error",
+    "translation": "Unable to install plugin. A plugin with the same ID is already installed and failed to be removed."
+  },
+  {
     "id": "app.plugin.invalid_id.app_error",
     "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}."
   },
@@ -3159,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 기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
@@ -3255,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"
   },
@@ -3263,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."
   },
@@ -3331,6 +3403,46 @@
     "translation": "잘못된 AD/LDAP 필터"
   },
   {
+    "id": "ent.message_export.global_relay.create_file_in_zip.app_error",
+    "translation": "Unable to create the eml file."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.close.app_error",
+    "translation": "Unable to deliver the email to Global Relay."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.from_address.app_error",
+    "translation": "Unable to set the email From address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg.app_error",
+    "translation": "Unable to set the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.msg_data.app_error",
+    "translation": "Unable to write the email message."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.parse_mail.app_error",
+    "translation": "Unable to read the email information."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.to_address.app_error",
+    "translation": "Unable to set the email To address."
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_get_file_info.app_error",
+    "translation": "Unable to get the information of the export temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_email_file.app_error",
+    "translation": "Unable to get the an email from the temporary file"
+  },
+  {
+    "id": "ent.message_export.global_relay_export.deliver.unable_to_open_zip_file_data.app_error",
+    "translation": "Unable to open the export temporary file"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Error attempting to authenticate MFA token"
   },
@@ -3464,7 +3576,7 @@
   },
   {
     "id": "jobs.start_synchronize_job.timeout",
-    "translation": "Reached AD/LDAP sychronization job timeout."
+    "translation": "Reached AD/LDAP synchronization job timeout."
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
@@ -4299,6 +4411,10 @@
     "translation": "Update at must be a valid time"
   },
   {
+    "id": "model.outgoing_hook.icon_url.app_error",
+    "translation": "잘못된 범위"
+  },
+  {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
     "translation": "Invalid callback urls"
   },
@@ -4355,6 +4471,10 @@
     "translation": "Invalid trigger words"
   },
   {
+    "id": "model.outgoing_hook.username.app_error",
+    "translation": "잘못된 유저이름입니다."
+  },
+  {
     "id": "model.plugin_command.error.app_error",
     "translation": "An error occurred while trying to execute this command."
   },
@@ -4616,11 +4736,11 @@
   },
   {
     "id": "store.sql_channel.clear_all_custom_role_assignments.select.app_error",
-    "translation": "Failed to retrieve the channel members"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_channel.clear_all_custom_role_assignments.update.app_error",
-    "translation": "Failed to update the channel member"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_channel.delete.channel.app_error",
@@ -4748,7 +4868,7 @@
   },
   {
     "id": "store.sql_channel.migrate_channel_members.update.app_error",
-    "translation": "Failed to update the channel member"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_channel.permanent_delete.app_error",
@@ -5620,11 +5740,11 @@
   },
   {
     "id": "store.sql_team.clear_all_custom_role_assignments.select.app_error",
-    "translation": "Failed to retrieve the team members"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_team.clear_all_custom_role_assignments.update.app_error",
-    "translation": "Failed to update the team member"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_team.get.find.app_error",
@@ -5700,7 +5820,7 @@
   },
   {
     "id": "store.sql_team.migrate_team_members.update.app_error",
-    "translation": "Failed to update the team member"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_team.permanent_delete.app_error",
@@ -5800,7 +5920,7 @@
   },
   {
     "id": "store.sql_user.clear_all_custom_role_assignments.update.app_error",
-    "translation": "Failed to update the user"
+    "translation": "채널 업데이트에 실패하였습니다"
   },
   {
     "id": "store.sql_user.get.app_error",