[tx-robot] updated from transifex

9 files changed, 134 insertions, 134 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 74474bca2cf..646962f3e38 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-04 01:54-0400\n"
-"PO-Revision-Date: 2014-07-04 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-05 02:50+0000\n"
+"Last-Translator: Kaijia Feng <fengkaijia@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"
@@ -48,7 +48,7 @@ msgstr "数据库已更新"
 
 #: ajax/update.php:19
 msgid "Checked database schema update"
-msgstr ""
+msgstr "已经检查数据库架构更新"
 
 #: ajax/update.php:27
 #, php-format
@@ -228,7 +228,7 @@ msgid ""
 "The link to reset your password has been sent to your email. If you do not "
 "receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。"
 
 #: js/lostpassword.js:7
 msgid ""
@@ -236,7 +236,7 @@ msgid ""
 "will be no way to get your data back after your password is reset.<br />If "
 "you are not sure what to do, please contact your administrator before you "
 "continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？"
 
 #: js/lostpassword.js:10
 msgid "I know what I'm doing"
@@ -620,7 +620,7 @@ msgstr "个人"
 msgid "Users"
 msgstr "用户"
 
-#: strings.php:7 templates/layout.user.php:53 templates/layout.user.php:117
+#: strings.php:7 templates/layout.user.php:53 templates/layout.user.php:118
 msgid "Apps"
 msgstr "应用"
 
@@ -776,7 +776,7 @@ msgstr "数据库主机"
 msgid ""
 "SQLite will be used as database. For larger installations we recommend to "
 "change this."
-msgstr ""
+msgstr "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。"
 
 #: templates/installation.php:159
 msgid "Finish setup"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 11e4d52d296..cb05ef26d9e 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-04 01:54-0400\n"
-"PO-Revision-Date: 2014-07-04 01:00+0000\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-04 15:13+0000\n"
 "Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -196,7 +196,7 @@ msgstr "文件正在上传中。现在离开此页会导致上传动作被取消
 msgid "URL cannot be empty"
 msgstr "URL不能为空"
 
-#: js/file-upload.js:568 js/filelist.js:1244
+#: js/file-upload.js:568 js/filelist.js:1253
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
@@ -212,19 +212,19 @@ msgstr "不能创建文件夹"
 msgid "Error fetching URL"
 msgstr "获取URL出错"
 
-#: js/fileactions.js:258
+#: js/fileactions.js:254
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:271
+#: js/fileactions.js:267
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/fileactions.js:273 templates/list.php:77 templates/list.php:78
+#: js/fileactions.js:269 templates/list.php:77 templates/list.php:78
 msgid "Delete"
 msgstr "删除"
 
-#: js/fileactions.js:309
+#: js/fileactions.js:305
 msgid "Rename"
 msgstr "重命名"
 
@@ -234,53 +234,53 @@ msgid ""
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/filelist.js:669 js/filelist.js:1768
+#: js/filelist.js:669 js/filelist.js:1777
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:1195
+#: js/filelist.js:1204
 msgid "Error moving file."
 msgstr "移动文件出错。"
 
-#: js/filelist.js:1203
+#: js/filelist.js:1212
 msgid "Error moving file"
 msgstr "移动文件错误"
 
-#: js/filelist.js:1203
+#: js/filelist.js:1212
 msgid "Error"
 msgstr "错误"
 
-#: js/filelist.js:1292
+#: js/filelist.js:1301
 msgid "Could not rename file"
 msgstr "不能重命名文件"
 
-#: js/filelist.js:1410
+#: js/filelist.js:1419
 msgid "Error deleting file."
 msgstr "删除文件出错。"
 
-#: js/filelist.js:1513 templates/list.php:61
+#: js/filelist.js:1522 templates/list.php:61
 msgid "Name"
 msgstr "名称"
 
-#: js/filelist.js:1514 templates/list.php:72
+#: js/filelist.js:1523 templates/list.php:72
 msgid "Size"
 msgstr "大小"
 
-#: js/filelist.js:1515 templates/list.php:75
+#: js/filelist.js:1524 templates/list.php:75
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/filelist.js:1525 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1534 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:1531 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1540 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:1661 js/filelist.js:1700
+#: js/filelist.js:1670 js/filelist.js:1709
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "上传 %n 个文件"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 8b28365aefc..e4e72a609fe 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Kaijia Feng <fengkaijia@gmail.com>, 2014
 # Mengz You <mengz.you@gmail.com>, 2013
 # Star Brilliant <m13253@hotmail.com>, 2013
 # phy <transifex@phy25.com>, 2014
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-05 03:00+0000\n"
+"Last-Translator: Kaijia Feng <fengkaijia@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"
@@ -82,7 +83,7 @@ msgstr ""
 msgid ""
 "Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr ""
+msgstr "未知错误。请检查系统设置或联系您的管理员"
 
 #: hooks/hooks.php:66
 msgid "Missing requirements."
@@ -101,11 +102,11 @@ msgstr "以下用户还没有设置加密："
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "初始加密启动中....这可能会花一些时间，请稍后再试。"
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "初始加密运行中....请稍后再试。"
 
 #: templates/invalid_private_key.php:8
 #, php-format
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 79ba2c9f2da..72fbbec11ef 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-29 01:54-0400\n"
-"PO-Revision-Date: 2014-06-29 05:54+0000\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-04 15:13+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -237,29 +237,29 @@ msgstr ""
 msgid "Saved"
 msgstr "已保存"
 
-#: lib/config.php:707
+#: lib/config.php:712
 msgid "<b>Note:</b> "
 msgstr "<b>注意：</b>"
 
-#: lib/config.php:717
+#: lib/config.php:722
 msgid " and "
 msgstr "和"
 
-#: lib/config.php:739
+#: lib/config.php:744
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:741
+#: lib/config.php:746
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:743
+#: lib/config.php:748
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index ff755e49a00..5ea4cd1ce18 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-04 01:54-0400\n"
-"PO-Revision-Date: 2014-07-04 01:30+0000\n"
-"Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-05 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -78,7 +78,7 @@ msgstr "无效的 ownCloud 网址"
 msgid "Shared by {owner}"
 msgstr "由 {owner} 分享"
 
-#: js/sharedfilelist.js:128
+#: js/sharedfilelist.js:123
 msgid "Shared by"
 msgstr "共享人"
 
@@ -126,10 +126,6 @@ msgstr "欲知详情，请联系发给你链接的人。"
 msgid "Add to your ownCloud"
 msgstr "添加到您的 ownCloud"
 
-#: templates/public.php:25
-msgid "Save"
-msgstr "保存"
-
 #: templates/public.php:30
 msgid "Download"
 msgstr "下载"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 42db9c5ddd3..72aa1108e64 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -5,6 +5,7 @@
 # Translators:
 # Charlie Mak <makchamhim72@gmail.com>, 2013
 # fangpeishi <fangpeishi@gmail.com>, 2014
+# Kaijia Feng <fengkaijia@gmail.com>, 2014
 # Martin Liu <liuzh66@gmail.com>, 2014
 # wang <modokwang@gmail.com>, 2013
 # csslayer <wengxt@gmail.com>, 2013-2014
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-29 01:54-0400\n"
-"PO-Revision-Date: 2014-06-29 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-05 03:00+0000\n"
+"Last-Translator: Kaijia Feng <fengkaijia@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"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: base.php:187 base.php:194
 msgid "Cannot write into \"config\" directory!"
-msgstr ""
+msgstr "无法写入“config”目录！"
 
 #: base.php:188
 msgid ""
@@ -35,7 +36,7 @@ msgstr ""
 #: base.php:190
 #, php-format
 msgid "See %s"
-msgstr ""
+msgstr "查看 %s"
 
 #: base.php:195 private/util.php:413
 #, php-format
@@ -296,7 +297,7 @@ msgstr "共享 %s 失败，因为文件不存在。"
 #: private/share/share.php:501
 #, php-format
 msgid "You are not allowed to share %s"
-msgstr ""
+msgstr "您无权分享 %s"
 
 #: private/share/share.php:531
 #, php-format
@@ -471,7 +472,7 @@ msgstr "用户名已被使用"
 
 #: private/util.php:398
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
-msgstr ""
+msgstr "没有安装数据库驱动 (SQLite、MySQL 或 PostgreSQL)。"
 
 #: private/util.php:405
 #, php-format
@@ -482,11 +483,11 @@ msgstr ""
 
 #: private/util.php:412
 msgid "Cannot write into \"config\" directory"
-msgstr ""
+msgstr "无法写入“config”目录"
 
 #: private/util.php:425
 msgid "Cannot write into \"apps\" directory"
-msgstr ""
+msgstr "无法写入“apps”目录"
 
 #: private/util.php:426
 #, php-format
@@ -498,7 +499,7 @@ msgstr ""
 #: private/util.php:440
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
-msgstr ""
+msgstr "无法创建“apps”目录 (%s)"
 
 #: private/util.php:441
 #, php-format
@@ -510,17 +511,17 @@ msgstr ""
 #: private/util.php:457
 #, php-format
 msgid "Setting locale to %s failed"
-msgstr ""
+msgstr "设置语言为 %s 失败"
 
 #: private/util.php:460
 msgid ""
 "Please install one of theses locales on your system and restart your "
 "webserver."
-msgstr ""
+msgstr "请在您的系统中安装这些语言并重新启动您的网页服务器。"
 
 #: private/util.php:464
 msgid "Please ask your server administrator to install the module."
-msgstr ""
+msgstr "请联系服务器管理员安装模块。"
 
 #: private/util.php:468 private/util.php:475 private/util.php:482
 #: private/util.php:496 private/util.php:503 private/util.php:510
@@ -528,64 +529,64 @@ msgstr ""
 #: private/util.php:546
 #, php-format
 msgid "PHP module %s not installed."
-msgstr ""
+msgstr "PHP %s 模块未安装。"
 
 #: private/util.php:538
 #, php-format
 msgid "PHP %s or higher is required."
-msgstr ""
+msgstr "要求 PHP 版本 %s 或者更高。"
 
 #: private/util.php:539
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
-msgstr ""
+msgstr "请联系服务器管理员升级 PHP 到最新的版本。ownCloud 和 PHP 社区已经不再支持此版本的 PHP。"
 
 #: private/util.php:556
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
-msgstr ""
+msgstr "PHP Safe Mode 已经启用，ownCloud 需要 Safe Mode 停用以正常工作。"
 
 #: private/util.php:557
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
-msgstr ""
+msgstr "PHP Safe Mode 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Safe Mode。"
 
 #: private/util.php:564
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
-msgstr ""
+msgstr "Magic Quotes 已经启用，ownCloud 需要 Magic Quotes 停用以正常工作。"
 
 #: private/util.php:565
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
-msgstr ""
+msgstr "Magic Quotes 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Magic Quotes。"
 
 #: private/util.php:579
 msgid "PHP modules have been installed, but they are still listed as missing?"
-msgstr ""
+msgstr "PHP 模块已经安装，但仍然显示未安装？"
 
 #: private/util.php:580
 msgid "Please ask your server administrator to restart the web server."
-msgstr ""
+msgstr "请联系服务器管理员重启网页服务器。"
 
 #: private/util.php:609
 msgid "PostgreSQL >= 9 required"
-msgstr ""
+msgstr "要求 PostgreSQL >= 9"
 
 #: private/util.php:610
 msgid "Please upgrade your database version"
-msgstr ""
+msgstr "请升级您的数据库版本"
 
 #: private/util.php:617
 msgid "Error occurred while checking PostgreSQL version"
-msgstr ""
+msgstr "检查 PostgreSQL 版本时发生了一个错误"
 
 #: private/util.php:618
 msgid ""
@@ -597,23 +598,23 @@ msgstr ""
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed"
 " by other users."
-msgstr ""
+msgstr "请更改权限为 0770 以避免其他用户查看目录。"
 
 #: private/util.php:689
 #, php-format
 msgid "Data directory (%s) is readable by other users"
-msgstr ""
+msgstr "文件目录 (%s) 可以被其他用户读取"
 
 #: private/util.php:710
 #, php-format
 msgid "Data directory (%s) is invalid"
-msgstr ""
+msgstr "文件目录 (%s) 无效"
 
 #: private/util.php:711
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its "
 "root."
-msgstr ""
+msgstr "请确保文件根目录下包含有一个名为“.ocdata”的文件。"
 
 #: public/files/locknotacquiredexception.php:39
 #, php-format
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index be32c4116a2..6732b2d056c 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Kaijia Feng <fengkaijia@gmail.com>, 2014
 # Martin Liu <liuzh66@gmail.com>, 2014
 # mozillazg <opensource.mozillazg@gmail.com>, 2014
 # Star Brilliant <m13253@hotmail.com>, 2013
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-03 01:54-0400\n"
-"PO-Revision-Date: 2014-07-03 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-05 02:41+0000\n"
+"Last-Translator: Kaijia Feng <fengkaijia@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"
@@ -108,17 +109,17 @@ msgstr "无法解密您的文件，请检查密码并重试。"
 
 #: ajax/deletekeys.php:14
 msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "加密密钥已经永久删除"
 
 #: ajax/deletekeys.php:16
 msgid ""
 "Couldn't permanently delete your encryption keys, please check your "
 "owncloud.log or ask your administrator"
-msgstr ""
+msgstr "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员"
 
 #: ajax/installapp.php:18 ajax/uninstallapp.php:18
 msgid "Couldn't remove app."
-msgstr ""
+msgstr "无法删除应用。"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -138,13 +139,13 @@ msgstr "无法删除用户"
 
 #: ajax/restorekeys.php:14
 msgid "Backups restored successfully"
-msgstr ""
+msgstr "恢复备份成功"
 
 #: ajax/restorekeys.php:23
 msgid ""
 "Couldn't restore your encryption keys, please check your owncloud.log or ask"
 " your administrator"
-msgstr ""
+msgstr "无法恢复加密密钥，请检查 owncloud.log 或联系管理员"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -219,7 +220,7 @@ msgstr "更新至 {appversion}"
 
 #: js/apps.js:90
 msgid "Uninstall App"
-msgstr ""
+msgstr "下载应用"
 
 #: js/apps.js:96 js/apps.js:158 js/apps.js:191
 msgid "Disable"
@@ -263,15 +264,15 @@ msgstr "已更新"
 
 #: js/apps.js:233
 msgid "Uninstalling ...."
-msgstr ""
+msgstr "卸载中...."
 
 #: js/apps.js:236
 msgid "Error while uninstalling app"
-msgstr ""
+msgstr "卸载应用时发生了一个错误"
 
 #: js/apps.js:237 templates/apps.php:56
 msgid "Uninstall"
-msgstr ""
+msgstr "卸载"
 
 #: js/personal.js:256
 msgid "Select a profile picture"
@@ -303,27 +304,27 @@ msgstr "正在解密文件... 请稍等，可能需要一些时间。"
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "永久删除加密密钥。"
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "恢复加密密钥。"
 
 #: js/users/deleteHandler.js:166
 msgid "Unable to delete {objName}"
-msgstr ""
+msgstr "无法删除 {objName}"
 
 #: js/users/groups.js:73 js/users/groups.js:178
 msgid "Error creating group"
-msgstr ""
+msgstr "创建组时出错"
 
 #: js/users/groups.js:177
 msgid "A valid group name must be provided"
-msgstr ""
+msgstr "请提供一个有效的组名称"
 
 #: js/users/groups.js:205
 msgid "deleted {groupName}"
-msgstr ""
+msgstr "已删除 {groupName}"
 
 #: js/users/groups.js:206 js/users/users.js:265
 msgid "undo"
@@ -351,25 +352,25 @@ msgstr "从不"
 
 #: js/users/users.js:264
 msgid "deleted {userName}"
-msgstr ""
+msgstr "已删除 {userName}"
 
-#: js/users/users.js:383
+#: js/users/users.js:381
 msgid "add group"
 msgstr "增加组"
 
-#: js/users/users.js:580
+#: js/users/users.js:578
 msgid "A valid username must be provided"
 msgstr "必须提供合法的用户名"
 
-#: js/users/users.js:581 js/users/users.js:587 js/users/users.js:602
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
 msgid "Error creating user"
 msgstr "创建用户出错"
 
-#: js/users/users.js:586
+#: js/users/users.js:584
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
-#: js/users/users.js:610
+#: js/users/users.js:608
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告：用户 \"{user}\" 的家目录已存在"
 
@@ -460,24 +461,24 @@ msgstr "请认真检查<a href='%s'>安装指南</a>."
 msgid ""
 "PHP is apparently setup to strip inline doc blocks. This will make several "
 "core apps inaccessible."
-msgstr ""
+msgstr "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。"
 
 #: templates/admin.php:94
 msgid ""
 "This is probably caused by a cache/accelerator such as Zend OPcache or "
 "eAccelerator."
-msgstr ""
+msgstr "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。"
 
 #: templates/admin.php:105
 msgid "Database Performance Info"
-msgstr ""
+msgstr "数据库性能信息"
 
 #: templates/admin.php:108
 msgid ""
 "SQLite is used as database. For larger installations we recommend to change "
 "this. To migrate to another database use the command line tool: 'occ db"
 ":convert-type'"
-msgstr ""
+msgstr "SQLite 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具：“occ db:convert-type”迁移数据库"
 
 #: templates/admin.php:119
 msgid "Module 'fileinfo' missing"
@@ -578,11 +579,11 @@ msgstr "允许应用软件使用共享API"
 
 #: templates/admin.php:243
 msgid "Allow users to share via link"
-msgstr ""
+msgstr "允许用户通过链接分享文件"
 
 #: templates/admin.php:249
 msgid "Enforce password protection"
-msgstr ""
+msgstr "强制密码保护"
 
 #: templates/admin.php:252
 msgid "Allow public uploads"
@@ -610,7 +611,7 @@ msgstr "允许再次共享"
 
 #: templates/admin.php:276
 msgid "Restrict users to only share with users in their groups"
-msgstr ""
+msgstr "限制仅与组内用户分享"
 
 #: templates/admin.php:281
 msgid "Allow users to send mail notification for shared files"
@@ -618,12 +619,12 @@ msgstr "允许用户发送共享文件的邮件通知"
 
 #: templates/admin.php:286
 msgid "Exclude groups from sharing"
-msgstr ""
+msgstr "在分享中排除组"
 
 #: templates/admin.php:298
 msgid ""
 "These groups will still be able to receive shares, but not to initiate them."
-msgstr ""
+msgstr "这些组将仍可以获取分享，但无法向他人分享。"
 
 #: templates/admin.php:303
 msgid "Security"
@@ -659,7 +660,7 @@ msgstr "来自地址"
 
 #: templates/admin.php:366
 msgid "mail"
-msgstr ""
+msgstr "邮件"
 
 #: templates/admin.php:387
 msgid "Authentication required"
@@ -753,7 +754,7 @@ msgstr "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>
 
 #: templates/apps.php:59
 msgid "Enable only for specific groups"
-msgstr ""
+msgstr "仅对特定的组开放"
 
 #: templates/apps.php:61
 msgid "All"
@@ -791,7 +792,7 @@ msgid ""
 "\t\tor\n"
 "\t\t<a href=\"https://owncloud.org/promote\"\n"
 "\t\t\ttarget=\"_blank\">spread the word</a>!"
-msgstr ""
+msgstr "<a href=\"https://owncloud.org/contribute\"\n\ttarget=\"_blank\">加入开发</a>\n或\n<a href=\"https://owncloud.org/promote\"\n\ttarget=\"_blank\">帮助推广</a>以支持本项目！"
 
 #: templates/personal.php:31
 msgid "Show First Run Wizard again"
@@ -902,15 +903,15 @@ msgid ""
 "Your encryption keys are moved to a backup location. If something went wrong"
 " you can restore the keys. Only delete them permanently if you are sure that"
 " all files are decrypted correctly."
-msgstr ""
+msgstr "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。"
 
 #: templates/personal.php:190
 msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "恢复加密密钥"
 
 #: templates/personal.php:194
 msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "删除加密密钥"
 
 #: templates/users/part.createuser.php:4
 msgid "Login Name"
@@ -933,11 +934,11 @@ msgstr "输入恢复密码来在更改密码的时候恢复用户文件"
 
 #: templates/users/part.createuser.php:32
 msgid "Search Users and Groups"
-msgstr ""
+msgstr "搜索用户和组"
 
 #: templates/users/part.grouplist.php:5
 msgid "Add Group"
-msgstr ""
+msgstr "增加组"
 
 #: templates/users/part.grouplist.php:10
 msgid "Group"
@@ -945,11 +946,11 @@ msgstr "分组"
 
 #: templates/users/part.grouplist.php:18
 msgid "Everyone"
-msgstr ""
+msgstr "所有人"
 
 #: templates/users/part.grouplist.php:31
 msgid "Admins"
-msgstr ""
+msgstr "管理员"
 
 #: templates/users/part.setquota.php:7
 msgid "Default Quota"
@@ -977,11 +978,11 @@ msgstr "配额"
 
 #: templates/users/part.userlist.php:15
 msgid "Storage Location"
-msgstr ""
+msgstr "存储空间位置"
 
 #: templates/users/part.userlist.php:16
 msgid "Last Login"
-msgstr ""
+msgstr "最后登录"
 
 #: templates/users/part.userlist.php:30
 msgid "change full name"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 6872e5fed07..f129efe958e 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-19 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 06:12+0000\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-04 15:13+0000\n"
 "Last-Translator: phy <transifex@phy25.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -145,24 +145,24 @@ msgstr "您真的想要删除当前服务器配置吗？"
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
-#: lib/wizard.php:83 lib/wizard.php:97
+#: lib/wizard.php:97 lib/wizard.php:112
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:130
+#: lib/wizard.php:126
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:825 lib/wizard.php:837
-msgid "Invalid Host"
+#: lib/wizard.php:317 lib/wizard.php:1051
+msgid "Could not find the desired feature"
 msgstr ""
 
-#: lib/wizard.php:1025
-msgid "Could not find the desired feature"
+#: lib/wizard.php:858 lib/wizard.php:870
+msgid "Invalid Host"
 msgstr ""
 
 #: settings.php:52
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index d8dfeee9111..7ab2e8274cd 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -5,6 +5,7 @@
 # Translators:
 # hanfeng <appweb.cn@gmail.com>, 2012
 # Dianjin Wang <1132321739qq@gmail.com>, 2012
+# Kaijia Feng <fengkaijia@gmail.com>, 2014
 # marguerite su <i@marguerite.su>, 2013
 # wang <modokwang@gmail.com>, 2013
 # csslayer <wengxt@gmail.com>, 2013
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-19 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-07-05 01:54-0400\n"
+"PO-Revision-Date: 2014-07-05 02:20+0000\n"
+"Last-Translator: Kaijia Feng <fengkaijia@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,7 +29,7 @@ msgstr "WebDAV 认证"
 
 #: templates/settings.php:3
 msgid "Address:"
-msgstr ""
+msgstr "地址："
 
 #: templates/settings.php:5
 msgid "Save"