[tx-robot] updated from transifex

3 files changed, 112 insertions, 87 deletions

diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 1078d24b82e..4e16a2a03c2 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-04-25 01:54-0400\n"
+"PO-Revision-Date: 2014-04-25 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"
@@ -31,7 +31,7 @@ msgstr "无法移动 %s - 同名文件已存在"
 msgid "Could not move %s"
 msgstr "无法移动 %s"
 
-#: ajax/newfile.php:58 js/files.js:98
+#: ajax/newfile.php:58 js/files.js:96
 msgid "File name cannot be empty."
 msgstr "文件名不能为空。"
 
@@ -40,18 +40,18 @@ msgstr "文件名不能为空。"
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:65
+#: lib/app.php:60
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -177,131 +177,123 @@ msgstr "文件正在上传中。现在离开此页会导致上传动作被取消
 msgid "URL cannot be empty"
 msgstr "URL不能为空"
 
-#: js/file-upload.js:559
-msgid "In the home folder 'Shared' is a reserved filename"
-msgstr "主目录里 'Shared' 是系统预留目录名"
-
-#: js/file-upload.js:561 js/filelist.js:585
+#: js/file-upload.js:559 js/filelist.js:597
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/file-upload.js:613
+#: js/file-upload.js:611
 msgid "Could not create file"
 msgstr "不能创建文件"
 
-#: js/file-upload.js:626
+#: js/file-upload.js:624
 msgid "Could not create folder"
 msgstr "不能创建文件夹"
 
-#: js/file-upload.js:666
+#: js/file-upload.js:664
 msgid "Error fetching URL"
 msgstr "获取URL出错"
 
-#: js/fileactions.js:164
+#: js/fileactions.js:160
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:177
+#: js/fileactions.js:173
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/fileactions.js:238
+#: js/fileactions.js:234
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:102 js/files.js:552
+#: js/filelist.js:102 js/files.js:550
 msgid "Error moving file"
 msgstr "移动文件错误"
 
-#: js/filelist.js:102 js/files.js:552
+#: js/filelist.js:102 js/files.js:550
 msgid "Error"
 msgstr "错误"
 
-#: js/filelist.js:251 js/filelist.js:1129
+#: js/filelist.js:258 js/filelist.js:1141
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:612
+#: js/filelist.js:624
 msgid "Could not rename file"
 msgstr "不能重命名文件"
 
-#: js/filelist.js:775
+#: js/filelist.js:787
 msgid "Error deleting file."
 msgstr "删除文件出错。"
 
-#: js/filelist.js:800 js/filelist.js:876 js/files.js:589
+#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:801 js/filelist.js:877 js/files.js:595
+#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:808
+#: js/filelist.js:820
 msgid "{dirs} and {files}"
 msgstr "{dirs} 和 {files}"
 
-#: js/filelist.js:1037 js/filelist.js:1076
+#: js/filelist.js:1049 js/filelist.js:1088
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "上传 %n 个文件"
 
-#: js/files.js:96
+#: js/files.js:94
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:117
+#: js/files.js:115
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "您的存储空间已满，文件将无法更新或同步！"
 
-#: js/files.js:121
+#: js/files.js:119
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
 
-#: js/files.js:134
+#: js/files.js:132
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。"
 
-#: js/files.js:138
+#: js/files.js:136
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。"
 
-#: js/files.js:142
+#: js/files.js:140
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。"
 
-#: js/files.js:331
+#: js/files.js:329
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:570 templates/index.php:67
+#: js/files.js:568 templates/index.php:67
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:571 templates/index.php:79
+#: js/files.js:569 templates/index.php:79
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:572 templates/index.php:81
+#: js/files.js:570 templates/index.php:81
 msgid "Modified"
 msgstr "修改日期"
 
-#: lib/app.php:60
-msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
-
-#: lib/app.php:93
+#: lib/app.php:86
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s 不能被重命名"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 0b53e0ef257..47aa49ad551 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-24 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 05:54+0000\n"
+"POT-Creation-Date: 2014-04-25 01:54-0400\n"
+"PO-Revision-Date: 2014-04-25 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"
@@ -22,6 +22,14 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: base.php:723
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:724
+msgid "Please contact your administrator"
+msgstr ""
+
 #: private/app.php:236
 #, php-format
 msgid ""
@@ -289,99 +297,104 @@ msgstr "请认真检查<a href='%s'>安装指南</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s 向您分享了 »%s«"
 
-#: private/share/share.php:490
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:496
+#: private/share/share.php:529
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:505
+#: private/share/share.php:538
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:518 private/share/share.php:546
+#: private/share/share.php:551 private/share/share.php:579
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:526
+#: private/share/share.php:559
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:533
+#: private/share/share.php:566
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:596
+#: private/share/share.php:629
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:603
+#: private/share/share.php:636
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:740
+#: private/share/share.php:773
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:801
+#: private/share/share.php:834
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:895
+#: private/share/share.php:940
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:902
+#: private/share/share.php:947
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:908
+#: private/share/share.php:953
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1325
+#: private/share/share.php:1367
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1334
+#: private/share/share.php:1376
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1349
+#: private/share/share.php:1391
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1361
+#: private/share/share.php:1403
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1375
+#: private/share/share.php:1417
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 38db6ba96f8..370c5239693 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-04-25 01:54-0400\n"
+"PO-Revision-Date: 2014-04-25 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"
@@ -54,15 +54,15 @@ msgstr "邮件已发送"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:299
+#: admin/controller.php:116 templates/admin.php:316
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:336
+#: admin/controller.php:120 templates/admin.php:353
 msgid "Authentication method"
 msgstr ""
 
@@ -530,91 +530,111 @@ msgstr "允许邮件通知"
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:261
+#: templates/admin.php:262
+msgid "Set default expire date"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:266
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:269
+msgid "Enforce expire date"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Expire shares by default after N days"
+msgstr ""
+
+#: templates/admin.php:278
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:274
+#: templates/admin.php:291
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:276
+#: templates/admin.php:293
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "强制客户端通过加密连接连接到%s。"
 
-#: templates/admin.php:282
+#: templates/admin.php:299
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL."
 
-#: templates/admin.php:294
+#: templates/admin.php:311
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:296
+#: templates/admin.php:313
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:327
+#: templates/admin.php:344
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:349
+#: templates/admin.php:366
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:353
+#: templates/admin.php:370
 msgid "Server address"
 msgstr "服务器地址"
 
-#: templates/admin.php:357
+#: templates/admin.php:374
 msgid "Port"
 msgstr "端口"
 
-#: templates/admin.php:362
+#: templates/admin.php:379
 msgid "Credentials"
 msgstr "凭证"
 
-#: templates/admin.php:363
+#: templates/admin.php:380
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:383
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:387
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:388
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:376
+#: templates/admin.php:393
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:377
+#: templates/admin.php:394
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:409
+#: templates/admin.php:426
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:410
+#: templates/admin.php:427
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:416 templates/personal.php:171
+#: templates/admin.php:433 templates/personal.php:171
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:420 templates/personal.php:174
+#: templates/admin.php:437 templates/personal.php:174
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "