# HG changeset patch
# User xpol <xpolife@gmail.com>
# Date 2012-11-26 07:20:49
# Node ID 8572e1826220ee5606761f7038ee366f294cf463
# Parent  ff9e0cbfcd7f17fcbf82335bc5723a95cb012b45

zhCN translation catch up with the new code.

diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo
index abf60eabb60780a7c613f6f696c1228e51243c44..b016c6e2a892c8c74c291e750d18d5642a3167b5
GIT binary patch
literal 55601
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

diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode 1.4.4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-10-16 10:48+0800\n"
-"PO-Revision-Date: 2012-10-16 11:36+0800\n"
+"POT-Creation-Date: 2012-11-26 14:41+0800\n"
+"PO-Revision-Date: 2012-11-26 15:19+0800\n"
 "Last-Translator: xpol <xpolife@gmail.com>\n"
 "Language-Team: mikespook\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -24,38 +24,34 @@ msgstr ""
 msgid "All Branches"
 msgstr "所有分支"
 
-#: rhodecode/controllers/changeset.py:83
+#: rhodecode/controllers/changeset.py:84
 msgid "show white space"
 msgstr "显示空白字符"
 
-#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
+#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
 msgid "ignore white space"
 msgstr "忽略空白字符"
 
-#: rhodecode/controllers/changeset.py:157
+#: rhodecode/controllers/changeset.py:164
 #, python-format
 msgid "%s line context"
 msgstr "%s行上下文"
 
-#: rhodecode/controllers/changeset.py:333
-#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:74
-msgid "binary file"
-msgstr "二进制文件"
-
-#: rhodecode/controllers/changeset.py:381
-#: rhodecode/controllers/pullrequests.py:383
+#: rhodecode/controllers/changeset.py:315
+#: rhodecode/controllers/pullrequests.py:411
 #, python-format
+#| msgid "Last change"
 msgid "Status change -> %s"
-msgstr "状态改变->%s"
-
-#: rhodecode/controllers/changeset.py:412
+msgstr "状态修改为%s"
+
+#: rhodecode/controllers/changeset.py:346
 msgid ""
 "Changing status on a changeset associated witha closed pull request is not "
 "allowed"
 msgstr "不允许修改已关闭拉取请求的修订集状态"
 
-#: rhodecode/controllers/compare.py:73
-#: rhodecode/controllers/pullrequests.py:114
+#: rhodecode/controllers/compare.py:75
+#: rhodecode/controllers/pullrequests.py:117
 msgid "There are no changesets yet"
 msgstr "还没有修订集"
 
@@ -86,104 +82,109 @@ msgid ""
 "fulfilling the request."
 msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。"
 
-#: rhodecode/controllers/feed.py:49
+#: rhodecode/controllers/feed.py:51
 #, python-format
 msgid "Changes on %s repository"
 msgstr "%s库的修改"
 
-#: rhodecode/controllers/feed.py:50
+#: rhodecode/controllers/feed.py:52
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s订阅"
 
-#: rhodecode/controllers/feed.py:67
-#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/controllers/feed.py:82
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/changeset/changeset.html:138
+#: rhodecode/templates/compare/compare_diff.html:62
+#: rhodecode/templates/compare/compare_diff.html:73
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 msgid "Changeset was too big and was cut off..."
 msgstr "修订集太大已被截断......"
 
-#: rhodecode/controllers/feed.py:81
+#: rhodecode/controllers/feed.py:88
 msgid "commited on"
 msgstr "提交于"
 
-#: rhodecode/controllers/files.py:84
+#: rhodecode/controllers/files.py:86
 msgid "click here to add new file"
 msgstr "点击此处添加新文件"
 
-#: rhodecode/controllers/files.py:85
+#: rhodecode/controllers/files.py:87
 #, python-format
 msgid "There are no files yet %s"
 msgstr "还没有文件%s"
 
-#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299
+#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "版本库由%s于%s锁定"
 
-#: rhodecode/controllers/files.py:266
+#: rhodecode/controllers/files.py:292
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "通过RhodeCode修改了%s"
 
-#: rhodecode/controllers/files.py:271
+#: rhodecode/controllers/files.py:297
 msgid "No changes"
 msgstr "无变更"
 
-#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346
+#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "成功提交到%s"
 
-#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352
+#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
 msgid "Error occurred during commit"
 msgstr "提交时发生错误"
 
-#: rhodecode/controllers/files.py:318
+#: rhodecode/controllers/files.py:344
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "通过RhodeCode添加了%s"
 
-#: rhodecode/controllers/files.py:332
+#: rhodecode/controllers/files.py:358
 msgid "No content"
 msgstr "无内容"
 
-#: rhodecode/controllers/files.py:336
+#: rhodecode/controllers/files.py:362
 msgid "No filename"
 msgstr "无文件名"
 
-#: rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:404
 msgid "downloads disabled"
 msgstr "禁止下载"
 
-#: rhodecode/controllers/files.py:389
+#: rhodecode/controllers/files.py:415
 #, python-format
 msgid "Unknown revision %s"
 msgstr "未知版本%s"
 
-#: rhodecode/controllers/files.py:391
+#: rhodecode/controllers/files.py:417
 msgid "Empty repository"
 msgstr "空版本库"
 
-#: rhodecode/controllers/files.py:393
+#: rhodecode/controllers/files.py:419
 msgid "Unknown archive type"
 msgstr "未知包类型"
 
-#: rhodecode/controllers/files.py:494
+#: rhodecode/controllers/files.py:564
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "修订集"
 
-#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:73
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:543
+#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
 msgid "Branches"
 msgstr "分支"
 
-#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:77
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:554
+#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
 msgid "Tags"
 msgstr "标签"
 
-#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:90
+#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the "
@@ -211,12 +212,12 @@ msgstr "版本库%s被复刻到%s"
 msgid "An error occurred during repository forking %s"
 msgstr "在复刻版本库%s的时候发生错误"
 
-#: rhodecode/controllers/journal.py:203 rhodecode/controllers/journal.py:240
+#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
 msgid "public journal"
 msgstr "公共日志"
 
-#: rhodecode/controllers/journal.py:207 rhodecode/controllers/journal.py:244
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247
+#: rhodecode/templates/base/base.html:232
 msgid "journal"
 msgstr "日志"
 
@@ -233,27 +234,27 @@ msgid ""
 "Your password reset was successful, new password has been sent to your email"
 msgstr "密码已经成功重置，新密码已经发送到你的邮箱"
 
-#: rhodecode/controllers/pullrequests.py:75 rhodecode/model/scm.py:549
+#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556
 msgid "Bookmarks"
 msgstr "书签"
 
-#: rhodecode/controllers/pullrequests.py:183
+#: rhodecode/controllers/pullrequests.py:186
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "拉取请求的标题至少3个字符"
 
-#: rhodecode/controllers/pullrequests.py:185
+#: rhodecode/controllers/pullrequests.py:188
 msgid "error during creation of pull request"
 msgstr "提交拉取请求时发生错误"
 
-#: rhodecode/controllers/pullrequests.py:206
+#: rhodecode/controllers/pullrequests.py:220
 msgid "Successfully opened new pull request"
 msgstr "成功提交拉取请求"
 
-#: rhodecode/controllers/pullrequests.py:209
+#: rhodecode/controllers/pullrequests.py:223
 msgid "Error occurred during sending pull request"
 msgstr "提交拉取请求时发生错误"
 
-#: rhodecode/controllers/pullrequests.py:242
+#: rhodecode/controllers/pullrequests.py:256
 msgid "Successfully deleted pull request"
 msgstr "成功删除拉取请求"
 
@@ -270,19 +271,19 @@ msgid "An error occurred during this sea
 msgstr "在搜索操作中发生异常"
 
 #: rhodecode/controllers/settings.py:108
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:267
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "版本库%s成功更新"
 
 #: rhodecode/controllers/settings.py:126
-#: rhodecode/controllers/admin/repos.py:284
+#: rhodecode/controllers/admin/repos.py:285
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "在更新版本库%s的时候发生错误"
 
 #: rhodecode/controllers/settings.py:144
-#: rhodecode/controllers/admin/repos.py:302
+#: rhodecode/controllers/admin/repos.py:303
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from the "
@@ -292,33 +293,36 @@ msgstr ""
 "新扫描版本库"
 
 #: rhodecode/controllers/settings.py:156
-#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "deleted repository %s"
 msgstr "已经删除版本库%s"
 
 #: rhodecode/controllers/settings.py:160
-#: rhodecode/controllers/admin/repos.py:324
-#: rhodecode/controllers/admin/repos.py:330
+#: rhodecode/controllers/admin/repos.py:325
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "在删除%s的时候发生错误"
 
 #: rhodecode/controllers/settings.py:179
+#| msgid "unlock"
 msgid "unlocked"
 msgstr "未锁"
 
 #: rhodecode/controllers/settings.py:182
+#| msgid "unlock"
 msgid "locked"
 msgstr "已锁"
 
 #: rhodecode/controllers/settings.py:184
 #, python-format
+#| msgid "forked %s repository as %s"
 msgid "Repository has been %s"
-msgstr "版本库已经%s"
+msgstr "版本库已被%s"
 
 #: rhodecode/controllers/settings.py:188
-#: rhodecode/controllers/admin/repos.py:422
+#: rhodecode/controllers/admin/repos.py:423
 msgid "An error occurred during unlocking"
 msgstr "解锁时发生错误"
 
@@ -327,7 +331,7 @@ msgid "No data loaded yet"
 msgstr "数据未加载"
 
 #: rhodecode/controllers/summary.py:144
-#: rhodecode/templates/summary/summary.html:148
+#: rhodecode/templates/summary/summary.html:157
 msgid "Statistics are disabled for this repository"
 msgstr "该版本库统计功能已经禁用"
 
@@ -412,15 +416,15 @@ msgstr "写"
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/admin/users/user_add.html:8
 #: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:122
+#: rhodecode/templates/admin/users/user_edit.html:126
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
 #: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:346
-#: rhodecode/templates/base/base.html:348
-#: rhodecode/templates/base/base.html:350
+#: rhodecode/templates/base/base.html:349
+#: rhodecode/templates/base/base.html:351
+#: rhodecode/templates/base/base.html:353
 msgid "Admin"
 msgstr "管理"
 
@@ -454,124 +458,124 @@ msgstr "成功更新默认权限"
 msgid "error occurred during update of permissions"
 msgstr "更新权限时发生错误"
 
-#: rhodecode/controllers/admin/repos.py:123
+#: rhodecode/controllers/admin/repos.py:124
 msgid "--REMOVE FORK--"
 msgstr "-- 移除复刻 --"
 
-#: rhodecode/controllers/admin/repos.py:192
+#: rhodecode/controllers/admin/repos.py:193
 #, python-format
 msgid "created repository %s from %s"
 msgstr "新版本库%s基于%s建立。"
 
-#: rhodecode/controllers/admin/repos.py:196
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "created repository %s"
 msgstr "建立版本库%s"
 
-#: rhodecode/controllers/admin/repos.py:227
+#: rhodecode/controllers/admin/repos.py:228
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "创建版本库时发生错误%s"
 
-#: rhodecode/controllers/admin/repos.py:319
+#: rhodecode/controllers/admin/repos.py:320
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "无法删除%s因为它还有其他分复刻本库"
 
-#: rhodecode/controllers/admin/repos.py:348
+#: rhodecode/controllers/admin/repos.py:349
 msgid "An error occurred during deletion of repository user"
 msgstr "删除版本库用户时发生错误"
 
-#: rhodecode/controllers/admin/repos.py:367
+#: rhodecode/controllers/admin/repos.py:368
 msgid "An error occurred during deletion of repository users groups"
 msgstr "删除版本库用户组时发生错误"
 
-#: rhodecode/controllers/admin/repos.py:385
+#: rhodecode/controllers/admin/repos.py:386
 msgid "An error occurred during deletion of repository stats"
 msgstr "删除版本库统计时发生错误"
 
-#: rhodecode/controllers/admin/repos.py:402
+#: rhodecode/controllers/admin/repos.py:403
 msgid "An error occurred during cache invalidation"
 msgstr "清除缓存时发生错误"
 
-#: rhodecode/controllers/admin/repos.py:442
+#: rhodecode/controllers/admin/repos.py:443
 msgid "Updated repository visibility in public journal"
 msgstr "成功更新在公共日志中的可见性"
 
-#: rhodecode/controllers/admin/repos.py:446
+#: rhodecode/controllers/admin/repos.py:447
 msgid "An error occurred during setting this repository in public journal"
 msgstr "设置版本库到公共日志时发生错误"
 
-#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:300
+#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
 msgid "Token mismatch"
 msgstr "令牌不匹配"
 
-#: rhodecode/controllers/admin/repos.py:464
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr "成功拉取自远程路径"
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:467
 msgid "An error occurred during pull from remote location"
 msgstr "从远程路径拉取时发生错误"
 
-#: rhodecode/controllers/admin/repos.py:482
+#: rhodecode/controllers/admin/repos.py:483
 msgid "Nothing"
 msgstr "无"
 
-#: rhodecode/controllers/admin/repos.py:484
+#: rhodecode/controllers/admin/repos.py:485
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "成功将版本库%s标记为复刻自%s"
 
-#: rhodecode/controllers/admin/repos.py:488
+#: rhodecode/controllers/admin/repos.py:489
 msgid "An error occurred during this operation"
 msgstr "在搜索操作中发生错误"
 
-#: rhodecode/controllers/admin/repos_groups.py:117
+#: rhodecode/controllers/admin/repos_groups.py:120
 #, python-format
 msgid "created repos group %s"
 msgstr "建立版本库组%s"
 
-#: rhodecode/controllers/admin/repos_groups.py:130
+#: rhodecode/controllers/admin/repos_groups.py:133
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "创建版本库组时发生错误%s"
 
-#: rhodecode/controllers/admin/repos_groups.py:164
+#: rhodecode/controllers/admin/repos_groups.py:167
 #, python-format
 msgid "updated repos group %s"
 msgstr "更新版本库组%s"
 
-#: rhodecode/controllers/admin/repos_groups.py:177
+#: rhodecode/controllers/admin/repos_groups.py:180
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "更新版本库组时发生错误%s"
 
-#: rhodecode/controllers/admin/repos_groups.py:195
+#: rhodecode/controllers/admin/repos_groups.py:198
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "这个组内有%s个版本库因而无法删除"
 
-#: rhodecode/controllers/admin/repos_groups.py:203
+#: rhodecode/controllers/admin/repos_groups.py:206
 #, python-format
 msgid "removed repos group %s"
 msgstr "移除版本库组%s"
 
-#: rhodecode/controllers/admin/repos_groups.py:209
+#: rhodecode/controllers/admin/repos_groups.py:212
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "不能删除包含子组的组"
 
-#: rhodecode/controllers/admin/repos_groups.py:214
-#: rhodecode/controllers/admin/repos_groups.py:219
+#: rhodecode/controllers/admin/repos_groups.py:217
+#: rhodecode/controllers/admin/repos_groups.py:222
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "删除版本库组时发生错误%s"
 
-#: rhodecode/controllers/admin/repos_groups.py:240
+#: rhodecode/controllers/admin/repos_groups.py:243
 msgid "An error occurred during deletion of group user"
 msgstr "删除组用户时发生错误"
 
-#: rhodecode/controllers/admin/repos_groups.py:261
+#: rhodecode/controllers/admin/repos_groups.py:264
 msgid "An error occurred during deletion of group users groups"
 msgstr "删除版本库组的用户组时发生错误"
 
@@ -589,48 +593,48 @@ msgid "Updated application settings"
 msgstr "更新应用设置"
 
 #: rhodecode/controllers/admin/settings.py:166
-#: rhodecode/controllers/admin/settings.py:294
+#: rhodecode/controllers/admin/settings.py:299
 msgid "error occurred during updating application settings"
 msgstr "更新设置时发生错误"
 
-#: rhodecode/controllers/admin/settings.py:202
-msgid "Updated visualisation settings"
-msgstr "成功更新可视化设置"
-
 #: rhodecode/controllers/admin/settings.py:207
+msgid "Updated visualisation settings"
+msgstr "成功更新可视化设置"
+
+#: rhodecode/controllers/admin/settings.py:212
 msgid "error occurred during updating visualisation settings"
 msgstr "更新可视化设置时发生错误"
 
-#: rhodecode/controllers/admin/settings.py:290
+#: rhodecode/controllers/admin/settings.py:295
 msgid "Updated VCS settings"
 msgstr "成功更新版本控制系统设置"
 
-#: rhodecode/controllers/admin/settings.py:304
+#: rhodecode/controllers/admin/settings.py:309
 msgid "Added new hook"
 msgstr "新建钩子"
 
-#: rhodecode/controllers/admin/settings.py:316
+#: rhodecode/controllers/admin/settings.py:321
 msgid "Updated hooks"
 msgstr "更新钩子"
 
-#: rhodecode/controllers/admin/settings.py:320
+#: rhodecode/controllers/admin/settings.py:325
 msgid "error occurred during hook creation"
 msgstr "创建钩子时发生错误"
 
-#: rhodecode/controllers/admin/settings.py:339
+#: rhodecode/controllers/admin/settings.py:344
 msgid "Email task created"
 msgstr "已创建电子邮件任务"
 
-#: rhodecode/controllers/admin/settings.py:394
+#: rhodecode/controllers/admin/settings.py:399
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法编辑该用户"
 
-#: rhodecode/controllers/admin/settings.py:425
+#: rhodecode/controllers/admin/settings.py:430
 msgid "Your account was updated successfully"
 msgstr "你的帐号已经更新完成"
 
-#: rhodecode/controllers/admin/settings.py:440
-#: rhodecode/controllers/admin/users.py:191
+#: rhodecode/controllers/admin/settings.py:445
+#: rhodecode/controllers/admin/users.py:196
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "更新用户%s时发生错误"
@@ -645,97 +649,97 @@ msgstr "创建用户%s"
 msgid "error occurred during creation of user %s"
 msgstr "创建用户%s时发生错误"
 
-#: rhodecode/controllers/admin/users.py:171
+#: rhodecode/controllers/admin/users.py:176
 msgid "User updated successfully"
 msgstr "用户更新成功"
 
-#: rhodecode/controllers/admin/users.py:207
-msgid "successfully deleted user"
-msgstr "用户删除成功"
-
 #: rhodecode/controllers/admin/users.py:212
+msgid "successfully deleted user"
+msgstr "用户删除成功"
+
+#: rhodecode/controllers/admin/users.py:217
 msgid "An error occurred during deletion of user"
 msgstr "删除用户时发生错误"
 
-#: rhodecode/controllers/admin/users.py:226
+#: rhodecode/controllers/admin/users.py:231
 msgid "You can't edit this user"
 msgstr "无法编辑该用户"
 
-#: rhodecode/controllers/admin/users.py:266
+#: rhodecode/controllers/admin/users.py:272
 msgid "Granted 'repository create' permission to user"
 msgstr "已授予用户‘创建版本库’的权限"
 
-#: rhodecode/controllers/admin/users.py:271
+#: rhodecode/controllers/admin/users.py:277
 msgid "Revoked 'repository create' permission to user"
 msgstr "已撤销用户‘创建版本库’的权限"
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:283
 msgid "Granted 'repository fork' permission to user"
 msgstr "成功授予了用户“复刻版本库”权限"
 
-#: rhodecode/controllers/admin/users.py:282
+#: rhodecode/controllers/admin/users.py:288
 msgid "Revoked 'repository fork' permission to user"
 msgstr "成功撤销用户“复刻版本库”权限"
 
-#: rhodecode/controllers/admin/users.py:288
-#: rhodecode/controllers/admin/users_groups.py:255
+#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr "保存权限时发生错误"
 
-#: rhodecode/controllers/admin/users.py:303
+#: rhodecode/controllers/admin/users.py:309
 #, python-format
 msgid "Added email %s to user"
 msgstr "已为用户添加电子邮件 %s"
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:315
 msgid "An error occurred during email saving"
 msgstr "保存电子邮件时发生错误"
 
-#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:325
 msgid "Removed email from user"
 msgstr "成功删除用户电子邮件"
 
-#: rhodecode/controllers/admin/users_groups.py:84
+#: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
 msgstr "建立用户组%s"
 
-#: rhodecode/controllers/admin/users_groups.py:95
+#: rhodecode/controllers/admin/users_groups.py:97
 #, python-format
 msgid "error occurred during creation of users group %s"
 msgstr "创建用户组%s时发生错误"
 
-#: rhodecode/controllers/admin/users_groups.py:135
+#: rhodecode/controllers/admin/users_groups.py:164
 #, python-format
 msgid "updated users group %s"
 msgstr "更新用户组%s"
 
-#: rhodecode/controllers/admin/users_groups.py:157
+#: rhodecode/controllers/admin/users_groups.py:186
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr "更新用户组%s时发生错误"
 
-#: rhodecode/controllers/admin/users_groups.py:174
+#: rhodecode/controllers/admin/users_groups.py:203
 msgid "successfully deleted users group"
 msgstr "删除用户组成功"
 
-#: rhodecode/controllers/admin/users_groups.py:179
+#: rhodecode/controllers/admin/users_groups.py:208
 msgid "An error occurred during deletion of users group"
 msgstr "删除用户组时发生错误"
 
-#: rhodecode/controllers/admin/users_groups.py:233
+#: rhodecode/controllers/admin/users_groups.py:257
 msgid "Granted 'repository create' permission to users group"
 msgstr "已授予用户组‘创建版本库’的权限"
 
-#: rhodecode/controllers/admin/users_groups.py:238
+#: rhodecode/controllers/admin/users_groups.py:262
 msgid "Revoked 'repository create' permission to users group"
 msgstr "已撤销用户组‘创建版本库’的权限"
 
-#: rhodecode/controllers/admin/users_groups.py:244
+#: rhodecode/controllers/admin/users_groups.py:268
 msgid "Granted 'repository fork' permission to users group"
 msgstr "已授予用户组‘复刻版本库’的权限"
 
-#: rhodecode/controllers/admin/users_groups.py:249
+#: rhodecode/controllers/admin/users_groups.py:273
 msgid "Revoked 'repository fork' permission to users group"
 msgstr "已撤销用户组‘复刻版本库’的权限"
 
@@ -747,6 +751,10 @@ msgstr "必须是注册用户才能进行此操作"
 msgid "You need to be a signed in to view this page"
 msgstr "必须登录才能访问该页面"
 
+#: rhodecode/lib/diffs.py:74
+msgid "binary file"
+msgstr "二进制文件"
+
 #: rhodecode/lib/diffs.py:90
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
@@ -769,194 +777,206 @@ msgstr "是"
 msgid "False"
 msgstr "否"
 
-#: rhodecode/lib/helpers.py:533
+#: rhodecode/lib/helpers.py:529
+#, python-format
+#| msgid "deleted repository %s"
+msgid "Deleted branch: %s"
+msgstr "已经删除分支%s"
+
+#: rhodecode/lib/helpers.py:532
+#, python-format
+#| msgid "created user %s"
+msgid "Created tag: %s"
+msgstr "创建标签%s"
+
+#: rhodecode/lib/helpers.py:545
 msgid "Changeset not found"
 msgstr "未找到修订集"
 
-#: rhodecode/lib/helpers.py:556
+#: rhodecode/lib/helpers.py:588
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "显示合并的修订集%s->%s"
 
-#: rhodecode/lib/helpers.py:562
+#: rhodecode/lib/helpers.py:594
 msgid "compare view"
 msgstr "比较显示"
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:614
 msgid "and"
 msgstr "还有"
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:615
 #, python-format
 msgid "%s more"
 msgstr "%s个"
 
-#: rhodecode/lib/helpers.py:584
-#: rhodecode/templates/changelog/changelog.html:49
+#: rhodecode/lib/helpers.py:616
+#: rhodecode/templates/changelog/changelog.html:51
 msgid "revisions"
 msgstr "修订"
 
-#: rhodecode/lib/helpers.py:608
+#: rhodecode/lib/helpers.py:640
 #, python-format
 #| msgid "fork name "
 msgid "fork name %s"
 msgstr "复刻名称%s"
 
-#: rhodecode/lib/helpers.py:621
+#: rhodecode/lib/helpers.py:653
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr "拉取请求#%s"
 
-#: rhodecode/lib/helpers.py:627
+#: rhodecode/lib/helpers.py:659
 msgid "[deleted] repository"
 msgstr "[删除]版本库"
 
-#: rhodecode/lib/helpers.py:629 rhodecode/lib/helpers.py:639
+#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671
 msgid "[created] repository"
 msgstr "[创建]版本库"
 
-#: rhodecode/lib/helpers.py:631
+#: rhodecode/lib/helpers.py:663
 msgid "[created] repository as fork"
 msgstr "[创建]复刻版本库"
 
-#: rhodecode/lib/helpers.py:633 rhodecode/lib/helpers.py:641
+#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673
 msgid "[forked] repository"
 msgstr "[复刻]版本库"
 
-#: rhodecode/lib/helpers.py:635 rhodecode/lib/helpers.py:643
+#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675
 msgid "[updated] repository"
 msgstr "[更新]版本库"
 
-#: rhodecode/lib/helpers.py:637
+#: rhodecode/lib/helpers.py:669
 msgid "[delete] repository"
 msgstr "[删除]版本库"
 
-#: rhodecode/lib/helpers.py:645
+#: rhodecode/lib/helpers.py:677
 msgid "[created] user"
 msgstr "[创建]用户"
 
-#: rhodecode/lib/helpers.py:647
+#: rhodecode/lib/helpers.py:679
 msgid "[updated] user"
 msgstr "[更新]用户"
 
-#: rhodecode/lib/helpers.py:649
+#: rhodecode/lib/helpers.py:681
 msgid "[created] users group"
 msgstr "[创建]用户组"
 
-#: rhodecode/lib/helpers.py:651
+#: rhodecode/lib/helpers.py:683
 msgid "[updated] users group"
 msgstr "[更新]用户组"
 
-#: rhodecode/lib/helpers.py:653
+#: rhodecode/lib/helpers.py:685
 msgid "[commented] on revision in repository"
 msgstr "[评论]了版本库中的修订"
 
-#: rhodecode/lib/helpers.py:655
+#: rhodecode/lib/helpers.py:687
 msgid "[commented] on pull request for"
 msgstr "[评论]拉取请求"
 
-#: rhodecode/lib/helpers.py:657
+#: rhodecode/lib/helpers.py:689
 msgid "[closed] pull request for"
 msgstr "[关闭] 拉取请求"
 
-#: rhodecode/lib/helpers.py:659
+#: rhodecode/lib/helpers.py:691
 msgid "[pushed] into"
 msgstr "[推送]到"
 
-#: rhodecode/lib/helpers.py:661
+#: rhodecode/lib/helpers.py:693
 msgid "[committed via RhodeCode] into repository"
 msgstr "[通过RhodeCode提交]到版本库"
 
-#: rhodecode/lib/helpers.py:663
+#: rhodecode/lib/helpers.py:695
 msgid "[pulled from remote] into repository"
 msgstr "[远程拉取]到版本库"
 
-#: rhodecode/lib/helpers.py:665
+#: rhodecode/lib/helpers.py:697
 msgid "[pulled] from"
 msgstr "[拉取]自"
 
-#: rhodecode/lib/helpers.py:667
+#: rhodecode/lib/helpers.py:699
 msgid "[started following] repository"
 msgstr "[开始关注]版本库"
 
-#: rhodecode/lib/helpers.py:669
+#: rhodecode/lib/helpers.py:701
 msgid "[stopped following] repository"
 msgstr "[停止关注]版本库"
 
-#: rhodecode/lib/helpers.py:845
+#: rhodecode/lib/helpers.py:877
 #, python-format
 msgid " and %s more"
 msgstr "还有%s个"
 
-#: rhodecode/lib/helpers.py:849
+#: rhodecode/lib/helpers.py:881
 msgid "No Files"
 msgstr "没有文件"
 
-#: rhodecode/lib/utils2.py:357
+#: rhodecode/lib/utils2.py:403
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d年"
 
-#: rhodecode/lib/utils2.py:358
+#: rhodecode/lib/utils2.py:404
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d月"
 
-#: rhodecode/lib/utils2.py:359
+#: rhodecode/lib/utils2.py:405
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d天"
 
-#: rhodecode/lib/utils2.py:360
+#: rhodecode/lib/utils2.py:406
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d时"
 
-#: rhodecode/lib/utils2.py:361
+#: rhodecode/lib/utils2.py:407
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: rhodecode/lib/utils2.py:362
+#: rhodecode/lib/utils2.py:408
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 
-#: rhodecode/lib/utils2.py:378
+#: rhodecode/lib/utils2.py:424
 #, python-format
 #| msgid "on line %s"
 msgid "in %s"
-msgstr "%s前"
-
-#: rhodecode/lib/utils2.py:380
+msgstr "%s"
+
+#: rhodecode/lib/utils2.py:426
 #, python-format
 msgid "%s ago"
 msgstr "%s前"
 
-#: rhodecode/lib/utils2.py:382
+#: rhodecode/lib/utils2.py:428
 #, python-format
 #| msgid "%s and %s ago"
 msgid "in %s and %s"
-msgstr "%s%s前"
-
-#: rhodecode/lib/utils2.py:385
+msgstr "%s零%s"
+
+#: rhodecode/lib/utils2.py:431
 #, python-format
 msgid "%s and %s ago"
-msgstr "%s%s前"
-
-#: rhodecode/lib/utils2.py:388
+msgstr "%s零%s前"
+
+#: rhodecode/lib/utils2.py:434
 msgid "just now"
 msgstr "刚才"
 
-#: rhodecode/lib/celerylib/tasks.py:269
+#: rhodecode/lib/celerylib/tasks.py:270
 msgid "password reset link"
 msgstr "密码重置链接"
 
@@ -969,83 +989,83 @@ msgstr "在%s行"
 msgid "[Mention]"
 msgstr "[提及]"
 
-#: rhodecode/model/db.py:1164
+#: rhodecode/model/db.py:1163
 msgid "Repository no access"
 msgstr "无版本库访问权限"
 
-#: rhodecode/model/db.py:1165
+#: rhodecode/model/db.py:1164
 msgid "Repository read access"
 msgstr "版本库读取权限"
 
+#: rhodecode/model/db.py:1165
+msgid "Repository write access"
+msgstr "版本库写入权限"
+
 #: rhodecode/model/db.py:1166
-msgid "Repository write access"
-msgstr "版本库写入权限"
-
-#: rhodecode/model/db.py:1167
 msgid "Repository admin access"
 msgstr "版本库管理权限"
 
-#: rhodecode/model/db.py:1169
+#: rhodecode/model/db.py:1168
 msgid "Repositories Group no access"
 msgstr "无版本库组访问权限"
 
-#: rhodecode/model/db.py:1170
+#: rhodecode/model/db.py:1169
 msgid "Repositories Group read access"
 msgstr "版本库组读取权限"
 
-#: rhodecode/model/db.py:1171
+#: rhodecode/model/db.py:1170
 msgid "Repositories Group write access"
 msgstr "版本库组写入"
 
-#: rhodecode/model/db.py:1172
+#: rhodecode/model/db.py:1171
 msgid "Repositories Group admin access"
 msgstr "版本库组管理权限"
 
+#: rhodecode/model/db.py:1173
+msgid "RhodeCode Administrator"
+msgstr "RhodeCode 管理员"
+
 #: rhodecode/model/db.py:1174
-msgid "RhodeCode Administrator"
-msgstr "RhodeCode 管理员"
-
-#: rhodecode/model/db.py:1175
 msgid "Repository creation disabled"
 msgstr "禁用创建版本库"
 
-#: rhodecode/model/db.py:1176
+#: rhodecode/model/db.py:1175
 msgid "Repository creation enabled"
 msgstr "允许创建版本库"
 
-#: rhodecode/model/db.py:1177
+#: rhodecode/model/db.py:1176
 msgid "Repository forking disabled"
 msgstr "禁用复刻版本库"
 
+#: rhodecode/model/db.py:1177
+msgid "Repository forking enabled"
+msgstr "允许复刻版本库"
+
 #: rhodecode/model/db.py:1178
-msgid "Repository forking enabled"
-msgstr "允许复刻版本库"
+msgid "Register disabled"
+msgstr "禁用注册"
 
 #: rhodecode/model/db.py:1179
-msgid "Register disabled"
-msgstr "禁用注册"
-
-#: rhodecode/model/db.py:1180
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "用手动激活注册新用户"
 
-#: rhodecode/model/db.py:1183
+#: rhodecode/model/db.py:1182
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "用自动激活注册新用户"
 
-#: rhodecode/model/db.py:1611
+#: rhodecode/model/db.py:1623
 msgid "Not Reviewed"
 msgstr "未检视"
 
-#: rhodecode/model/db.py:1612
+#: rhodecode/model/db.py:1624
 msgid "Approved"
 msgstr "已批准"
 
-#: rhodecode/model/db.py:1613
+#: rhodecode/model/db.py:1625
 msgid "Rejected"
 msgstr "驳回"
 
-#: rhodecode/model/db.py:1614
+#: rhodecode/model/db.py:1626
 msgid "Under Review"
 msgstr "检视中"
 
@@ -1068,35 +1088,47 @@ msgid "Enter %(min)i characters or more"
 msgstr "输入少于%(min)i个字符"
 
 #: rhodecode/model/notification.py:220
-msgid "commented on commit"
-msgstr "评论了评论"
+#, python-format
+#| msgid "commented on commit"
+msgid "commented on commit at %(when)s"
+msgstr "在%(when)s评论了提交"
 
 #: rhodecode/model/notification.py:221
-msgid "sent message"
-msgstr "发送信息"
+#, python-format
+#| msgid "sent message"
+msgid "sent message at %(when)s"
+msgstr "在%(when)s发送信息"
 
 #: rhodecode/model/notification.py:222
-msgid "mentioned you"
-msgstr "提到了你"
+#, python-format
+#| msgid "mentioned you"
+msgid "mentioned you at %(when)s"
+msgstr "在%(when)s提到了你"
 
 #: rhodecode/model/notification.py:223
-msgid "registered in RhodeCode"
-msgstr "注册到RhodeCode"
+#, python-format
+#| msgid "registered in RhodeCode"
+msgid "registered in RhodeCode at %(when)s"
+msgstr "在%(when)s注册到RhodeCode"
 
 #: rhodecode/model/notification.py:224
-msgid "opened new pull request"
-msgstr "创建新的拉取请求"
+#, python-format
+#| msgid "opened new pull request"
+msgid "opened new pull request at %(when)s"
+msgstr "在%(when)s创建新的拉取请求"
 
 #: rhodecode/model/notification.py:225
-msgid "commented on pull request"
-msgstr "评论了拉取请求"
-
-#: rhodecode/model/pull_request.py:89
+#, python-format
+#| msgid "commented on pull request"
+msgid "commented on pull request at %(when)s"
+msgstr "在%(when)s评论了拉取请求"
+
+#: rhodecode/model/pull_request.py:90
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr "%(user)s想要你检视拉取请求#%(pr_id)s"
 
-#: rhodecode/model/scm.py:535
+#: rhodecode/model/scm.py:542
 msgid "latest tip"
 msgstr "最新tip版本"
 
@@ -1104,16 +1136,16 @@ msgstr "最新tip版本"
 msgid "new user registration"
 msgstr "[RhodeCode]新用户注册"
 
-#: rhodecode/model/user.py:255 rhodecode/model/user.py:277
-#: rhodecode/model/user.py:299
+#: rhodecode/model/user.py:255 rhodecode/model/user.py:279
+#: rhodecode/model/user.py:301
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法编辑该用户"
 
-#: rhodecode/model/user.py:323
+#: rhodecode/model/user.py:325
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法删除该用户"
 
-#: rhodecode/model/user.py:329
+#: rhodecode/model/user.py:331
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
@@ -1230,8 +1262,9 @@ msgid "Fork have to be the same type as 
 msgstr "复刻版本库必须和父版本库类型相同"
 
 #: rhodecode/model/validators.py:473
+#| msgid "You don't have permission to view this page"
 msgid "You don't have permissions to create repository in this group"
-msgstr "没有在这个组里面创建版本库的权限"
+msgstr "没有在该版本库组中创建版本库的权限"
 
 #: rhodecode/model/validators.py:498
 msgid "This username or users group name is not valid"
@@ -1279,7 +1312,7 @@ msgstr "快速过滤..."
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:230
+#: rhodecode/templates/base/base.html:233
 msgid "repositories"
 msgstr "版本库"
 
@@ -1290,6 +1323,7 @@ msgid "ADD REPOSITORY"
 msgstr "新建版本库"
 
 #: rhodecode/templates/index_base.html:29
+#: rhodecode/templates/index_base.html:136
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
@@ -1299,9 +1333,10 @@ msgid "Group name"
 msgstr "组名"
 
 #: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:142
-#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:176
+#: rhodecode/templates/index_base.html:266
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
@@ -1310,142 +1345,137 @@ msgstr "组名"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
-#: rhodecode/templates/summary/summary.html:105
+#: rhodecode/templates/summary/summary.html:114
 msgid "Description"
 msgstr "描述"
 
 #: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr "版本库组"
 
-#: rhodecode/templates/index_base.html:70
-#: rhodecode/templates/index_base.html:166
+#: rhodecode/templates/index_base.html:71
+#: rhodecode/templates/index_base.html:174
+#: rhodecode/templates/index_base.html:264
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:192
+#: rhodecode/templates/admin/users/user_edit.html:196
 #: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:181
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
+#: rhodecode/templates/admin/users/user_edit_my_account.html:180
+#: rhodecode/templates/admin/users/user_edit_my_account.html:216
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:59
-#: rhodecode/templates/journal/journal.html:107
-#: rhodecode/templates/journal/journal.html:186
+#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal.html:168
+#: rhodecode/templates/journal/journal_page_repos.html:7
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:123
-#: rhodecode/templates/tags/tags.html:36
+#: rhodecode/templates/summary/summary.html:132
+#: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "名称"
 
-#: rhodecode/templates/index_base.html:72
+#: rhodecode/templates/index_base.html:73
 msgid "Last change"
 msgstr "最后修改"
 
-#: rhodecode/templates/index_base.html:73
-#: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/journal/journal.html:188
+#: rhodecode/templates/index_base.html:74
+#: rhodecode/templates/index_base.html:179
+#: rhodecode/templates/admin/users/user_edit_my_account.html:182
+#: rhodecode/templates/journal/journal.html:170
 msgid "Tip"
 msgstr "Tip"
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:173
+#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:269
 #: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr "所有者"
 
-#: rhodecode/templates/index_base.html:75
+#: rhodecode/templates/index_base.html:76
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:77
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:110
-#: rhodecode/templates/index_base.html:112
-#, python-format
-msgid "Subscribe to %s rss feed"
-msgstr "订阅%s的RSS"
-
-#: rhodecode/templates/index_base.html:117
-#: rhodecode/templates/index_base.html:119
-#, python-format
-msgid "Subscribe to %s atom feed"
-msgstr "订阅%s的Atom"
-
-#: rhodecode/templates/index_base.html:140
-msgid "Group Name"
-msgstr "组名"
-
-#: rhodecode/templates/index_base.html:158
-#: rhodecode/templates/index_base.html:198
+#: rhodecode/templates/index_base.html:167
+#: rhodecode/templates/index_base.html:207
+#: rhodecode/templates/index_base.html:291
 #: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/admin/users/user_edit_my_account.html:202
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:211
-#: rhodecode/templates/tags/tags.html:60
+#: rhodecode/templates/branches/branches.html:76
+#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr "点击以升序排列"
 
-#: rhodecode/templates/index_base.html:159
-#: rhodecode/templates/index_base.html:199
+#: rhodecode/templates/index_base.html:168
+#: rhodecode/templates/index_base.html:208
+#: rhodecode/templates/index_base.html:292
 #: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
+#: rhodecode/templates/admin/users/user_edit_my_account.html:203
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:212
-#: rhodecode/templates/tags/tags.html:61
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:194
+#: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr "点击以降序排列"
 
-#: rhodecode/templates/index_base.html:169
+#: rhodecode/templates/index_base.html:177
+#: rhodecode/templates/index_base.html:267
 msgid "Last Change"
 msgstr "最后修改"
 
-#: rhodecode/templates/index_base.html:200
+#: rhodecode/templates/index_base.html:209
+#: rhodecode/templates/index_base.html:293
 #: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
+#: rhodecode/templates/admin/users/user_edit_my_account.html:204
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:213
-#: rhodecode/templates/tags/tags.html:62
+#: rhodecode/templates/branches/branches.html:78
+#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr "没有找到记录"
 
-#: rhodecode/templates/index_base.html:201
+#: rhodecode/templates/index_base.html:210
+#: rhodecode/templates/index_base.html:294
 #: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/admin/users/user_edit_my_account.html:205
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:214
-#: rhodecode/templates/tags/tags.html:63
+#: rhodecode/templates/branches/branches.html:79
+#: rhodecode/templates/journal/journal.html:196
+#: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr "数据错误"
 
-#: rhodecode/templates/index_base.html:202
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:295
 #: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:207
+#: rhodecode/templates/admin/users/user_edit_my_account.html:206
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:81
-#: rhodecode/templates/journal/journal.html:215
-#: rhodecode/templates/tags/tags.html:64
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:54
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "载入中..."
 
@@ -1463,7 +1493,7 @@ msgstr "登录到"
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:122
+#: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr "帐号"
 
@@ -1520,23 +1550,23 @@ msgstr "确认密码"
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:86
+#: rhodecode/templates/admin/users/user_edit.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 msgid "First Name"
 msgstr "名"
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:95
+#: rhodecode/templates/admin/users/user_edit.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
 msgid "Last Name"
 msgstr "姓"
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:104
+#: rhodecode/templates/admin/users/user_edit.html:108
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr "电子邮件"
 
@@ -1576,7 +1606,7 @@ msgid "tags"
 msgstr "标签"
 
 #: rhodecode/templates/switch_to_list.html:22
-#: rhodecode/templates/tags/tags_data.html:33
+#: rhodecode/templates/tags/tags_data.html:38
 msgid "There are no tags yet"
 msgstr "没有任何标签"
 
@@ -1599,8 +1629,8 @@ msgstr "系统日志"
 #: rhodecode/templates/admin/repos/repos.html:74
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal.html:61
-#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal_page_repos.html:9
+#: rhodecode/templates/journal/journal_page_repos.html:10
 msgid "Action"
 msgstr "操作"
 
@@ -1611,8 +1641,9 @@ msgstr "版本库"
 #: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:52
-#: rhodecode/templates/tags/tags.html:37
+#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr "日期"
@@ -1621,7 +1652,7 @@ msgstr "日期"
 msgid "From IP"
 msgstr "来源IP"
 
-#: rhodecode/templates/admin/admin_log.html:53
+#: rhodecode/templates/admin/admin_log.html:57
 msgid "No actions yet"
 msgstr "无操作"
 
@@ -1701,8 +1732,8 @@ msgstr "电子邮件属性"
 #: rhodecode/templates/admin/repos/repo_edit.html:141
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:129
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:133
+#: rhodecode/templates/admin/users/user_edit.html:178
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:93
@@ -1723,8 +1754,8 @@ msgid "Comments"
 msgstr "评论"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:263
-#: rhodecode/templates/base/base.html:265
+#: rhodecode/templates/base/base.html:266
+#: rhodecode/templates/base/base.html:268
 msgid "Pull requests"
 msgstr "拉取请求"
 
@@ -1752,7 +1783,7 @@ msgstr "权限管理"
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:139
+#: rhodecode/templates/admin/users/user_edit.html:143
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
@@ -1795,7 +1826,7 @@ msgid "Repository forking"
 msgstr "版本库复刻"
 
 #: rhodecode/templates/admin/permissions/permissions.html:78
-#: rhodecode/templates/admin/repos/repo_edit.html:255
+#: rhodecode/templates/admin/repos/repo_edit.html:264
 msgid "set"
 msgstr "设置"
 
@@ -1815,8 +1846,8 @@ msgid "add new"
 msgstr "新建"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:95
-#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:104
+#: rhodecode/templates/summary/summary.html:105
 msgid "Clone from"
 msgstr "克隆自"
 
@@ -1893,12 +1924,14 @@ msgstr "编辑版本库"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:224
-#: rhodecode/templates/admin/users/user_edit.html:226
+#: rhodecode/templates/admin/users/user_edit.html:228
+#: rhodecode/templates/admin/users/user_edit.html:230
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/files/files_source.html:44
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/files/files_source.html:29
+#: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "edit"
 msgstr "编辑"
 
@@ -1944,16 +1977,16 @@ msgstr "修改这个版本库的所有者"
 #: rhodecode/templates/admin/repos/repo_edit.html:142
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 #: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:168
-#: rhodecode/templates/admin/settings/settings.html:258
-#: rhodecode/templates/admin/users/user_edit.html:130
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:278
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:134
+#: rhodecode/templates/admin/users/user_edit.html:179
+#: rhodecode/templates/admin/users/user_edit.html:282
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:122
+#: rhodecode/templates/pullrequests/pullrequest.html:124
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Reset"
 msgstr "重置"
@@ -2014,81 +2047,97 @@ msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:198
 msgid "List of cached values"
-msgstr "缓存数据列表"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:209
-#: rhodecode/templates/base/base.html:327
-#: rhodecode/templates/base/base.html:329
-#: rhodecode/templates/base/base.html:331
+msgstr "缓存值列表"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:201
+msgid "Prefix"
+msgstr "前缀"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:202
+#| msgid "API key"
+msgid "Key"
+msgstr "键"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:203
+#: rhodecode/templates/admin/users/user_add.html:86
+#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
+msgid "Active"
+msgstr "启用"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/base/base.html:330
+#: rhodecode/templates/base/base.html:332
+#: rhodecode/templates/base/base.html:334
 msgid "Public journal"
 msgstr "公共日志"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:215
+#: rhodecode/templates/admin/repos/repo_edit.html:224
 msgid "Remove from public journal"
 msgstr "从公共日志删除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:217
+#: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Add to public journal"
 msgstr "添加到公共日志"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
+#: rhodecode/templates/admin/repos/repo_edit.html:231
 msgid ""
 "All actions made on this repository will be accessible to everyone in public "
 "journal"
 msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:229
+#: rhodecode/templates/admin/repos/repo_edit.html:238
 msgid "Locking"
 msgstr "锁定"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:234
+#: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Unlock locked repo"
 msgstr "解锁版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:234
+#: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Confirm to unlock repository"
 msgstr "确认解锁版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:237
+#: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "lock repo"
 msgstr "锁定版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:237
+#: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "Confirm to lock repository"
 msgstr "确认锁定版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:238
+#: rhodecode/templates/admin/repos/repo_edit.html:247
 msgid "Repository is not locked"
 msgstr "版本库未锁定"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:252
 msgid ""
 "Force locking on repository. Works only when anonymous access is disabled"
 msgstr "强制锁定版本库。只有在禁止匿名访问时候才有效"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:250
+#: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid "Set as fork of"
 msgstr "设置复刻自"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:259
+#: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Manually set this repository as a fork of another from the list"
 msgstr "从列表中手动设置这个版本库复刻自另一版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:265
+#: rhodecode/templates/admin/repos/repo_edit.html:274
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr "删除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:269
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "Remove this repository"
 msgstr "删除版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:269
-#: rhodecode/templates/journal/journal.html:84
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "Confirm to delete this repository"
 msgstr "确认删除版本库"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:273
+#: rhodecode/templates/admin/repos/repo_edit.html:282
 msgid ""
 "This repository will be renamed in a special way in order to be unaccesible "
 "for RhodeCode and VCS systems.\n"
@@ -2116,7 +2165,7 @@ msgstr "写"
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:226
+#: rhodecode/templates/base/base.html:229
 msgid "admin"
 msgstr "管理"
 
@@ -2127,8 +2176,8 @@ msgstr "成员"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:132
-#: rhodecode/templates/summary/summary.html:76
+#: rhodecode/templates/journal/journal.html:87
+#: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr "私有版本库"
 
@@ -2172,13 +2221,13 @@ msgstr "应用到成员"
 msgid ""
 "Set or revoke permission to all children of that group, including "
 "repositories and other groups"
-msgstr "授予或者撤销权限所有组成员，包括子组和子版本库"
+msgstr "设置或者撤销该组所有成员的权限，包括版本库和其他组"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:9
 #: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:309
-#: rhodecode/templates/base/base.html:311
-#: rhodecode/templates/base/base.html:313
+#: rhodecode/templates/base/base.html:312
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:316
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2228,7 +2277,7 @@ msgstr "上级组"
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:117
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
 msgid "save"
 msgstr "保存"
 
@@ -2264,20 +2313,22 @@ msgstr "顶层版本库数量"
 msgid "action"
 msgstr "操作"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/users/user_edit.html:255
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:259
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:121
 msgid "delete"
 msgstr "删除"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
 #, python-format
-msgid "Confirm to delete this group: %s"
-msgstr "确认删除该版本库组：%s"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
+#| msgid "Confirm to delete this repository"
+msgid "Confirm to delete this group: %s with %s repository"
+msgid_plural "Confirm to delete this group: %s with %s repositories"
+msgstr[0] "确认删除这个版本库组：%s包含%s个版本库"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63
 msgid "There are no repositories groups yet"
 msgstr "没有版本库组"
 
@@ -2372,8 +2423,8 @@ msgid "GA code"
 msgstr "GA code"
 
 #: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:167
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/settings/settings.html:268
 msgid "Save settings"
 msgstr "保存设置"
 
@@ -2381,39 +2432,48 @@ msgstr "保存设置"
 msgid "Visualisation settings"
 msgstr "可视化设置"
 
-#: rhodecode/templates/admin/settings/settings.html:128
+#: rhodecode/templates/admin/settings/settings.html:127
+#| msgid "enable"
+msgid "General"
+msgstr "通用"
+
+#: rhodecode/templates/admin/settings/settings.html:132
+msgid "Use lightweight dashboard"
+msgstr "使用轻量的控制面板"
+
+#: rhodecode/templates/admin/settings/settings.html:139
 msgid "Icons"
 msgstr "图标"
 
-#: rhodecode/templates/admin/settings/settings.html:133
+#: rhodecode/templates/admin/settings/settings.html:144
 msgid "Show public repo icon on repositories"
 msgstr "显示公共版本库图标"
 
-#: rhodecode/templates/admin/settings/settings.html:137
+#: rhodecode/templates/admin/settings/settings.html:148
 msgid "Show private repo icon on repositories"
 msgstr "显示私有版本库图标"
 
-#: rhodecode/templates/admin/settings/settings.html:144
+#: rhodecode/templates/admin/settings/settings.html:155
 msgid "Meta-Tagging"
 msgstr "元标记"
 
-#: rhodecode/templates/admin/settings/settings.html:149
+#: rhodecode/templates/admin/settings/settings.html:160
 msgid "Stylify recognised metatags:"
 msgstr "样式化识别的元标记"
 
-#: rhodecode/templates/admin/settings/settings.html:176
+#: rhodecode/templates/admin/settings/settings.html:187
 msgid "VCS settings"
 msgstr "版本控制系统设置"
 
-#: rhodecode/templates/admin/settings/settings.html:185
+#: rhodecode/templates/admin/settings/settings.html:196
 msgid "Web"
 msgstr "网络"
 
-#: rhodecode/templates/admin/settings/settings.html:190
+#: rhodecode/templates/admin/settings/settings.html:201
 msgid "require ssl for vcs operations"
 msgstr "要求使用SSL进行版本控制系统操作"
 
-#: rhodecode/templates/admin/settings/settings.html:192
+#: rhodecode/templates/admin/settings/settings.html:203
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will "
 "return HTTP Error 406: Not Acceptable"
@@ -2421,87 +2481,87 @@ msgstr ""
 "勾选后RhodeCode将要求使用SSL进行推送和拉取。如果没有使用SSL将返回HTTP 406错"
 "误：Not Acceptable"
 
-#: rhodecode/templates/admin/settings/settings.html:198
+#: rhodecode/templates/admin/settings/settings.html:209
 msgid "Hooks"
 msgstr "钩子"
 
-#: rhodecode/templates/admin/settings/settings.html:203
+#: rhodecode/templates/admin/settings/settings.html:214
 msgid "Update repository after push (hg update)"
 msgstr "推送后更新版本库（hg update）"
 
-#: rhodecode/templates/admin/settings/settings.html:207
+#: rhodecode/templates/admin/settings/settings.html:218
 msgid "Show repository size after push"
 msgstr "推送后显示版本库大小"
 
-#: rhodecode/templates/admin/settings/settings.html:211
+#: rhodecode/templates/admin/settings/settings.html:222
 msgid "Log user push commands"
 msgstr "记录用户推送命令"
 
-#: rhodecode/templates/admin/settings/settings.html:215
+#: rhodecode/templates/admin/settings/settings.html:226
 msgid "Log user pull commands"
 msgstr "记录用户拉取命令"
 
-#: rhodecode/templates/admin/settings/settings.html:219
+#: rhodecode/templates/admin/settings/settings.html:230
 msgid "advanced setup"
 msgstr "高级设置"
 
-#: rhodecode/templates/admin/settings/settings.html:224
+#: rhodecode/templates/admin/settings/settings.html:235
 msgid "Mercurial Extensions"
 msgstr "Mercurial扩展"
 
-#: rhodecode/templates/admin/settings/settings.html:229
+#: rhodecode/templates/admin/settings/settings.html:240
 msgid "largefiles extensions"
 msgstr "大文件扩展"
 
-#: rhodecode/templates/admin/settings/settings.html:233
+#: rhodecode/templates/admin/settings/settings.html:244
 msgid "hgsubversion extensions"
 msgstr "hgsubversion扩展"
 
-#: rhodecode/templates/admin/settings/settings.html:235
+#: rhodecode/templates/admin/settings/settings.html:246
 msgid ""
 "Requires hgsubversion library installed. Allows clonning from svn remote "
 "locations"
 msgstr " 允许从远程svn地址克隆。需要安装hgsubversion库"
 
-#: rhodecode/templates/admin/settings/settings.html:245
+#: rhodecode/templates/admin/settings/settings.html:256
 msgid "Repositories location"
 msgstr "版本库路径"
 
-#: rhodecode/templates/admin/settings/settings.html:250
+#: rhodecode/templates/admin/settings/settings.html:261
 msgid ""
 "This a crucial application setting. If you are really sure you need to "
 "change this, you must restart application in order to make this setting take "
 "effect. Click this label to unlock."
 msgstr "这是一个关键设置。如果确认修改该项设置，请重启服务以便设置生效。"
 
-#: rhodecode/templates/admin/settings/settings.html:251
-#: rhodecode/templates/base/base.html:218
+#: rhodecode/templates/admin/settings/settings.html:262
+#: rhodecode/templates/base/base.html:221
 msgid "unlock"
 msgstr "解锁"
 
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings.html:263
 msgid ""
 "Location where repositories are stored. After changing this value a restart, "
 "and rescan is required"
 msgstr "版本库存储路径。 修改后需要重启和重新扫描"
 
-#: rhodecode/templates/admin/settings/settings.html:272
+#: rhodecode/templates/admin/settings/settings.html:283
 msgid "Test Email"
 msgstr "测试邮件"
 
-#: rhodecode/templates/admin/settings/settings.html:280
+#: rhodecode/templates/admin/settings/settings.html:291
 msgid "Email to"
 msgstr "发送到"
 
-#: rhodecode/templates/admin/settings/settings.html:288
+#: rhodecode/templates/admin/settings/settings.html:299
 msgid "Send"
 msgstr "发送"
 
-#: rhodecode/templates/admin/settings/settings.html:294
+#: rhodecode/templates/admin/settings/settings.html:305
 msgid "System Info and Packages"
 msgstr "系统和软件包信息"
 
-#: rhodecode/templates/admin/settings/settings.html:297
+#: rhodecode/templates/admin/settings/settings.html:308
 msgid "show"
 msgstr "显示"
 
@@ -2522,13 +2582,6 @@ msgstr "添加新用户"
 msgid "Password confirmation"
 msgstr "确认密码"
 
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:113
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-msgid "Active"
-msgstr "启用"
-
 #: rhodecode/templates/admin/users/user_edit.html:5
 msgid "Edit user"
 msgstr "编辑用户"
@@ -2548,26 +2601,26 @@ msgstr "使用中"
 msgid "API key"
 msgstr "API密钥"
 
-#: rhodecode/templates/admin/users/user_edit.html:59
+#: rhodecode/templates/admin/users/user_edit.html:63
 msgid "LDAP DN"
 msgstr "LDAP DN"
 
-#: rhodecode/templates/admin/users/user_edit.html:68
+#: rhodecode/templates/admin/users/user_edit.html:72
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
 msgid "New password"
 msgstr "新密码"
 
-#: rhodecode/templates/admin/users/user_edit.html:77
+#: rhodecode/templates/admin/users/user_edit.html:81
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
 msgid "New password confirmation"
 msgstr "确认新密码"
 
-#: rhodecode/templates/admin/users/user_edit.html:147
+#: rhodecode/templates/admin/users/user_edit.html:151
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr "继承默认权限"
 
-#: rhodecode/templates/admin/users/user_edit.html:152
+#: rhodecode/templates/admin/users/user_edit.html:156
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2575,46 +2628,48 @@ msgid ""
 "options does not have any action"
 msgstr "勾选以从%s继承权限设置。 勾选后下面的选项将不起作用"
 
-#: rhodecode/templates/admin/users/user_edit.html:158
+#: rhodecode/templates/admin/users/user_edit.html:162
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "创建版本库"
 
-#: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr "复刻版本库"
 
-#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit.html:190
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
 msgid "Nothing here yet"
 msgstr "无条目"
 
-#: rhodecode/templates/admin/users/user_edit.html:193
+#: rhodecode/templates/admin/users/user_edit.html:197
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:218
+#: rhodecode/templates/admin/users/user_edit_my_account.html:217
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
 msgid "Permission"
 msgstr "权限"
 
-#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit.html:198
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
 msgid "Edit Permission"
 msgstr "编辑权限"
 
-#: rhodecode/templates/admin/users/user_edit.html:243
+#: rhodecode/templates/admin/users/user_edit.html:247
 msgid "Email addresses"
 msgstr "邮件地址"
 
-#: rhodecode/templates/admin/users/user_edit.html:256
+#: rhodecode/templates/admin/users/user_edit.html:260
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "确认删除邮箱：%s"
 
-#: rhodecode/templates/admin/users/user_edit.html:270
+#: rhodecode/templates/admin/users/user_edit.html:274
 msgid "New email address"
 msgstr "增加邮箱"
 
-#: rhodecode/templates/admin/users/user_edit.html:277
+#: rhodecode/templates/admin/users/user_edit.html:281
 msgid "Add"
 msgstr "增加"
 
@@ -2670,31 +2725,33 @@ msgstr "拉取请求#%s由%s创建于%s"
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:55
-#: rhodecode/templates/journal/journal.html:60
-#: rhodecode/templates/tags/tags.html:40
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/journal/journal_page_repos.html:8
+#: rhodecode/templates/tags/tags.html:55
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "修订"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "private"
 msgstr "私有"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:7
+#: rhodecode/templates/journal/journal_page_repos.html:32
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "确认删除版本库：%s"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal.html:94
+#: rhodecode/templates/journal/journal_page_repos.html:42
 msgid "No repositories yet"
 msgstr "没有任何版本库"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal.html:96
+#: rhodecode/templates/journal/journal_page_repos.html:44
 msgid "create one now"
 msgstr "创建一个"
 
@@ -2703,7 +2760,7 @@ msgid "Users administration"
 msgstr "用户管理员"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:235
 msgid "users"
 msgstr "用户"
 
@@ -2733,7 +2790,7 @@ msgid "active"
 msgstr "启用"
 
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:235
+#: rhodecode/templates/base/base.html:238
 msgid "ldap"
 msgstr "LDAP"
 
@@ -2782,6 +2839,21 @@ msgstr "添加全部项目"
 msgid "Group members"
 msgstr "拥护者成员"
 
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:163
+#| msgid "members"
+msgid "No members yet"
+msgstr "还没有成员"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:171
+#| msgid "Permissions administration"
+msgid "Permissions defined for this group"
+msgstr "这个组的权限"
+
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:178
+#| msgid "Copy permissions"
+msgid "No permissions set yet"
+msgstr "还未设置权限"
+
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
 msgid "Users groups administration"
 msgstr "用户组管理"
@@ -2825,9 +2897,9 @@ msgid "Inbox"
 msgstr "收件箱"
 
 #: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:320
-#: rhodecode/templates/base/base.html:322
+#: rhodecode/templates/base/base.html:321
+#: rhodecode/templates/base/base.html:323
+#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
@@ -2848,6 +2920,7 @@ msgstr "产品"
 
 #: rhodecode/templates/base/base.html:152
 #: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/root.html:47
 msgid "loading..."
 msgstr "载入中..."
 
@@ -2892,8 +2965,9 @@ msgstr "选项"
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
+#| msgid "Repository creation"
 msgid "repository settings"
-msgstr "版本库设置"
+msgstr "版本库选项"
 
 #: rhodecode/templates/base/base.html:210
 #: rhodecode/templates/data_table/_dt_elements.html:80
@@ -2902,47 +2976,54 @@ msgid "fork"
 msgstr "复刻"
 
 #: rhodecode/templates/base/base.html:212
-#: rhodecode/templates/changelog/changelog.html:41
+#: rhodecode/templates/base/root.html:50
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Open new pull request"
 msgstr "新建拉取请求"
 
-#: rhodecode/templates/base/base.html:214
+#: rhodecode/templates/base/base.html:215
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "比较复刻"
+
+#: rhodecode/templates/base/base.html:217
 msgid "search"
 msgstr "搜索"
 
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/templates/base/base.html:223
+#| msgid "unlock"
 msgid "lock"
 msgstr "锁定"
 
-#: rhodecode/templates/base/base.html:231
-msgid "repositories groups"
-msgstr "版本库组"
-
-#: rhodecode/templates/base/base.html:233
-msgid "users groups"
-msgstr "用户组"
-
 #: rhodecode/templates/base/base.html:234
+msgid "repositories groups"
+msgstr "版本库组"
+
+#: rhodecode/templates/base/base.html:236
+msgid "users groups"
+msgstr "用户组"
+
+#: rhodecode/templates/base/base.html:237
 msgid "permissions"
 msgstr "权限"
 
-#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:239
 msgid "settings"
 msgstr "设置"
 
-#: rhodecode/templates/base/base.html:247
-#: rhodecode/templates/base/base.html:249
+#: rhodecode/templates/base/base.html:250
+#: rhodecode/templates/base/base.html:252
 msgid "Followers"
 msgstr "关注者"
 
-#: rhodecode/templates/base/base.html:255
-#: rhodecode/templates/base/base.html:257
+#: rhodecode/templates/base/base.html:258
+#: rhodecode/templates/base/base.html:260
 msgid "Forks"
 msgstr "复刻"
 
-#: rhodecode/templates/base/base.html:336
-#: rhodecode/templates/base/base.html:338
-#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:341
+#: rhodecode/templates/base/base.html:343
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "搜索"
@@ -2952,7 +3033,7 @@ msgid "add another comment"
 msgstr "添加新的评论"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:120
+#: rhodecode/templates/journal/journal.html:75
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "停止关注该版本库"
@@ -2966,14 +3047,27 @@ msgstr "开始关注该版本库"
 msgid "Group"
 msgstr "组"
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:48
 msgid "search truncated"
 msgstr "搜索被截断"
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:49
 msgid "no matching files"
 msgstr "没有符合的文件"
 
+#: rhodecode/templates/base/root.html:51
+#| msgid "opened new pull request"
+msgid "Open new pull request for selected changesets"
+msgstr "为选择的变更集创建新的拉取请求"
+
+#: rhodecode/templates/base/root.html:52
+msgid "Show selected changes __S -> __E"
+msgstr "显示选定的修订集：__S -> __E"
+
+#: rhodecode/templates/base/root.html:53
+msgid "Selection link"
+msgstr "选择链接"
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
@@ -2981,8 +3075,9 @@ msgstr "%s书签"
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/tags/tags.html:39
+#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr "作者"
@@ -2996,34 +3091,15 @@ msgstr "%s分支"
 msgid "Compare branches"
 msgstr "比较分支"
 
-#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches.html:56
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/compare/compare_diff.html:5
 #: rhodecode/templates/compare/compare_diff.html:13
+#: rhodecode/templates/tags/tags.html:57
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Compare"
 msgstr "比较显示"
 
-#: rhodecode/templates/branches/branches_data.html:6
-msgid "name"
-msgstr "名称"
-
-#: rhodecode/templates/branches/branches_data.html:7
-msgid "date"
-msgstr "日期"
-
-#: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/shortlog/shortlog_data.html:8
-msgid "author"
-msgstr "作者"
-
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "revision"
-msgstr "修订"
-
-#: rhodecode/templates/branches/branches_data.html:10
-msgid "compare"
-msgstr "比较显示"
-
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
@@ -3035,60 +3111,66 @@ msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] "显示%d/%d个版本"
 
-#: rhodecode/templates/changelog/changelog.html:38
+#: rhodecode/templates/changelog/changelog.html:37
+#| msgid "Search settings"
+msgid "Clear selection"
+msgstr "清除选择"
+
+#: rhodecode/templates/changelog/changelog.html:40
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "compare fork with %s"
 msgstr "比较复刻和%s"
 
-#: rhodecode/templates/changelog/changelog.html:38
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr "比较复刻"
-
-#: rhodecode/templates/changelog/changelog.html:47
+#: rhodecode/templates/changelog/changelog.html:40
+#, python-format
+#| msgid "compare fork with %s"
+msgid "Compare fork with parent"
+msgstr "比较复刻和源版本库"
+
+#: rhodecode/templates/changelog/changelog.html:49
 msgid "Show"
 msgstr "显示"
 
-#: rhodecode/templates/changelog/changelog.html:72
-#: rhodecode/templates/summary/summary.html:364
+#: rhodecode/templates/changelog/changelog.html:74
+#: rhodecode/templates/summary/summary.html:375
 msgid "show more"
 msgstr "显示更多"
 
-#: rhodecode/templates/changelog/changelog.html:76
+#: rhodecode/templates/changelog/changelog.html:78
 msgid "Affected number of files, click to show more details"
 msgstr "影响的文件数，点击显示详细信息"
 
-#: rhodecode/templates/changelog/changelog.html:89
-#: rhodecode/templates/changeset/changeset.html:38
+#: rhodecode/templates/changelog/changelog.html:91
+#: rhodecode/templates/changeset/changeset.html:44
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 msgid "Changeset status"
 msgstr "修订集状态"
 
-#: rhodecode/templates/changelog/changelog.html:92
+#: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
 msgid "Click to open associated pull request"
 msgstr "点击建立相关的拉取请求"
 
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changelog/changelog.html:104
+#: rhodecode/templates/changeset/changeset.html:85
 msgid "Parent"
 msgstr "父版本"
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changeset/changeset.html:84
+#: rhodecode/templates/changelog/changelog.html:110
+#: rhodecode/templates/changeset/changeset.html:91
 msgid "No parents"
 msgstr "无父版本"
 
-#: rhodecode/templates/changelog/changelog.html:113
-#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changeset/changeset.html:95
 #: rhodecode/templates/changeset/changeset_range.html:79
 msgid "merge"
 msgstr "合并"
 
-#: rhodecode/templates/changelog/changelog.html:116
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changelog/changelog.html:118
+#: rhodecode/templates/changeset/changeset.html:98
 #: rhodecode/templates/changeset/changeset_range.html:82
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
@@ -3097,46 +3179,42 @@ msgstr "合并"
 msgid "branch"
 msgstr "分支"
 
-#: rhodecode/templates/changelog/changelog.html:122
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changeset/changeset_range.html:88
 msgid "bookmark"
 msgstr "书签"
 
-#: rhodecode/templates/changelog/changelog.html:128
-#: rhodecode/templates/changeset/changeset.html:96
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changeset/changeset.html:103
 #: rhodecode/templates/changeset/changeset_range.html:94
 msgid "tag"
 msgstr "标签"
 
-#: rhodecode/templates/changelog/changelog.html:164
-msgid "Show selected changes __S -> __E"
-msgstr "显示选定的修订集：__S -> __E"
-
-#: rhodecode/templates/changelog/changelog.html:256
+#: rhodecode/templates/changelog/changelog.html:301
 msgid "There are no changes yet"
 msgstr "没有任何变更"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:66
+#: rhodecode/templates/changeset/changeset.html:73
 msgid "removed"
 msgstr "移除"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset.html:74
 msgid "changed"
 msgstr "修改"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:68
+#: rhodecode/templates/changeset/changeset.html:75
 msgid "added"
 msgstr "添加"
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:70
-#: rhodecode/templates/changeset/changeset.html:71
-#: rhodecode/templates/changeset/changeset.html:72
+#: rhodecode/templates/changeset/changeset.html:77
+#: rhodecode/templates/changeset/changeset.html:78
+#: rhodecode/templates/changeset/changeset.html:79
 #, python-format
 msgid "affected %s files"
 msgstr "影响%s文件"
@@ -3150,34 +3228,52 @@ msgstr "%s修订集"
 msgid "Changeset"
 msgstr "修订集"
 
-#: rhodecode/templates/changeset/changeset.html:43
+#: rhodecode/templates/changeset/changeset.html:49
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr "原始diff"
 
-#: rhodecode/templates/changeset/changeset.html:44
+#: rhodecode/templates/changeset/changeset.html:50
+#| msgid "raw diff"
+msgid "patch diff"
+msgstr "原始diff"
+
+#: rhodecode/templates/changeset/changeset.html:51
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr "下载diff"
 
-#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset.html:55
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d条评论"
 
-#: rhodecode/templates/changeset/changeset.html:48
+#: rhodecode/templates/changeset/changeset.html:55
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(%d内嵌)"
 
-#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/compare/compare_diff.html:44
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
 #, python-format
-msgid "%s files affected with %s insertions and %s deletions:"
-msgstr "%s个文件受影响%s行插入和%s行删除："
+#| msgid "file changed"
+msgid "%s file changed"
+msgid_plural "%s files changed"
+msgstr[0] "修改%s个文件"
+
+#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/compare/compare_diff.html:46
+#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#, python-format
+#| msgid "%s files affected with %s insertions and %s deletions:"
+msgid "%s file changed with %s insertions and %s deletions"
+msgid_plural "%s files changed with %s insertions and %s deletions"
+msgstr[0] "修改%s个文件包括%s行插入和%s行删除"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
@@ -3243,15 +3339,18 @@ msgstr "%s修订集"
 msgid "Compare View"
 msgstr "比较显示"
 
+#: rhodecode/templates/changeset/changeset_range.html:29
+#| msgid "show inline comments"
+msgid "Show combined compare"
+msgstr "显示紧凑比较"
+
 #: rhodecode/templates/changeset/changeset_range.html:54
-#: rhodecode/templates/compare/compare_diff.html:41
-#: rhodecode/templates/pullrequests/pullrequest_show.html:73
 msgid "Files affected"
 msgstr "影响文件"
 
 #: rhodecode/templates/changeset/diff_block.html:19
-msgid "diff"
-msgstr "差别"
+msgid "show full diff for this file"
+msgstr "显示文件的完整差异"
 
 #: rhodecode/templates/changeset/diff_block.html:27
 msgid "show inline comments"
@@ -3262,8 +3361,18 @@ msgid "No changesets"
 msgstr "无修订"
 
 #: rhodecode/templates/compare/compare_diff.html:37
-msgid "Outgoing changesets"
-msgstr "传出修订集"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#, python-format
+#| msgid "show inline comments"
+msgid "Showing %s commit"
+msgid_plural "Showing %s commits"
+msgstr[0] "显示%s个提交"
+
+#: rhodecode/templates/compare/compare_diff.html:52
+#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#| msgid "files"
+msgid "No files"
+msgstr "无文件"
 
 #: rhodecode/templates/data_table/_dt_elements.html:39
 #: rhodecode/templates/data_table/_dt_elements.html:41
@@ -3272,41 +3381,54 @@ msgid "Fork"
 msgstr "复刻"
 
 #: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:126
-#: rhodecode/templates/summary/summary.html:68
+#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr "Mercurial版本库"
 
 #: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:128
-#: rhodecode/templates/summary/summary.html:71
+#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr "Git版本库"
 
 #: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:134
-#: rhodecode/templates/summary/summary.html:78
+#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "公共版本库"
 
 #: rhodecode/templates/data_table/_dt_elements.html:80
-#: rhodecode/templates/summary/summary.html:87
-#: rhodecode/templates/summary/summary.html:88
+#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr "复刻自"
 
-#: rhodecode/templates/data_table/_dt_elements.html:92
+#: rhodecode/templates/data_table/_dt_elements.html:94
 msgid "No changesets yet"
 msgstr "无修订"
 
-#: rhodecode/templates/data_table/_dt_elements.html:104
+#: rhodecode/templates/data_table/_dt_elements.html:101
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#, python-format
+msgid "Subscribe to %s rss feed"
+msgstr "订阅%s的RSS"
+
+#: rhodecode/templates/data_table/_dt_elements.html:109
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#, python-format
+msgid "Subscribe to %s atom feed"
+msgstr "订阅%s的Atom"
+
+#: rhodecode/templates/data_table/_dt_elements.html:122
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "确认删除用户：%s"
 
 #: rhodecode/templates/email_templates/main.html:8
-msgid "This is an notification from RhodeCode."
-msgstr "这是RhodeCode发送的一个通知。"
+#| msgid "This is an notification from RhodeCode."
+msgid "This is a notification from RhodeCode."
+msgstr "这是一个RhodeCode通知。"
 
 #: rhodecode/templates/errors/error_document.html:46
 #, python-format
@@ -3323,21 +3445,16 @@ msgid "File diff"
 msgstr "文件差异"
 
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:72
+#: rhodecode/templates/files/files.html:74
 #, python-format
 msgid "%s files"
 msgstr "%s文件"
 
 #: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:340
+#: rhodecode/templates/summary/summary.html:351
 msgid "files"
 msgstr "文件"
 
-#: rhodecode/templates/files/files.html:92
-#: rhodecode/templates/files/files_source.html:124
-msgid "Selection link"
-msgstr "选择链接"
-
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
@@ -3445,18 +3562,18 @@ msgid "edit file"
 msgstr "编辑文件"
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:38
+#: rhodecode/templates/files/files_source.html:23
 msgid "show annotation"
 msgstr "显示注释"
 
 #: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:40
-#: rhodecode/templates/files/files_source.html:68
+#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:53
 msgid "show as raw"
 msgstr "显示原始文件"
 
 #: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:26
 msgid "download as raw"
 msgstr "下载原始文件"
 
@@ -3468,34 +3585,39 @@ msgstr "显示源文件"
 msgid "Editing file"
 msgstr "编辑文件"
 
-#: rhodecode/templates/files/files_source.html:2
+#: rhodecode/templates/files/files_history_box.html:2
 msgid "History"
 msgstr "历史"
 
-#: rhodecode/templates/files/files_source.html:9
+#: rhodecode/templates/files/files_history_box.html:9
 msgid "diff to revision"
 msgstr "比较差异"
 
-#: rhodecode/templates/files/files_source.html:10
+#: rhodecode/templates/files/files_history_box.html:10
 msgid "show at revision"
 msgstr "显示修订"
 
-#: rhodecode/templates/files/files_source.html:14
+#: rhodecode/templates/files/files_history_box.html:15
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s个作者"
 
-#: rhodecode/templates/files/files_source.html:36
+#: rhodecode/templates/files/files_source.html:6
+#| msgid "Loading file list..."
+msgid "Load file history"
+msgstr "加载文件历史记录..."
+
+#: rhodecode/templates/files/files_source.html:21
 msgid "show source"
 msgstr "显示代码"
 
-#: rhodecode/templates/files/files_source.html:59
+#: rhodecode/templates/files/files_source.html:44
 #, python-format
 msgid "Binary file (%s)"
 msgstr "二进制文件（%s）"
 
-#: rhodecode/templates/files/files_source.html:68
+#: rhodecode/templates/files/files_source.html:53
 msgid "File is too big to display"
 msgstr "文件过大，不能显示"
 
@@ -3570,7 +3692,7 @@ msgstr "复刻"
 msgid "forked"
 msgstr "已有复刻"
 
-#: rhodecode/templates/forks/forks_data.html:38
+#: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "无复刻"
 
@@ -3583,7 +3705,7 @@ msgid "RSS journal feed"
 msgstr "订阅日志RSS"
 
 #: rhodecode/templates/journal/journal.html:24
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr "刷新"
 
@@ -3605,19 +3727,19 @@ msgstr "关注的"
 msgid "ADD"
 msgstr "新建版本库"
 
-#: rhodecode/templates/journal/journal.html:114
+#: rhodecode/templates/journal/journal.html:69
 msgid "following user"
 msgstr "关注用户"
 
-#: rhodecode/templates/journal/journal.html:114
+#: rhodecode/templates/journal/journal.html:69
 msgid "user"
 msgstr "用户"
 
-#: rhodecode/templates/journal/journal.html:147
+#: rhodecode/templates/journal/journal.html:102
 msgid "You are not following any users or repositories"
 msgstr "未关注任何用户或版本库"
 
-#: rhodecode/templates/journal/journal_data.html:47
+#: rhodecode/templates/journal/journal_data.html:51
 msgid "No entries yet"
 msgstr "没有条目"
 
@@ -3638,44 +3760,44 @@ msgstr "公共日志"
 msgid "New pull request"
 msgstr "新建拉取请求"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:52
+#: rhodecode/templates/pullrequests/pullrequest.html:54
 msgid "refresh overview"
 msgstr "刷新概览"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:64
+#: rhodecode/templates/pullrequests/pullrequest.html:66
 msgid "Detailed compare view"
 msgstr "详细比较显示"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:68
-#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/pullrequests/pullrequest.html:70
+#: rhodecode/templates/pullrequests/pullrequest_show.html:100
 msgid "Pull request reviewers"
 msgstr "拉取请求检视人员"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:77
-#: rhodecode/templates/pullrequests/pullrequest_show.html:98
+#: rhodecode/templates/pullrequests/pullrequest.html:79
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
 msgid "owner"
 msgstr "所有者"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:89
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:127
 msgid "Add reviewer to this pull request."
 msgstr "为这个拉取请求增加检视人员"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:95
+#: rhodecode/templates/pullrequests/pullrequest.html:97
 msgid "Create new pull request"
 msgstr "创建新的拉取请求"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:104
+#: rhodecode/templates/pullrequests/pullrequest.html:106
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr "标题"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:113
+#: rhodecode/templates/pullrequests/pullrequest.html:115
 msgid "description"
 msgstr "描述"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:121
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Send pull request"
 msgstr "发送拉取请求"
 
@@ -3708,8 +3830,9 @@ msgid_plural "%d reviewers"
 msgstr[0] "%d个检视者"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:50
+#| msgid "Pull request reviewers"
 msgid "pull request was reviewed by all reviewers"
-msgstr "拉取请求已经被所有检视人员检视"
+msgstr "拉取请求已经由所有检视人员检视"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:58
 msgid "Created on"
@@ -3719,10 +3842,6 @@ msgstr "创建于"
 msgid "Compare view"
 msgstr "比较显示"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
-msgid "Incoming changesets"
-msgstr "传入修订集"
-
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 msgid "all pull requests"
 msgstr "所有拉取请求"
@@ -3796,10 +3915,18 @@ msgstr "%s简短日志"
 msgid "shortlog"
 msgstr "简短日志"
 
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+msgid "revision"
+msgstr "修订"
+
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr "时间"
 
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+msgid "author"
+msgstr "作者"
+
 #: rhodecode/templates/shortlog/shortlog_data.html:33
 msgid "No commit message"
 msgstr "没有提交信息"
@@ -3840,128 +3967,139 @@ msgstr "订阅RSS %s"
 msgid "ATOM"
 msgstr "ATOM"
 
-#: rhodecode/templates/summary/summary.html:82
+#: rhodecode/templates/summary/summary.html:70
+#, python-format
+#| msgid "Repository is not locked"
+msgid "Repository locked by %s"
+msgstr "版本库由%s锁定"
+
+#: rhodecode/templates/summary/summary.html:72
+#| msgid "Repository is not locked"
+msgid "Repository unlocked"
+msgstr "版本库未锁定"
+
+#: rhodecode/templates/summary/summary.html:91
 #, python-format
 msgid "Non changable ID %s"
 msgstr "不可变ID %s"
 
-#: rhodecode/templates/summary/summary.html:87
+#: rhodecode/templates/summary/summary.html:96
 msgid "public"
 msgstr "公共"
 
-#: rhodecode/templates/summary/summary.html:95
+#: rhodecode/templates/summary/summary.html:104
 msgid "remote clone"
 msgstr "远程克隆"
 
-#: rhodecode/templates/summary/summary.html:116
+#: rhodecode/templates/summary/summary.html:125
 msgid "Contact"
 msgstr "联系方式"
 
-#: rhodecode/templates/summary/summary.html:130
+#: rhodecode/templates/summary/summary.html:139
 msgid "Clone url"
 msgstr "克隆地址"
 
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/summary/summary.html:142
 msgid "Show by Name"
 msgstr "以名字显示"
 
-#: rhodecode/templates/summary/summary.html:134
+#: rhodecode/templates/summary/summary.html:143
 msgid "Show by ID"
 msgstr "按ID显示"
 
-#: rhodecode/templates/summary/summary.html:142
+#: rhodecode/templates/summary/summary.html:151
 msgid "Trending files"
 msgstr "文件趋势图"
 
-#: rhodecode/templates/summary/summary.html:150
-#: rhodecode/templates/summary/summary.html:166
-#: rhodecode/templates/summary/summary.html:194
+#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:175
+#: rhodecode/templates/summary/summary.html:203
 msgid "enable"
 msgstr "启用"
 
-#: rhodecode/templates/summary/summary.html:158
+#: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr "下载"
 
-#: rhodecode/templates/summary/summary.html:162
+#: rhodecode/templates/summary/summary.html:171
 msgid "There are no downloads yet"
 msgstr "无下载"
 
-#: rhodecode/templates/summary/summary.html:164
+#: rhodecode/templates/summary/summary.html:173
 msgid "Downloads are disabled for this repository"
 msgstr "这个版本库的下载已经禁用"
 
-#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:179
 msgid "Download as zip"
 msgstr "zip打包下载"
 
-#: rhodecode/templates/summary/summary.html:173
+#: rhodecode/templates/summary/summary.html:182
 msgid "Check this to download archive with subrepos"
 msgstr "勾选以下载包含子版本库的压缩包"
 
-#: rhodecode/templates/summary/summary.html:173
+#: rhodecode/templates/summary/summary.html:182
 msgid "with subrepos"
 msgstr "包括子版本库"
 
-#: rhodecode/templates/summary/summary.html:186
+#: rhodecode/templates/summary/summary.html:195
 msgid "Commit activity by day / author"
 msgstr "按日期或作者的提交活动"
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:206
 msgid "Stats gathered: "
 msgstr "已收集的统计："
 
-#: rhodecode/templates/summary/summary.html:218
+#: rhodecode/templates/summary/summary.html:227
 msgid "Shortlog"
 msgstr "简短日志"
 
-#: rhodecode/templates/summary/summary.html:220
+#: rhodecode/templates/summary/summary.html:229
 msgid "Quick start"
 msgstr "快速入门"
 
-#: rhodecode/templates/summary/summary.html:233
+#: rhodecode/templates/summary/summary.html:243
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr "修订'%s'中的README"
 
-#: rhodecode/templates/summary/summary.html:236
+#: rhodecode/templates/summary/summary.html:246
 msgid "Permalink to this readme"
 msgstr "这个README的永久链接"
 
-#: rhodecode/templates/summary/summary.html:293
+#: rhodecode/templates/summary/summary.html:304
 #, python-format
 msgid "Download %s as %s"
 msgstr "下载%s为%s包"
 
-#: rhodecode/templates/summary/summary.html:650
+#: rhodecode/templates/summary/summary.html:661
 msgid "commits"
 msgstr "提交"
 
-#: rhodecode/templates/summary/summary.html:651
+#: rhodecode/templates/summary/summary.html:662
 msgid "files added"
 msgstr "文件已添加"
 
-#: rhodecode/templates/summary/summary.html:652
+#: rhodecode/templates/summary/summary.html:663
 msgid "files changed"
 msgstr "文件已更改"
 
-#: rhodecode/templates/summary/summary.html:653
+#: rhodecode/templates/summary/summary.html:664
 msgid "files removed"
 msgstr "文件已删除"
 
-#: rhodecode/templates/summary/summary.html:656
+#: rhodecode/templates/summary/summary.html:667
 msgid "commit"
 msgstr "提交"
 
-#: rhodecode/templates/summary/summary.html:657
+#: rhodecode/templates/summary/summary.html:668
 msgid "file added"
 msgstr "文件已添加"
 
-#: rhodecode/templates/summary/summary.html:658
+#: rhodecode/templates/summary/summary.html:669
 msgid "file changed"
 msgstr "文件已更改"
 
-#: rhodecode/templates/summary/summary.html:659
+#: rhodecode/templates/summary/summary.html:670
 msgid "file removed"
 msgstr "文件已删除"
 
@@ -3969,3 +4107,11 @@ msgstr "文件已删除"
 #, python-format
 msgid "%s Tags"
 msgstr "%s标签"
+
+#: rhodecode/templates/tags/tags.html:29
+#| msgid "compare"
+msgid "Compare tags"
+msgstr "比较标签"
+
+#~ msgid "Group Name"
+#~ msgstr "组名"