translations PR 20161219 (#4838)

1 files changed, 36 insertions, 17 deletions

diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index b2ce919ba..b00d11fe4 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -338,7 +338,7 @@
   "admin.gitlab.userDescription": "GitLab 연동을 위해 다음 URL https://<your-gitlab-url>/api/v3/user 을 입력하십시오.   서버 설정에 따라 HTTP와 HTTPS 중 올바른 것을 사용하여야 합니다.",
   "admin.gitlab.userExample": "예시 \"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "사용자 API 엔드포인트:",
-  "admin.google.EnableHtmlDesc": "<ol><li><a target='_blank' href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a target='_blank' href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a target='_blank' href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
   "admin.google.authTitle": "Auth Endpoint:",
   "admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
   "admin.google.clientIdExample": "예시 \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -435,6 +435,9 @@
   "admin.ldap.portDesc": "Mettermost가 AD/LDAP서버에 연결할 때 사용될 포트입니다. 기본값은 389입니다.",
   "admin.ldap.portEx": "예시 \"389\"",
   "admin.ldap.portTitle": "AD/LDAP 포트:",
+  "admin.ldap.positionAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.",
+  "admin.ldap.positionAttrEx": "E.g.: \"title\"",
+  "admin.ldap.positionAttrTitle": "Position Attribute:",
   "admin.ldap.queryDesc": "AD/LDAP서버 조회를 할때 사용되는 timeout 값입니다.. 만양 느린 AD/LDAP 서버에 의해 timout 에러가 발생한다면 증가시키십시오.",
   "admin.ldap.queryEx": "예시 \"60\"",
   "admin.ldap.queryTitle": "Query Timeout (초):",
@@ -496,14 +499,14 @@
   "admin.log.logSettings": "로그 설정",
   "admin.logs.reload": "새로 고침",
   "admin.logs.title": "서버 로그",
-  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target=\"_blank\">documentation</a> to learn more about configuring performance monitoring for Mattermost.",
+  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
   "admin.metrics.enableTitle": "Enable Performance Monitoring:",
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
   "admin.metrics.listenAddressEx": "Ex \":8065\"",
   "admin.metrics.listenAddressTitle": "Listen Address:",
   "admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
   "admin.mfa.cluster": "High",
-  "admin.mfa.title": "Multi-factor Authentication",
+  "admin.mfa.title": "Enable Multi-factor Authentication:",
   "admin.nav.help": "도움말",
   "admin.nav.logout": "로그아웃",
   "admin.nav.report": "문제 보고",
@@ -515,10 +518,10 @@
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
   "admin.oauth.office365": "Office 365 (베타)",
-  "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a target='_blank' href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
+  "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
   "admin.oauth.providerTitle": "OAuth 2.0 서비스 제공자: ",
   "admin.oauth.select": "Select OAuth 2.0 service provider:",
-  "admin.office365.EnableHtmlDesc": "<ol><li>여러분의 마이크로소프트 또는 오피스 365 계정에 <a target='_blank' href='https://login.microsoftonline.com/'>로그인</a> 하십시요. 로그인하는 계정은 <a target='_blank' href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>테넌트</a>의 >계정과 동일해야 합니다.</li><li><a target='_blank' href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>을 방문하셔서, <strong>Go to app list</strong>의 <strong>Add an app</strong>를 클릭한 다음 \"Mattermost - 여러분의 회사 이름\"을 <strong>어플리케이션 이름</strong>으로 사용하십시요. </li><li><strong>Application Secrets</strong>에서, <strong>Generate New Password</strong>를 클릭한 다음 아래<strong>Application Secret Password</strong> 필드에 그 값을 복사하여 붙여넣으십시요.</li><li><strong>Platforms</strong>에서, <strong>Add Platform</strong>을 클릭한 다음, <strong>Web</strong>을 선택하고 <strong>your-mattermost-url/signup/office365/complete</strong> (예시: http://localhost:8065/signup/office365/complete)을 <strong>Redirect URIs</strong>에 기입하십시요. 또한 <strong>Allow Implicit Flow</strong>의 체크를 해제하십시요.</li><li>마지막으로, <strong>Save</strong>를 클릭한 다음 아래의 <strong>Application ID</strong>붙여넣으십시요.</li></ol>",
+  "admin.office365.EnableHtmlDesc": "<ol><li>여러분의 마이크로소프트 또는 오피스 365 계정에 <a href='https://login.microsoftonline.com/'>로그인</a> 하십시요. 로그인하는 계정은 <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>테넌트</a>의 >계정과 동일해야 합니다.</li><li><a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>을 방문하셔서, <strong>Go to app list</strong>의 <strong>Add an app</strong>를 클릭한 다음 \"Mattermost - 여러분의 회사 이름\"을 <strong>어플리케이션 이름</strong>으로 사용하십시요. </li><li><strong>Application Secrets</strong>에서, <strong>Generate New Password</strong>를 클릭한 다음 아래<strong>Application Secret Password</strong> 필드에 그 값을 복사하여 붙여넣으십시요.</li><li><strong>Platforms</strong>에서, <strong>Add Platform</strong>을 클릭한 다음, <strong>Web</strong>을 선택하고 <strong>your-mattermost-url/signup/office365/complete</strong> (예시: http://localhost:8065/signup/office365/complete)을 <strong>Redirect URIs</strong>에 기입하십시요. 또한 <strong>Allow Implicit Flow</strong>의 체크를 해제하십시요.</li><li>마지막으로, <strong>Save</strong>를 클릭한 다음 아래의 <strong>Application ID</strong>붙여넣으십시요.</li></ol>",
   "admin.office365.authTitle": "인증 엔드포인트:",
   "admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
   "admin.office365.clientIdExample": "예시 \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -611,6 +614,9 @@
   "admin.saml.nicknameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the nickname of users in Mattermost.",
   "admin.saml.nicknameAttrEx": "예시 \"Nickname\"",
   "admin.saml.nicknameAttrTitle": "별명 속성:",
+  "admin.saml.positionAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the language of users in Mattermost.",
+  "admin.saml.positionAttrEx": "E.g.: \"Role\"",
+  "admin.saml.positionAttrTitle": "Position Attribute:",
   "admin.saml.privateKeyFileFileDesc": "The private key used to decrypt SAML Assertions from the Identity Provider.",
   "admin.saml.privateKeyFileFileRemoveDesc": "Remove the private key used to decrypt SAML Assertions from the Identity Provider.",
   "admin.saml.privateKeyFileTitle": "Service Provider Private Key:",
@@ -653,7 +659,7 @@
   "admin.service.corsTitle": "CORS 요청 허용:",
   "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "개발자 모드: ",
-  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Enable Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
@@ -1250,7 +1256,7 @@
   "filtered_user_list.countTotal": "{total}명 중 {count}{count, plural, =0 {0명} one {명} other {명}}",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.member": "회원",
-  "filtered_user_list.search": "ENTER 키를 눌러 검색",
+  "filtered_user_list.search": "Search users",
   "filtered_user_list.searchButton": "검색",
   "filtered_user_list.show": "필터:",
   "filtered_user_list.team_only": "팀의 회원",
@@ -1292,11 +1298,13 @@
   "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
   "get_app.mattermostInc": "Mattermost, Inc",
   "get_app.openMattermost": "Mattermost 열기",
-  "get_link.clipboard": " 링크가 클립보드에 복사되었습니다.",
+  "get_link.clipboard": " Link copied",
   "get_link.close": "닫기",
   "get_link.copy": "링크 복사",
   "get_post_link_modal.help": "아래 링크를 통해 허용된 사용자가 내 글을 볼 수 있습니다.",
   "get_post_link_modal.title": "바로가기 링크 복사",
+  "get_public_link_modal.help": "The link below allows anyone to see this file without being registered on this server.",
+  "get_public_link_modal.title": "공개 링크 보기",
   "get_team_invite_link_modal.help": "아래 링크를 통해 팀에 가입할 수 있습니다. 가입 링크는 여러 사람들에게 공유될 수 있고, 팀 관리자에 의해 변경될 수 있습니다.",
   "get_team_invite_link_modal.helpDisabled": "팀의 신규 사용자 가입이 비활성화 되어있습니다. 팀 관리자에게 문의하세요.",
   "get_team_invite_link_modal.title": "가입 링크",
@@ -1540,18 +1548,18 @@
   "members_popover.msg": "메시지",
   "members_popover.title": "회원",
   "mfa.confirm.complete": "<strong>Set up complete!</strong>",
-  "mfa.confirm.okay": "Okay",
+  "mfa.confirm.okay": "확인",
   "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
   "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
   "mfa.setup.code": "MFA Code",
   "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
   "mfa.setup.required": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
-  "mfa.setup.save": "Save",
+  "mfa.setup.save": "저장",
   "mfa.setup.secret": "Secret: {secret}",
   "mfa.setup.step1": "<strong>Step 1: </strong>On your phone, download Google Authenticator from <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> or <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>",
   "mfa.setup.step2": "<strong>Step 2: </strong>Use Google Authenticator to scan this QR code, or manually type in the secret key",
   "mfa.setup.step3": "<strong>Step 3: </strong>Enter the code generated by Google Authenticator",
-  "mfa.setupTitle": "Multi-factor Authentication Setup",
+  "mfa.setupTitle": "Enable Multi-factor Authentication:",
   "mobile.components.channels_list_view.yourChannels": "Your channels:",
   "mobile.components.select_server_view.enterServerUrl": "Enter Server URL",
   "mobile.components.select_server_view.proceed": "Proceed",
@@ -1594,6 +1602,7 @@
   "navbar_dropdown.help": "도움말",
   "navbar_dropdown.integrations": "통합 기능",
   "navbar_dropdown.inviteMember": "회원 초대",
+  "navbar_dropdown.join": "Join Another Team",
   "navbar_dropdown.leave": "팀 떠나기",
   "navbar_dropdown.logout": "로그아웃",
   "navbar_dropdown.manageMembers": "회원 관리",
@@ -1640,13 +1649,20 @@
   "post_info.mobile.unflag": "중요 해제",
   "post_info.permalink": "링크",
   "post_info.reply": "답글",
+  "post_message_view.edited": "(edited)",
   "posts_view.loadMore": "메시지 더 보기",
   "posts_view.newMsg": "새로운 메시지",
   "posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
   "reaction.clickToAdd": "(click to add)",
   "reaction.clickToRemove": "(click to remove)",
-  "reaction.multipleReacted": "<b>{users} and {lastUser}</b> reacted with <b>:{emojiName}:</b>",
-  "reaction.oneReacted": "<b>{user}</b> reacted with <b>:{emojiName}:</b>",
+  "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
+  "reaction.reacted": "{users} {reactionVerb} with {emoji}",
+  "reaction.reactionVerb.user": "reacted",
+  "reaction.reactionVerb.users": "reacted",
+  "reaction.reactionVerb.you": "reacted",
+  "reaction.reactionVerb.youAndUsers": "reacted",
+  "reaction.usersAndOthersReacted": "{users} and {otherUsers, number} other {otherUsers, plural, one {user} other {users}}",
+  "reaction.usersReacted": "{users} and {lastUser}",
   "reaction.you": "You",
   "removed_channel.channelName": "the channel",
   "removed_channel.from": "Removed from ",
@@ -1736,7 +1752,6 @@
   "sidebar_right_menu.nativeApps": "애플리케이션 다운로드",
   "sidebar_right_menu.recentMentions": "최근 멘션",
   "sidebar_right_menu.report": "문제 보고",
-  "sidebar_right_menu.switch_team": "팀 선택",
   "sidebar_right_menu.teamLink": "가입 링크",
   "sidebar_right_menu.teamSettings": "팀 설정",
   "sidebar_right_menu.viewMembers": "회원 보기",
@@ -1746,7 +1761,6 @@
   "signup.ldap": "AD/LDAP Credentials",
   "signup.office365": "Office 365",
   "signup.title": "다음 계정으로 가입하기:",
-  "signup_team.choose": "가입한 팀: ",
   "signup_team.createTeam": "팀 생성하기",
   "signup_team.disabled": "팀을 생성할 수 없습니다. 시스템 관리자에게 문의하세요.",
   "signup_team.join_open": "가입할 수 있는 팀: ",
@@ -1839,6 +1853,7 @@
   "team_settings_modal.generalTab": "일반",
   "team_settings_modal.importTab": "가져오기",
   "team_settings_modal.title": "팀 설정",
+  "team_sidebar.join": "Other teams you can join.",
   "textbox.bold": "**굵게**",
   "textbox.edit": "메시지 편집",
   "textbox.help": "도움말",
@@ -1963,6 +1978,7 @@
   "user.settings.general.emailUnchanged": "새로 입력한 이메일 주소가 기존과 동일합니다.",
   "user.settings.general.emptyName": "'편집'을 클릭하여 본명을 설정",
   "user.settings.general.emptyNickname": "'편집'을 클릭하여 별명을 설정",
+  "user.settings.general.emptyPosition": "Click 'Edit' to add your job title / position",
   "user.settings.general.field_handled_externally": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
   "user.settings.general.firstName": "이름",
   "user.settings.general.fullName": "본명",
@@ -1979,6 +1995,8 @@
   "user.settings.general.nicknameExtra": "본명과 사용자명과는 다르게 불리는 고유한 이름을 사용하세요. 비슷한 이름을 가진 사람들이 모여있을 때 자주 사용됩니다.",
   "user.settings.general.notificationsExtra": "기본적으로 이 곳에 설정된 이름으로 언급되었을 때 멘션 알림을 받게됩니다. {notify}에서 기본 설정을 변경하세요.",
   "user.settings.general.notificationsLink": "알림",
+  "user.settings.general.position": "Position",
+  "user.settings.general.positionExtra": "Tell your teammates what you do.",
   "user.settings.general.primaryEmail": "주 이메일",
   "user.settings.general.profilePicture": "프로필 사진",
   "user.settings.general.title": "일반 설정",
@@ -1997,14 +2015,14 @@
   "user.settings.languages.change": "언어 변경",
   "user.settings.languages.promote": "어떤 언어로 Mattermost 인터페이스를 표시할지 선택하세요.<br /><br />? <a href='http://translate.mattermost.com/' target='_blank'>Mattermost 번역 서버</a>에 가입하여 번역 품질에 기여해주세요.",
   "user.settings.mfa.add": "Add MFA to your account",
-  "user.settings.mfa.addHelp": "You can require a smartphone-based token, in addition to your password, to sign into Mattermost.<br/><br/>To enable, download Google Authenticator from <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> or <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> for your phone, then<br/><br/>1. Click the <strong>Add MFA to your account</strong> button above.<br/>2. Use Google Authenticator to scan the QR code that appears.<br/>3. Type in the Token generated by Google Authenticator and click <strong>Save</strong>.<br/><br/>When logging in, you will be asked to enter a token from Google Authenticator in addition to your regular credentials.",
+  "user.settings.mfa.addHelp": "Adding multi-factor authentication will make your account more secure by requiring a code from your mobile phone each time you sign in.",
   "user.settings.mfa.addHelpQr": "Please scan the bar code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.",
   "user.settings.mfa.enterToken": "토큰 (숫자만)",
   "user.settings.mfa.qrCode": "바코드",
   "user.settings.mfa.remove": "Remove MFA from your account",
   "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
   "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
-  "user.settings.mfa.reset": "Reset MFA on your account",
+  "user.settings.mfa.reset": "Remove MFA from your account",
   "user.settings.mfa.secret": "보안",
   "user.settings.mfa.title": "Enable Multi-factor Authentication:",
   "user.settings.modal.advanced": "고급",
@@ -2153,6 +2171,7 @@
   "web.footer.privacy": "정책",
   "web.footer.terms": "서비스 약관",
   "web.header.back": "돌아가기",
+  "web.header.logout": "Logout",
   "web.root.signup_info": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 빠르게 찾고 공유할 수 있습니다.",
   "webrtc.busy": "{username} is busy.",
   "webrtc.call": "통화",