merge master into filesystem

6 files changed, 115 insertions, 125 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 8b6fa46a9a6..9b8dcdd8495 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-07 00:04+0100\n"
-"PO-Revision-Date: 2013-01-06 23:04+0000\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: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -88,55 +88,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 "一分钟前"
 
-#: 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 "年前"
 
@@ -212,7 +212,6 @@ msgid "Password protect"
 msgstr "密码保护"
 
 #: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
 msgid "Password"
 msgstr "密码"
 
@@ -557,10 +556,6 @@ msgstr "记住"
 msgid "Log in"
 msgstr "登录"
 
-#: templates/logout.php:1
-msgid "You are logged out."
-msgstr "您已注销。"
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "上一页"
@@ -573,17 +568,3 @@ msgstr "下一页"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: 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/zh_CN/files.po b/l10n/zh_CN/files.po
index 2ce09f94756..bda2cc9518c 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -5,6 +5,7 @@
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
 # Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
 #   <rainofchaos@gmail.com>, 2012.
 #   <suiy02@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-07 00:04+0100\n"
-"PO-Revision-Date: 2013-01-06 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 11:25+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +23,20 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr "无法移动 %s - 同名文件已存在"
+
+#: ajax/move.php:24
+#, php-format
+msgid "Could not move %s"
+msgstr "无法移动 %s"
+
+#: ajax/rename.php:19
+msgid "Unable to rename file"
+msgstr "无法重命名文件"
+
 #: ajax/upload.php:14
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
@@ -59,21 +74,21 @@ msgstr "写入磁盘失败"
 
 #: ajax/upload.php:45
 msgid "Not enough space available"
-msgstr ""
+msgstr "没有足够可用空间"
 
 #: ajax/upload.php:69
 msgid "Invalid directory."
-msgstr ""
+msgstr "无效文件夹。"
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
+#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
+#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
 msgid "Delete"
 msgstr "删除"
 
@@ -81,49 +96,49 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:199
+#: js/filelist.js:205
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:248
+#: js/filelist.js:254
 msgid "replaced {new_name}"
 msgstr "替换 {new_name}"
 
-#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
+#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:250
+#: js/filelist.js:256
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:282
+#: js/filelist.js:288
 msgid "unshared {files}"
 msgstr "取消了共享 {files}"
 
-#: js/filelist.js:284
+#: js/filelist.js:290
 msgid "deleted {files}"
 msgstr "删除了 {files}"
 
 #: js/files.js:31
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' 是一个无效的文件名。"
 
 #: js/files.js:36
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "文件名不能为空。"
 
 #: js/files.js:45
 msgid ""
@@ -131,80 +146,84 @@ msgid ""
 "allowed."
 msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
 
-#: js/files.js:186
+#: js/files.js:187
 msgid "generating ZIP-file, it may take some time."
 msgstr "正在生成 ZIP 文件，可能需要一些时间"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "无法上传文件，因为它是一个目录或者大小为 0 字节"
 
-#: js/files.js:224
+#: js/files.js:225
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:241
+#: js/files.js:242
 msgid "Close"
 msgstr "关闭"
 
-#: js/files.js:260 js/files.js:374 js/files.js:404
+#: js/files.js:261 js/files.js:377 js/files.js:410
 msgid "Pending"
 msgstr "操作等待中"
 
-#: js/files.js:280
+#: js/files.js:281
 msgid "1 file uploading"
 msgstr "1个文件上传中"
 
-#: js/files.js:283 js/files.js:337 js/files.js:352
+#: js/files.js:284 js/files.js:339 js/files.js:354
 msgid "{count} files uploading"
 msgstr "{count} 个文件上传中"
 
-#: js/files.js:355 js/files.js:388
+#: js/files.js:358 js/files.js:394
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/files.js:457
+#: js/files.js:465
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/files.js:527
-msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr "无效的文件夹名称。”Shared“ 是 Owncloud 保留字符。"
+#: js/files.js:538
+msgid "URL cannot be empty."
+msgstr "URL不能为空"
+
+#: js/files.js:544
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:711
+#: js/files.js:728
 msgid "{count} files scanned"
 msgstr "{count} 个文件已扫描。"
 
-#: js/files.js:719
+#: js/files.js:736
 msgid "error while scanning"
 msgstr "扫描时出错"
 
-#: js/files.js:792 templates/index.php:66
+#: js/files.js:809 templates/index.php:64
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:793 templates/index.php:77
+#: js/files.js:810 templates/index.php:75
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:794 templates/index.php:79
+#: js/files.js:811 templates/index.php:77
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:813
+#: js/files.js:830
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:815
+#: js/files.js:832
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:823
+#: js/files.js:840
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:825
+#: js/files.js:842
 msgid "{count} files"
 msgstr "{count} 个文件"
 
@@ -256,36 +275,36 @@ msgstr "文件夹"
 msgid "From link"
 msgstr "来自链接"
 
-#: templates/index.php:35
+#: templates/index.php:18
 msgid "Upload"
 msgstr "上传"
 
-#: templates/index.php:43
+#: templates/index.php:41
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:58
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:72
+#: templates/index.php:70
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:104
+#: templates/index.php:102
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:106
+#: templates/index.php:104
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
 
-#: templates/index.php:111
+#: templates/index.php:109
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Current scanning"
 msgstr "当前扫描"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index df61cf98da4..8427a53caaf 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 09:58+0000\n"
-"Last-Translator: hanfeng <appweb.cn@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: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: zh_CN\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/zh_CN/settings.po b/l10n/zh_CN/settings.po
index a28ef198295..a0a2353d6d4 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012-2013.
 # Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 #   <suiy02@gmail.com>, 2012.
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 12:51+0000\n"
+"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr "已存在该组"
 msgid "Unable to add group"
 msgstr "无法添加组"
 
-#: ajax/enableapp.php:12
+#: ajax/enableapp.php:11
 msgid "Could not enable app. "
 msgstr "无法开启App"
 
@@ -47,14 +47,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 "无法删除组"
@@ -71,6 +63,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 "管理员不能将自己移出管理组。"
@@ -250,11 +246,11 @@ msgstr "创建"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "默认存储"
 
 #: templates/users.php:42 templates/users.php:138
 msgid "Unlimited"
-msgstr ""
+msgstr "无限"
 
 #: templates/users.php:60 templates/users.php:153
 msgid "Other"
@@ -266,11 +262,11 @@ msgstr "组管理员"
 
 #: templates/users.php:87
 msgid "Storage"
-msgstr ""
+msgstr "存储"
 
 #: templates/users.php:133
 msgid "Default"
-msgstr ""
+msgstr "默认"
 
 #: templates/users.php:161
 msgid "Delete"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index be239585259..c8011d2b2c7 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 11:27+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,13 +24,13 @@ msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behaviour. Please ask your system administrator to "
 "disable one of them."
-msgstr ""
+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 ""
+msgstr "<b>警告：</b>需要的 PHP LDAP 模块未安装，后端将无法工作。请垂询您的系统管理员来安装它。"
 
 #: templates/settings.php:15
 msgid "Host"
@@ -171,7 +172,7 @@ msgstr "字节数"
 
 #: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "以秒计。修改将清空缓存。"
 
 #: templates/settings.php:37
 msgid ""
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index fc3ccc1393b..507b60d8a07 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
 # Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:10+0100\n"
-"PO-Revision-Date: 2012-12-23 13:55+0000\n"
-"Last-Translator: Dianjin Wang <1132321739qq@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: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,17 @@ msgstr ""
 "Language: zh_CN\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."
+"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 ""