Merge branch 'master' into appframework-master

5 files changed, 109 insertions, 94 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index c516d6a84d5..d05019be94c 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xuetian Weng <wengxt@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 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-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+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"
@@ -24,6 +25,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s 向您分享了 »%s«"
 
+#: ajax/share.php:227
+msgid "group"
+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 "...已完成 %d%% ..."
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "未提供分类类型。"
@@ -155,7 +185,7 @@ 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 +198,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 +207,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 +221,23 @@ msgstr "去年"
 msgid "years ago"
 msgstr "年前"
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr "选择(&C)..."
 
-#: 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 "好"
 
@@ -226,7 +256,7 @@ msgstr "错误"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "未指定App名称。"
+msgstr "未指定应用名称。"
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
@@ -374,7 +404,7 @@ msgstr "更新成功。正在重定向至 ownCloud。"
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "重置 %s 的密码"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -440,7 +470,7 @@ msgstr "个人"
 msgid "Users"
 msgstr "用户"
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr "应用"
 
@@ -491,7 +521,7 @@ msgstr "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)"
 #: templates/installation.php:26
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "为保证安全使用 %s 请更新您的PHP。"
 
 #: templates/installation.php:32
 msgid ""
@@ -516,7 +546,7 @@ msgstr "您的数据目录和文件可能可以直接被互联网访问，因为
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。"
 
 #: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
@@ -573,10 +603,6 @@ msgstr "%s 可用。获取更多关于如何升级的信息。"
 msgid "Log out"
 msgstr "注销"
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自动登录被拒绝！"
@@ -591,19 +617,19 @@ msgstr "如果您没有最近修改您的密码，您的帐户可能会受到影
 msgid "Please change your password to secure your account again."
 msgstr "请修改您的密码，以保护您的账户安全。"
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr "忘记密码？"
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr "登录"
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr "其他登录方式"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index f2c016bafb2..fe65471744c 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -10,8 +10,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-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+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"
@@ -77,7 +77,11 @@ msgstr "写入磁盘失败"
 msgid "Not enough storage available"
 msgstr "没有足够的存储空间"
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -97,21 +101,20 @@ msgstr "没有足够可用空间"
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 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:239
 msgid "URL cannot be empty."
 msgstr "URL不能为空"
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
 
-#: 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:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr "错误"
 
@@ -127,40 +130,54 @@ msgstr "永久删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:453
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 文件夹"
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n个文件"
+
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:561
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/filelist.js:518
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr "文件上传中"
 
@@ -198,32 +215,18 @@ msgid ""
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:358
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
-
-#: 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
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 文件夹"
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n个文件"
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -327,22 +330,6 @@ msgstr "文件正在被扫描，请稍候。"
 msgid "Current scanning"
 msgstr "当前扫描"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "文件"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "文件"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "正在更新文件系统缓存..."
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 28e19119a91..08447c650f0 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -5,13 +5,14 @@
 # Translators:
 # Charlie Mak <makchamhim72@gmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
+# Xuetian Weng <wengxt@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-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 19:10+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@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"
@@ -109,7 +110,7 @@ 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"
@@ -278,7 +279,7 @@ 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"
@@ -291,7 +292,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"
@@ -300,7 +301,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"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7258511fab3..d8d9cefc362 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -6,14 +6,15 @@
 # m13253 <m13253@hotmail.com>, 2013
 # waterone <suiy02@gmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
 # zhangmin <zm1990s@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-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 17:40+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@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"
@@ -106,11 +107,11 @@ msgstr "请稍等...."
 
 #: js/apps.js:71 js/apps.js:72 js/apps.js:92
 msgid "Error while disabling app"
-msgstr ""
+msgstr "禁用 app 时出错"
 
 #: js/apps.js:91 js/apps.js:104 js/apps.js:105
 msgid "Error while enabling app"
-msgstr ""
+msgstr "启用 app 时出错"
 
 #: js/apps.js:115
 msgid "Updating...."
@@ -134,7 +135,7 @@ msgstr "已更新"
 
 #: js/personal.js:150
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "正在解密文件... 请稍等，可能需要一些时间。"
 
 #: js/personal.js:172
 msgid "Saving..."
@@ -483,15 +484,15 @@ msgstr "加密"
 
 #: templates/personal.php:119
 msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "加密 app 未启用，将解密您所有文件"
 
 #: templates/personal.php:125
 msgid "Log-in password"
-msgstr ""
+msgstr "登录密码"
 
 #: templates/personal.php:130
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "解密所有文件"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index c3a8727e4b6..754dd58d6e5 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 19:10+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@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"
@@ -28,11 +28,11 @@ msgstr "WebDAV 认证"
 
 #: templates/settings.php:4
 msgid "Address: "
-msgstr ""
+msgstr "地址："
 
 #: templates/settings.php:7
 msgid ""
 "The user credentials will be sent to this address. 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 ""
+msgstr "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"