[tx-robot] updated from transifex

2 files changed, 111 insertions, 111 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index c549f6d7fde..7db9536abf4 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 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"
@@ -63,79 +63,79 @@ msgstr "没有临时概览页图片可用，请重试"
 msgid "No crop data provided"
 msgstr "没有提供相应数据"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "星期日"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "星期一"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "星期二"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "星期三"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "星期四"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "星期五"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "星期六"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "十二月"
 
@@ -191,74 +191,74 @@ msgstr "去年"
 msgid "years ago"
 msgstr "年前"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "选择(&C)..."
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "加载文件分拣模板出错: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "选择(&C)..."
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "加载文件分拣模板出错: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "好"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "加载消息模板出错: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} 个文件冲突"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "1个文件冲突"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "新文件"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "已经存在的文件"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "想要保留哪一个文件呢？"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "如果同时选择了连个版本，复制的文件名将会添加上一个数字。"
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "继续"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(选中全部)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "(选择了{count}个)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "加载文件存在性模板失败"
 
@@ -290,12 +290,12 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
 #: templates/installation.php:10
 msgid "Error"
 msgstr "错误"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -323,107 +323,116 @@ msgstr "分享给其他用户或组 ..."
 msgid "Share link"
 msgstr "分享链接"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "密码"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "允许公开上传"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "发送链接到个人"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "组"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "以邮件通知"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:721
+#: js/share.js:734
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:734
+#: js/share.js:747
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:752
+#: js/share.js:768
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:777
+#: js/share.js:797
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:788
+#: js/share.js:808
 msgid "Email sent"
 msgstr "邮件已发送"
 
-#: js/share.js:812
+#: js/share.js:832
 msgid "Warning"
 msgstr "警告"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 12efd3bf854..1053498b967 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 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"
@@ -196,7 +196,7 @@ msgstr "后端不支持修改密码，但是用户的加密密码已成功更新
 msgid "Unable to change password"
 msgstr "不能更改密码"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "正在发送..."
 
@@ -521,63 +521,54 @@ msgstr "允许应用软件使用共享API"
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "允许用户使用连接公开共享项目"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
 msgid "Allow public uploads"
 msgstr "允许公开上传"
 
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "用户可让其他人上传到他的公开共享文件夹"
+#: templates/admin.php:229
+msgid "Set default expiration date"
+msgstr "设置默认过期日期"
 
-#: templates/admin.php:235
+#: templates/admin.php:231
+msgid "Expire after "
+msgstr "过期于"
+
+#: templates/admin.php:234
+msgid "days"
+msgstr "天"
+
+#: templates/admin.php:237
+msgid "Enforce expiration date"
+msgstr "强制过期日期"
+
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "允许用户使用连接公开共享项目"
+
+#: templates/admin.php:251
 msgid "Allow resharing"
 msgstr "允许再次共享"
 
-#: templates/admin.php:236
+#: templates/admin.php:252
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户将共享给他们的项目再次共享"
 
-#: templates/admin.php:243
+#: templates/admin.php:259
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人共享"
 
-#: templates/admin.php:246
+#: templates/admin.php:262
 msgid "Allow users to only share with users in their groups"
 msgstr "允许用户只向同组用户共享"
 
-#: templates/admin.php:253
+#: templates/admin.php:269
 msgid "Allow mail notification"
 msgstr "允许邮件通知"
 
-#: templates/admin.php:254
+#: templates/admin.php:270
 msgid "Allow users to send mail notification for shared files"
 msgstr "允许用户发送共享文件的邮件通知"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "设置默认过期日期"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "过期于"
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "天"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "强制过期日期"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "默认 N 天后共享过期"
-
 #: templates/admin.php:278
 msgid "Security"
 msgstr "安全"