[tx-robot] updated from transifex

2 files changed, 45 insertions, 43 deletions

diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index f39018da430..7828ac9a31e 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # fkj <fengkaijia@gmail.com>, 2013
+# Martin Liu <liuzh66@gmail.com>, 2013
 # hyy0591 <yangyu.huang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 12:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-03 01:55-0400\n"
+"PO-Revision-Date: 2013-08-02 12:20+0000\n"
+"Last-Translator: Martin Liu <liuzh66@gmail.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s 与您共享了 »%s« "
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -47,7 +48,7 @@ msgstr "未选择对象类型。"
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "%s 没有提供 ID"
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
@@ -143,55 +144,55 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:715
+#: js/js.js:753
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:716
+#: js/js.js:754
 msgid "1 minute ago"
 msgstr "1 分钟前"
 
-#: js/js.js:717
+#: js/js.js:755
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:718
+#: js/js.js:756
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: js/js.js:719
+#: js/js.js:757
 msgid "{hours} hours ago"
 msgstr "{hours}小时前"
 
-#: js/js.js:720
+#: js/js.js:758
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:721
+#: js/js.js:759
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:722
+#: js/js.js:760
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:723
+#: js/js.js:761
 msgid "last month"
 msgstr "上个月"
 
-#: js/js.js:724
+#: js/js.js:762
 msgid "{months} months ago"
 msgstr "{months}月前"
 
-#: js/js.js:725
+#: js/js.js:763
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:726
+#: js/js.js:764
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:727
+#: js/js.js:765
 msgid "years ago"
 msgstr "年前"
 
@@ -205,7 +206,7 @@ msgstr "取消"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "加载文件选取模板出错"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -286,7 +287,7 @@ msgstr "密码"
 
 #: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "允许公众上传"
 
 #: js/share.js:202
 msgid "Email link to person"
@@ -392,11 +393,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>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> 如果你没有收到邮件，可能是由于要再等一下，或者检查一下您的垃圾邮件夹。<br> 如果还是没有收到，请联系您的系统管理员。"
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "请求失败！<br> 你确定你的邮件地址/用户名是正确的？"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -413,11 +414,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "您的文件是加密的。如果您还没有启用恢复密钥，在重置了密码后，您的数据讲无法恢复回来。如果您不确定是否这么做，请联系您的管理员在继续这个操作。你却是想继续么？"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "是的，我想现在重置密码。"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -476,7 +477,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "你好！⏎\n⏎\n温馨提示： %s 与您共享了 %s 。⏎\n查看： %s⏎\n⏎\n祝顺利！"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -493,12 +494,12 @@ msgstr "安全警告"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "您的PHP版本是会受到NULL字节漏洞攻击的(CVE-2006-7243)"
 
 #: templates/installation.php:26
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "请安全地升级您的PHP版本到 %s 。"
 
 #: templates/installation.php:32
 msgid ""
@@ -523,7 +524,7 @@ msgstr "因为.htaccess文件无效，您的数据文件夹及文件可能可以
 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>"
@@ -574,7 +575,7 @@ msgstr "完成安装"
 #: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s 是可用的。获取更多关于升级的信息。"
 
 #: templates/layout.user.php:66
 msgid "Log out"
@@ -615,7 +616,7 @@ msgstr "备选登录"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "你好！<br><br>温馨提示： %s 与您共享了 %s 。<br><br>\n查看： %s <br><br> 祝顺利！"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index fd864864730..092a305f344 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # hlx98007 <hlx98007@gmail.com>, 2013
+# Martin Liu <liuzh66@gmail.com>, 2013
 # hyy0591 <yangyu.huang@gmail.com>, 2013
 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-25 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-03 01:55-0400\n"
+"PO-Revision-Date: 2013-08-02 12:00+0000\n"
+"Last-Translator: Martin Liu <liuzh66@gmail.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -182,7 +183,7 @@ msgid ""
 "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 ""
+msgstr "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。"
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -197,7 +198,7 @@ msgstr "因WebDAV接口故障，您的网络服务器好像并未允许文件同
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "请双击<a href='%s'>安装向导</a>。"
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -219,7 +220,7 @@ msgid ""
 "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 ""
+msgstr "ownCloud 服务器不能把系统区域设置为 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的区域/语言支持包来支持 “%s” 。"
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -232,7 +233,7 @@ msgid ""
 "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 ""
+msgstr "服务器没有可用的Internet连接。这意味着像挂载外部储存、版本更新提示和安装第三方插件等功能会失效。远程访问文件和发送邮件提醒也可能会失效。如果您需要这些功能，建议开启服务器的英特网连接。"
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -246,11 +247,11 @@ msgstr "在每个页面载入时执行一项任务"
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
-msgstr ""
+msgstr "cron.php 已作为 webcron 服务注册。owncloud 将通过 http 协议每分钟调用一次 cron.php。"
 
 #: templates/admin.php:121
 msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php"
 
 #: templates/admin.php:128
 msgid "Sharing"
@@ -274,12 +275,12 @@ msgstr "允许用户通过链接共享内容"
 
 #: templates/admin.php:151
 msgid "Allow public uploads"
-msgstr ""
+msgstr "允许公众账户上传"
 
 #: templates/admin.php:152
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "允许其它人向用户的公众共享文件夹里上传文件"
 
 #: templates/admin.php:160
 msgid "Allow resharing"
@@ -308,14 +309,14 @@ msgstr "强制HTTPS"
 #: templates/admin.php:193
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "强制客户端通过加密连接与%s连接"
 
 #: templates/admin.php:199
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
-msgstr ""
+msgstr "请通过HTTPS协议连接到 %s，需要启用或者禁止强制SSL的开关。"
 
 #: templates/admin.php:211
 msgid "Log"