Merge branch 'master' into mimetype-defaults

Conflicts:
	apps/files/ajax/newfile.php

1 files changed, 34 insertions, 33 deletions

diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index de8a2f445db..f8be8d34af6 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-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -139,59 +139,55 @@ msgstr "11월"
 msgid "December"
 msgstr "12월"
 
-#: js/js.js:293
+#: js/js.js:355
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:753
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "초 전"
 
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1분 전"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes}분 전"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1시간 전"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours}시간 전"
-
-#: js/js.js:758
+#: js/js.js:818
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:759
+#: js/js.js:819
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days}일 전"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:761
+#: js/js.js:821
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months}개월 전"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:763
+#: js/js.js:823
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:764
+#: js/js.js:824
 msgid "last year"
 msgstr "작년"
 
-#: js/js.js:765
+#: js/js.js:825
 msgid "years ago"
 msgstr "년 전"
 
@@ -379,9 +375,10 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud 암호 재설정"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr ""
 msgid "Log out"
 msgstr "로그아웃"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "자동 로그인이 거부되었습니다!"