[tx-robot] updated from transifex

3 files changed, 158 insertions, 90 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index a533a1d73ee..8d4cdaa172a 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+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"
@@ -93,6 +93,26 @@ msgstr "没有选择要删除的类别"
 msgid "Error removing %s from favorites."
 msgstr "从收藏夹中移除%s时出错。"
 
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
 #: js/config.php:32
 msgid "Sunday"
 msgstr "星期日"
@@ -169,55 +189,55 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:355
+#: js/js.js:387
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:821
+#: js/js.js:853
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:822
+#: js/js.js:854
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: js/js.js:823
+#: js/js.js:855
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: js/js.js:824
+#: js/js.js:856
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:825
+#: js/js.js:857
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:826
+#: js/js.js:858
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: js/js.js:827
+#: js/js.js:859
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:828
+#: js/js.js:860
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: js/js.js:829
+#: js/js.js:861
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:830
+#: js/js.js:862
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:831
+#: js/js.js:863
 msgid "years ago"
 msgstr "年前"
 
@@ -225,22 +245,26 @@ msgstr "年前"
 msgid "Choose"
 msgstr "选择(&C)..."
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "加载文件选择器模板出错"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
 msgid "Ok"
 msgstr "好"
 
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
@@ -250,7 +274,7 @@ msgstr "未指定对象类型。"
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
 msgid "Error"
 msgstr "错误"
 
@@ -270,7 +294,7 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -326,67 +350,67 @@ msgstr "设置过期日期"
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:241
+#: js/share.js:242
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:243
+#: js/share.js:245
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:281
+#: js/share.js:283
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:317
+#: js/share.js:319
 msgid "Shared in {item} with {user}"
 msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:338
+#: js/share.js:340
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:350
+#: js/share.js:352
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:352
+#: js/share.js:354
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:355
+#: js/share.js:357
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:358
+#: js/share.js:360
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:361
+#: js/share.js:363
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:364
+#: js/share.js:366
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:643
+#: js/share.js:645
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:655
+#: js/share.js:657
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:670
+#: js/share.js:672
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:681
+#: js/share.js:683
 msgid "Email sent"
 msgstr "邮件已发送"
 
@@ -470,7 +494,7 @@ msgstr "个人"
 msgid "Users"
 msgstr "用户"
 
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
 msgid "Apps"
 msgstr "应用"
 
@@ -599,7 +623,7 @@ msgstr "安装完成"
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 可用。获取更多关于如何升级的信息。"
 
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
 msgid "Log out"
 msgstr "注销"
 
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 08447c650f0..6d3267bb037 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-28 06:22-0400\n"
-"PO-Revision-Date: 2013-08-27 19:10+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+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"
@@ -51,11 +51,23 @@ msgstr "用户"
 msgid "Admin"
 msgstr "管理"
 
-#: app.php:837
+#: app.php:839
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
 #: defaults.php:35
 msgid "web services under your control"
 msgstr "您控制的web服务"
@@ -108,37 +120,37 @@ msgstr ""
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: installer.php:123
+#: installer.php:125
 msgid "App does not provide an info.xml file"
 msgstr "应用未提供 info.xml 文件"
 
-#: installer.php:129
+#: installer.php:131
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: installer.php:138
+#: installer.php:140
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: installer.php:144
+#: installer.php:146
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: installer.php:150
+#: installer.php:152
 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"
 msgstr ""
 
-#: installer.php:160
+#: installer.php:162
 msgid "App directory already exists"
 msgstr ""
 
-#: installer.php:173
+#: installer.php:175
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
@@ -267,47 +279,47 @@ msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV�
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
-#: template/functions.php:80
+#: template/functions.php:96
 msgid "seconds ago"
 msgstr "秒前"
 
-#: template/functions.php:81
+#: template/functions.php:97
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: template/functions.php:82
+#: template/functions.php:98
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: template/functions.php:83
+#: template/functions.php:99
 msgid "today"
 msgstr "今天"
 
-#: template/functions.php:84
+#: template/functions.php:100
 msgid "yesterday"
 msgstr "昨天"
 
-#: template/functions.php:85
+#: template/functions.php:101
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: template/functions.php:86
+#: template/functions.php:102
 msgid "last month"
 msgstr "上月"
 
-#: template/functions.php:87
+#: template/functions.php:103
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: template/functions.php:88
+#: template/functions.php:104
 msgid "last year"
 msgstr "去年"
 
-#: template/functions.php:89
+#: template/functions.php:105
 msgid "years ago"
 msgstr "年前"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 26bf0b96692..f6c57de60cb 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+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"
@@ -133,11 +133,15 @@ msgstr "更新"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "正在解密文件... 请稍等，可能需要一些时间。"
 
-#: js/personal.js:172
+#: js/personal.js:284
 msgid "Saving..."
 msgstr "保存中"
 
@@ -153,16 +157,16 @@ msgstr "撤销"
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
 msgid "Groups"
 msgstr "组"
 
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr "组管理员"
 
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
 msgid "Delete"
 msgstr "删除"
 
@@ -182,7 +186,7 @@ msgstr "创建用户出错"
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
 msgid "__language_name__"
 msgstr "简体中文"
 
@@ -348,11 +352,11 @@ msgstr "更多"
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -419,7 +423,7 @@ msgstr "再次显示首次运行向导"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
 msgid "Password"
 msgstr "密码"
 
@@ -443,7 +447,7 @@ msgstr "新密码"
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
 msgid "Display Name"
 msgstr "显示名称"
 
@@ -459,38 +463,66 @@ msgstr "您的电子邮件"
 msgid "Fill in an email address to enable password recovery"
 msgstr "填写电子邮件地址以启用密码恢复功能"
 
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:98
+#: templates/personal.php:119
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:104
+#: templates/personal.php:125
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:106
+#: templates/personal.php:127
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>"
 
-#: templates/personal.php:117
+#: templates/personal.php:138
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/personal.php:119
+#: templates/personal.php:140
 msgid "The encryption app is no longer enabled, decrypt all your file"
 msgstr "加密 app 未启用，将解密您所有文件"
 
-#: templates/personal.php:125
+#: templates/personal.php:146
 msgid "Log-in password"
 msgstr "登录密码"
 
-#: templates/personal.php:130
+#: templates/personal.php:151
 msgid "Decrypt all Files"
 msgstr "解密所有文件"
 
@@ -516,30 +548,30 @@ msgstr "输入恢复密码来在更改密码的时候恢复用户文件"
 msgid "Default Storage"
 msgstr "默认存储"
 
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
 msgid "Unlimited"
 msgstr "无限"
 
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
 msgid "Other"
 msgstr "其它"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Username"
 msgstr "用户名"
 
-#: templates/users.php:91
+#: templates/users.php:94
 msgid "Storage"
 msgstr "存储"
 
-#: templates/users.php:102
+#: templates/users.php:108
 msgid "change display name"
 msgstr "修改显示名称"
 
-#: templates/users.php:106
+#: templates/users.php:112
 msgid "set new password"
 msgstr "设置新密码"
 
-#: templates/users.php:137
+#: templates/users.php:143
 msgid "Default"
 msgstr "默认"