[tx-robot] updated from transifex

1 files changed, 88 insertions, 77 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 5e6b9cab941..928825121df 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -5,16 +5,16 @@
 # Translators:
 # hanfeng <appweb.cn@gmail.com>, 2013
 # jsgang <jsgang9@gmail.com>, 2014
-# smartree <smartree@gmail.com>, 2014
-# Xuetian Weng <wengxt@gmail.com>, 2013-2014
-# min zhang <zm1990s@gmail.com>, 2013
-# min zhang <zm1990s@gmail.com>, 2013
+# Smartree <smartree@gmail.com>, 2014
+# csslayer <wengxt@gmail.com>, 2013-2014
+# zhangmin <zm1990s@gmail.com>, 2013
+# zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-05 01:54-0400\n"
+"PO-Revision-Date: 2014-06-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"
@@ -153,47 +153,47 @@ msgstr "设置"
 msgid "Saving..."
 msgstr "保存中"
 
-#: js/js.js:1234
+#: js/js.js:1229
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:1235
+#: js/js.js:1230
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: js/js.js:1236
+#: js/js.js:1231
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: js/js.js:1237
+#: js/js.js:1232
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:1238
+#: js/js.js:1233
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:1239
+#: js/js.js:1234
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: js/js.js:1240
+#: js/js.js:1235
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:1241
+#: js/js.js:1236
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: js/js.js:1242
+#: js/js.js:1237
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:1243
+#: js/js.js:1238
 msgid "years ago"
 msgstr "年前"
 
@@ -288,157 +288,165 @@ msgstr "较强的密码"
 msgid "Strong password"
 msgstr "强密码"
 
-#: js/share.js:79 js/share.js:96 js/share.js:152
+#: js/share.js:109 js/share.js:199
 msgid "Shared"
 msgstr "已共享"
 
-#: js/share.js:155
+#: js/share.js:202
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with {recipients}"
+msgstr ""
+
+#: js/share.js:211
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:220 js/share.js:234 js/share.js:241 js/share.js:848
+#: js/share.js:271 js/share.js:285 js/share.js:292 js/share.js:917
 #: templates/installation.php:10
 msgid "Error"
 msgstr "错误"
 
-#: js/share.js:222 js/share.js:911
+#: js/share.js:273 js/share.js:980
 msgid "Error while sharing"
 msgstr "共享时出错"
 
-#: js/share.js:234
+#: js/share.js:285
 msgid "Error while unsharing"
 msgstr "取消共享时出错"
 
-#: js/share.js:241
+#: js/share.js:292
 msgid "Error while changing permissions"
 msgstr "修改权限时出错"
 
-#: js/share.js:251
+#: js/share.js:302
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} 共享给您及 {group} 组"
 
-#: js/share.js:253
+#: js/share.js:304
 msgid "Shared with you by {owner}"
 msgstr "{owner} 与您共享"
 
-#: js/share.js:277
+#: js/share.js:328
 msgid "Share with user or group …"
 msgstr "分享给其他用户或组 ..."
 
-#: js/share.js:283
+#: js/share.js:334
 msgid "Share link"
 msgstr "分享链接"
 
-#: js/share.js:289
+#: js/share.js:340
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "这个共享链接将在创建后 {days} 天失效"
 
-#: js/share.js:291
+#: js/share.js:342
 msgid "By default the public link will expire after {days} days"
 msgstr "默认共享链接失效天数为 {days} "
 
-#: js/share.js:296
+#: js/share.js:347
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:298
+#: js/share.js:349
 msgid "Choose a password for the public link"
 msgstr "为共享链接设置密码"
 
-#: js/share.js:304
+#: js/share.js:355
 msgid "Allow Public Upload"
 msgstr "允许公开上传"
 
-#: js/share.js:308
+#: js/share.js:359
 msgid "Email link to person"
 msgstr "发送链接到个人"
 
-#: js/share.js:309
+#: js/share.js:360
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:314
+#: js/share.js:365
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:315
+#: js/share.js:366
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:352
+#: js/share.js:404
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:355
+#: js/share.js:407
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:403 js/share.js:464
+#: js/share.js:456 js/share.js:524
 msgid "group"
 msgstr "组"
 
-#: js/share.js:436
+#: js/share.js:489
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:480
+#: js/share.js:540
 msgid "Shared in {item} with {user}"
 msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:502
+#: js/share.js:562
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:510
+#: js/share.js:570
 msgid "notify by email"
 msgstr "以邮件通知"
 
-#: js/share.js:513
+#: js/share.js:573
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:515
+#: js/share.js:575
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:518
+#: js/share.js:578
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:521
+#: js/share.js:581
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:524
+#: js/share.js:584
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:527
+#: js/share.js:587
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:829
+#: js/share.js:898
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:848
+#: js/share.js:917
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:869
+#: js/share.js:938
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:898
+#: js/share.js:967
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:909
+#: js/share.js:978
 msgid "Email sent"
 msgstr "邮件已发送"
 
-#: js/share.js:933
+#: js/share.js:1002
 msgid "Warning"
 msgstr "警告"
 
@@ -516,12 +524,13 @@ msgstr "请求失败<br>您确定您的邮箱/用户名是正确的？"
 msgid "You will receive a link to reset your password via Email."
 msgstr "您将会收到包含可以重置密码链接的邮件。"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
-#: templates/login.php:34
+#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
 msgid "Username"
 msgstr "用户名"
 
-#: lostpassword/templates/lostpassword.php:25
+#: lostpassword/templates/lostpassword.php:27
 msgid ""
 "Your files are encrypted. If you haven't enabled the recovery key, there "
 "will be no way to get your data back after your password is reset. If you "
@@ -529,11 +538,11 @@ msgid ""
 "continue. Do you really want to continue?"
 msgstr "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？"
 
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:29
 msgid "Yes, I really want to reset my password now"
 msgstr "使得，我真的要现在重设密码"
 
-#: lostpassword/templates/lostpassword.php:30
+#: lostpassword/templates/lostpassword.php:32
 msgid "Reset"
 msgstr "重置"
 
@@ -546,10 +555,11 @@ msgid "To login page"
 msgstr "到登录页面"
 
 #: lostpassword/templates/resetpassword.php:8
+#: lostpassword/templates/resetpassword.php:10
 msgid "New password"
 msgstr "新密码"
 
-#: lostpassword/templates/resetpassword.php:11
+#: lostpassword/templates/resetpassword.php:13
 msgid "Reset password"
 msgstr "重置密码"
 
@@ -683,58 +693,59 @@ msgstr "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\"
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
-#: templates/installation.php:60 templates/login.php:42
+#: templates/installation.php:59 templates/installation.php:62
+#: templates/login.php:41 templates/login.php:44
 msgid "Password"
 msgstr "密码"
 
-#: templates/installation.php:70
+#: templates/installation.php:72
 msgid "Storage & database"
 msgstr "存储 & 数据库"
 
-#: templates/installation.php:77
+#: templates/installation.php:79
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:90
+#: templates/installation.php:92
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:94
+#: templates/installation.php:96
 #, php-format
 msgid "Only %s is available."
 msgstr ""
 
-#: templates/installation.php:109
+#: templates/installation.php:111 templates/installation.php:113
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:118
+#: templates/installation.php:119 templates/installation.php:122
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:123
+#: templates/installation.php:127 templates/installation.php:129
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:132
+#: templates/installation.php:137 templates/installation.php:139
 msgid "Database tablespace"
 msgstr "数据库表空间"
 
-#: templates/installation.php:140
+#: templates/installation.php:146 templates/installation.php:148
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:150
+#: templates/installation.php:157
 msgid ""
 "SQLite will be used as database. For larger installations we recommend to "
 "change this."
 msgstr ""
 
-#: templates/installation.php:152
+#: templates/installation.php:159
 msgid "Finish setup"
 msgstr "安装完成"
 
-#: templates/installation.php:152
+#: templates/installation.php:159
 msgid "Finishing …"
 msgstr "正在结束 ..."
 
@@ -776,19 +787,19 @@ msgstr "服务端验证失败！"
 msgid "Please contact your administrator."
 msgstr "请联系你的管理员。"
 
-#: templates/login.php:48
+#: templates/login.php:50
 msgid "Lost your password?"
 msgstr "忘记密码？"
 
-#: templates/login.php:53
+#: templates/login.php:55
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:57
+#: templates/login.php:59
 msgid "Log in"
 msgstr "登录"
 
-#: templates/login.php:63
+#: templates/login.php:65
 msgid "Alternative Logins"
 msgstr "其他登录方式"