[tx-robot] updated from transifex

5 files changed, 196 insertions, 211 deletions

diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index fc9d49e79a6..a6beec56ef2 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -227,8 +227,8 @@ msgstr "未指定对象类型。"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:625
-#: js/share.js:637
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:631 js/share.js:643
 msgid "Error"
 msgstr "出错"
 
@@ -248,123 +248,123 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:665
+#: js/share.js:131 js/share.js:671
 msgid "Error while sharing"
 msgstr "分享出错"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "取消分享出错"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "变更权限出错"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "由 {owner} 与您和 {group} 群组分享"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "由 {owner} 与您分享"
 
-#: js/share.js:177
+#: js/share.js:183
 msgid "Share with"
 msgstr "分享"
 
-#: js/share.js:182
+#: js/share.js:188
 msgid "Share with link"
 msgstr "分享链接"
 
-#: js/share.js:185
+#: js/share.js:191
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:187 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "密码"
 
-#: js/share.js:192
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:196
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "面向个人的电子邮件链接"
 
-#: js/share.js:197
+#: js/share.js:203
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:202
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "设置失效日期"
 
-#: js/share.js:203
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "失效日期"
 
-#: js/share.js:235
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "通过电子邮件分享："
 
-#: js/share.js:237
+#: js/share.js:243
 msgid "No people found"
 msgstr "查无此人"
 
-#: js/share.js:275
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "不允许重复分享"
 
-#: js/share.js:311
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "已经与 {user} 在 {item} 中分享"
 
-#: js/share.js:332
+#: js/share.js:338
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/share.js:344
+#: js/share.js:350
 msgid "can edit"
 msgstr "可编辑"
 
-#: js/share.js:346
+#: js/share.js:352
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:349
+#: js/share.js:355
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:352
+#: js/share.js:358
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:355
+#: js/share.js:361
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:358
+#: js/share.js:364
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:392 js/share.js:612
+#: js/share.js:398 js/share.js:618
 msgid "Password protected"
 msgstr "密码保护"
 
-#: js/share.js:625
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "取消设置失效日期出错"
 
-#: js/share.js:637
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "设置失效日期出错"
 
-#: js/share.js:652
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "发送中……"
 
-#: js/share.js:663
+#: js/share.js:669
 msgid "Email sent"
 msgstr "电子邮件已发送"
 
@@ -402,7 +402,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "你将会收到一个重置密码的链接"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "用户名"
@@ -467,7 +467,7 @@ msgstr "禁止访问"
 msgid "Cloud not found"
 msgstr "云 没有被找到"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "请升级您的PHP版本以稳定运行ownCloud。"
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,65 +518,65 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "因为.htaccess文件无效，您的数据文件夹及文件可能可以在互联网上访问。"
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "要获得大概如何配置您的服务器的相关信息，参见<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">说明文档</a>。"
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一个 <strong>管理帐户</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "进阶"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "数据存放文件夹"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "将会使用"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "数据库用户名"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "数据库表格空间"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "完成安装"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "注销"
 
@@ -609,7 +610,7 @@ msgstr "登陆"
 msgid "Alternative Logins"
 msgstr "备选登录"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index c1ffcfb75c3..209fa855936 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "无法恢复：%s"
 
-#: history.php:40
-msgid "success"
-msgstr "成功"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "文件 %s 已被恢复为 %s 的版本"
-
-#: history.php:49
-msgid "failure"
-msgstr "失败"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "文件 %s 无法恢复为 %s 的版本"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "版本"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "没有可用的旧版本"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "未指定路径"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "版本"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "请点击“恢复”按钮把文件恢复到早前的版本"
+#: js/versions.js:149
+msgid "Restore"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index b5aa2a0b1a1..fd864864730 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.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-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:55+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -171,175 +171,173 @@ msgstr "请填写有效密码"
 msgid "__language_name__"
 msgstr "Chinese"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。"
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "配置注意"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。"
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "请双击<a href='%s'>安装向导</a>。"
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "模块“fileinfo”丢失。"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP 模块“fileinfo”丢失。我们强烈建议打开此模块来获得 mine 类型检测的最佳结果。"
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "区域设置未运作"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "ownCloud 服务器不能把系统区域设置到 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的包来支持“%s”。"
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "互联网连接未运作"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps don´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "服务器没有可用的Internet连接。这意味着像挂载外部储存、更新提示和安装第三方插件等功能会失效。远程访问文件和发送邮件提醒也可能会失效。建议开启服务器的英特网网络。"
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "在每个页面载入时执行一项任务"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php 已作为 webcron 服务注册。owncloud 根用户将通过 http 协议每分钟调用一次 cron.php。"
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php"
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "分享"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "开启分享API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "允许应用使用分享API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "允许用户通过链接共享内容"
 
-#: templates/admin.php:153
+#: templates/admin.php:151
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:154
+#: templates/admin.php:152
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:162
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "允许转帖"
 
-#: templates/admin.php:163
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户再次共享已共享的内容"
 
-#: templates/admin.php:170
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人分享"
 
-#: templates/admin.php:173
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "只允许用户向所在群组中的其他用户分享"
 
-#: templates/admin.php:180
+#: templates/admin.php:178
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:193
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "强制HTTPS"
 
-#: templates/admin.php:194
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "强制客户端通过加密连接与ownCloud连接"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "请先使用HTTPS访问本站以设置强制SSL的开关。"
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:211
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:208
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "日志等级"
 
-#: templates/admin.php:239
+#: templates/admin.php:243
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:240
+#: templates/admin.php:244
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:246 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:250 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -397,72 +395,72 @@ msgstr "Bug追踪者"
 msgid "Commercial Support"
 msgstr "商业支持"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "获取应用并同步您的文件"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "再次显示首次运行向导"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "您已使用<strong>%s</strong>/<strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "您的密码以变更"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "不能改变你的密码"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "现在的密码"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "改变密码"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "显示名称"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "你的email地址"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "输入一个邮箱地址以激活密码恢复功能"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index e7b4fdb7e7a..d65a51203b6 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:05+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "关闭 SSL 证书校验。"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "如果只有使用此选项才能连接，请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "群组显示名称字段"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 0956f14fc26..042d9edc6b1 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"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 ""