diff options
author | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
---|---|---|
committer | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
commit | f1518a54dffb4a309da3952e154b71d4bc9482f8 (patch) | |
tree | b6faeec269eb8904c5c8f42732e5466758fdeb0e /l10n/ko/core.po | |
parent | 65d802329f8307cd010a306073d2d3ffd7dc7b74 (diff) | |
parent | de949b1caa4491a8016ed5e609fc781526fea54d (diff) | |
download | nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.tar.gz nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.zip |
Merge branch 'master' into clean_up_util
Conflicts:
lib/util.php
Diffstat (limited to 'l10n/ko/core.po')
-rw-r--r-- | l10n/ko/core.po | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/l10n/ko/core.po b/l10n/ko/core.po index f8be8d34af6..f99e2b89d90 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-08-19 15:06-0400\n" +"PO-Revision-Date: 2013-08-19 19:06+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -143,51 +143,51 @@ msgstr "12월" msgid "Settings" msgstr "설정" -#: js/js.js:815 +#: js/js.js:812 msgid "seconds ago" msgstr "초 전" -#: js/js.js:816 +#: js/js.js:813 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:817 +#: js/js.js:814 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:818 +#: js/js.js:815 msgid "today" msgstr "오늘" -#: js/js.js:819 +#: js/js.js:816 msgid "yesterday" msgstr "어제" -#: js/js.js:820 +#: js/js.js:817 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:821 +#: js/js.js:818 msgid "last month" msgstr "지난 달" -#: js/js.js:822 +#: js/js.js:819 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:823 +#: js/js.js:820 msgid "months ago" msgstr "개월 전" -#: js/js.js:824 +#: js/js.js:821 msgid "last year" msgstr "작년" -#: js/js.js:825 +#: js/js.js:822 msgid "years ago" msgstr "년 전" @@ -195,23 +195,19 @@ msgstr "년 전" msgid "Choose" msgstr "선택" -#: js/oc-dialogs.js:122 -msgid "Cancel" -msgstr "취소" - -#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 +#: js/oc-dialogs.js:137 js/oc-dialogs.js:196 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:164 +#: js/oc-dialogs.js:160 msgid "Yes" msgstr "예" -#: js/oc-dialogs.js:172 +#: js/oc-dialogs.js:168 msgid "No" msgstr "아니요" -#: js/oc-dialogs.js:185 +#: js/oc-dialogs.js:181 msgid "Ok" msgstr "승락" @@ -618,14 +614,6 @@ msgid "" "href=\"%s\">View it!</a><br><br>Cheers!" msgstr "" -#: templates/part.pagenavi.php:3 -msgid "prev" -msgstr "이전" - -#: templates/part.pagenavi.php:20 -msgid "next" -msgstr "다음" - #: templates/update.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." |