[tx-robot] updated from transifex

2 files changed, 94 insertions, 87 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 60ecfb92daf..856631ca491 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-16 01:54-0400\n"
-"PO-Revision-Date: 2014-07-16 05:54+0000\n"
+"POT-Creation-Date: 2014-07-29 01:54-0400\n"
+"PO-Revision-Date: 2014-07-29 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"
@@ -25,11 +25,7 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:90
-msgid "Expiration date is in the past."
-msgstr "过期日期已过。"
-
-#: ajax/share.php:122 ajax/share.php:164
+#: ajax/share.php:116 ajax/share.php:158
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "发送失败，用户如下: %s "
@@ -219,7 +215,7 @@ msgstr "去年"
 msgid "years ago"
 msgstr "年前"
 
-#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
+#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:198
 msgid "Couldn't send reset email. Please contact your administrator."
 msgstr "未能成功发送重置邮件，请联系管理员。"
 
@@ -353,12 +349,12 @@ msgstr "由{recipients}分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:326 js/share.js:340 js/share.js:347 js/share.js:989
+#: js/share.js:326 js/share.js:340 js/share.js:347 js/share.js:1007
 #: templates/installation.php:10
 msgid "Error"
 msgstr "错误"
 
-#: js/share.js:328 js/share.js:1052
+#: js/share.js:328 js/share.js:1070
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -471,27 +467,27 @@ msgstr "更新"
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:970
+#: js/share.js:988
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:989
+#: js/share.js:1007
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:1010
+#: js/share.js:1028
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:1039
+#: js/share.js:1057
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:1050
+#: js/share.js:1068
 msgid "Email sent"
 msgstr "邮件已发送"
 
-#: js/share.js:1074
+#: js/share.js:1092
 msgid "Warning"
 msgstr "警告"
 
@@ -539,21 +535,21 @@ msgstr "更新未成功。"
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功。正在重定向至 ownCloud。"
 
-#: lostpassword/controller/lostcontroller.php:110
+#: lostpassword/controller/lostcontroller.php:133
 msgid "Couldn't reset password because the token is invalid"
 msgstr "令牌无效，无法重置密码"
 
-#: lostpassword/controller/lostcontroller.php:136
+#: lostpassword/controller/lostcontroller.php:159
 msgid "Couldn't send reset email. Please make sure your username is correct."
 msgstr "无法发送重置邮件，请检查您的用户名是否正确。"
 
-#: lostpassword/controller/lostcontroller.php:151
+#: lostpassword/controller/lostcontroller.php:174
 msgid ""
 "Couldn't send reset email because there is no email address for this "
 "username. Please contact your administrator."
 msgstr "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。"
 
-#: lostpassword/controller/lostcontroller.php:168
+#: lostpassword/controller/lostcontroller.php:191
 #, php-format
 msgid "%s password reset"
 msgstr "重置 %s 的密码"
@@ -616,7 +612,7 @@ msgstr "个人"
 msgid "Users"
 msgstr "用户"
 
-#: strings.php:7 templates/layout.user.php:53 templates/layout.user.php:118
+#: strings.php:7 templates/layout.user.php:57 templates/layout.user.php:122
 msgid "Apps"
 msgstr "应用"
 
@@ -782,19 +778,19 @@ msgstr "安装完成"
 msgid "Finishing …"
 msgstr "正在结束 ..."
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:44
 msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
 msgstr "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此接口。"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:48
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 可用。获取更多关于如何升级的信息。"
 
-#: templates/layout.user.php:80 templates/singleuser.user.php:8
+#: templates/layout.user.php:84 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "注销"
 
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 3bd2a6cfdbb..92bb533ef9e 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-06 01:54-0400\n"
-"PO-Revision-Date: 2014-07-05 18:43+0000\n"
-"Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
+"POT-Creation-Date: 2014-07-29 01:54-0400\n"
+"PO-Revision-Date: 2014-07-29 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"
@@ -23,33 +23,33 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:187 base.php:194
+#: base.php:195 base.php:202
 msgid "Cannot write into \"config\" directory!"
 msgstr "无法写入“config”目录！"
 
-#: base.php:188
+#: base.php:196
 msgid ""
 "This can usually be fixed by giving the webserver write access to the config"
 " directory"
 msgstr ""
 
-#: base.php:190
+#: base.php:198
 #, php-format
 msgid "See %s"
 msgstr "查看 %s"
 
-#: base.php:195 private/util.php:413
+#: base.php:203 private/util.php:428
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
 "config directory%s."
 msgstr ""
 
-#: base.php:675
+#: base.php:673
 msgid "You are accessing the server from an untrusted domain."
 msgstr "您正在访问来自不信任域名的服务器。"
 
-#: base.php:676
+#: base.php:674
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,19 +76,19 @@ msgstr "用户"
 msgid "Admin"
 msgstr "管理"
 
-#: private/app.php:987
+#: private/app.php:985
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "\"%s\" 升级失败。"
 
-#: private/app.php:1144
+#: private/app.php:1142
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: private/app.php:1156
+#: private/app.php:1154
 msgid "No app name specified"
 msgstr "没有指定的 App 名称"
 
@@ -117,44 +117,44 @@ msgstr "无法创建应用程序文件夹。请修正权限。%s"
 msgid "No source specified when installing app"
 msgstr "安装 App 时未指定来源"
 
-#: private/installer.php:242
+#: private/installer.php:243
 msgid "No href specified when installing app from http"
 msgstr "从 http 安装 App 时未指定链接"
 
-#: private/installer.php:247
+#: private/installer.php:248
 msgid "No path specified when installing app from local file"
 msgstr "从本地文件安装 App 时未指定路径"
 
-#: private/installer.php:261
+#: private/installer.php:256
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "不支持 %s 的压缩格式"
 
-#: private/installer.php:275
+#: private/installer.php:270
 msgid "Failed to open archive when installing app"
 msgstr "安装 App 是打开归档失败"
 
-#: private/installer.php:313
+#: private/installer.php:308
 msgid "App does not provide an info.xml file"
 msgstr "应用未提供 info.xml 文件"
 
-#: private/installer.php:319
+#: private/installer.php:314
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "App 无法安装，因为 App 中有非法代码 "
 
-#: private/installer.php:325
+#: private/installer.php:320
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "App 无法安装，因为和当前 ownCloud 版本不兼容"
 
-#: private/installer.php:331
+#: private/installer.php:326
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "App 无法安装，因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签"
 
-#: private/installer.php:344
+#: private/installer.php:339
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
@@ -359,45 +359,56 @@ msgstr "设置 %s 权限失败，因为权限超出了 %s 已有权限。"
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "设置 %s 的权限失败，因为未找到到对应项"
 
-#: private/share/share.php:1046
+#: private/share/share.php:959
+#, php-format
+msgid ""
+"Can not set expire date. Shares can not expire later then %s after they "
+"where shared"
+msgstr ""
+
+#: private/share/share.php:967
+msgid "Can not set expire date. Expire date is in the past"
+msgstr ""
+
+#: private/share/share.php:1092
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "共享后端 %s 必须实现 OCP\\Share_Backend 接口"
 
-#: private/share/share.php:1053
+#: private/share/share.php:1099
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "未找到共享后端 %s"
 
-#: private/share/share.php:1059
+#: private/share/share.php:1105
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "%s 的共享后端未找到"
 
-#: private/share/share.php:1476
+#: private/share/share.php:1522
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "共享 %s 失败，因为用户 %s 不是原始共享者"
 
-#: private/share/share.php:1485
+#: private/share/share.php:1531
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "共享 %s 失败，因为权限超过了 %s 已有权限"
 
-#: private/share/share.php:1501
+#: private/share/share.php:1547
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "共享 %s 失败，因为不允许二次共享"
 
-#: private/share/share.php:1513
+#: private/share/share.php:1559
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "共享 %s 失败，因为 %s 使用的共享后端未找到它的来源"
 
-#: private/share/share.php:1527
+#: private/share/share.php:1573
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
@@ -452,165 +463,165 @@ msgstr "去年"
 msgid "years ago"
 msgstr "年前"
 
-#: private/user/manager.php:238
+#: private/user/manager.php:239
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr "用户名只允许使用以下字符：“a-z”，“A-Z”，“0-9”，和“_.@-”"
 
-#: private/user/manager.php:243
+#: private/user/manager.php:244
 msgid "A valid username must be provided"
 msgstr "必须提供合法的用户名"
 
-#: private/user/manager.php:247
+#: private/user/manager.php:248
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
-#: private/user/manager.php:252
+#: private/user/manager.php:253
 msgid "The username is already being used"
 msgstr "用户名已被使用"
 
-#: private/util.php:398
+#: private/util.php:413
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr "没有安装数据库驱动 (SQLite、MySQL 或 PostgreSQL)。"
 
-#: private/util.php:405
+#: private/util.php:420
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: private/util.php:412
+#: private/util.php:427
 msgid "Cannot write into \"config\" directory"
 msgstr "无法写入“config”目录"
 
-#: private/util.php:425
+#: private/util.php:440
 msgid "Cannot write into \"apps\" directory"
 msgstr "无法写入“apps”目录"
 
-#: private/util.php:426
+#: private/util.php:441
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps"
 " directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: private/util.php:440
+#: private/util.php:455
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr "无法创建“apps”目录 (%s)"
 
-#: private/util.php:441
+#: private/util.php:456
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: private/util.php:457
+#: private/util.php:472
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr "设置语言为 %s 失败"
 
-#: private/util.php:460
+#: private/util.php:475
 msgid ""
 "Please install one of theses locales on your system and restart your "
 "webserver."
 msgstr "请在您的系统中安装这些语言并重新启动您的网页服务器。"
 
-#: private/util.php:464
+#: private/util.php:479
 msgid "Please ask your server administrator to install the module."
 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
-#: private/util.php:517 private/util.php:524 private/util.php:531
-#: private/util.php:546
+#: private/util.php:483 private/util.php:490 private/util.php:497
+#: private/util.php:511 private/util.php:518 private/util.php:525
+#: private/util.php:532 private/util.php:539 private/util.php:546
+#: private/util.php:561
 #, php-format
 msgid "PHP module %s not installed."
 msgstr "PHP %s 模块未安装。"
 
-#: private/util.php:538
+#: private/util.php:553
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr "要求 PHP 版本 %s 或者更高。"
 
-#: private/util.php:539
+#: private/util.php:554
 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 "请联系服务器管理员升级 PHP 到最新的版本。ownCloud 和 PHP 社区已经不再支持此版本的 PHP。"
 
-#: private/util.php:556
+#: private/util.php:571
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr "PHP Safe Mode 已经启用，ownCloud 需要 Safe Mode 停用以正常工作。"
 
-#: private/util.php:557
+#: private/util.php:572
 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 "PHP Safe Mode 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Safe Mode。"
 
-#: private/util.php:564
+#: private/util.php:579
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr "Magic Quotes 已经启用，ownCloud 需要 Magic Quotes 停用以正常工作。"
 
-#: private/util.php:565
+#: private/util.php:580
 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 "Magic Quotes 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Magic Quotes。"
 
-#: private/util.php:579
+#: private/util.php:594
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr "PHP 模块已经安装，但仍然显示未安装？"
 
-#: private/util.php:580
+#: private/util.php:595
 msgid "Please ask your server administrator to restart the web server."
 msgstr "请联系服务器管理员重启网页服务器。"
 
-#: private/util.php:609
+#: private/util.php:624
 msgid "PostgreSQL >= 9 required"
 msgstr "要求 PostgreSQL >= 9"
 
-#: private/util.php:610
+#: private/util.php:625
 msgid "Please upgrade your database version"
 msgstr "请升级您的数据库版本"
 
-#: private/util.php:617
+#: private/util.php:632
 msgid "Error occurred while checking PostgreSQL version"
 msgstr "检查 PostgreSQL 版本时发生了一个错误"
 
-#: private/util.php:618
+#: private/util.php:633
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: private/util.php:680
+#: private/util.php:695
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed"
 " by other users."
 msgstr "请更改权限为 0770 以避免其他用户查看目录。"
 
-#: private/util.php:689
+#: private/util.php:704
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr "文件目录 (%s) 可以被其他用户读取"
 
-#: private/util.php:710
+#: private/util.php:725
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr "文件目录 (%s) 无效"
 
-#: private/util.php:711
+#: private/util.php:726
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its "
 "root."