summaryrefslogtreecommitdiffstats
path: root/l10n/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'l10n/zh_CN')
-rw-r--r--l10n/zh_CN/core.po4
-rw-r--r--l10n/zh_CN/files.po4
-rw-r--r--l10n/zh_CN/files_encryption.po83
-rw-r--r--l10n/zh_CN/files_external.po4
-rw-r--r--l10n/zh_CN/files_sharing.po4
-rw-r--r--l10n/zh_CN/files_trashbin.po4
-rw-r--r--l10n/zh_CN/files_versions.po4
-rw-r--r--l10n/zh_CN/lib.po4
-rw-r--r--l10n/zh_CN/settings.po44
-rw-r--r--l10n/zh_CN/user_ldap.po4
-rw-r--r--l10n/zh_CN/user_webdavauth.po12
11 files changed, 115 insertions, 56 deletions
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 73520d3ac5a..0be2e9fed4c 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 00903854a06..9d17fe97ca5 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 9ececa51497..a1441c26e05 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
@@ -17,22 +17,77 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "加密"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "文件加密已启用."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "如下的文件类型将不会被加密:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "从加密中排除如下的文件类型:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "无"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 6e798b3bc31..c61ffd44380 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+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"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 77a25d1939f..59049f512dc 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+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"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 52c54bcbee0..cfe8509cf7d 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+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"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index a01c8b41aa6..cc566f1c466 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+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"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index bad97551334..7a1e0aedf6a 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 6056eafbef2..4f7b161acd1 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "无法移除用户"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "组"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "组管理员"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "删除"
@@ -154,15 +154,15 @@ msgstr "删除"
msgid "add group"
msgstr "添加组"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "必须提供合法的用户名"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "创建用户出错"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "必须提供合法的密码"
@@ -400,7 +400,7 @@ msgstr "安装应用进行文件同步"
msgid "Show First Run Wizard again"
msgstr "再次显示首次运行向导"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密码"
@@ -424,7 +424,7 @@ msgstr "新密码"
msgid "Change password"
msgstr "修改密码"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "显示名称"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "用该地址来连接文件管理器中的 ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "登录名称"
@@ -464,30 +464,34 @@ msgstr "登录名称"
msgid "Create"
msgstr "创建"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "默认存储"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "无限"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "其它"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "存储"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "修改显示名称"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "设置新密码"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index d4dd9b9928b..50870467678 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+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"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index 7c8b3ea542d..82c49c2fbc2 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
-# marguerite su <i@marguerite.su>, 2013.
-# <wengxt@gmail.com>, 2013.
+# hanfeng <appweb.cn@gmail.com>, 2012
+# Dianjin Wang <1132321739qq@gmail.com>, 2012
+# marguerite su <i@marguerite.su>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+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"