summaryrefslogtreecommitdiff
path: root/locale/ko/LC_MESSAGES
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-10 15:25:43 -0800
committerZach Copley <zach@status.net>2009-11-10 15:25:43 -0800
commitdb64b612961c37477d0729e9ff4f882fb5df7b8d (patch)
tree9ae5a31b58a289fc838c29c34230edd3962c231f /locale/ko/LC_MESSAGES
parentee3fc8ba03ddd8451cac60547af72ea2cef7dc6a (diff)
parent91332cdadc20e721c22fcf22ca1773cedbde95c5 (diff)
Merge branch '0.9.x' into finish-account-api
* 0.9.x: Added a events for the settings menu items Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server. Changed to Evan's event style and added an AuthPlugin superclass add geo output to statuses in json, xml, atom, rss in API Localisation updates from translatewiki.net (2009-11-10) Localisation updates from translatewiki.net Update pot add lat and long parameters to api/statuses/update change credential check to work more like other events fixup output of object attributes in db error code Performance fix for subscription/subscriber lists based on feedback from ops. Adjusting indexes to make favorites query more efficient, based on feedback from ops. Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php" Added hook for the Group navigation items Updated block @title text (shouldn't say from group) Updated group block markup Revert "Remove more contractions"
Diffstat (limited to 'locale/ko/LC_MESSAGES')
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.mobin74615 -> 74777 bytes
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po147
2 files changed, 79 insertions, 68 deletions
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index bb916d356..b2e5f3d92 100644
--- a/locale/ko/LC_MESSAGES/statusnet.mo
+++ b/locale/ko/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 1c8b2350b..f521a9f09 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 22:51+0000\n"
-"PO-Revision-Date: 2009-11-08 22:58:26+0000\n"
+"POT-Creation-Date: 2009-11-10 20:53+0000\n"
+"PO-Revision-Date: 2009-11-10 20:59:19+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -483,7 +483,7 @@ msgid "Invalid size."
msgstr "옳지 않은 크기"
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:113
msgid "Avatar"
msgstr "아바타"
@@ -531,7 +531,7 @@ msgstr "자르기"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/othersettings.php:145 actions/passwordsettings.php:151
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -631,7 +631,7 @@ msgstr "프로필을 지정하지 않았습니다."
msgid "No profile with that ID."
msgstr "해당 ID의 프로필이 없습니다."
-#: actions/block.php:111 actions/block.php:134
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
msgid "Block user"
msgstr "사용자를 차단합니다."
@@ -643,24 +643,24 @@ msgid ""
msgstr ""
#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:176
+#: actions/groupblock.php:178
msgid "No"
msgstr "아니오"
#: actions/block.php:149
#, fuzzy
-msgid "Do not block this user from this group"
-msgstr "이 그룹의 회원리스트"
+msgid "Do not block this user"
+msgstr "이 사용자를 차단해제합니다."
#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:177
+#: actions/groupblock.php:179
msgid "Yes"
msgstr "네, 맞습니다."
-#: actions/block.php:150
-#, fuzzy
-msgid "Block this user from this group"
-msgstr "이 그룹의 회원리스트"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "이 사용자 차단하기"
#: actions/block.php:165
msgid "You have already blocked this user."
@@ -1155,7 +1155,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
msgid "Block user from group"
msgstr "사용자를 차단합니다."
-#: actions/groupblock.php:155
+#: actions/groupblock.php:162
#, php-format
msgid ""
"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
@@ -1163,7 +1163,17 @@ msgid ""
"group in the future."
msgstr ""
-#: actions/groupblock.php:193
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "이 그룹의 회원리스트"
+
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "이 그룹의 회원리스트"
+
+#: actions/groupblock.php:196
msgid "Database error blocking user from group."
msgstr ""
@@ -1228,7 +1238,7 @@ msgstr "로고를 업데이트했습니다."
msgid "Failed updating logo."
msgstr "로고 업데이트에 실패했습니다."
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/groupmembers.php:93 lib/groupnav.php:92
#, php-format
msgid "%s group members"
msgstr "%s 그룹 회원"
@@ -1242,7 +1252,7 @@ msgstr "%s 그룹 회원, %d페이지"
msgid "A list of the users in this group."
msgstr "이 그룹의 회원리스트"
-#: actions/groupmembers.php:175 lib/groupnav.php:106
+#: actions/groupmembers.php:175 lib/groupnav.php:107
msgid "Admin"
msgstr "관리자"
@@ -1250,10 +1260,6 @@ msgstr "관리자"
msgid "Block"
msgstr "차단하기"
-#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "이 사용자 차단하기"
-
#: actions/groupmembers.php:441
#, fuzzy
msgid "Make user an admin of the group"
@@ -1655,7 +1661,7 @@ msgid "Nickname"
msgstr "별명"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:118
msgid "Password"
msgstr "비밀 번호"
@@ -1898,60 +1904,65 @@ msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비
msgid "Change password"
msgstr "비밀번호 바꾸기"
-#: actions/passwordsettings.php:69
+#: actions/passwordsettings.php:70
+#, fuzzy
+msgid "You are not allowed to change your password"
+msgstr "비밀번호 바꾸기"
+
+#: actions/passwordsettings.php:82
msgid "Change your password."
msgstr "비밀번호를 변경하세요."
-#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
msgid "Password change"
msgstr "비밀번호 변경"
-#: actions/passwordsettings.php:103
+#: actions/passwordsettings.php:117
msgid "Old password"
msgstr "기존 비밀 번호"
-#: actions/passwordsettings.php:107 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
msgid "New password"
msgstr "새로운 비밀 번호"
-#: actions/passwordsettings.php:108
+#: actions/passwordsettings.php:122
msgid "6 or more characters"
msgstr "6글자 이상"
-#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "인증"
-#: actions/passwordsettings.php:112
+#: actions/passwordsettings.php:126
msgid "same as password above"
msgstr "위 비밀번호와 동일하게"
-#: actions/passwordsettings.php:116
+#: actions/passwordsettings.php:130
msgid "Change"
msgstr "변환"
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:167 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "비밀번호는 6자리 이상이어야 합니다."
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:170 actions/register.php:233
msgid "Passwords don't match."
msgstr "비밀 번호가 일치하지 않습니다."
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:178
msgid "Incorrect old password"
msgstr "기존 비밀 번호가 틀렸습니다"
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:194
msgid "Error saving user; invalid."
msgstr "사용자 저장 오류; 무효한 사용자"
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "새 비밀번호를 저장 할 수 없습니다."
-#: actions/passwordsettings.php:191 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "비밀 번호 저장"
@@ -2390,7 +2401,7 @@ msgid "Same as password above. Required."
msgstr "위와 같은 비밀 번호. 필수 사항."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:117
+#: lib/accountsettingsaction.php:122
msgid "Email"
msgstr "이메일"
@@ -2620,7 +2631,7 @@ msgstr ""
msgid "This is a way to share what you like."
msgstr ""
-#: actions/showgroup.php:82 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
msgstr "%s 그룹"
@@ -2672,7 +2683,7 @@ msgstr "%s 그룹을 위한 공지피드"
msgid "FOAF for %s group"
msgstr "%s의 보낸쪽지함"
-#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
msgid "Members"
msgstr "회원"
@@ -3318,40 +3329,40 @@ msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "%2$s에서 %1$s까지 메시지"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "프로필"
-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:110
msgid "Change your profile settings"
msgstr "프로필 세팅 바꾸기"
-#: lib/accountsettingsaction.php:112
+#: lib/accountsettingsaction.php:114
msgid "Upload an avatar"
msgstr "아바타를 업로드하세요."
-#: lib/accountsettingsaction.php:115
+#: lib/accountsettingsaction.php:119
msgid "Change your password"
msgstr "비밀번호 바꾸기"
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:123
msgid "Change email handling"
msgstr "이메일 처리 변경"
-#: lib/accountsettingsaction.php:120 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:121
+#: lib/accountsettingsaction.php:126
#, fuzzy
msgid "Design your profile"
msgstr "이용자 프로필"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:128
msgid "Other"
msgstr "기타"
-#: lib/accountsettingsaction.php:124
+#: lib/accountsettingsaction.php:129
msgid "Other options"
msgstr "다른 옵션들"
@@ -3942,35 +3953,35 @@ msgstr "그룹의 위치, \"시/군/구, 도, 나라\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
msgid "Group"
msgstr "그룹"
-#: lib/groupnav.php:100
+#: lib/groupnav.php:101
#, fuzzy
msgid "Blocked"
msgstr "차단하기"
-#: lib/groupnav.php:101
+#: lib/groupnav.php:102
#, fuzzy, php-format
msgid "%s blocked users"
msgstr "사용자를 차단합니다."
-#: lib/groupnav.php:107
+#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
msgstr "%s 그룹 속성 편집"
-#: lib/groupnav.php:112
+#: lib/groupnav.php:113
msgid "Logo"
msgstr "로고"
-#: lib/groupnav.php:113
+#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
msgstr "%s logo 추가 혹은 수정"
-#: lib/groupnav.php:119
+#: lib/groupnav.php:120
#, fuzzy, php-format
msgid "Add or edit %s design"
msgstr "%s logo 추가 혹은 수정"
@@ -4165,7 +4176,7 @@ msgid ""
"\n"
"%3$s\n"
"\n"
-"Do not reply to this email. It will not get to them.\n"
+"Don't reply to this email; it won't get to them.\n"
"\n"
"With kind regards,\n"
"%4$s\n"
@@ -4189,7 +4200,7 @@ msgid ""
"\n"
"%4$s\n"
"\n"
-"Do not reply to this email. It will not get to them.\n"
+"Don't reply to this email; it won't get to them.\n"
"\n"
"With kind regards,\n"
"%5$s\n"
@@ -4587,47 +4598,47 @@ msgstr "이 회원에게 직접 메시지를 보냅니다."
msgid "Message"
msgstr "메시지"
-#: lib/util.php:844
+#: lib/util.php:818
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:846
+#: lib/util.php:820
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:848
+#: lib/util.php:822
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:850
+#: lib/util.php:824
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:852
+#: lib/util.php:826
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:854
+#: lib/util.php:828
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:856
+#: lib/util.php:830
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
-#: lib/util.php:858
+#: lib/util.php:832
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:860
+#: lib/util.php:834
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:862
+#: lib/util.php:836
msgid "about a year ago"
msgstr "1년 전"