Merge master into oc_preview

3 files changed, 83 insertions, 62 deletions

diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index f99e2b89d90..fd2020b36d2 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-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 22:31+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"
@@ -24,6 +24,31 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr ""
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr ""
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "분류 형식이 제공되지 않았습니다."
@@ -150,12 +175,12 @@ msgstr "초 전"
 #: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n분 전 "
 
 #: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n시간 전 "
 
 #: js/js.js:815
 msgid "today"
@@ -168,7 +193,7 @@ msgstr "어제"
 #: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n일 전 "
 
 #: js/js.js:818
 msgid "last month"
@@ -177,7 +202,7 @@ msgstr "지난 달"
 #: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n달 전 "
 
 #: js/js.js:820
 msgid "months ago"
@@ -191,23 +216,23 @@ msgstr "작년"
 msgid "years ago"
 msgstr "년 전"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "선택"
 
-#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr "예"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr "아니요"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr "승락"
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index cdab5cceeb1..6141204cfa2 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.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-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -96,21 +96,20 @@ msgstr "여유 공간이 부족합니다"
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:167
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:241
 msgid "URL cannot be empty."
 msgstr "URL을 입력해야 합니다."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:246 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:277 js/file-upload.js:293 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "오류"
 
@@ -197,28 +196,24 @@ msgid ""
 "big."
 msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "폴더 이름이 유효하지 않습니다. "
-
-#: js/files.js:760 templates/index.php:67
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:778
+#: js/files.js:580
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:784
+#: js/files.js:586
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 1c826578446..f320d2ae96d 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# chohy <chohy@yahoo.com>, 2013
 # smallsnail <bjh13579@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-27 11:18-0400\n"
+"PO-Revision-Date: 2013-08-26 09:30+0000\n"
+"Last-Translator: chohy <chohy@yahoo.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +24,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 \"%s\" 앱을 설치할 수 없습니다."
 
 #: app.php:250
 msgid "No app name specified"
-msgstr ""
+msgstr "앱 이름이 지정되지 않았습니다."
 
 #: app.php:361
 msgid "Help"
@@ -52,7 +53,7 @@ msgstr "관리자"
 #: app.php:837
 #, php-format
 msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "\"%s\" 업그레이드에 실패했습니다."
 
 #: defaults.php:35
 msgid "web services under your control"
@@ -61,7 +62,7 @@ msgstr "내가 관리하는 웹 서비스"
 #: files.php:66 files.php:98
 #, php-format
 msgid "cannot open \"%s\""
-msgstr ""
+msgstr "\"%s\"을(를) 열 수 없습니다."
 
 #: files.php:226
 msgid "ZIP download is turned off."
@@ -87,59 +88,59 @@ msgstr ""
 
 #: installer.php:63
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "앱을 설치할 때 소스가 지정되지 않았습니다."
 
 #: installer.php:70
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "http에서 앱을 설치할 대 href가 지정되지 않았습니다."
 
 #: installer.php:75
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다."
 
 #: installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "%s 타입 아카이브는 지원되지 않습니다."
 
 #: installer.php:103
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "앱을 설치할 때 아카이브를 열지 못했습니다."
 
 #: installer.php:123
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "앱에서 info.xml 파일이 제공되지 않았습니다."
 
 #: installer.php:129
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다. "
 
 #: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다."
 
 #: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "출하되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다."
 
 #: installer.php:150
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
-msgstr ""
+msgstr "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다. "
 
 #: installer.php:160
 msgid "App directory already exists"
-msgstr ""
+msgstr "앱 디렉토리가 이미 존재합니다. "
 
 #: installer.php:173
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s "
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -183,16 +184,16 @@ msgstr "%s 에 적으신 데이터베이스 이름에는 점을 사용할수 없
 #: setup/mssql.php:20
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s"
 
 #: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
 #: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "기존 계정이나 administrator(관리자)를 입력해야 합니다."
 
 #: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL 사용자 이름이나 암호가 잘못되었습니다."
 
 #: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
 #: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
@@ -209,38 +210,38 @@ msgstr "DB 오류: \"%s\""
 #: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "잘못된 명령: \"%s\""
 
 #: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL 사용자 '%s'@'localhost'이(가) 이미 존재합니다."
 
 #: setup/mysql.php:86
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "이 사용자를 MySQL에서 뺍니다."
 
 #: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL 사용자 '%s'@'%%'이(가) 이미 존재합니다. "
 
 #: setup/mysql.php:92
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "이 사용자를 MySQL에서 뺍니다."
 
 #: setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Oracle 연결을 수립할 수 없습니다."
 
 #: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle 사용자 이름이나 암호가 잘못되었습니다."
 
 #: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "잘못된 명령: \"%s\", 이름: %s, 암호: %s"
 
 #: setup/postgresql.php:23 setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
@@ -272,12 +273,12 @@ msgstr "초 전"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n분 전 "
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n시간 전 "
 
 #: template/functions.php:83
 msgid "today"
@@ -290,7 +291,7 @@ msgstr "어제"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n일 전 "
 
 #: template/functions.php:86
 msgid "last month"
@@ -299,7 +300,7 @@ msgstr "지난 달"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n달 전 "
 
 #: template/functions.php:88
 msgid "last year"
@@ -311,7 +312,7 @@ msgstr "년 전"
 
 #: template.php:297
 msgid "Caused by:"
-msgstr ""
+msgstr "원인: "
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format