[tx-robot] updated from transifex

6 files changed, 76 insertions, 66 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index b3e0da4342f..1d93dafaa90 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -6,6 +6,7 @@
 # hanfeng <appweb.cn@gmail.com>, 2013
 # jsgang <jsgang9@gmail.com>, 2014
 # Smartree <smartree@gmail.com>, 2014
+# phy <transifex@phy25.com>, 2014
 # csslayer <wengxt@gmail.com>, 2013-2014
 # zhangmin <zm1990s@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-11 01:54-0400\n"
+"PO-Revision-Date: 2014-06-11 04:00+0000\n"
+"Last-Translator: phy <transifex@phy25.com>\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"
@@ -266,7 +267,7 @@ msgstr "想要保留哪一个文件呢？"
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr "如果同时选择了连个版本，复制的文件名将会添加上一个数字。"
+msgstr "如果同时选择了两个版本，复制的文件名将会增加上一个数字。"
 
 #: js/oc-dialogs.js:457
 msgid "Cancel"
@@ -629,7 +630,7 @@ msgstr "删除标签(s)时出错"
 
 #: tags/controller.php:75
 msgid "Error tagging"
-msgstr "添加标签时出错"
+msgstr "增加标签时出错"
 
 #: tags/controller.php:86
 msgid "Error untagging"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 7a04c43309b..aee78176a2e 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -5,6 +5,7 @@
 # Translators:
 # Martin Liu <liuzh66@gmail.com>, 2014
 # Mengz You <mengz.you@gmail.com>, 2013
+# phy <transifex@phy25.com>, 2014
 # csslayer <wengxt@gmail.com>, 2014
 # zhangmin <zm1990s@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-11 01:54-0400\n"
+"PO-Revision-Date: 2014-06-11 04:00+0000\n"
+"Last-Translator: phy <transifex@phy25.com>\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"
@@ -150,7 +151,7 @@ msgstr "文件"
 
 #: appinfo/app.php:27
 msgid "All files"
-msgstr ""
+msgstr "全部文件"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -182,7 +183,7 @@ msgstr "文件正在上传中。现在离开此页会导致上传动作被取消
 msgid "URL cannot be empty"
 msgstr "URL不能为空"
 
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
@@ -220,53 +221,53 @@ msgid ""
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:1139
+#: js/filelist.js:1141
 msgid "Error moving file."
 msgstr "移动文件出错。"
 
-#: js/filelist.js:1147
+#: js/filelist.js:1149
 msgid "Error moving file"
 msgstr "移动文件错误"
 
-#: js/filelist.js:1147
+#: js/filelist.js:1149
 msgid "Error"
 msgstr "错误"
 
-#: js/filelist.js:1225
+#: js/filelist.js:1227
 msgid "Could not rename file"
 msgstr "不能重命名文件"
 
-#: js/filelist.js:1346
+#: js/filelist.js:1348
 msgid "Error deleting file."
 msgstr "删除文件出错。"
 
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
 msgid "Name"
 msgstr "名称"
 
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
 msgid "Size"
 msgstr "大小"
 
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "上传 %n 个文件"
@@ -357,7 +358,7 @@ msgstr "文本文件"
 
 #: templates/list.php:12
 msgid "New folder"
-msgstr "添加文件夹"
+msgstr "增加文件夹"
 
 #: templates/list.php:13
 msgid "Folder"
@@ -399,4 +400,4 @@ msgstr "文件正在被扫描，请稍候。"
 
 #: templates/list.php:102
 msgid "Currently scanning"
-msgstr ""
+msgstr "正在扫描"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 4eeb796cd2f..478a0760d36 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Mengz You <mengz.you@gmail.com>, 2013
-# m13253 <m13253@hotmail.com>, 2013
-# modokwang <modokwang@gmail.com>, 2013
+# Star Brilliant <m13253@hotmail.com>, 2013
+# phy <transifex@phy25.com>, 2014
+# wang <modokwang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-28 01:54-0400\n"
-"PO-Revision-Date: 2014-05-28 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-11 01:54-0400\n"
+"PO-Revision-Date: 2014-06-11 04:20+0000\n"
+"Last-Translator: phy <transifex@phy25.com>\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"
@@ -61,7 +62,7 @@ msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。"
 
 #: files/error.php:16
 #, php-format
@@ -83,20 +84,20 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:64
+#: hooks/hooks.php:66
 msgid "Missing requirements."
-msgstr ""
+msgstr "必填项未填写。"
 
-#: hooks/hooks.php:65
+#: hooks/hooks.php:67
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
-msgstr ""
+msgstr "请确认安装了 PHP 5.3.3 或更新版本，且 OpenSSL 及其 PHP 扩展已经启用并正确配置。加密应用现在已被禁用。"
 
-#: hooks/hooks.php:299
+#: hooks/hooks.php:300
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "以下用户还没有设置加密："
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
@@ -108,7 +109,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "直接进入你的"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
@@ -129,7 +130,7 @@ msgstr "恢复密钥密码"
 
 #: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "重复恢复密钥密码"
 
 #: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
@@ -153,7 +154,7 @@ msgstr "新的恢复密钥密码"
 
 #: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "重复新的密钥恢复密码"
 
 #: templates/settings-admin.php:56
 msgid "Change Password"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 87f6a970744..5193ac92937 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# phy <transifex@phy25.com>, 2014
 # csslayer <wengxt@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-11 01:54-0400\n"
+"PO-Revision-Date: 2014-06-11 04:00+0000\n"
+"Last-Translator: phy <transifex@phy25.com>\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"
@@ -281,7 +282,7 @@ msgstr "可用于"
 
 #: templates/settings.php:32
 msgid "Add storage"
-msgstr "添加存储"
+msgstr "增加存储"
 
 #: templates/settings.php:92
 msgid "No user or group"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 65b360c06b4..6b874a1322d 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -7,6 +7,7 @@
 # mozillazg <opensource.mozillazg@gmail.com>, 2014
 # Star Brilliant <m13253@hotmail.com>, 2013
 # waterone <suiy02@gmail.com>, 2013-2014
+# phy <transifex@phy25.com>, 2014
 # wang <modokwang@gmail.com>, 2013
 # csslayer <wengxt@gmail.com>, 2013-2014
 # zhangmin <zm1990s@gmail.com>, 2013
@@ -14,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-06 05:54+0000\n"
+"POT-Creation-Date: 2014-06-11 01:54-0400\n"
+"PO-Revision-Date: 2014-06-11 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"
@@ -52,7 +53,7 @@ msgstr "邮件已发送"
 
 #: admin/controller.php:101
 msgid "You need to set your user email before being able to send test emails."
-msgstr "在发送测试邮件钱您需要设置您的用户电子邮件"
+msgstr "在发送测试邮件前您需要设置您的用户电子邮件。"
 
 #: admin/controller.php:116 templates/admin.php:353
 msgid "Send mode"
@@ -89,7 +90,7 @@ msgstr "已存在该组"
 
 #: ajax/creategroup.php:20
 msgid "Unable to add group"
-msgstr "无法添加组"
+msgstr "无法增加组"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
@@ -156,7 +157,7 @@ msgstr "管理员不能将自己移出管理组。"
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "无法把用户添加到组 %s"
+msgstr "无法把用户增加到组 %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
@@ -289,7 +290,7 @@ msgid "Restore encryption keys."
 msgstr ""
 
 #: js/users/deleteHandler.js:166
-msgid "Unable to delete "
+msgid "Unable to delete {objName}"
 msgstr ""
 
 #: js/users/groups.js:73 js/users/groups.js:178
@@ -300,9 +301,9 @@ msgstr ""
 msgid "A valid group name must be provided"
 msgstr ""
 
-#: js/users/groups.js:205 js/users/users.js:254
-msgid "deleted"
-msgstr "已经删除"
+#: js/users/groups.js:205
+msgid "deleted {groupName}"
+msgstr ""
 
 #: js/users/groups.js:206 js/users/users.js:255
 msgid "undo"
@@ -328,9 +329,13 @@ msgstr "删除"
 msgid "never"
 msgstr "从不"
 
+#: js/users/users.js:254
+msgid "deleted {userName}"
+msgstr ""
+
 #: js/users/users.js:371
 msgid "add group"
-msgstr "添加组"
+msgstr "增加组"
 
 #: js/users/users.js:568
 msgid "A valid username must be provided"
@@ -700,7 +705,7 @@ msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社
 
 #: templates/apps.php:14
 msgid "Add your App"
-msgstr "添加应用"
+msgstr "增加应用"
 
 #: templates/apps.php:31
 msgid "More Apps"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 5867fad508c..e912bba16d9 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Martin Liu <liuzh66@gmail.com>, 2014
+# phy <transifex@phy25.com>, 2014
 # wang <modokwang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-11 01:54-0400\n"
+"PO-Revision-Date: 2014-06-11 04:00+0000\n"
+"Last-Translator: phy <transifex@phy25.com>\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"
@@ -78,7 +79,7 @@ msgstr ""
 
 #: js/settings.js:99
 msgid "Cannot add server configuration"
-msgstr "无法添加服务器配置"
+msgstr "无法增加服务器配置"
 
 #: js/settings.js:127
 msgid "mappings cleared"
@@ -263,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
-msgstr "添加服务器配置"
+msgstr "增加服务器配置"
 
 #: templates/part.wizard-server.php:21
 msgid "Delete Configuration"
@@ -345,7 +346,7 @@ msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr ""
+msgstr "<b>警告：</b> 应用 user_ldap 和 user_webdavauth 之间不兼容。您可能遭遇未预料的行为。请让系统管理员禁用其中一个。"
 
 #: templates/settings.php:14
 msgid ""
@@ -420,7 +421,7 @@ msgstr "用户显示名称字段"
 
 #: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "用来生成用户的显示名称的 LDAP 属性。"
 
 #: templates/settings.php:33
 msgid "Base User Tree"
@@ -444,7 +445,7 @@ msgstr "组显示名称字段"
 
 #: templates/settings.php:35
 msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "用来生成组的显示名称的 LDAP 属性。"
 
 #: templates/settings.php:36
 msgid "Base Group Tree"
@@ -511,7 +512,7 @@ msgstr "用户主目录命名规则"
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
+msgstr "指定一个 LDAP/AD 属性。留空，则使用用户名称（默认）。"
 
 #: templates/settings.php:53
 msgid "Internal Username"
@@ -531,7 +532,7 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "默认情况下，内部用户名具有唯一识别属性，以确保用户名唯一，且字符不用经过转换。内部用户名有严格的字符限制，只允许使用 [ a-zA-Z0-9_.@- ]。其他字符会被 ASCII 码取代，或者被忽略。当出现冲突时，用户名后会增加或者减少一个数字。内部用户名用于内部用户识别，同时也作为 ownCloud 中用户根文件夹的默认名。其也作为远程 URLs 的一部分，如在所有的 *DAV 服务中。在这种设置下，默认行为可以被覆盖。要实现在 ownCloud 5 之前的类似的效果，在下框中输入用户的显示名称属性。如果留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户。"
 
 #: templates/settings.php:55
 msgid "Internal Username Attribute:"
@@ -550,7 +551,7 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "ownCloud 默认会自动检测 UUID 属性。UUID 属性用来无误地识别 LDAP 用户和组。同时，如果上面没有特别设置，内部用户名也基于 UUID 创建。也可以覆盖设置，直接指定一个属性。但一定要确保指定的属性取得的用户和组是唯一的。留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户和组。"
 
 #: templates/settings.php:58
 msgid "UUID Attribute for Users:"
@@ -576,7 +577,7 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr ""
+msgstr "用户名用于存储和分配数据 (元)。为了准确地识别和确认用户，每个用户都有一个内部用户名。这需要一个 ownCloud 用户名到 LDAP 用户的映射。创建的用户名被映射到 LDAP 用户的 UUID。此外，DN 也会被缓存，以减少 LDAP 连接，但它不用于识别。DN 的变化会被监视到。内部用户名会被用于所有地方。清除映射将导致一片混乱。清除映射不是常用的设置，它会影响到所有的 LDAP 配置！千万不要在正式环境中清除映射，只有在测试或试验时才这样做。"
 
 #: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"