summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/ko.json
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-15 11:05:43 -0400
committerGitHub <noreply@github.com>2017-06-15 11:05:43 -0400
commit528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c (patch)
tree71fa9b677ce72050dca3abc3c9243e6cf39e0278 /webapp/i18n/ko.json
parentc0a0065472c199166d32b052dd328b0212f5b693 (diff)
downloadchat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.gz
chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.bz2
chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.zip
Merge release-3.10 into master (#6654)
* PLT-6787 Fixed being able to send a post before files finished uploading (#6617) * Fix quick switcher for channels/users not stored locally (#6610) * Fix button text on confirm mention modal (#6609) * fix post delete permission of channel admin (#6608) * open comment thread for the most recent reply-able message (#6605) * Use mutex flag with yarn to prevent concurrent builds interfering (#6619) * Use mutex flag with yarn to prevent concurrent builds interfering * Remove yarn mutex file with clean * Minor bug fixes (#6615) * PLT-6774 - Fixing color for offline icon * PLT-6784 - Fixing status icon * Fixing icon margin * Updating caret position * PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620) * Fixing JS error (#6623) * Minor bug fixes (#6622) * PLT-6808 - Updating channel switcher on mobile * PLT-6743 - Updating scrollbar styling * Login instead of failing if user exists in OAuth sign-up flow (#6627) * PLT-6802 Disable team switcher (#6626) * Disable team switcher * Fix ESLint errors * PLT-6807 Ensured select teams page can scroll on iOS (#6630) * Do not redirect from account switch pages on 401 (#6631) * Fixing loadtest command and renaming to /test (#6624) * PLT-6820 Update mattermost-redux dependency (#6632) * translations PR 20170612 (#6629) * Bump HTTP client timeout to 30 seconds (#6633) * For team unreads return empty array instead of null (#6636) * PLT-6831 Fix status modal localization IDs (#6637) * Fix status modal localization IDs * Update test snapshot
Diffstat (limited to 'webapp/i18n/ko.json')
-rw-r--r--webapp/i18n/ko.json29
1 files changed, 19 insertions, 10 deletions
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 26050dd63..ca0755d48 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -746,7 +746,7 @@
"admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.",
"admin.service.sessionDaysEx": "예시 \"30\"",
"admin.service.siteURL": "사이트 URL:",
- "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This setting is required.",
+ "admin.service.siteURLDescription": "The URL that users will use to access Mattermost. Standard ports, such as 80 and 443, can be omitted, but non-standard ports are required. For example: http://mattermost.example.com:8065. This setting is required.",
"admin.service.siteURLExample": "예시 \"https://mattermost.example.com:1234\"",
"admin.service.ssoSessionDays": "Session length for mobile apps (days):",
"admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
@@ -1684,6 +1684,7 @@
"mobile.account_notifications.threads_mentions": "Mentions in threads",
"mobile.account_notifications.threads_start": "Threads that I start",
"mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
+ "mobile.channel_drawer.search": "Jump to a conversation",
"mobile.channel_info.alertMessageDeleteChannel": "정말 {term}을 삭제하시겠습니까?",
"mobile.channel_info.alertMessageLeaveChannel": "정말 {term}을 삭제하시겠습니까?",
"mobile.channel_info.alertNo": "아니요",
@@ -1700,6 +1701,7 @@
"mobile.channel_list.closeGM": "Close Group Message",
"mobile.channel_list.dm": "개인 메시지",
"mobile.channel_list.gm": "Group Message",
+ "mobile.channel_list.not_member": "NOT A MEMBER",
"mobile.channel_list.open": "Open {term}",
"mobile.channel_list.openDM": "Open Direct Message",
"mobile.channel_list.openGM": "Open Group Message",
@@ -1716,11 +1718,12 @@
"mobile.create_channel.private": "채널 떠나기",
"mobile.create_channel.public": "공개 채널",
"mobile.custom_list.no_results": "No Results",
+ "mobile.drawer.teamsTitle": "서비스 약관",
"mobile.edit_post.title": "Editing Message",
"mobile.file_upload.camera": "Take Photo or Video",
"mobile.file_upload.library": "Photo Library",
"mobile.file_upload.more": "더 보기",
- "mobile.file_upload.video": "Video Libary",
+ "mobile.file_upload.video": "Video Library",
"mobile.help.title": "도움말",
"mobile.intro_messages.DM": "{teammate}와 개인 메시지의 시작입니다.<br />개인 메시지나 여기서 공유된 파일들은 외부에서 보여지지 않습니다.",
"mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.",
@@ -1768,6 +1771,11 @@
"mobile.server_url.invalid_format": "URL 주소는 http:// 또는 https:// 로 시작되어야 합니다",
"mobile.session_expired": "Session Expired: Please log in to continue receiving notifications.",
"mobile.settings.team_selection": "팀 선택",
+ "modal.manaul_status.ask": "Do not ask me again",
+ "modal.manaul_status.button": "Yes, set my status to \"Online\"",
+ "modal.manaul_status.cancel": "No, keep it as \"{status}\"",
+ "modal.manaul_status.message": "Would you like to switch your status to \"Online\"?",
+ "modal.manaul_status.title": "Your status is set to \"{status}\"",
"more_channels.close": "닫기",
"more_channels.create": "새로 만들기",
"more_channels.createClick": "'새로 만들기'를 클릭하여 새로운 채널을 만드세요",
@@ -1874,13 +1882,13 @@
"posts_view.newMsg": "새로운 메시지",
"posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below",
"quick_switch_modal.channels": "채널",
- "quick_switch_modal.channelsShortcut.mac": "(CMD+K)",
- "quick_switch_modal.channelsShortcut.windows": "(CTRL+K)",
- "quick_switch_modal.help": "Use TAB to toggle between teams/channels, ↑↓ to browse, ↵ to confirm, ESC to dismiss",
- "quick_switch_modal.help_no_team": "채널 이름을 입력하세요. ↑↓ 방향키와 TAB키를 이용하여 선택하세요, ↵ 엔터키를 누르면 확인, ESC키를 누르면 취소됩니다.",
+ "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
+ "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
+ "quick_switch_modal.help": "Start typing then use TAB to toggle channels/teams, ↑↓ to browse, ↵ to select, and ESC to dismiss.",
+ "quick_switch_modal.help_no_team": "Start typing then use ↑↓ to browse, ↵ to select, and ESC to dismiss.",
"quick_switch_modal.teams": "서비스 약관",
- "quick_switch_modal.teamsShortcut.mac": "(CMD+ALT+K)",
- "quick_switch_modal.teamsShortcut.windows": "(CTRL+ALT+K)",
+ "quick_switch_modal.teamsShortcut.mac": "- ⌘⌥K",
+ "quick_switch_modal.teamsShortcut.windows": "- CTRL+ALT+K",
"reaction.clickToAdd": "(click to add)",
"reaction.clickToRemove": "(click to remove)",
"reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
@@ -1971,8 +1979,6 @@
"sidebar.otherMembers": "팀 외부",
"sidebar.pg": "채널 떠나기",
"sidebar.removeList": "목록에서 제거",
- "sidebar.switch_channels": "Switch Channels (CTRL + K)",
- "sidebar.switch_channels.mac": "Switch Channels (CMD + K)",
"sidebar.tutorialScreen1": "<h4>채널</h4><p><strong>채널</strong>을 통해 주제별로 대화를 구성합니다. 팀의 모든 일원에게 공개되어 있습니다. 공개하고 싶지 않은 메시지는 <strong>개인 메시지</strong>나 <strong>비공개 그룹</strong>으로 전달할 수 있습니다. </p>",
"sidebar.tutorialScreen2": "<h4>\"{townsquare}\" 와 \"{offtopic}\" 채널</h4><p>두 채널과 함께 시작합니다:</p><p><strong>{townsquare}</strong>(은)는 팀 전체의 소통을 위한 공간입니다. 모든 팀의 구성원들이 확인할 수 있습니다.</p><p><strong>{offtopic}</strong> 비업무 대화를 위한 공간입니다. 당신의 팀에 어떤 채널을 만들고 운영할지 결정할 수 있습니다.</p>",
"sidebar.tutorialScreen3": "<h4>채널 만들고 가입하기</h4><p><strong>\"더 보기...\"</strong>를 눌러 새로운 채널을 만들거나 기존 채널에 입장할 수 있습니다.</p><p>채널이나 비공개 그룹의 헤더 옆에 <strong>\"+\" 표시</strong> 를 눌러 새로운 채널이나 비공개 그룹을 만들 수 있습니다.</p>",
@@ -2044,6 +2050,9 @@
"sso_signup.length_error": "이름이 반드시 3글자 이상 15글자 이하가 되어야 합니다.",
"sso_signup.teamName": "팀 이름을 입력하세요.",
"sso_signup.team_error": "팀 이름을 입력하세요.",
+ "status_dropdown.set_away": "Away",
+ "status_dropdown.set_offline": "오프라인",
+ "status_dropdown.set_online": "Online",
"suggestion.loading": "로딩 중...",
"suggestion.mention.all": "CAUTION: This mentions everyone in channel",
"suggestion.mention.channel": "모든 채널 회원들에게 알림을 보냅니다",