Index: messages.po
===================================================================
--- messages.po	(revision 9411)
+++ messages.po	(working copy)
@@ -10,29 +10,29 @@
 "Project-Id-Version: Trac 0.12\n"
 "Report-Msgid-Bugs-To: trac-dev@googlegroups.com\n"
 "POT-Creation-Date: 2010-03-17 08:34+0100\n"
-"PO-Revision-Date: 2010-03-18 22:20+0800\n"
-"Last-Translator: Jake Li <gnozil@gmail.com>\n"
+"PO-Revision-Date: 2010-04-01 15:26+0800\n"
+"Last-Translator: Zeng Jie <zengjie@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh_CN>\n"
+"Plural-Forms: nplurals=2; plural=0\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=0\n"
 "Generated-By: Babel 0.9.4\n"
 
 #: tracopt/mimeview/php.py:97
-msgid "You appear to be using the PHP CGI binary. Trac requires the CLI version for syntax highlighting."
+msgid ""
+"You appear to be using the PHP CGI binary. Trac requires the CLI version "
+"for syntax highlighting."
 msgstr "你使用的是PHP CGI的二进制版本，Trac需要使用CLI版本以提供语法高亮。"
 
-#: tracopt/ticket/deleter.py:69
-#: tracopt/ticket/deleter.py:82
+#: tracopt/ticket/deleter.py:69 tracopt/ticket/deleter.py:82
 #: tracopt/ticket/templates/ticket_delete.html:19
 #: trac/ticket/templates/report_list.html:37
 #: trac/wiki/templates/wiki_delete.html:22
 msgid "Delete"
 msgstr "删除"
 
-#: tracopt/ticket/deleter.py:70
-#: tracopt/ticket/templates/ticket_delete.html:39
+#: tracopt/ticket/deleter.py:70 tracopt/ticket/templates/ticket_delete.html:39
 msgid "Delete ticket"
 msgstr "删除任务单"
 
@@ -94,19 +94,17 @@
 
 #: tracopt/ticket/templates/ticket_delete.html:34
 #: tracopt/ticket/templates/ticket_delete.html:64
-#: trac/templates/attachment.html:70
-#: trac/wiki/templates/wiki_delete.html:32
+#: trac/templates/attachment.html:70 trac/wiki/templates/wiki_delete.html:32
 msgid "This is an irreversible operation."
 msgstr "该操作是不可逆的."
 
 #: tracopt/ticket/templates/ticket_delete.html:38
 #: tracopt/ticket/templates/ticket_delete.html:68
 #: trac/admin/templates/admin_components.html:55
-#: trac/admin/templates/admin_enums.html:23
+#: trac/admin/templates/admin_enums.html:24
 #: trac/admin/templates/admin_milestones.html:68
 #: trac/admin/templates/admin_versions.html:45
-#: trac/templates/attachment.html:63
-#: trac/templates/attachment.html:76
+#: trac/templates/attachment.html:63 trac/templates/attachment.html:76
 #: trac/ticket/templates/milestone_delete.html:40
 #: trac/ticket/templates/milestone_edit.html:94
 #: trac/ticket/templates/report_delete.html:21
@@ -116,6 +114,7 @@
 #: trac/wiki/templates/wiki_delete.html:36
 #: trac/wiki/templates/wiki_edit.html:80
 #: trac/wiki/templates/wiki_edit_form.html:77
+#: trac/wiki/templates/wiki_rename.html:31
 msgid "Cancel"
 msgstr "取消"
 
@@ -133,169 +132,178 @@
 msgid "Are you sure you want to delete this ticket comment?"
 msgstr "确定删除该工作单的评论?"
 
-#: trac/about.py:45
-#: trac/templates/about.html:9
-#: trac/templates/about.html:28
+#: trac/about.py:45 trac/templates/about.html:10 trac/templates/about.html:29
 msgid "About Trac"
 msgstr "关于Trac"
 
-#: trac/attachment.py:149
+#: trac/attachment.py:152
 #, python-format
 msgid "Attachment '%(title)s' does not exist."
 msgstr "附件 '%(title)s' 不存在。"
 
-#: trac/attachment.py:150
+#: trac/attachment.py:153
 msgid "Invalid Attachment"
 msgstr "无效附件"
 
-#: trac/attachment.py:188
+#: trac/attachment.py:193
 msgid "Could not delete attachment"
 msgstr "不能删除附件"
 
-#: trac/attachment.py:283
+#: trac/attachment.py:209
 #, python-format
+msgid ""
+"Cannot reparent attachment \"%(att)s\" as it already exists in "
+"%(realm)s:%(id)s"
+msgstr "不能为附件 \"%(att)s\" 重定父页面，因为它已在 %(realm)s:%(id)s 中存在"
+
+#: trac/attachment.py:228
+#, python-format
+msgid "Could not reparent attachment %(name)s"
+msgstr "不能为附件 %(name)s 重定父页面"
+
+#: trac/attachment.py:345
+#, python-format
 msgid "Attachment '%(filename)s' not found"
 msgstr "没有找到附件'%(filename)s'"
 
-#: trac/attachment.py:357
+#: trac/attachment.py:419
 msgid "Bad request"
 msgstr "错误请求"
 
-#: trac/attachment.py:374
+#: trac/attachment.py:436
 #, python-format
 msgid "Back to %(parent)s"
 msgstr "返回 %(parent)s"
 
-#: trac/attachment.py:466
-msgid " attached to "
-msgstr "附加到"
+#: trac/attachment.py:529
+#, python-format
+msgid "%(attachment)s attached to %(resource)s"
+msgstr "%(attachment)s 附加到 %(resource)s"
 
-#: trac/attachment.py:527
+#: trac/attachment.py:590
 #, python-format
 msgid "Attachment '%(id)s' in %(parent)s"
 msgstr "在 %(parent)s 中的附件 '%(id)s'"
 
-#: trac/attachment.py:530
+#: trac/attachment.py:593
 #, python-format
 msgid "Attachments of %(parent)s"
 msgstr "%(parent)s的附件"
 
-#: trac/attachment.py:543
-#: trac/attachment.py:566
-#: trac/admin/web_ui.py:425
-#: trac/admin/web_ui.py:428
-#: trac/admin/web_ui.py:432
+#: trac/attachment.py:606 trac/attachment.py:629 trac/admin/web_ui.py:425
+#: trac/admin/web_ui.py:428 trac/admin/web_ui.py:432
 msgid "No file uploaded"
 msgstr "没有文件被上传"
 
-#: trac/attachment.py:551
+#: trac/attachment.py:614
 msgid "Can't upload empty file"
 msgstr "不能上传空文件"
 
-#: trac/attachment.py:556
+#: trac/attachment.py:619
 #, python-format
 msgid "Maximum attachment size: %(num)s bytes"
 msgstr "附件的最大尺寸为: %(num)s 字节"
 
-#: trac/attachment.py:557
+#: trac/attachment.py:620
 msgid "Upload failed"
 msgstr "上传失败"
 
-#: trac/attachment.py:578
+#: trac/attachment.py:641
 #, python-format
 msgid "Attachment field %(field)s is invalid: %(message)s"
 msgstr "附件字段 %(field)s 无效: %(message)s"
 
-#: trac/attachment.py:582
+#: trac/attachment.py:645
 #, python-format
 msgid "Invalid attachment: %(message)s"
 msgstr "无效附件: %(message)s"
 
-#: trac/attachment.py:593
+#: trac/attachment.py:656
 #, python-format
-msgid "You don't have permission to replace the attachment %(name)s. You can only replace your own attachments. Replacing other's attachments requires ATTACHMENT_DELETE permission."
+msgid ""
+"You don't have permission to replace the attachment %(name)s. You can "
+"only replace your own attachments. Replacing other's attachments requires"
+" ATTACHMENT_DELETE permission."
 msgstr ""
 "你没有替换附件 %(name)s 的权限。你只能替换你自己的附件，\n"
 "替换别人的附件需要 ATTACHMENT_DELETE权限"
 
-#: trac/attachment.py:625
+#: trac/attachment.py:688
 #, python-format
 msgid "%(attachment)s (delete)"
 msgstr "%(attachment)s (删除)"
 
-#: trac/attachment.py:686
-#: trac/versioncontrol/web_ui/browser.py:633
+#: trac/attachment.py:749 trac/versioncontrol/web_ui/browser.py:633
 #: trac/wiki/web_ui.py:69
 msgid "Plain Text"
 msgstr "纯文本"
 
-#: trac/attachment.py:692
-#: trac/versioncontrol/web_ui/browser.py:639
+#: trac/attachment.py:755 trac/versioncontrol/web_ui/browser.py:639
 msgid "Original Format"
 msgstr "原始格式"
 
-#: trac/attachment.py:734
-#: trac/attachment.py:740
+#: trac/attachment.py:797 trac/attachment.py:803
 #: trac/ticket/templates/ticket_change.html:21
 #: trac/ticket/templates/ticket_change.html:22
 msgid "Download"
 msgstr "下载"
 
-#: trac/attachment.py:834
+#: trac/attachment.py:897
 #, python-format
 msgid "Invalid resource identifier '%(id)s'"
 msgstr "资源标示符'%(id)s'无效"
 
-#: trac/attachment.py:870
-#: trac/admin/templates/admin_components.html:80
-#: trac/admin/templates/admin_enums.html:47
+#: trac/attachment.py:933 trac/admin/templates/admin_components.html:80
+#: trac/admin/templates/admin_enums.html:48
 #: trac/admin/templates/admin_milestones.html:104
-#: trac/admin/templates/admin_versions.html:77
-#: trac/templates/about.html:83
-#: trac/templates/error.html:185
-#: trac/ticket/admin.py:210
-#: trac/ticket/admin.py:401
-#: trac/ticket/admin.py:560
+#: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:84
+#: trac/templates/error.html:185 trac/ticket/admin.py:210
+#: trac/ticket/admin.py:401 trac/ticket/admin.py:560
 #: trac/versioncontrol/admin.py:108
 #: trac/versioncontrol/templates/admin_repositories.html:124
 #: trac/web/session.py:315
 msgid "Name"
 msgstr "名称"
 
-#: trac/attachment.py:870
+#: trac/attachment.py:933
 msgid "Size"
 msgstr "大小"
 
-#: trac/attachment.py:870
-#: trac/templates/history_view.html:29
+#: trac/attachment.py:933 trac/templates/history_view.html:29
 #: trac/ticket/templates/ticket.html:360
 #: trac/versioncontrol/templates/revisionlog.html:96
 msgid "Author"
 msgstr "作者"
 
-#: trac/attachment.py:870
-#: trac/templates/history_view.html:28
+#: trac/attachment.py:933 trac/templates/history_view.html:28
 msgid "Date"
 msgstr "日期"
 
-#: trac/attachment.py:871
-#: trac/templates/attachment.html:93
-#: trac/ticket/api.py:289
-#: trac/ticket/templates/ticket_box.html:60
+#: trac/attachment.py:934 trac/templates/attachment.html:93
+#: trac/ticket/api.py:289 trac/ticket/templates/ticket_box.html:60
 msgid "Description"
 msgstr "描述"
 
-#: trac/attachment.py:896
-#: trac/wiki/admin.py:102
+#: trac/attachment.py:959 trac/wiki/admin.py:105
 #, python-format
 msgid "File '%(name)s' exists"
 msgstr "文件 '%(name)s' 已经存在."
 
-#: trac/config.py:391
+#: trac/config.py:403
 #, python-format
 msgid "[%(section)s] %(entry)s: expected integer, got %(value)s"
 msgstr "[%(section)s] %(entry)s: 期望是整数, 却得到 %(value)s"
 
+#: trac/config.py:421
+#, python-format
+msgid "[%(section)s] %(entry)s: expected float, got %(value)s"
+msgstr "[%(section)s] %(entry)s: 期望是浮点数, 却得到 %(value)s"
+
+#: trac/config.py:605
+#, python-format
+msgid "[%(section)s] %(entry)s: expected one of (%(choices)s), got %(value)s"
+msgstr "[%(section)s] %(entry)s: 期望是 (%(choices)s)之一, 得到 %(value)s"
+
 #: trac/env.py:569
 msgid "Database newer than Trac version"
 msgstr "数据库的版本比Trac使用的版本新"
@@ -306,7 +314,9 @@
 msgstr "版本%(num)i 没有升级模块 (%(version)s.py)"
 
 #: trac/env.py:628
-msgid "Missing environment variable \"TRAC_ENV\". Trac requires this variable to point to a valid Trac environment."
+msgid ""
+"Missing environment variable \"TRAC_ENV\". Trac requires this variable to"
+" point to a valid Trac environment."
 msgstr "没有环境变量\"TRAC_ENV\". Trac要求使用该变量以指向一个有效的Trac环境."
 
 #: trac/env.py:660
@@ -346,8 +356,7 @@
 msgid "Hotcopy done."
 msgstr "热备结束。"
 
-#: trac/env.py:766
-#: trac/admin/api.py:125
+#: trac/env.py:766 trac/admin/api.py:125
 msgid "Invalid arguments"
 msgstr "无效参数"
 
@@ -366,7 +375,8 @@
 
 #: trac/env.py:791
 msgid ""
-"Warning: the wiki-macros directory in the environment is non-empty, but Trac\n"
+"Warning: the wiki-macros directory in the environment is non-empty, but "
+"Trac\n"
 "doesn't load plugins from there anymore. Please remove it by hand."
 msgstr ""
 "警告：Trac环境中的wiki-macro目录非空，但是Trac\n"
@@ -376,7 +386,8 @@
 #, python-format
 msgid ""
 "Error while removing wiki-macros: %(err)s\n"
-"Trac doesn't load plugins from wiki-macros anymore. Please remove it by hand."
+"Trac doesn't load plugins from wiki-macros anymore. Please remove it by "
+"hand."
 msgstr ""
 "删除wiki-macros时出错: %(err)s\n"
 "Trac不能从wiki-macros加载插件，请手工删除。"
@@ -421,8 +432,7 @@
 msgid "User"
 msgstr "用户"
 
-#: trac/perm.py:640
-#: trac/admin/templates/admin_perms.html:69
+#: trac/perm.py:640 trac/admin/templates/admin_perms.html:69
 #: trac/ticket/templates/ticket.html:338
 msgid "Action"
 msgstr "动作"
@@ -437,15 +447,14 @@
 
 #: trac/resource.py:326
 #, python-format
-msgid " at version %(version)s"
-msgstr "于版本 %(version)s"
+msgid "%(name)s at version %(version)s"
+msgstr "%(name)s 的版本 %(version)s"
 
 #: trac/admin/api.py:129
 msgid "Command not found"
 msgstr "命令无法找到"
 
-#: trac/admin/console.py:111
-#: trac/ticket/templates/report_edit.html:34
+#: trac/admin/console.py:111 trac/ticket/templates/report_edit.html:34
 msgid "Error:"
 msgstr "错误:"
 
@@ -637,8 +646,7 @@
 msgid "Admin"
 msgstr "管理"
 
-#: trac/admin/web_ui.py:65
-#: trac/admin/templates/admin.html:16
+#: trac/admin/web_ui.py:65 trac/admin/templates/admin.html:16
 msgid "Administration"
 msgstr "管理"
 
@@ -646,54 +654,42 @@
 msgid "No administration panels available"
 msgstr "没有可用的管理面板"
 
-#: trac/admin/web_ui.py:107
-#: trac/admin/web_ui.py:111
+#: trac/admin/web_ui.py:107 trac/admin/web_ui.py:111
 msgid "Unknown administration panel"
 msgstr "未知管理面板"
 
-#: trac/admin/web_ui.py:185
-#: trac/ticket/admin.py:66
-#: trac/ticket/admin.py:91
-#: trac/ticket/admin.py:276
-#: trac/ticket/admin.py:458
-#: trac/ticket/admin.py:610
-#: trac/ticket/admin.py:698
-#: trac/ticket/report.py:189
-#: trac/ticket/roadmap.py:689
-#: trac/versioncontrol/admin.py:196
-#: trac/wiki/web_ui.py:292
+#: trac/admin/web_ui.py:185 trac/ticket/admin.py:66 trac/ticket/admin.py:91
+#: trac/ticket/admin.py:276 trac/ticket/admin.py:458 trac/ticket/admin.py:610
+#: trac/ticket/admin.py:698 trac/ticket/report.py:189
+#: trac/ticket/roadmap.py:689 trac/versioncontrol/admin.py:196
+#: trac/wiki/web_ui.py:334
 msgid "Your changes have been saved."
 msgstr "您的修改已保存"
 
-#: trac/admin/web_ui.py:190
-#: trac/ticket/admin.py:69
-msgid "Error writing to trac.ini, make sure it is writable by the web server. Your changes have not been saved."
+#: trac/admin/web_ui.py:190 trac/ticket/admin.py:69
+msgid ""
+"Error writing to trac.ini, make sure it is writable by the web server. "
+"Your changes have not been saved."
 msgstr ""
 "写入trac.ini错误，请确保它能被Web服务器写入。\n"
 "您的修改没有保存。"
 
-#: trac/admin/web_ui.py:203
-#: trac/admin/web_ui.py:231
-#: trac/admin/web_ui.py:319
-#: trac/admin/web_ui.py:401
-#: trac/prefs/web_ui.py:86
+#: trac/admin/web_ui.py:203 trac/admin/web_ui.py:231 trac/admin/web_ui.py:319
+#: trac/admin/web_ui.py:401 trac/prefs/web_ui.py:86
 #: trac/prefs/templates/prefs_general.html:9
 msgid "General"
 msgstr "一般"
 
-#: trac/admin/web_ui.py:203
-#: trac/admin/templates/admin_basics.html:13
+#: trac/admin/web_ui.py:203 trac/admin/templates/admin_basics.html:13
 msgid "Basic Settings"
 msgstr "基础设置"
 
-#: trac/admin/web_ui.py:231
-#: trac/admin/templates/admin_logging.html:10
+#: trac/admin/web_ui.py:231 trac/admin/templates/admin_logging.html:10
 #: trac/admin/templates/admin_logging.html:22
 msgid "Logging"
 msgstr "日志"
 
-#: trac/admin/web_ui.py:240
-#: trac/ticket/templates/milestone_delete.html:31
+#: trac/admin/web_ui.py:240 trac/ticket/templates/milestone_delete.html:31
 #: trac/ticket/templates/milestone_edit.html:73
 msgid "None"
 msgstr "无"
@@ -702,8 +698,7 @@
 msgid "Console"
 msgstr "控制台"
 
-#: trac/admin/web_ui.py:243
-#: trac/templates/attachment.html:32
+#: trac/admin/web_ui.py:243 trac/templates/attachment.html:32
 msgid "File"
 msgstr "文件"
 
@@ -741,8 +736,7 @@
 msgid "Missing field"
 msgstr "缺少字段"
 
-#: trac/admin/web_ui.py:319
-#: trac/admin/templates/admin_perms.html:9
+#: trac/admin/web_ui.py:319 trac/admin/templates/admin_perms.html:9
 msgid "Permissions"
 msgstr "权限"
 
@@ -778,8 +772,7 @@
 msgid "The selected permissions have been revoked."
 msgstr "所选权限已收回。"
 
-#: trac/admin/web_ui.py:401
-#: trac/admin/templates/admin_plugins.html:9
+#: trac/admin/web_ui.py:401 trac/admin/templates/admin_plugins.html:9
 msgid "Plugins"
 msgstr "插件s"
 
@@ -819,8 +812,8 @@
 #: trac/admin/templates/admin_basics.html:19
 #: trac/admin/templates/admin_components.html:37
 #: trac/admin/templates/admin_components.html:66
-#: trac/admin/templates/admin_enums.html:20
-#: trac/admin/templates/admin_enums.html:34
+#: trac/admin/templates/admin_enums.html:21
+#: trac/admin/templates/admin_enums.html:35
 #: trac/admin/templates/admin_milestones.html:22
 #: trac/admin/templates/admin_milestones.html:80
 #: trac/admin/templates/admin_versions.html:21
@@ -843,7 +836,7 @@
 
 #: trac/admin/templates/admin_basics.html:36
 #: trac/admin/templates/admin_components.html:99
-#: trac/admin/templates/admin_enums.html:69
+#: trac/admin/templates/admin_enums.html:70
 #: trac/admin/templates/admin_logging.html:54
 #: trac/admin/templates/admin_milestones.html:129
 #: trac/admin/templates/admin_plugins.html:164
@@ -851,8 +844,7 @@
 msgid "Apply changes"
 msgstr "应用修改"
 
-#: trac/admin/templates/admin_components.html:10
-#: trac/ticket/admin.py:77
+#: trac/admin/templates/admin_components.html:10 trac/ticket/admin.py:77
 msgid "Components"
 msgstr "组件"
 
@@ -879,7 +871,7 @@
 "                ):"
 
 #: trac/admin/templates/admin_components.html:56
-#: trac/admin/templates/admin_enums.html:24
+#: trac/admin/templates/admin_enums.html:25
 #: trac/admin/templates/admin_milestones.html:69
 #: trac/admin/templates/admin_versions.html:46
 #: trac/versioncontrol/templates/admin_repositories.html:84
@@ -891,8 +883,8 @@
 msgstr "增加组件"
 
 #: trac/admin/templates/admin_components.html:70
-#: trac/admin/templates/admin_enums.html:32
-#: trac/admin/templates/admin_enums.html:37
+#: trac/admin/templates/admin_enums.html:33
+#: trac/admin/templates/admin_enums.html:38
 #: trac/admin/templates/admin_milestones.html:93
 #: trac/admin/templates/admin_perms.html:38
 #: trac/admin/templates/admin_perms.html:60
@@ -902,22 +894,20 @@
 msgid "Add"
 msgstr "增加"
 
-#: trac/admin/templates/admin_components.html:80
-#: trac/ticket/admin.py:210
-#: trac/ticket/api.py:283
-#: trac/ticket/web_ui.py:1324
+#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:210
+#: trac/ticket/api.py:283 trac/ticket/web_ui.py:1324
 msgid "Owner"
 msgstr "属主"
 
 #: trac/admin/templates/admin_components.html:80
-#: trac/admin/templates/admin_enums.html:47
+#: trac/admin/templates/admin_enums.html:48
 #: trac/admin/templates/admin_milestones.html:104
 #: trac/admin/templates/admin_versions.html:77
 msgid "Default"
 msgstr "默认"
 
 #: trac/admin/templates/admin_components.html:98
-#: trac/admin/templates/admin_enums.html:68
+#: trac/admin/templates/admin_enums.html:69
 #: trac/admin/templates/admin_milestones.html:128
 #: trac/admin/templates/admin_perms.html:87
 #: trac/admin/templates/admin_versions.html:93
@@ -926,7 +916,7 @@
 msgstr "删选择项"
 
 #: trac/admin/templates/admin_components.html:101
-#: trac/admin/templates/admin_enums.html:71
+#: trac/admin/templates/admin_enums.html:72
 #: trac/admin/templates/admin_milestones.html:131
 #: trac/admin/templates/admin_versions.html:96
 msgid ""
@@ -937,7 +927,7 @@
 "              用户界面中将完全隐藏该字段。"
 
 #: trac/admin/templates/admin_components.html:107
-#: trac/admin/templates/admin_enums.html:77
+#: trac/admin/templates/admin_enums.html:78
 #: trac/admin/templates/admin_milestones.html:137
 #: trac/admin/templates/admin_versions.html:102
 msgid ""
@@ -947,21 +937,21 @@
 "该列表在添加任何条目之前，\n"
 "            用户界面中将完全隐藏该字段。"
 
-#: trac/admin/templates/admin_enums.html:13
-msgid "Manage"
-msgstr "管理"
+#: trac/admin/templates/admin_enums.html:14
+#, python-format
+msgid "Manage %(label_plural)s"
+msgstr "管理 %(label_plural)s"
 
-#: trac/admin/templates/admin_enums.html:18
-#: trac/ticket/templates/ticket.html:80
-msgid "Modify"
-msgstr "修改"
+#: trac/admin/templates/admin_enums.html:19
+#, python-format
+msgid "Modify %(label_singular)s"
+msgstr "修改 %(label_singular)s"
 
-#: trac/admin/templates/admin_enums.html:47
+#: trac/admin/templates/admin_enums.html:48
 msgid "Order"
 msgstr "排序"
 
-#: trac/admin/templates/admin_logging.html:26
-#: trac/templates/about.html:78
+#: trac/admin/templates/admin_logging.html:26 trac/templates/about.html:79
 msgid "Configuration"
 msgstr "配置"
 
@@ -985,8 +975,7 @@
 "            [1:log] directory of the project environment ([2:%(dir)s])."
 msgstr "如果指定了相对路径，日志文件将被存储在项目环境([2:%(dir)s])的 [1:log]目录。"
 
-#: trac/admin/templates/admin_milestones.html:10
-#: trac/ticket/admin.py:242
+#: trac/admin/templates/admin_milestones.html:10 trac/ticket/admin.py:242
 #: trac/ticket/roadmap.py:857
 msgid "Milestones"
 msgstr "里程碑"
@@ -1039,18 +1028,15 @@
 msgid "Add Milestone:"
 msgstr "增加里程碑:"
 
-#: trac/admin/templates/admin_milestones.html:104
-#: trac/ticket/admin.py:401
+#: trac/admin/templates/admin_milestones.html:104 trac/ticket/admin.py:401
 msgid "Due"
-msgstr "预期"
+msgstr "逾期"
 
-#: trac/admin/templates/admin_milestones.html:104
-#: trac/ticket/admin.py:401
+#: trac/admin/templates/admin_milestones.html:104 trac/ticket/admin.py:401
 msgid "Completed"
 msgstr "完成"
 
-#: trac/admin/templates/admin_milestones.html:104
-#: trac/ticket/web_ui.py:184
+#: trac/admin/templates/admin_milestones.html:104 trac/ticket/web_ui.py:184
 msgid "Tickets"
 msgstr "任务单"
 
@@ -1100,8 +1086,7 @@
 msgid "Note that"
 msgstr "注意"
 
-#: trac/admin/templates/admin_perms.html:92
-#: trac/ticket/templates/query.html:73
+#: trac/admin/templates/admin_perms.html:92 trac/ticket/templates/query.html:73
 msgid "or"
 msgstr "或"
 
@@ -1146,8 +1131,7 @@
 msgid "Install"
 msgstr "安装"
 
-#: trac/admin/templates/admin_plugins.html:84
-#: trac/templates/diff_view.html:45
+#: trac/admin/templates/admin_plugins.html:84 trac/templates/diff_view.html:45
 #: trac/versioncontrol/templates/changeset.html:114
 msgid "Author:"
 msgstr "作者:"
@@ -1168,8 +1152,7 @@
 msgid "Hide all descriptions"
 msgstr "隐藏所有描述"
 
-#: trac/admin/templates/admin_plugins.html:114
-#: trac/ticket/admin.py:77
+#: trac/admin/templates/admin_plugins.html:114 trac/ticket/admin.py:77
 #: trac/ticket/api.py:296
 msgid "Component"
 msgstr "组件"
@@ -1186,8 +1169,7 @@
 msgid "Toggle the component description"
 msgstr "切换组建描述"
 
-#: trac/admin/templates/admin_versions.html:10
-#: trac/ticket/admin.py:441
+#: trac/admin/templates/admin_versions.html:10 trac/ticket/admin.py:441
 msgid "Versions"
 msgstr "版本"
 
@@ -1222,7 +1204,9 @@
 
 #: trac/db/api.py:162
 #, python-format
-msgid "Unknown scheme \"%(scheme)s\"; database connection string must start with {scheme}:/"
+msgid ""
+"Unknown scheme \"%(scheme)s\"; database connection string must start with"
+" {scheme}:/"
 msgstr "未知scheme \"%(scheme)s\"；数据库链接字符串必须始于scheme:/"
 
 #: trac/db/mysql_backend.py:80
@@ -1258,11 +1242,12 @@
 
 #: trac/db/sqlite_backend.py:249
 #, python-format
-msgid "The user %(user)s requires read _and_ write permissions to the database file %(path)s and the directory it is located in."
+msgid ""
+"The user %(user)s requires read _and_ write permissions to the database "
+"file %(path)s and the directory it is located in."
 msgstr "用户 %(user)s 需要数据库文件 %(path)s 及其所在目录的读/写权限。"
 
-#: trac/mimeview/api.py:672
-#: trac/mimeview/api.py:683
+#: trac/mimeview/api.py:672 trac/mimeview/api.py:683
 #, python-format
 msgid "No available MIME conversions from %(old)s to %(new)s"
 msgstr "没有有效的MIME将 %(old)s 转换为 %(new)s"
@@ -1295,18 +1280,15 @@
 msgid "this hunk was shorter than expected"
 msgstr "此块比预期的短"
 
-#: trac/mimeview/pygments.py:126
-#: trac/prefs/templates/prefs_pygments.html:9
+#: trac/mimeview/pygments.py:126 trac/prefs/templates/prefs_pygments.html:9
 msgid "Syntax Highlighting"
 msgstr "语法高亮"
 
-#: trac/mimeview/pygments.py:135
-#: trac/prefs/web_ui.py:143
+#: trac/mimeview/pygments.py:135 trac/prefs/web_ui.py:143
 msgid "Your preferences have been saved."
 msgstr "您的个人设置已保存。"
 
-#: trac/prefs/web_ui.py:52
-#: trac/prefs/templates/prefs.html:16
+#: trac/prefs/web_ui.py:52 trac/prefs/templates/prefs.html:16
 #: trac/ticket/templates/ticket.html:374
 #: trac/wiki/templates/wiki_edit_form.html:50
 msgid "Preferences"
@@ -1316,23 +1298,19 @@
 msgid "Unknown preference panel"
 msgstr "未知选项面板"
 
-#: trac/prefs/web_ui.py:87
-#: trac/prefs/templates/prefs_datetime.html:10
+#: trac/prefs/web_ui.py:87 trac/prefs/templates/prefs_datetime.html:10
 msgid "Date & Time"
 msgstr "日期和时间"
 
-#: trac/prefs/web_ui.py:88
-#: trac/prefs/templates/prefs_keybindings.html:10
+#: trac/prefs/web_ui.py:88 trac/prefs/templates/prefs_keybindings.html:10
 msgid "Keyboard Shortcuts"
 msgstr "键盘快捷方式"
 
-#: trac/prefs/web_ui.py:90
-#: trac/prefs/templates/prefs_language.html:9
+#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_language.html:9
 msgid "Language"
 msgstr "语言"
 
-#: trac/prefs/web_ui.py:92
-#: trac/prefs/templates/prefs_advanced.html:9
+#: trac/prefs/web_ui.py:92 trac/prefs/templates/prefs_advanced.html:9
 msgid "Advanced"
 msgstr "高级"
 
@@ -1343,8 +1321,10 @@
 #: trac/prefs/templates/prefs.html:17
 msgid ""
 "This page lets you customize your personal settings for this site.\n"
-"      These settings are stored on the server and are identified by a session\n"
-"      key stored in a browser cookie. That cookie allows your settings to be\n"
+"      These settings are stored on the server and are identified by a "
+"session\n"
+"      key stored in a browser cookie. That cookie allows your settings to"
+" be\n"
 "      restored on subsequent visits."
 msgstr ""
 "该页用于定制该站点的个人设置。\n"
@@ -1382,7 +1362,8 @@
 #: trac/prefs/templates/prefs_advanced.html:30
 msgid ""
 "You may load a previously created session by entering the\n"
-"      corresponding session key below. This lets you share settings between\n"
+"      corresponding session key below. This lets you share settings "
+"between\n"
 "      multiple computers and web browsers."
 msgstr ""
 "通过在下面输入相应的会话标志，您可以载入先前创建的会话。\n"
@@ -1432,11 +1413,15 @@
 "            [1:%(formatted)s]."
 
 #: trac/prefs/templates/prefs_datetime.html:47
-msgid "Note: Universal Co-ordinated Time (UTC) is also known as Greenwich Mean Time (GMT)."
+msgid ""
+"Note: Universal Co-ordinated Time (UTC) is also known as Greenwich Mean "
+"Time (GMT)."
 msgstr "注: 全球统一时间 (UTC) 也被称为格林威治标准时间 (GMT)。"
 
 #: trac/prefs/templates/prefs_datetime.html:48
-msgid "A positive offset is used to indicate a timezone at the east of Greenwich, i.e. ahead of Universal Time."
+msgid ""
+"A positive offset is used to indicate a timezone at the east of "
+"Greenwich, i.e. ahead of Universal Time."
 msgstr "正值表示在格林威治以东的时区，即比标准时间早。"
 
 #: trac/prefs/templates/prefs_general.html:15
@@ -1469,7 +1454,8 @@
 #: trac/prefs/templates/prefs_keybindings.html:21
 msgid ""
 "This site provides keyboard shortcuts for\n"
-"      faster access to certain functions of this site. As these shortcuts can\n"
+"      faster access to certain functions of this site. As these shortcuts"
+" can\n"
 "      cause conflicts with shortcuts provided by the desktop system or\n"
 "      web browser, they are disabled by default. See\n"
 "      [1:TracAccessibility]\n"
@@ -1517,10 +1503,8 @@
 msgid "Preview:"
 msgstr "预览:"
 
-#: trac/search/web_ui.py:63
-#: trac/search/templates/search.html:10
-#: trac/search/templates/search.html:23
-#: trac/search/templates/search.html:28
+#: trac/search/web_ui.py:63 trac/search/templates/search.html:10
+#: trac/search/templates/search.html:23 trac/search/templates/search.html:28
 #: trac/templates/theme.html:28
 msgid "Search"
 msgstr "搜索"
@@ -1535,20 +1519,15 @@
 msgid "Search query too short. Query must be at least %(num)s characters long."
 msgstr "搜索查询太短。查询必须至少包含 %(num)s 字符。"
 
-#: trac/search/web_ui.py:231
-#: trac/ticket/query.py:763
-#: trac/ticket/report.py:370
+#: trac/search/web_ui.py:231 trac/ticket/query.py:763 trac/ticket/report.py:370
 msgid "Next Page"
 msgstr "下一页"
 
-#: trac/search/web_ui.py:237
-#: trac/ticket/query.py:768
-#: trac/ticket/report.py:373
+#: trac/search/web_ui.py:237 trac/ticket/query.py:768 trac/ticket/report.py:373
 msgid "Previous Page"
 msgstr "上一页"
 
-#: trac/search/templates/search.html:10
-#: trac/search/templates/search.html:40
+#: trac/search/templates/search.html:10 trac/search/templates/search.html:40
 #: trac/ticket/templates/query_results.html:20
 #: trac/ticket/templates/report_view.html:79
 msgid "Results"
@@ -1559,8 +1538,9 @@
 msgstr "快速跳转到"
 
 #: trac/search/templates/search.html:56
-msgid "By"
-msgstr "操作者:"
+#, python-format
+msgid "By %(author)s"
+msgstr ": %(author)s"
 
 #: trac/search/templates/search.html:65
 #: trac/ticket/templates/report_view.html:193
@@ -1573,16 +1553,17 @@
 "        for help on searching."
 msgstr "[1:注意：] 关于搜索的帮助参见 [2:TracSearch]"
 
-#: trac/templates/about.html:25
+#: trac/templates/about.html:26
 msgid "Trac: Integrated SCM & Project Management"
 msgstr "Trac: 集成的源码管理和项目管理"
 
-#: trac/templates/about.html:29
+#: trac/templates/about.html:30
 msgid ""
 "Trac is a web-based software project management and bug/issue\n"
 "        tracking system emphasizing ease of use and low ceremony.\n"
 "        It provides an integrated Wiki, an interface to version control\n"
-"        systems, and a number of convenient ways to stay on top of events\n"
+"        systems, and a number of convenient ways to stay on top of events"
+"\n"
 "        and changes within a project."
 msgstr ""
 "Trac是基于web的软件项目管理和缺陷/事务追踪系统.\n"
@@ -1590,62 +1571,48 @@
 "        它提供了集成Wiki/版本控制系统界面, \n"
 "        以及更多方便的项目管理渠道, 来掌控项目的事件和变化."
 
-#: trac/templates/about.html:35
-msgid "Trac is distributed under the modified BSD License."
-msgstr "Trac是以modified BSD许可证分发的。"
+#: trac/templates/about.html:36
+msgid ""
+"Trac is distributed under the modified BSD License.[1:]\n"
+"        The complete text of the license can be found\n"
+"        [2:online]\n"
+"        as well as in the [3:COPYING] file included in the distribution."
+msgstr ""
+"Trac 在经过修改的BSD协议下发布。[1:]\n"
+"        协议的完整文本可以\n"
+"        [2:在线查看]\n"
+"        也可在发布版的 [3:COPYING] 文件中找到。"
 
-#: trac/templates/about.html:35
-msgid "The complete text of the license can be found"
-msgstr "查看许可证的完整内容"
-
-#: trac/templates/about.html:37
-msgid "online"
-msgstr "在线版本"
-
-#: trac/templates/about.html:37
-msgid "as well as in the"
-msgstr "以及在"
-
-#: trac/templates/about.html:38
-msgid "COPYING"
-msgstr "COPYING"
-
-#: trac/templates/about.html:38
-msgid "file included in the distribution."
-msgstr "文件中(包含的发布文件中)."
-
-#: trac/templates/about.html:40
+#: trac/templates/about.html:41
 msgid "python powered"
 msgstr "动力源自python"
 
-#: trac/templates/about.html:43
+#: trac/templates/about.html:44
 msgid "Please visit the Trac open source project:"
 msgstr "访问Trac开源项目:"
 
-#: trac/templates/about.html:44
+#: trac/templates/about.html:45
 msgid "http://trac.edgewall.org/"
 msgstr "http://trac.edgewall.org/"
 
-#: trac/templates/about.html:53
+#: trac/templates/about.html:54
 msgid "System Information"
 msgstr "系统信息"
 
-#: trac/templates/about.html:63
+#: trac/templates/about.html:64
 msgid "Installed Plugins"
 msgstr "已安装插件"
 
-#: trac/templates/about.html:71
-#: trac/templates/error.html:83
+#: trac/templates/about.html:72 trac/templates/error.html:83
 #: trac/templates/error.html:217
 msgid "N/A"
 msgstr "不适用"
 
-#: trac/templates/about.html:82
+#: trac/templates/about.html:83
 msgid "Section"
 msgstr "部分"
 
-#: trac/templates/about.html:84
-#: trac/templates/error.html:185
+#: trac/templates/about.html:85 trac/templates/error.html:185
 msgid "Value"
 msgstr "值"
 
@@ -1678,8 +1645,7 @@
 msgid "Attachment Info"
 msgstr "附件信息"
 
-#: trac/templates/attachment.html:40
-#: trac/ticket/templates/ticket.html:365
+#: trac/templates/attachment.html:40 trac/ticket/templates/ticket.html:365
 #: trac/wiki/templates/wiki_edit_form.html:46
 msgid "Your email or username:"
 msgstr "您的email或用户名:"
@@ -1700,8 +1666,7 @@
 msgid "Are you sure you want to delete this attachment?"
 msgstr "确定删除该附件?"
 
-#: trac/templates/attachment.html:77
-#: trac/templates/attachment.html:119
+#: trac/templates/attachment.html:77 trac/templates/attachment.html:119
 msgid "Delete attachment"
 msgstr "删除附件"
 
@@ -1721,8 +1686,7 @@
 msgid "Property"
 msgstr "属性"
 
-#: trac/templates/diff_div.html:70
-#: trac/ticket/templates/ticket_change.html:27
+#: trac/templates/diff_div.html:70 trac/ticket/templates/ticket_change.html:27
 msgid "to"
 msgstr "至"
 
@@ -1784,31 +1748,24 @@
 msgid "Changes"
 msgstr "变更"
 
-#: trac/templates/diff_view.html:18
-#: trac/templates/diff_view.html:21
+#: trac/templates/diff_view.html:18 trac/templates/diff_view.html:21
 #: trac/ticket/templates/query.html:115
 msgid "between"
 msgstr "之间"
 
-#: trac/templates/diff_view.html:19
-#: trac/templates/diff_view.html:25
-#: trac/templates/history_view.html:27
-#: trac/ticket/admin.py:441
-#: trac/ticket/api.py:297
-#: trac/ticket/templates/ticket.html:94
+#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:25
+#: trac/templates/history_view.html:27 trac/ticket/admin.py:441
+#: trac/ticket/api.py:297 trac/ticket/templates/ticket.html:94
 msgid "Version"
 msgstr "版本"
 
-#: trac/templates/diff_view.html:19
-#: trac/templates/diff_view.html:22
+#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:22
 #: trac/ticket/templates/query.html:117
 msgid "and"
 msgstr "和"
 
-#: trac/templates/diff_view.html:22
-#: trac/ticket/web_ui.py:799
-#: trac/ticket/web_ui.py:934
-#: trac/ticket/templates/ticket.html:91
+#: trac/templates/diff_view.html:22 trac/ticket/web_ui.py:799
+#: trac/ticket/web_ui.py:934 trac/ticket/templates/ticket.html:91
 msgid "Initial Version"
 msgstr "初始版本"
 
@@ -1825,8 +1782,7 @@
 msgid "Timestamp:"
 msgstr "时间戳:"
 
-#: trac/templates/diff_view.html:40
-#: trac/templates/diff_view.html:47
+#: trac/templates/diff_view.html:40 trac/templates/diff_view.html:47
 #: trac/templates/diff_view.html:53
 msgid "(multiple changes)"
 msgstr "(多次变更)"
@@ -1867,11 +1823,9 @@
 msgid "Removed"
 msgstr "删除"
 
-#: trac/templates/diff_view.html:64
-#: trac/ticket/api.py:325
+#: trac/templates/diff_view.html:64 trac/ticket/api.py:325
 #: trac/versioncontrol/templates/changeset.html:176
-#: trac/versioncontrol/templates/revisionlog.html:77
-#: trac/wiki/admin.py:199
+#: trac/versioncontrol/templates/revisionlog.html:77 trac/wiki/admin.py:202
 msgid "Modified"
 msgstr "修改"
 
@@ -2002,8 +1956,10 @@
 msgid ""
 "Before you do that, though, please first try\n"
 "                [1:[2:searching]\n"
-"                for similar issues], as it is quite likely that this problem\n"
-"                has been reported before. For questions about installation\n"
+"                for similar issues], as it is quite likely that this "
+"problem\n"
+"                has been reported before. For questions about "
+"installation\n"
 "                and configuration of Trac or its plugins, please try the\n"
 "                [3:mailing list]\n"
 "                instead of creating a ticket."
@@ -2033,8 +1989,7 @@
 msgid "Most recent call last:"
 msgstr "最多最近调用的:"
 
-#: trac/templates/error.html:166
-#: trac/templates/error.html:197
+#: trac/templates/error.html:166 trac/templates/error.html:197
 msgid "File \""
 msgstr "文件 \""
 
@@ -2046,8 +2001,7 @@
 "\",\n"
 "                        行"
 
-#: trac/templates/error.html:167
-#: trac/templates/error.html:197
+#: trac/templates/error.html:167 trac/templates/error.html:197
 msgid ", in"
 msgstr ", 于"
 
@@ -2091,8 +2045,7 @@
 msgid "Change History for"
 msgstr "变更历史"
 
-#: trac/templates/history_view.html:21
-#: trac/templates/history_view.html:54
+#: trac/templates/history_view.html:21 trac/templates/history_view.html:54
 #: trac/versioncontrol/templates/diff_form.html:58
 #: trac/versioncontrol/templates/revisionlog.html:180
 msgid "View changes"
@@ -2116,8 +2069,7 @@
 msgid "IP-Address: %(ipnr)s"
 msgstr "IP地址： %(ipnr)s"
 
-#: trac/templates/index.html:8
-#: trac/templates/index.html:12
+#: trac/templates/index.html:8 trac/templates/index.html:12
 msgid "Available Projects"
 msgstr "有效项目"
 
@@ -2159,45 +2111,40 @@
 msgid "%(size)s bytes"
 msgstr "%(size)s 字节"
 
-#: trac/templates/macros.html:37
-#: trac/templates/macros.html:38
+#: trac/templates/macros.html:37 trac/templates/macros.html:38
 msgid "Previous"
 msgstr "上一个"
 
-#: trac/templates/macros.html:47
-#: trac/templates/macros.html:48
+#: trac/templates/macros.html:47 trac/templates/macros.html:48
 msgid "Next"
 msgstr "下一个"
 
-#: trac/templates/preview_file.html:13
+#: trac/templates/preview_file.html:15
 msgid "(The file is empty)"
 msgstr "(文件为空)"
 
-#: trac/templates/preview_file.html:16
+#: trac/templates/preview_file.html:18
 msgid "HTML preview not available"
 msgstr "HTML预览功能不可用"
 
-#: trac/templates/preview_file.html:18
-msgid "since the file size exceeds"
-msgstr "由于文件大小超过"
-
-#: trac/templates/preview_file.html:19
-msgid "bytes."
-msgstr "字节。"
-
 #: trac/templates/preview_file.html:21
+#, python-format
+msgid "since the file size exceeds %(size)s bytes."
+msgstr "由于文件大小超过 %(size)s 字节。"
+
+#: trac/templates/preview_file.html:25
 msgid "since no preview renderer could handle it."
 msgstr "由于没有合适的渲染器来处理。"
 
-#: trac/templates/preview_file.html:24
+#: trac/templates/preview_file.html:28
 msgid "Try"
 msgstr "尝试"
 
-#: trac/templates/preview_file.html:25
+#: trac/templates/preview_file.html:29
 msgid "downloading"
 msgstr "下载"
 
-#: trac/templates/preview_file.html:25
+#: trac/templates/preview_file.html:29
 msgid "the file instead."
 msgstr "文件代替。"
 
@@ -2205,20 +2152,22 @@
 #, python-format
 msgid "%(num)s of %(total)s %(unit)s %(title)s"
 msgid_plural "%(num)s of %(total)s %(units)s %(title)s"
-msgstr[0] "%(num)s / %(total)s %(units)s %(title)s"
+msgstr[0] "%(num)s / %(total)s %(unit)s %(title)s"
 msgstr[1] "%(num)s / %(total)s %(units)s %(title)s"
 
 #: trac/templates/progress_bar.html:37
 #, python-format
 msgid "%(title)s %(unit)s:"
 msgid_plural "%(title)s %(units)s:"
-msgstr[0] "%(title)s %(units)s:"
+msgstr[0] "%(title)s %(unit)s:"
 msgstr[1] "%(title)s %(units)s:"
 
 #: trac/templates/progress_bar.html:47
 #, python-format
 msgid "Total %(unit)s:"
-msgstr "总计%(unit)s:"
+msgid_plural "Total %(units)s:"
+msgstr[0] "总计 %(unit)s:"
+msgstr[1] "总计 %(units)s:"
 
 #: trac/templates/theme.html:26
 msgid "Search:"
@@ -2245,9 +2194,7 @@
 msgid "The component \"%(name)s\" has been added."
 msgstr "组件 '%(name)s' 已添加。"
 
-#: trac/ticket/admin.py:118
-#: trac/ticket/model.py:816
-#: trac/ticket/model.py:833
+#: trac/ticket/admin.py:118 trac/ticket/model.py:816 trac/ticket/model.py:833
 msgid "Invalid component name."
 msgstr "无效的组件名称。"
 
@@ -2264,15 +2211,13 @@
 msgid "The selected components have been removed."
 msgstr "选定组件已删除。"
 
-#: trac/ticket/admin.py:242
-#: trac/ticket/api.py:295
+#: trac/ticket/admin.py:242 trac/ticket/api.py:295
 #: trac/ticket/templates/milestone_view.html:10
 #: trac/ticket/templates/milestone_view.html:21
 msgid "Milestone"
 msgstr "里程碑"
 
-#: trac/ticket/admin.py:271
-#: trac/ticket/roadmap.py:665
+#: trac/ticket/admin.py:271 trac/ticket/roadmap.py:665
 msgid "Completion date may not be in the future"
 msgstr "完成日期不能是未来的日期"
 
@@ -2285,9 +2230,7 @@
 msgid "The milestone \"%(name)s\" has been added."
 msgstr "里程碑 \"%(name)s\" 已添加。"
 
-#: trac/ticket/admin.py:305
-#: trac/ticket/model.py:942
-#: trac/ticket/model.py:962
+#: trac/ticket/admin.py:305 trac/ticket/model.py:942 trac/ticket/model.py:962
 msgid "Invalid milestone name."
 msgstr "无效的里程碑名称。"
 
@@ -2309,9 +2252,7 @@
 msgid "The version \"%(name)s\" has been added."
 msgstr "版本 '%(name)s' 已添加。"
 
-#: trac/ticket/admin.py:486
-#: trac/ticket/model.py:1065
-#: trac/ticket/model.py:1081
+#: trac/ticket/admin.py:486 trac/ticket/model.py:1065 trac/ticket/model.py:1081
 msgid "Invalid version name."
 msgstr "无效的版本名称。"
 
@@ -2337,9 +2278,7 @@
 msgid "The %(field)s \"%(name)s\" has been added."
 msgstr "%(field)s \"%(name)s\" 已添加。"
 
-#: trac/ticket/admin.py:636
-#: trac/ticket/model.py:687
-#: trac/ticket/model.py:710
+#: trac/ticket/admin.py:636 trac/ticket/model.py:687 trac/ticket/model.py:710
 #, python-format
 msgid "Invalid %(type)s name."
 msgstr "无效的%(type)s名称。"
@@ -2360,7 +2299,9 @@
 msgstr "选定%(fields)s已删除。"
 
 #: trac/ticket/admin.py:675
-msgid "Error writing to trac.ini, make sure it is writable by the web server. The default value has not been saved."
+msgid ""
+"Error writing to trac.ini, make sure it is writable by the web server. "
+"The default value has not been saved."
 msgstr ""
 "写入trac.ini错误，请确保它可被Web服务器写入。\n"
 "缺省值没有被保存。"
@@ -2378,8 +2319,7 @@
 msgid "Invalid up/down value: %(value)s"
 msgstr "无效的 up/down 值: %(value)s"
 
-#: trac/ticket/admin.py:793
-#: trac/ticket/api.py:294
+#: trac/ticket/admin.py:793 trac/ticket/api.py:294
 msgid "Priority"
 msgstr "优先级"
 
@@ -2387,8 +2327,7 @@
 msgid "Priorities"
 msgstr "优先级"
 
-#: trac/ticket/admin.py:799
-#: trac/ticket/api.py:299
+#: trac/ticket/admin.py:799 trac/ticket/api.py:299
 msgid "Resolution"
 msgstr "处理结果"
 
@@ -2396,8 +2335,7 @@
 msgid "Resolutions"
 msgstr "处理结果"
 
-#: trac/ticket/admin.py:805
-#: trac/ticket/api.py:298
+#: trac/ticket/admin.py:805 trac/ticket/api.py:298
 msgid "Severity"
 msgstr "严重性"
 
@@ -2426,13 +2364,11 @@
 msgid "Summary"
 msgstr "概述:"
 
-#: trac/ticket/api.py:279
-#: trac/ticket/templates/ticket.html:361
+#: trac/ticket/api.py:279 trac/ticket/templates/ticket.html:361
 msgid "Reporter"
 msgstr "报告人:"
 
-#: trac/ticket/api.py:292
-#: trac/versioncontrol/admin.py:108
+#: trac/ticket/api.py:292 trac/versioncontrol/admin.py:108
 #: trac/versioncontrol/templates/admin_repositories.html:124
 msgid "Type"
 msgstr "类型:"
@@ -2471,8 +2407,7 @@
 msgid "The ticket will be disowned"
 msgstr "任务单将将脱离属主"
 
-#: trac/ticket/default_workflow.py:246
-#: trac/ticket/default_workflow.py:262
+#: trac/ticket/default_workflow.py:246 trac/ticket/default_workflow.py:262
 #, python-format
 msgid "The owner will be changed from %(current_owner)s"
 msgstr "属主将由%(current_owner)s变更"
@@ -2492,7 +2427,9 @@
 msgstr "属主将由%(current_owner)s变更为%(authname)s"
 
 #: trac/ticket/default_workflow.py:277
-msgid "Your workflow attempts to set a resolution but none is defined (configuration issue, please contact your Trac admin)."
+msgid ""
+"Your workflow attempts to set a resolution but none is defined "
+"(configuration issue, please contact your Trac admin)."
 msgstr ""
 "您的工作流试图设置处理结果，但一个也没有定义\n"
 "(配置问题，请联系您的Trac管理员)。"
@@ -2596,13 +2533,11 @@
 msgid "Invalid ticket id list: %(value)s"
 msgstr "无效的任务单ID列表： %(value)s"
 
-#: trac/ticket/query.py:662
-#: trac/ticket/query.py:670
+#: trac/ticket/query.py:662 trac/ticket/query.py:670
 msgid "contains"
 msgstr "包含"
 
-#: trac/ticket/query.py:663
-#: trac/ticket/query.py:671
+#: trac/ticket/query.py:663 trac/ticket/query.py:671
 msgid "doesn't contain"
 msgstr "不包含"
 
@@ -2614,64 +2549,47 @@
 msgid "ends with"
 msgstr "结束于"
 
-#: trac/ticket/query.py:666
-#: trac/ticket/query.py:674
-#: trac/ticket/query.py:678
+#: trac/ticket/query.py:666 trac/ticket/query.py:674 trac/ticket/query.py:678
 msgid "is"
 msgstr "是"
 
-#: trac/ticket/query.py:667
-#: trac/ticket/query.py:675
-#: trac/ticket/query.py:679
+#: trac/ticket/query.py:667 trac/ticket/query.py:675 trac/ticket/query.py:679
 msgid "is not"
 msgstr "不是"
 
-#: trac/ticket/query.py:709
-#: trac/ticket/query.py:715
+#: trac/ticket/query.py:709 trac/ticket/query.py:715
 msgid "Ticket"
 msgstr "任务单"
 
-#: trac/ticket/query.py:776
-#: trac/ticket/report.py:379
+#: trac/ticket/query.py:776 trac/ticket/report.py:379
 #, python-format
 msgid "Page %(num)d"
 msgstr "第 %(num)d 页"
 
-#: trac/ticket/query.py:825
-#: trac/ticket/report.py:539
-#: trac/ticket/web_ui.py:130
-#: trac/timeline/web_ui.py:215
-#: trac/versioncontrol/web_ui/log.py:303
+#: trac/ticket/query.py:825 trac/ticket/report.py:539 trac/ticket/web_ui.py:130
+#: trac/timeline/web_ui.py:215 trac/versioncontrol/web_ui/log.py:303
 msgid "RSS Feed"
 msgstr "RSS Feed"
 
-#: trac/ticket/query.py:827
-#: trac/ticket/report.py:541
-#: trac/ticket/web_ui.py:126
+#: trac/ticket/query.py:827 trac/ticket/report.py:541 trac/ticket/web_ui.py:126
 msgid "Comma-delimited Text"
 msgstr "逗号分割文本"
 
-#: trac/ticket/query.py:829
-#: trac/ticket/report.py:543
-#: trac/ticket/web_ui.py:128
+#: trac/ticket/query.py:829 trac/ticket/report.py:543 trac/ticket/web_ui.py:128
 msgid "Tab-delimited Text"
 msgstr "Tab分割文本"
 
-#: trac/ticket/query.py:851
-#: trac/ticket/report.py:73
+#: trac/ticket/query.py:851 trac/ticket/report.py:73
 msgid "View Tickets"
 msgstr "查看任务单"
 
-#: trac/ticket/query.py:1058
-#: trac/ticket/query.py:1069
+#: trac/ticket/query.py:1058 trac/ticket/query.py:1069
 #: trac/ticket/report.py:133
 msgid "Custom Query"
 msgstr "定制查询"
 
-#: trac/ticket/query.py:1068
-#: trac/ticket/report.py:123
-#: trac/ticket/report.py:124
-#: trac/ticket/report.py:126
+#: trac/ticket/query.py:1068 trac/ticket/report.py:123
+#: trac/ticket/report.py:124 trac/ticket/report.py:126
 #: trac/ticket/templates/report_list.html:10
 #: trac/ticket/templates/report_list.html:15
 msgid "Available Reports"
@@ -2710,15 +2628,13 @@
 msgid "Delete Report {%(num)s} %(title)s"
 msgstr "删除报表 {%(num)s} %(title)s"
 
-#: trac/ticket/report.py:204
-#: trac/ticket/report.py:217
+#: trac/ticket/report.py:204 trac/ticket/report.py:217
 #: trac/ticket/report.py:269
 #, python-format
 msgid "Report {%(num)s} does not exist."
 msgstr "报表 {%(num)s} 不存在."
 
-#: trac/ticket/report.py:205
-#: trac/ticket/report.py:218
+#: trac/ticket/report.py:205 trac/ticket/report.py:218
 #: trac/ticket/report.py:270
 msgid "Invalid Report Number"
 msgstr "无效报表号"
@@ -2780,18 +2696,20 @@
 
 #: trac/ticket/roadmap.py:218
 #, python-format
-msgid "'%(group1)s' and '%(group2)s' milestone groups both are declared to be \"catch-all\" groups. Please check your configuration."
+msgid ""
+"'%(group1)s' and '%(group2)s' milestone groups both are declared to be "
+"\"catch-all\" groups. Please check your configuration."
 msgstr "'%(group1)s' 和 '%(group2)s' 里程碑组都声明为\"catch-all\" 组. 请检查您的配置."
 
 #: trac/ticket/roadmap.py:234
 #, python-format
-msgid "'%(groupname)s' milestone group reused status '%(status)s' already taken by other groups. Please check your configuration."
+msgid ""
+"'%(groupname)s' milestone group reused status '%(status)s' already taken "
+"by other groups. Please check your configuration."
 msgstr "'%(groupname)s' 里程碑组重用了已经被其它组使用的状态 '%(status)s'. 请检查您的配置."
 
-#: trac/ticket/roadmap.py:317
-#: trac/ticket/roadmap.py:439
-#: trac/ticket/roadmap.py:573
-#: trac/ticket/templates/roadmap.html:10
+#: trac/ticket/roadmap.py:317 trac/ticket/roadmap.py:439
+#: trac/ticket/roadmap.py:573 trac/ticket/templates/roadmap.html:10
 #: trac/ticket/templates/roadmap.html:15
 msgid "Roadmap"
 msgstr "路线图"
@@ -2800,8 +2718,7 @@
 msgid "iCalendar"
 msgstr "iCalendar"
 
-#: trac/ticket/roadmap.py:448
-#: trac/ticket/roadmap.py:847
+#: trac/ticket/roadmap.py:448 trac/ticket/roadmap.py:847
 #, python-format
 msgid "Milestone %(name)s"
 msgstr "里程碑 %(name)s"
@@ -2829,8 +2746,7 @@
 msgid "You must provide a name for the milestone."
 msgstr "您必须为里程碑提供名称."
 
-#: trac/ticket/web_ui.py:152
-#: trac/ticket/templates/ticket.html:14
+#: trac/ticket/web_ui.py:152 trac/ticket/templates/ticket.html:14
 msgid "New Ticket"
 msgstr "新建任务单"
 
@@ -2891,14 +2807,12 @@
 msgid "Back to Query"
 msgstr "返回查询"
 
-#: trac/ticket/web_ui.py:707
-#: trac/ticket/web_ui.py:855
+#: trac/ticket/web_ui.py:707 trac/ticket/web_ui.py:855
 #: trac/ticket/web_ui.py:863
 msgid "Ticket History"
 msgstr "任务单历史"
 
-#: trac/ticket/web_ui.py:711
-#: trac/ticket/web_ui.py:910
+#: trac/ticket/web_ui.py:711 trac/ticket/web_ui.py:910
 #, python-format
 msgid "Back to Ticket #%(num)s"
 msgstr "回到任务单 #%(num)s"
@@ -2907,36 +2821,25 @@
 msgid "No differences to show"
 msgstr "没有差异"
 
-#: trac/ticket/web_ui.py:796
-#: trac/ticket/web_ui.py:852
-#: trac/ticket/web_ui.py:860
-#: trac/ticket/web_ui.py:931
-#: trac/ticket/web_ui.py:968
-#: trac/ticket/web_ui.py:975
-#: trac/wiki/web_ui.py:378
-#: trac/wiki/web_ui.py:384
-#: trac/wiki/web_ui.py:573
-#: trac/wiki/web_ui.py:587
+#: trac/ticket/web_ui.py:796 trac/ticket/web_ui.py:852
+#: trac/ticket/web_ui.py:860 trac/ticket/web_ui.py:931
+#: trac/ticket/web_ui.py:968 trac/ticket/web_ui.py:975 trac/wiki/web_ui.py:431
+#: trac/wiki/web_ui.py:437 trac/wiki/web_ui.py:626 trac/wiki/web_ui.py:640
 #, python-format
 msgid "Version %(num)s"
 msgstr "版本 %(num)s"
 
-#: trac/ticket/web_ui.py:799
-#: trac/ticket/web_ui.py:934
+#: trac/ticket/web_ui.py:799 trac/ticket/web_ui.py:934
 msgid "initial"
 msgstr "初始"
 
-#: trac/ticket/web_ui.py:862
-#: trac/ticket/web_ui.py:977
-#: trac/versioncontrol/web_ui/changeset.py:369
-#: trac/wiki/web_ui.py:397
+#: trac/ticket/web_ui.py:862 trac/ticket/web_ui.py:977
+#: trac/versioncontrol/web_ui/changeset.py:369 trac/wiki/web_ui.py:450
 msgid "Previous Change"
 msgstr "上一个更改"
 
-#: trac/ticket/web_ui.py:862
-#: trac/ticket/web_ui.py:977
-#: trac/versioncontrol/web_ui/changeset.py:369
-#: trac/wiki/web_ui.py:397
+#: trac/ticket/web_ui.py:862 trac/ticket/web_ui.py:977
+#: trac/versioncontrol/web_ui/changeset.py:369 trac/wiki/web_ui.py:450
 msgid "Next Change"
 msgstr "下一个更改"
 
@@ -2944,14 +2847,12 @@
 msgid "Ticket Diff"
 msgstr "任务单差异"
 
-#: trac/ticket/web_ui.py:902
-#: trac/ticket/web_ui.py:971
+#: trac/ticket/web_ui.py:902 trac/ticket/web_ui.py:971
 #: trac/ticket/web_ui.py:978
 msgid "Ticket Comment History"
 msgstr "任务单评论历史"
 
-#: trac/ticket/web_ui.py:904
-#: trac/ticket/web_ui.py:928
+#: trac/ticket/web_ui.py:904 trac/ticket/web_ui.py:928
 #: trac/ticket/web_ui.py:985
 #, python-format
 msgid "Ticket #%(num)s, comment %(cnum)d"
@@ -2978,7 +2879,9 @@
 msgstr "无权增加评论。"
 
 #: trac/ticket/web_ui.py:1095
-msgid "Sorry, can not save your changes. This ticket has been modified by someone else since you started"
+msgid ""
+"Sorry, can not save your changes. This ticket has been modified by "
+"someone else since you started"
 msgstr "对不起, 无法保存您的修改。该任务单已在您修改过程中被其他人修改"
 
 #: trac/ticket/web_ui.py:1102
@@ -3006,12 +2909,16 @@
 
 #: trac/ticket/web_ui.py:1173
 #, python-format
-msgid "The ticket has been created, but an error occurred while sending notifications: %(message)s"
+msgid ""
+"The ticket has been created, but an error occurred while sending "
+"notifications: %(message)s"
 msgstr "该任务单已创建，但在发送邮件通知时发生错误： %(message)s"
 
 #: trac/ticket/web_ui.py:1183
 #, python-format
-msgid "Your ticket %(ticketref)s has been created, but you don't have permission to view it."
+msgid ""
+"Your ticket %(ticketref)s has been created, but you don't have permission"
+" to view it."
 msgstr "你的任务单 %(ticketref)s 已经创建，但你没有权限查看它。"
 
 #. TRANSLATOR: The 'change' has been saved... (link)
@@ -3021,7 +2928,9 @@
 
 #: trac/ticket/web_ui.py:1220
 #, python-format
-msgid "The %(change)s has been saved, but an error occurred while sending notifications: %(message)s"
+msgid ""
+"The %(change)s has been saved, but an error occurred while sending "
+"notifications: %(message)s"
 msgstr "%(change)s已保存，但在发送邮件通知时发生错误： %(message)s"
 
 #: trac/ticket/web_ui.py:1354
@@ -3040,18 +2949,15 @@
 msgid "<Author field>"
 msgstr "<Author field>"
 
-#: trac/ticket/web_ui.py:1378
-#: trac/ticket/templates/query.html:102
+#: trac/ticket/web_ui.py:1378 trac/ticket/templates/query.html:102
 msgid "yes"
 msgstr "是"
 
-#: trac/ticket/web_ui.py:1378
-#: trac/ticket/templates/query.html:105
+#: trac/ticket/web_ui.py:1378 trac/ticket/templates/query.html:105
 msgid "no"
 msgstr "否"
 
-#: trac/ticket/web_ui.py:1567
-#: trac/versioncontrol/templates/changeset.html:161
+#: trac/ticket/web_ui.py:1567 trac/versioncontrol/templates/changeset.html:161
 msgid "modified"
 msgstr "已修改"
 
@@ -3185,8 +3091,7 @@
 msgid "Query filters"
 msgstr "查询过滤器"
 
-#: trac/ticket/templates/query.html:45
-#: trac/ticket/templates/query.html:141
+#: trac/ticket/templates/query.html:45 trac/ticket/templates/query.html:141
 msgid "Or"
 msgstr "或"
 
@@ -3321,7 +3226,9 @@
 msgstr "描述: (您可用 [1:WikiFormatting] 格式)"
 
 #: trac/ticket/templates/report_edit.html:36
-msgid "Query for Report: (can be either SQL or, if starting with [1:query:], a [2:TracQuery] expression)"
+msgid ""
+"Query for Report: (can be either SQL or, if starting with [1:query:], a "
+"[2:TracQuery] expression)"
 msgstr "生成报表的查询: (可以是SQL，或者是一个以[1:query:]开头的[2:TracQuery]表达式)"
 
 #: trac/ticket/templates/report_edit.html:41
@@ -3336,14 +3243,12 @@
 msgid "Report"
 msgstr "报表"
 
-#: trac/ticket/templates/report_list.html:26
-#: trac/wiki/admin.py:199
+#: trac/ticket/templates/report_list.html:26 trac/wiki/admin.py:202
 msgid "Title"
 msgstr "标题"
 
 #: trac/ticket/templates/report_list.html:27
-#: trac/wiki/templates/wiki_edit.html:68
-#: trac/wiki/templates/wiki_edit.html:141
+#: trac/wiki/templates/wiki_edit.html:68 trac/wiki/templates/wiki_edit.html:141
 msgid "Actions"
 msgstr "动作"
 
@@ -3359,8 +3264,7 @@
 msgstr "编辑报表"
 
 #: trac/ticket/templates/report_list.html:35
-#: trac/ticket/templates/ticket.html:148
-#: trac/wiki/templates/wiki_edit.html:124
+#: trac/ticket/templates/ticket.html:148 trac/wiki/templates/wiki_edit.html:124
 msgid "Edit"
 msgstr "编辑"
 
@@ -3448,8 +3352,11 @@
 msgid "Go to the ticket editor"
 msgstr "转到任务单编辑器"
 
-#: trac/ticket/templates/ticket.html:90
-#: trac/ticket/templates/ticket.html:93
+#: trac/ticket/templates/ticket.html:80
+msgid "Modify"
+msgstr "修改"
+
+#: trac/ticket/templates/ticket.html:90 trac/ticket/templates/ticket.html:93
 msgid "— at"
 msgstr "— 于"
 
@@ -3461,8 +3368,7 @@
 msgid "Change History"
 msgstr "变更历史"
 
-#: trac/ticket/templates/ticket.html:128
-#: trac/ticket/templates/ticket.html:216
+#: trac/ticket/templates/ticket.html:128 trac/ticket/templates/ticket.html:216
 msgid "in reply to:"
 msgstr "回复到:"
 
@@ -3601,8 +3507,7 @@
 
 #: trac/ticket/templates/ticket.html:396
 #: trac/ticket/templates/ticket_change.html:45
-#: trac/wiki/templates/wiki_edit.html:70
-#: trac/wiki/templates/wiki_edit.html:128
+#: trac/wiki/templates/wiki_edit.html:70 trac/wiki/templates/wiki_edit.html:128
 #: trac/wiki/templates/wiki_edit_form.html:39
 #: trac/wiki/templates/wiki_edit_form.html:68
 msgid "Preview"
@@ -3698,19 +3603,16 @@
 "-- \n"
 "任务单 URL: <"
 
-#: trac/timeline/web_ui.py:75
-#: trac/timeline/templates/timeline.html:10
+#: trac/timeline/web_ui.py:75 trac/timeline/templates/timeline.html:10
 #: trac/timeline/templates/timeline.html:16
 msgid "Timeline"
 msgstr "时间线"
 
-#: trac/timeline/web_ui.py:228
-#: trac/timeline/web_ui.py:236
+#: trac/timeline/web_ui.py:228 trac/timeline/web_ui.py:236
 msgid "Previous Period"
 msgstr "上一周期"
 
-#: trac/timeline/web_ui.py:235
-#: trac/timeline/web_ui.py:236
+#: trac/timeline/web_ui.py:235 trac/timeline/web_ui.py:236
 msgid "Next Period"
 msgstr "下一周期"
 
@@ -3733,7 +3635,8 @@
 #, python-format
 msgid ""
 "\n"
-"              You may want to see the %(other_events)s from the Timeline or \n"
+"              You may want to see the %(other_events)s from the Timeline "
+"or \n"
 "              notify your Trac administrator about the error (detailed\n"
 "              informations were written to the log).\n"
 "            "
@@ -3818,17 +3721,20 @@
 
 #: trac/util/datefmt.py:247
 #, python-format
-msgid "\"%(date)s\" is an invalid date, or the date format is not known. Try \"%(hint)s\" instead."
+msgid ""
+"\"%(date)s\" is an invalid date, or the date format is not known. Try "
+"\"%(hint)s\" instead."
 msgstr "\"%(date)s\" 是一个无效日期，或者日期格式未知。请尝试 \"%(hint)s\" 。"
 
-#: trac/util/datefmt.py:249
-#: trac/util/datefmt.py:257
+#: trac/util/datefmt.py:249 trac/util/datefmt.py:257
 msgid "Invalid Date"
 msgstr "无效日期"
 
 #: trac/util/datefmt.py:255
 #, python-format
-msgid "The date \"%(date)s\" is outside valid range. Try a date closer to present time."
+msgid ""
+"The date \"%(date)s\" is outside valid range. Try a date closer to "
+"present time."
 msgstr "日期\"%(date)s\"超出了有效范围。请尝试与当前时间临近的日期。"
 
 #: trac/util/presentation.py:254
@@ -3841,12 +3747,9 @@
 msgid "%(start)d - %(stop)d of %(total)d"
 msgstr "%(start)d - %(stop)d 共 %(total)d"
 
-#: trac/versioncontrol/admin.py:80
-#: trac/versioncontrol/admin.py:105
-#: trac/versioncontrol/admin.py:106
-#: trac/versioncontrol/admin.py:296
-#: trac/versioncontrol/api.py:38
-#: trac/versioncontrol/api.py:155
+#: trac/versioncontrol/admin.py:80 trac/versioncontrol/admin.py:105
+#: trac/versioncontrol/admin.py:106 trac/versioncontrol/admin.py:296
+#: trac/versioncontrol/api.py:38 trac/versioncontrol/api.py:155
 #: trac/versioncontrol/api.py:192
 #: trac/versioncontrol/templates/admin_repositories.html:20
 #: trac/versioncontrol/templates/admin_repositories.html:33
@@ -3911,25 +3814,30 @@
 msgid "Repository %(name)s does not exist."
 msgstr "版本库 '%(name)s' 不存在."
 
-#: trac/versioncontrol/admin.py:199
-#: trac/versioncontrol/admin.py:235
+#: trac/versioncontrol/admin.py:199 trac/versioncontrol/admin.py:235
 #, python-format
-msgid "You should now run \"trac-admin $ENV repository resync %(name)s\" to synchronize Trac with the repository."
+msgid ""
+"You should now run \"trac-admin $ENV repository resync %(name)s\" to "
+"synchronize Trac with the repository."
 msgstr ""
 "你现在应执行 \"trac-admin $ENV repository resync %(name)s\" \"\n"
 "\"来将Trac与版本库同步。"
 
 #: trac/versioncontrol/admin.py:204
 #, python-format
-msgid "You may have to run \"trac-admin $ENV repository resync %(name)s\" to synchronize Trac with the repository."
+msgid ""
+"You may have to run \"trac-admin $ENV repository resync %(name)s\" to "
+"synchronize Trac with the repository."
 msgstr ""
 "你必须执行 \"trac-admin $ENV repository resync %(name)s\" \"\n"
 "\"来将Trac与版本库同步。"
 
 #: trac/versioncontrol/admin.py:209
-msgid "You will need to update your post-commit hook to call \"trac-admin $ENV changeset added\" with the new repository name."
+msgid ""
+"You will need to update your post-commit hook to call \"trac-admin $ENV "
+"changeset added\" with the new repository name."
 msgstr ""
-"你需要更新你的post-commit脚本，用新的版本库名字调用\"\n"
+"你需要更新你的post-commit脚本，用新的版本库名调用\"\n"
 "\" \"trac-admin $ENV changeset added\"。"
 
 #: trac/versioncontrol/admin.py:230
@@ -3939,7 +3847,10 @@
 
 #: trac/versioncontrol/admin.py:237
 #, python-format
-msgid "You should also set up a post-commit hook on the repository to call \"trac-admin $ENV changeset added %(name)s $REV\" for each committed changeset."
+msgid ""
+"You should also set up a post-commit hook on the repository to call "
+"\"trac-admin $ENV changeset added %(name)s $REV\" for each committed "
+"changeset."
 msgstr ""
 "你也应当在版本库中创建一个post-commit脚本，对已提交的每一个\"\n"
 "\"变更集调用 \"trac-admin $ENV changeset added %(name)s $REV\"。"
@@ -3987,7 +3898,9 @@
 
 #: trac/versioncontrol/api.py:337
 #, python-format
-msgid "Can't synchronize with repository \"%(name)s\" (%(error)s). Look in the Trac log for more information."
+msgid ""
+"Can't synchronize with repository \"%(name)s\" (%(error)s). Look in the "
+"Trac log for more information."
 msgstr "无法与版本库\"%(name)s\"同步 (%(error)s)。更多信息请查看Trac日志。"
 
 #: trac/versioncontrol/api.py:356
@@ -4034,7 +3947,9 @@
 
 #: trac/versioncontrol/api.py:662
 #, python-format
-msgid "Unsupported version control system \"%(name)s\": Can't find an appropriate component, maybe the corresponding plugin was not enabled? "
+msgid ""
+"Unsupported version control system \"%(name)s\": Can't find an "
+"appropriate component, maybe the corresponding plugin was not enabled? "
 msgstr "不支持的版本控制系统\"%(name)s\"：未能找到合适的组件，也许相关插件没有被激活？"
 
 #: trac/versioncontrol/api.py:670
@@ -4051,7 +3966,9 @@
 msgstr "没有这个节点"
 
 #: trac/versioncontrol/cache.py:143
-msgid "The 'repository_dir' has changed, a 'trac-admin $ENV repository resync' operation is needed."
+msgid ""
+"The 'repository_dir' has changed, a 'trac-admin $ENV repository resync' "
+"operation is needed."
 msgstr ""
 "'repository_dir' 已经被修改，需要执行 'trac-admin $ENV \"\n"
 "\"reposityory resync' 操作。"
@@ -4083,8 +4000,12 @@
 
 #: trac/versioncontrol/svn_fs.py:617
 #, python-format
-msgid "Diff mismatch: Base is a %(oldnode)s (%(oldpath)s in revision %(oldrev)s) and Target is a %(newnode)s (%(newpath)s in revision %(newrev)s)."
-msgstr "对比不匹配: 基准是 %(oldnode)s (%(oldpath)s 在修订 %(oldrev)s)中，而目标是 %(newnode)s (%(newpath)s 在修订 %(newrev)s)中。"
+msgid ""
+"Diff mismatch: Base is a %(oldnode)s (%(oldpath)s in revision %(oldrev)s)"
+" and Target is a %(newnode)s (%(newpath)s in revision %(newrev)s)."
+msgstr ""
+"对比不匹配: 基准是 %(oldnode)s (%(oldpath)s 在修订 %(oldrev)s)中，而目标是 %(newnode)s "
+"(%(newpath)s 在修订 %(newrev)s)中。"
 
 #: trac/versioncontrol/svn_fs.py:766
 #, python-format
@@ -4175,7 +4096,8 @@
 #: trac/versioncontrol/templates/admin_repositories.html:45
 msgid ""
 "[1:Note:]\n"
-"            This repository is defined in [2:[3:trac.ini]] and cannot be edited on this page."
+"            This repository is defined in [2:[3:trac.ini]] and cannot be "
+"edited on this page."
 msgstr ""
 "[1:Note:]\n"
 "\"\n"
@@ -4247,8 +4169,7 @@
 msgstr "没有找到任何文件"
 
 #: trac/versioncontrol/templates/browser.html:106
-#: trac/wiki/templates/wiki_edit.html:112
-#: trac/wiki/templates/wiki_view.html:36
+#: trac/wiki/templates/wiki_edit.html:112 trac/wiki/templates/wiki_view.html:36
 msgid "Revision info"
 msgstr "修订信息"
 
@@ -4476,7 +4397,8 @@
 #: trac/versioncontrol/templates/diff_form.html:50
 msgid ""
 "For either path, you can start typing the path and will be\n"
-"              presented a list of existing directories and files to select\n"
+"              presented a list of existing directories and files to "
+"select\n"
 "              from. Select an entry by clicking on it, or by using the\n"
 "              up/down cursor keys and hitting tab."
 msgstr ""
@@ -4716,7 +4638,9 @@
 msgstr "注解"
 
 #: trac/versioncontrol/web_ui/browser.py:453
-msgid "Annotate each line with the last changed revision (this can be time consuming...)"
+msgid ""
+"Annotate each line with the last changed revision (this can be time "
+"consuming...)"
 msgstr "给最新修订每行都加注解 (这可能是耗时操作...)"
 
 #: trac/versioncontrol/web_ui/browser.py:460
@@ -4850,7 +4774,9 @@
 
 #: trac/versioncontrol/web_ui/log.py:196
 #, python-format
-msgid "The file or directory '%(path)s' doesn't exist at revision %(rev)s or at any previous revision."
+msgid ""
+"The file or directory '%(path)s' doesn't exist at revision %(rev)s or at "
+"any previous revision."
 msgstr "文件或目录 '%(path)s' 不存在 %(rev)s 及以前的修订。"
 
 #: trac/versioncontrol/web_ui/log.py:198
@@ -4884,9 +4810,21 @@
 
 #: trac/versioncontrol/web_ui/util.py:68
 #, python-format
-msgid "You can %(search)s in the repository history to see if that path existed but was later removed"
+msgid ""
+"You can %(search)s in the repository history to see if that path existed "
+"but was later removed"
 msgstr "您可以在版本库历史中%(search)s，以判断是否路径曾经存在但后来被删除了。"
 
+#: trac/web/api.py:232
+#, python-format
+msgid "Invalid URL encoding (was %(path_info)r)"
+msgstr "无效URL编码 (原来是 %(path_info)r)"
+
+#: trac/web/api.py:447
+#, python-format
+msgid "File %(path)s not found"
+msgstr "文件 \"%(path)s\" 未找到。"
+
 #: trac/web/auth.py:104
 #, python-format
 msgid "logged in as %(user)s"
@@ -4905,16 +4843,16 @@
 msgid "Already logged in as %(user)s."
 msgstr "已经登录为 %(user)s."
 
-#: trac/web/chrome.py:578
+#: trac/web/chrome.py:580
 #, python-format
 msgid "Error with navigation contributor \"%(name)s\""
 msgstr "导航贡献者 \"%(name)s\" 错误"
 
-#: trac/web/chrome.py:873
+#: trac/web/chrome.py:875
 msgid "(unknown template location)"
 msgstr "(未知模板路径)"
 
-#: trac/web/chrome.py:874
+#: trac/web/chrome.py:876
 #, python-format
 msgid "Genshi %(error)s error while rendering template %(location)s"
 msgstr "Genshi在渲染模板%(location)s时，发生错误%(error)s。"
@@ -4949,7 +4887,9 @@
 
 #: trac/web/session.py:204
 #, python-format
-msgid "Session '%(id)s' already exists.<br />Please choose a different session ID."
+msgid ""
+"Session '%(id)s' already exists.<br />Please choose a different session "
+"ID."
 msgstr "会话'%(id)s'已经存在，<br />请选择其它会话标识。"
 
 #: trac/web/session.py:206
@@ -4985,31 +4925,39 @@
 msgid "A datetime object must be specified"
 msgstr "必须指定一个时间对象"
 
-#: trac/wiki/admin.py:114
+#: trac/wiki/admin.py:117
 #, python-format
 msgid "'%(name)s' is not a file"
 msgstr "'%(name)s'不是一个文件。"
 
-#: trac/wiki/admin.py:167
-#: trac/wiki/admin.py:251
+#: trac/wiki/admin.py:170 trac/wiki/admin.py:267
 #, python-format
 msgid "  %(page)s imported from %(filename)s"
 msgstr "已从%(filename)s中导入%(page)s"
 
-#: trac/wiki/admin.py:199
+#: trac/wiki/admin.py:202
 msgid "Edits"
 msgstr "编辑次数"
 
-#: trac/wiki/admin.py:210
+#: trac/wiki/admin.py:208 trac/wiki/web_ui.py:296
+msgid "A new name is mandatory for a rename."
+msgstr "重命名必须提供新的名称。"
+
+#: trac/wiki/admin.py:212 trac/wiki/web_ui.py:300
+#, python-format
+msgid "The page %(name)s already exists."
+msgstr "页面 %(name)s 已经存在"
+
+#: trac/wiki/admin.py:226
 msgid "Deleted pages"
 msgstr "已删除页面 "
 
-#: trac/wiki/admin.py:229
+#: trac/wiki/admin.py:245
 #, python-format
 msgid "'%(name)s' is not a directory"
 msgstr "'%(name)s'不是一个目录。"
 
-#: trac/wiki/api.py:316
+#: trac/wiki/api.py:319
 msgid "no permission to view this wiki page"
 msgstr "无权查看此Wiki页面"
 
@@ -5032,8 +4980,7 @@
 msgid "!#%(name)s must contain at least one table cell (and table cells only)"
 msgstr "!#%(name)s 必须包含在至少一个表单元中（也只允许在表单元中）"
 
-#: trac/wiki/formatter.py:564
-#: trac/wiki/interwiki.py:88
+#: trac/wiki/formatter.py:564 trac/wiki/interwiki.py:88
 #, python-format
 msgid "%(target)s in %(name)s"
 msgstr "%(target)s 在 %(name)s"
@@ -5068,8 +5015,12 @@
 msgid "Page not modified"
 msgstr "未修改的页面"
 
-#: trac/wiki/web_ui.py:88
-#: trac/wiki/web_ui.py:665
+#: trac/wiki/model.py:175
+#, python-format
+msgid "Can't rename to existing %(name)s page."
+msgstr "不能重命名为已有页面 %(name)s 。"
+
+#: trac/wiki/web_ui.py:88 trac/wiki/web_ui.py:718
 msgid "Wiki"
 msgstr "Wiki"
 
@@ -5077,124 +5028,133 @@
 msgid "Help/Guide"
 msgstr "帮助/指南"
 
-#: trac/wiki/web_ui.py:125
+#: trac/wiki/web_ui.py:126
 #, python-format
 msgid "No version \"%(num)s\" for Wiki page \"%(name)s\""
 msgstr "无版本 \"%(num)s\" , Wiki页面 \"%(name)s\""
 
-#: trac/wiki/web_ui.py:186
+#: trac/wiki/web_ui.py:191
 #, python-format
 msgid "The wiki page is too long (must be less than %(num)s characters)"
 msgstr "任务单描述太长(必须少于 %(num)s 个字符)"
 
-#: trac/wiki/web_ui.py:196
+#: trac/wiki/web_ui.py:201
 #, python-format
 msgid "The Wiki page field '%(field)s' is invalid: %(message)s"
 msgstr "Wiki页面字段 '%(field)s' 无效: %(message)s"
 
-#: trac/wiki/web_ui.py:200
+#: trac/wiki/web_ui.py:205
 #, python-format
 msgid "Invalid Wiki page: %(message)s"
 msgstr "无效的Wiki页面: %(message)s"
 
 #. TRANSLATOR: wiki page
-#: trac/wiki/web_ui.py:227
+#: trac/wiki/web_ui.py:232
 msgid "currently edited"
 msgstr "正在编辑"
 
-#: trac/wiki/web_ui.py:261
+#: trac/wiki/web_ui.py:266
 #, python-format
 msgid "The page %(name)s has been deleted."
 msgstr "页面 %(name)s 已删除。"
 
-#: trac/wiki/web_ui.py:266
+#: trac/wiki/web_ui.py:271
 #, python-format
 msgid "The versions %(from_)d to %(to)d of the page %(name)s have been deleted."
 msgstr "页面 %(name)s 的版本 %(from_)d 到 %(to)d 已删除。"
 
-#: trac/wiki/web_ui.py:270
+#: trac/wiki/web_ui.py:275
 #, python-format
 msgid "The version %(version)d of the page %(name)s has been deleted."
 msgstr "页面 %(name)s 版本 %(version)d 已删除。"
 
-#: trac/wiki/web_ui.py:296
+#: trac/wiki/web_ui.py:298
+msgid "The new name must be different from the old name."
+msgstr "新名称必须与旧名称不同。"
+
+#: trac/wiki/web_ui.py:310
+#, python-format
+msgid "See [wiki:\"%(name)s\"]."
+msgstr "查看 [wiki:\"%(name)s\"]."
+
+#: trac/wiki/web_ui.py:338
 msgid "Page not modified, showing latest version."
 msgstr "页面未修改，显示最新版本"
 
-#: trac/wiki/web_ui.py:328
+#: trac/wiki/web_ui.py:381
 #, python-format
 msgid "Version %(num)s of page \"%(name)s\" does not exist"
 msgstr "版本 %(num)s 不存在, 页面 \"%(name)s\" "
 
-#: trac/wiki/web_ui.py:380
+#: trac/wiki/web_ui.py:433
 msgid "Page history"
 msgstr "页面历史"
 
-#: trac/wiki/web_ui.py:398
+#: trac/wiki/web_ui.py:451
 msgid "Wiki History"
 msgstr "Wiki历史"
 
-#: trac/wiki/web_ui.py:484
+#: trac/wiki/web_ui.py:537
 #, python-format
 msgid "Page %(name)s does not exist"
 msgstr "页面 %(name)s 不存在"
 
-#: trac/wiki/web_ui.py:498
+#: trac/wiki/web_ui.py:551
 #, python-format
 msgid "Back to %(wikipage)s"
 msgstr "返回 %(wikipage)s"
 
-#: trac/wiki/web_ui.py:526
+#: trac/wiki/web_ui.py:579
 #, python-format
 msgid "Page %(name)s not found"
 msgstr "没有找到页面 %(name)s"
 
-#: trac/wiki/web_ui.py:578
+#: trac/wiki/web_ui.py:631
 msgid "View latest version"
 msgstr "查看最新版本"
 
-#: trac/wiki/web_ui.py:582
+#: trac/wiki/web_ui.py:635
 msgid "View parent page"
 msgstr "查看父页面"
 
-#: trac/wiki/web_ui.py:591
+#: trac/wiki/web_ui.py:644
 msgid "Previous Version"
 msgstr "上一版本"
 
-#: trac/wiki/web_ui.py:591
+#: trac/wiki/web_ui.py:644
 msgid "Next Version"
 msgstr "下一版本"
 
-#: trac/wiki/web_ui.py:592
+#: trac/wiki/web_ui.py:645
 msgid "View Latest Version"
 msgstr "查看最新版本"
 
-#: trac/wiki/web_ui.py:595
+#: trac/wiki/web_ui.py:648
 msgid "Up"
 msgstr "向上"
 
-#: trac/wiki/web_ui.py:612
+#: trac/wiki/web_ui.py:665
 msgid "Start Page"
 msgstr "起始页"
 
-#: trac/wiki/web_ui.py:613
+#: trac/wiki/web_ui.py:666
 msgid "Index"
 msgstr "索引"
 
-#: trac/wiki/web_ui.py:615
+#: trac/wiki/web_ui.py:668
 msgid "History"
 msgstr "历史"
 
-#: trac/wiki/web_ui.py:622
+#: trac/wiki/web_ui.py:675
 msgid "Wiki changes"
 msgstr "Wiki变更"
 
 #. TRANSLATOR: wiki page
-#: trac/wiki/web_ui.py:651
+#: trac/wiki/web_ui.py:704
 msgid " edited"
 msgstr "已编辑"
 
-#: trac/wiki/web_ui.py:651
+#: trac/wiki/web_ui.py:704
 msgid " created"
 msgstr "已创建"
 
@@ -5224,8 +5184,7 @@
 msgid "Delete version %(version)d"
 msgstr "删除版本 %(version)d"
 
-#: trac/wiki/templates/wiki_edit.html:67
-#: trac/wiki/templates/wiki_edit.html:140
+#: trac/wiki/templates/wiki_edit.html:67 trac/wiki/templates/wiki_edit.html:140
 msgid "Go to Save, Preview, Review or Cancel buttons"
 msgstr "转到保存、预览、检查或取消按钮"
 
@@ -5276,7 +5235,7 @@
 
 #: trac/wiki/templates/wiki_edit.html:114
 msgid "Change information for future version"
-msgstr "改变未来版本的信息"
+msgstr "未来版本的变更信息"
 
 #: trac/wiki/templates/wiki_edit.html:115
 msgid "(modified by"
@@ -5349,6 +5308,32 @@
 msgid "Preview Page"
 msgstr "页面预览"
 
+#: trac/wiki/templates/wiki_rename.html:14
+msgid "Rename"
+msgstr "重命名"
+
+#: trac/wiki/templates/wiki_rename.html:18
+msgid "Renaming the page will rename all existing versions of the page in place."
+msgstr "重命名页面将会重命名页面的所有版本。"
+
+#: trac/wiki/templates/wiki_rename.html:18
+msgid "The complete history of the page will be moved to the new location."
+msgstr "页面的完整历史将被移动到新位置。"
+
+#: trac/wiki/templates/wiki_rename.html:22
+#, python-format
+msgid "New name:"
+msgstr "新名称:"
+
+#: trac/wiki/templates/wiki_rename.html:26
+msgid "Leave a redirection page at the old location"
+msgstr "在旧位置放置一个重定向页面"
+
+#: trac/wiki/templates/wiki_rename.html:32
+#: trac/wiki/templates/wiki_view.html:109
+msgid "Rename page"
+msgstr "重命名页面"
+
 #: trac/wiki/templates/wiki_view.html:25
 msgid "View WikiStart"
 msgstr "查看 WikiStart"
@@ -5372,52 +5357,52 @@
 "\"\n"
 "\"               ([1:diff])"
 
-#: trac/wiki/templates/wiki_view.html:52
+#: trac/wiki/templates/wiki_view.html:51
 #, python-format
 msgid ""
-"[1:Last modified]\n"
-"            by %(author)s on %(datetime)s (%(reldate)s ago)"
+"[1:\n"
+"              Last modified] %(reldate)s ago"
 msgstr ""
-"[1:Last Modified]\n"
-"            由 %(author)s 于 %(datetime)s (%(reldate)s 前) 最后一次修改"
+"[1:\n"
+"              最后修改于] %(reldate)s 前"
 
-#: trac/wiki/templates/wiki_view.html:59
+#: trac/wiki/templates/wiki_view.html:60
 msgid "The page"
 msgstr "此页面"
 
-#: trac/wiki/templates/wiki_view.html:59
+#: trac/wiki/templates/wiki_view.html:60
 msgid "does not exist. You can create it here."
 msgstr "不存在。你可以在此创建它。"
 
-#: trac/wiki/templates/wiki_view.html:61
+#: trac/wiki/templates/wiki_view.html:62
 msgid "You could also create the same page higher in the hierarchy:"
 msgstr "此外，您也可以创建目录层次更高的页面:"
 
-#: trac/wiki/templates/wiki_view.html:83
+#: trac/wiki/templates/wiki_view.html:85
 msgid "Edit this page"
 msgstr "编辑此页面"
 
-#: trac/wiki/templates/wiki_view.html:86
+#: trac/wiki/templates/wiki_view.html:88
 msgid "Create this page"
 msgstr "创建此页面"
 
-#: trac/wiki/templates/wiki_view.html:88
+#: trac/wiki/templates/wiki_view.html:90
 msgid "Using the template:"
 msgstr "使用模板:"
 
-#: trac/wiki/templates/wiki_view.html:91
+#: trac/wiki/templates/wiki_view.html:93
 msgid "(blank page)"
 msgstr "(空白页面)"
 
-#: trac/wiki/templates/wiki_view.html:110
+#: trac/wiki/templates/wiki_view.html:118
 msgid "Delete this version"
 msgstr "删除此版本"
 
-#: trac/wiki/templates/wiki_view.html:112
+#: trac/wiki/templates/wiki_view.html:120
 msgid "Delete page"
 msgstr "删除页面 "
 
-#: trac/wiki/templates/wiki_view.html:121
+#: trac/wiki/templates/wiki_view.html:129
 msgid "The following pages have a name similar to this page, and may be related:"
-msgstr "以下页面与此页面名字相似，可能会有关联："
+msgstr "以下页面与此页面名称相似，可能会有关联："