5 files changed, 115 insertions, 108 deletions
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 514f8d534c9..4a6e721e77f 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -161,55 +161,55 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:759
+#: js/js.js:760
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:760
+#: js/js.js:761
 msgid "1 minute ago"
 msgstr "1 分钟前"
 
-#: js/js.js:761
+#: js/js.js:762
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:762
+#: js/js.js:763
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:763
+#: js/js.js:764
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:765
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:765
+#: js/js.js:766
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:766
+#: js/js.js:767
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "last month"
 msgstr "上个月"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "years ago"
 msgstr "年前"
 
@@ -564,14 +564,18 @@ msgstr "请修改您的密码以保护账户。"
 msgid "Lost your password?"
 msgstr "忘记密码?"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "备忘"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "登陆"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "后退"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 71d9b048220..31b335db11b 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -19,46 +19,46 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/upload.php:17
+#: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "没有上传文件。未知错误"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
 msgstr "没有任何错误,文件上传成功了"
 
-#: ajax/upload.php:25
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上传的文件超过了HTML表单指定的MAX_FILE_SIZE"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:31
 msgid "The uploaded file was only partially uploaded"
 msgstr "文件只有部分被上传"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:32
 msgid "No file was uploaded"
 msgstr "没有上传完成的文件"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:33
 msgid "Missing a temporary folder"
 msgstr "丢失了一个临时文件夹"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:34
 msgid "Failed to write to disk"
 msgstr "写磁盘失败"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:52
 msgid "Not enough space available"
 msgstr ""
 
-#: ajax/upload.php:82
+#: ajax/upload.php:83
 msgid "Invalid directory."
 msgstr ""
 
@@ -70,11 +70,15 @@ msgstr "文件"
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "删除"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "重命名"
 
@@ -179,31 +183,31 @@ msgstr "网址不能为空。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "名字"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index f85989afca2..bacd5c9294b 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.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-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -40,44 +40,22 @@ msgstr ""
 msgid "Could not change your file encryption password to your login password"
 msgstr ""
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr ""
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr ""
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr ""
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr "加密"
 
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
 msgstr ""
 
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
 msgstr ""
 
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
 msgstr ""
 
-#: templates/settings.php:65
-msgid "Encryption"
-msgstr "加密"
-
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "从加密中排除如下文件类型"
-
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "无"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 722b4a5f8cb..9add0d0faa9 100644
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ b/l10n/zh_CN.GB2312/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-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,35 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "名称"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 6aa5df48618..3335b000123 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "不能从App Store 中加载列表"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "认证错误"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "群组已存在"
@@ -47,10 +56,6 @@ msgstr "非法Email"
 msgid "Unable to delete group"
 msgstr "未能删除群组"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "认证错误"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "未能删除用户"
@@ -113,7 +118,7 @@ msgstr "出错"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "保存中..."
 
@@ -190,67 +195,83 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "您的密码以变更"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "不能改变你的密码"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "现在的密码"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "展示"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "改变密码"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "你的email地址"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "输入一个邮箱地址以激活密码恢复功能"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -284,10 +305,6 @@ msgstr ""
 msgid "Other"
 msgstr "其他的"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr ""
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "群组管理员"