Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js

7 files changed, 96 insertions, 109 deletions

diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 24948c06769..5e2b5617dd6 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-08 00:30+0100\n"
-"PO-Revision-Date: 2013-01-07 10:03+0000\n"
-"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,55 +87,55 @@ msgstr "책갈피에서 %s을(를) 삭제할 수 없었습니다."
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:704
+#: js/js.js:711
 msgid "seconds ago"
 msgstr "초 전"
 
-#: js/js.js:705
+#: js/js.js:712
 msgid "1 minute ago"
 msgstr "1분 전"
 
-#: js/js.js:706
+#: js/js.js:713
 msgid "{minutes} minutes ago"
 msgstr "{minutes}분 전"
 
-#: js/js.js:707
+#: js/js.js:714
 msgid "1 hour ago"
 msgstr "1시간 전"
 
-#: js/js.js:708
+#: js/js.js:715
 msgid "{hours} hours ago"
 msgstr "{hours}시간 전"
 
-#: js/js.js:709
+#: js/js.js:716
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:710
+#: js/js.js:717
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:711
+#: js/js.js:718
 msgid "{days} days ago"
 msgstr "{days}일 전"
 
-#: js/js.js:712
+#: js/js.js:719
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:713
+#: js/js.js:720
 msgid "{months} months ago"
 msgstr "{months}개월 전"
 
-#: js/js.js:714
+#: js/js.js:721
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:715
+#: js/js.js:722
 msgid "last year"
 msgstr "작년"
 
-#: js/js.js:716
+#: js/js.js:723
 msgid "years ago"
 msgstr "년 전"
 
@@ -211,7 +211,6 @@ msgid "Password protect"
 msgstr "암호 보호"
 
 #: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
 msgid "Password"
 msgstr "암호"
 
@@ -556,10 +555,6 @@ msgstr "기억하기"
 msgid "Log in"
 msgstr "로그인"
 
-#: templates/logout.php:1
-msgid "You are logged out."
-msgstr "로그아웃되었습니다."
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "이전"
@@ -572,17 +567,3 @@ msgstr "다음"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "ownCloud 를 버젼 %s로 업데이트 하는 중, 시간이 소요됩니다."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "보안 경고!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "암호를 확인해 주십시오.<br/>보안상의 이유로 종종 암호를 물어볼 것입니다."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "확인"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 1cbad6bb34e..724bb5fd2d9 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -5,15 +5,16 @@
 # Translators:
 #   <aoiob4305@gmail.com>, 2013.
 # 남자사람  <cessnagi@gmail.com>, 2012.
+# Harim Park <fofwisdom@gmail.com>, 2013.
 #   <limonade83@gmail.com>, 2012.
 # Shinjo Park <kde@peremen.name>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-12 00:09+0100\n"
+"PO-Revision-Date: 2013-01-11 13:42+0000\n"
+"Last-Translator: Harim Park <fofwisdom@gmail.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"
@@ -24,16 +25,16 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존재함"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "%s 항목을 이딩시키지 못하였음"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "파일 이름바꾸기 할 수 없음"
 
 #: ajax/upload.php:14
 msgid "No file was uploaded. Unknown error"
@@ -187,7 +188,7 @@ msgstr "URL을 입력해야 합니다."
 
 #: js/files.js:543
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "폴더 이름이 유효하지 않습니다. "
 
 #: js/files.js:727
 msgid "{count} files scanned"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index 20d3071b548..0fe524b7701 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:11+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "모든 버전 삭제"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "역사"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "버전"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "이 파일의 모든 백업 버전을 삭제합니다"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "파일 버전 관리"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 3870ebda87f..c759d43ece3 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:06+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "도움말"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "개인"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "설정"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "사용자"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "앱"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "관리자"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP 다운로드가 비활성화되었습니다."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "파일을 개별적으로 다운로드해야 합니다."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "파일로 돌아가기"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "앱이 활성화되지 않았습니다"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "인증 오류"
 
@@ -83,55 +87,55 @@ msgstr "텍스트"
 msgid "Images"
 msgstr "그림"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "초 전"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1분 전"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d분 전"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1시간 전"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d시간 전"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "오늘"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "어제"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d일 전"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "지난 달"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d개월 전"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "작년"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "년 전"
 
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 0d027d7cdfc..cf07cd95284 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -5,15 +5,16 @@
 # Translators:
 #   <aoiob4305@gmail.com>, 2013.
 # 남자사람  <cessnagi@gmail.com>, 2012.
+# Harim Park <fofwisdom@gmail.com>, 2013.
 #   <limonade83@gmail.com>, 2012.
 # Shinjo Park <kde@peremen.name>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-08 00:30+0100\n"
-"PO-Revision-Date: 2013-01-07 10:26+0000\n"
-"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\n"
+"POT-Creation-Date: 2013-01-12 00:09+0100\n"
+"PO-Revision-Date: 2013-01-11 23:09+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +34,7 @@ msgstr "그룹이 이미 존재합니다."
 msgid "Unable to add group"
 msgstr "그룹을 추가할 수 없습니다."
 
-#: ajax/enableapp.php:12
+#: ajax/enableapp.php:11
 msgid "Could not enable app. "
 msgstr "앱을 활성화할 수 없습니다."
 
@@ -45,14 +46,6 @@ msgstr "이메일 저장됨"
 msgid "Invalid email"
 msgstr "잘못된 이메일 주소"
 
-#: ajax/openid.php:13
-msgid "OpenID Changed"
-msgstr "OpenID 변경됨"
-
-#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20
-msgid "Invalid request"
-msgstr "잘못된 요청"
-
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
 msgstr "그룹을 삭제할 수 없습니다."
@@ -69,6 +62,10 @@ msgstr "사용자를 삭제할 수 없습니다."
 msgid "Language changed"
 msgstr "언어가 변경되었습니다"
 
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr "잘못된 요청"
+
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
 msgstr "관리자 자신을 관리자 그룹에서 삭제할 수 없습니다"
@@ -141,7 +138,7 @@ msgstr "버그트래커"
 
 #: templates/help.php:11
 msgid "Commercial Support"
-msgstr ""
+msgstr "상업용 지원"
 
 #: templates/personal.php:8
 #, php-format
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index f4012dc7305..53b9f3b081f 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-08 00:30+0100\n"
-"PO-Revision-Date: 2013-01-07 09:58+0000\n"
-"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,9 +29,9 @@ msgstr "<b>경고</b>user_ldap 앱과 user_webdavauth 앱은 호환되지 않습
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>경고</b>PHP LDAP 모듈이 설치되지 않았습니다. 백엔드가 동작하지 않을 것 입니다. 시스템관리자에게 요청하여 해당 모듈을 설치하시기 바랍니다."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
 
 #: templates/settings.php:15
 msgid "Host"
@@ -47,6 +47,10 @@ msgid "Base DN"
 msgstr "기본 DN"
 
 #: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
 
@@ -117,10 +121,18 @@ msgstr "포트"
 msgid "Base User Tree"
 msgstr "기본 사용자 트리"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "기본 그룹 트리"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "그룹-회원 연결"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 7baa17ed715..bd135598c7f 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-08 00:30+0100\n"
-"PO-Revision-Date: 2013-01-07 10:31+0000\n"
-"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud는 이 URL로 유저 인증을 보내게 되며, http 401 과 http 403은 인증 오류로, 그 외 코드는 인증이 올바른 것으로 해석합니다."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""