[tx-robot] updated from transifex

2 files changed, 132 insertions, 123 deletions

diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 5a72d63b06d..362ffa3ec4e 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-26 04:02-0500\n"
-"PO-Revision-Date: 2013-11-26 09:02+0000\n"
+"POT-Creation-Date: 2013-11-27 12:08-0500\n"
+"PO-Revision-Date: 2013-11-27 17:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -243,11 +243,18 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:22 templates/admin.php:36
 msgid "Security Warning"
 msgstr "安全警告"
 
 #: templates/admin.php:25
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:39
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -256,57 +263,57 @@ msgid ""
 "root."
 msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。"
 
-#: templates/admin.php:36
+#: templates/admin.php:50
 msgid "Setup Warning"
 msgstr "设置警告"
 
-#: templates/admin.php:39
+#: templates/admin.php:53
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: templates/admin.php:40
+#: templates/admin.php:54
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
-#: templates/admin.php:51
+#: templates/admin.php:65
 msgid "Module 'fileinfo' missing"
 msgstr "模块'文件信息'丢失"
 
-#: templates/admin.php:54
+#: templates/admin.php:68
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果."
 
-#: templates/admin.php:65
+#: templates/admin.php:79
 msgid "Locale not working"
 msgstr "本地化无法工作"
 
-#: templates/admin.php:70
+#: templates/admin.php:84
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:88
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:92
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:90
+#: templates/admin.php:104
 msgid "Internet connection not working"
 msgstr "因特网连接无法工作"
 
-#: templates/admin.php:93
+#: templates/admin.php:107
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -315,118 +322,118 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接."
 
-#: templates/admin.php:107
+#: templates/admin.php:121
 msgid "Cron"
 msgstr "计划任务"
 
-#: templates/admin.php:114
+#: templates/admin.php:128
 msgid "Execute one task with each page loaded"
 msgstr "每个页面加载后执行一个任务"
 
-#: templates/admin.php:122
+#: templates/admin.php:136
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:144
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:149
 msgid "Sharing"
 msgstr "共享"
 
-#: templates/admin.php:141
+#: templates/admin.php:155
 msgid "Enable Share API"
 msgstr "启用共享API"
 
-#: templates/admin.php:142
+#: templates/admin.php:156
 msgid "Allow apps to use the Share API"
 msgstr "允许应用软件使用共享API"
 
-#: templates/admin.php:149
+#: templates/admin.php:163
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:150
+#: templates/admin.php:164
 msgid "Allow users to share items to the public with links"
 msgstr "允许用户使用连接公开共享项目"
 
-#: templates/admin.php:158
+#: templates/admin.php:172
 msgid "Allow public uploads"
 msgstr "允许公开上传"
 
-#: templates/admin.php:159
+#: templates/admin.php:173
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "用户可让其他人上传到他的公开共享文件夹"
 
-#: templates/admin.php:167
+#: templates/admin.php:181
 msgid "Allow resharing"
 msgstr "允许再次共享"
 
-#: templates/admin.php:168
+#: templates/admin.php:182
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户将共享给他们的项目再次共享"
 
-#: templates/admin.php:175
+#: templates/admin.php:189
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人共享"
 
-#: templates/admin.php:178
+#: templates/admin.php:192
 msgid "Allow users to only share with users in their groups"
 msgstr "允许用户只向同组用户共享"
 
-#: templates/admin.php:185
+#: templates/admin.php:199
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:200
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:207
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:206
+#: templates/admin.php:220
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:208
+#: templates/admin.php:222
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "强制客户端通过加密连接连接到%s。"
 
-#: templates/admin.php:214
+#: templates/admin.php:228
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL."
 
-#: templates/admin.php:226
+#: templates/admin.php:240
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:227
+#: templates/admin.php:241
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:259
+#: templates/admin.php:273
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:260
+#: templates/admin.php:274
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:266 templates/personal.php:169
+#: templates/admin.php:280 templates/personal.php:173
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:270 templates/personal.php:172
+#: templates/admin.php:284 templates/personal.php:176
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -537,62 +544,66 @@ msgstr "填写电子邮件地址以启用密码恢复功能"
 msgid "Profile picture"
 msgstr "联系人图片"
 
-#: templates/personal.php:90
+#: templates/personal.php:91
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:92
+#: templates/personal.php:93
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:94
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:95
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
 #: templates/personal.php:97
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:101
 msgid "Abort"
 msgstr ""
 
-#: templates/personal.php:98
+#: templates/personal.php:102
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:106 templates/personal.php:107
+#: templates/personal.php:110 templates/personal.php:111
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:126
+#: templates/personal.php:130
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:133
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:135
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:146
+#: templates/personal.php:150
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/personal.php:148
+#: templates/personal.php:152
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:154
+#: templates/personal.php:158
 msgid "Log-in password"
 msgstr "登录密码"
 
-#: templates/personal.php:159
+#: templates/personal.php:163
 msgid "Decrypt all Files"
 msgstr "解密所有文件"
 
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 9bc79cc636e..f593f28f007 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:45+0000\n"
+"POT-Creation-Date: 2013-11-27 12:08-0500\n"
+"PO-Revision-Date: 2013-11-27 17:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -50,11 +50,11 @@ msgstr ""
 msgid "No configuration specified"
 msgstr ""
 
-#: ajax/wizard.php:78
+#: ajax/wizard.php:81
 msgid "No data specified"
 msgstr ""
 
-#: ajax/wizard.php:86
+#: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
 msgstr ""
@@ -87,63 +87,63 @@ msgstr "成功"
 msgid "Error"
 msgstr "错误"
 
-#: js/settings.js:674
+#: js/settings.js:777
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:683
+#: js/settings.js:786
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:692
+#: js/settings.js:795
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:709 js/settings.js:718
+#: js/settings.js:812 js/settings.js:821
 msgid "Select groups"
 msgstr "选择分组"
 
-#: js/settings.js:712 js/settings.js:721
+#: js/settings.js:815 js/settings.js:824
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:715
+#: js/settings.js:818
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:741
+#: js/settings.js:845
 msgid "Connection test succeeded"
 msgstr "连接测试成功"
 
-#: js/settings.js:748
+#: js/settings.js:852
 msgid "Connection test failed"
 msgstr "连接测试失败"
 
-#: js/settings.js:757
+#: js/settings.js:861
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的想要删除当前服务器配置吗？"
 
-#: js/settings.js:758
+#: js/settings.js:862
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
-#: lib/wizard.php:76 lib/wizard.php:90
+#: lib/wizard.php:79 lib/wizard.php:93
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:119
+#: lib/wizard.php:122
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:740 lib/wizard.php:752
+#: lib/wizard.php:779 lib/wizard.php:791
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:913
+#: lib/wizard.php:952
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -175,11 +175,13 @@ msgid "only from those groups:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
 #: templates/part.wizard-userfilter.php:25
 msgid "Edit raw filter instead"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
 #: templates/part.wizard-userfilter.php:30
 msgid "Raw LDAP filter"
 msgstr ""
@@ -210,6 +212,13 @@ msgstr ""
 msgid "Other Attributes:"
 msgstr ""
 
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "添加服务器配置"
@@ -303,148 +312,137 @@ msgid "When unchecked, this configuration will be skipped."
 msgstr "当反选后，此配置将被忽略。"
 
 #: templates/settings.php:23
-msgid "User Login Filter"
-msgstr "用户登录过滤"
-
-#: templates/settings.php:25
-#, php-format
-msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:26
 msgid "Backup (Replica) Host"
 msgstr "备份 (镜像) 主机"
 
-#: templates/settings.php:26
+#: templates/settings.php:23
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。"
 
-#: templates/settings.php:27
+#: templates/settings.php:24
 msgid "Backup (Replica) Port"
 msgstr "备份 (镜像) 端口"
 
-#: templates/settings.php:28
+#: templates/settings.php:25
 msgid "Disable Main Server"
 msgstr "禁用主服务器"
 
-#: templates/settings.php:28
+#: templates/settings.php:25
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:26
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写敏感LDAP服务器(Windows)"
 
-#: templates/settings.php:30
+#: templates/settings.php:27
 msgid "Turn off SSL certificate validation."
 msgstr "关闭SSL证书验证"
 
-#: templates/settings.php:30
+#: templates/settings.php:27
 #, php-format
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:28
 msgid "Cache Time-To-Live"
 msgstr "缓存存活时间"
 
-#: templates/settings.php:31
+#: templates/settings.php:28
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改将清空缓存。"
 
-#: templates/settings.php:33
+#: templates/settings.php:30
 msgid "Directory Settings"
 msgstr "目录设置"
 
-#: templates/settings.php:35
+#: templates/settings.php:32
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:35
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:33
 msgid "Base User Tree"
 msgstr "基础用户树"
 
-#: templates/settings.php:36
+#: templates/settings.php:33
 msgid "One User Base DN per line"
 msgstr "每行一个用户基准判别名"
 
-#: templates/settings.php:37
+#: templates/settings.php:34
 msgid "User Search Attributes"
 msgstr "用户搜索属性"
 
-#: templates/settings.php:37 templates/settings.php:40
+#: templates/settings.php:34 templates/settings.php:37
 msgid "Optional; one attribute per line"
 msgstr "可选;每行一个属性"
 
-#: templates/settings.php:38
+#: templates/settings.php:35
 msgid "Group Display Name Field"
 msgstr "组显示名称字段"
 
-#: templates/settings.php:38
+#: templates/settings.php:35
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:36
 msgid "Base Group Tree"
 msgstr "基础组树"
 
-#: templates/settings.php:39
+#: templates/settings.php:36
 msgid "One Group Base DN per line"
 msgstr "每行一个群组基准判别名"
 
-#: templates/settings.php:40
+#: templates/settings.php:37
 msgid "Group Search Attributes"
 msgstr "群组搜索属性"
 
-#: templates/settings.php:41
+#: templates/settings.php:38
 msgid "Group-Member association"
 msgstr "组成员关联"
 
-#: templates/settings.php:43
+#: templates/settings.php:40
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:45
+#: templates/settings.php:42
 msgid "Quota Field"
 msgstr "配额字段"
 
-#: templates/settings.php:46
+#: templates/settings.php:43
 msgid "Quota Default"
 msgstr "默认配额"
 
-#: templates/settings.php:46
+#: templates/settings.php:43
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:47
+#: templates/settings.php:44
 msgid "Email Field"
 msgstr "电邮字段"
 
-#: templates/settings.php:48
+#: templates/settings.php:45
 msgid "User Home Folder Naming Rule"
 msgstr "用户主目录命名规则"
 
-#: templates/settings.php:48
+#: templates/settings.php:45
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:54
+#: templates/settings.php:51
 msgid "Internal Username"
 msgstr "内部用户名"
 
-#: templates/settings.php:55
+#: templates/settings.php:52
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +458,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:53
 msgid "Internal Username Attribute:"
 msgstr "内部用户名属性："
 
-#: templates/settings.php:57
+#: templates/settings.php:54
 msgid "Override UUID detection"
 msgstr "超越UUID检测"
 
-#: templates/settings.php:58
+#: templates/settings.php:55
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +477,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:56
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:57
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:58
 msgid "Username-LDAP User Mapping"
 msgstr "用户名-LDAP用户映射"
 
-#: templates/settings.php:62
+#: templates/settings.php:59
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +503,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:60
 msgid "Clear Username-LDAP User Mapping"
 msgstr "清除用户-LDAP用户映射"
 
-#: templates/settings.php:63
+#: templates/settings.php:60
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "清除组用户-LDAP级映射"