Edgewall Software

Ticket #5472: zh_CN-lang-r9640.2.patch

File zh_CN-lang-r9640.2.patch, 158.0 KB (added by zengjie <zengjie@…>, 2 years ago)

translation update for r9640

Line 
1Index: messages.po
2===================================================================
3--- messages.po (°æ±¾ 9640)
4+++ messages.po (¹¤×÷¸±±¾)
5@@ -10,7 +10,7 @@
6 "Project-Id-Version: Trac 0.12\n"
7 "Report-Msgid-Bugs-To: trac-dev@googlegroups.com\n"
8 "POT-Creation-Date: 2010-03-17 08:34+0100\n"
9-"PO-Revision-Date: 2010-04-01 15:26+0800\n"
10+"PO-Revision-Date: 2010-05-08 01:16+0800\n"
11 "Last-Translator: Zeng Jie <zengjie@gmail.com>\n"
12 "Language-Team: Chinese Simplified <zh_CN>\n"
13 "Plural-Forms: nplurals=2; plural=0\n"
14@@ -26,13 +26,11 @@
15 msgstr "你使用的是PHP CGI的二进制版本，Trac需要使用CLI版本以提供语法高亮。"
16 
17 #: tracopt/ticket/deleter.py:69 tracopt/ticket/deleter.py:82
18-#: tracopt/ticket/templates/ticket_delete.html:19
19-#: trac/ticket/templates/report_list.html:37
20-#: trac/wiki/templates/wiki_delete.html:22
21+#: trac/ticket/templates/report_list.html:35
22 msgid "Delete"
23 msgstr "删除"
24 
25-#: tracopt/ticket/deleter.py:70 tracopt/ticket/templates/ticket_delete.html:39
26+#: tracopt/ticket/deleter.py:70 tracopt/ticket/templates/ticket_delete.html:43
27 msgid "Delete ticket"
28 msgstr "删除任务单"
29 
30@@ -57,49 +55,42 @@
31 msgstr "没有找到评论 %(num)s"
32 
33 #: tracopt/ticket/templates/ticket_delete.html:11
34-msgid "Delete Ticket #"
35-msgstr "删除任务单 #"
36+#, python-format
37+msgid "Delete Ticket #%(id)s"
38+msgstr "删除任务单 #%(id)s"
39 
40 #: tracopt/ticket/templates/ticket_delete.html:12
41-#: tracopt/ticket/templates/ticket_delete.html:45
42-#: tracopt/ticket/templates/ticket_delete.html:69
43-msgid "Delete comment"
44-msgstr "删除评论"
45+#: tracopt/ticket/templates/ticket_delete.html:49
46+#, python-format
47+msgid "Delete comment %(num)s on Ticket #%(id)s"
48+msgstr "删除任务单 #%(id)s 的评论 %(num)s"
49 
50-#: tracopt/ticket/templates/ticket_delete.html:12
51-#: tracopt/ticket/templates/ticket_delete.html:45
52-msgid "on Ticket #"
53-msgstr "任务单#"
54-
55 #: tracopt/ticket/templates/ticket_delete.html:20
56-#: trac/ticket/templates/ticket.html:84
57-msgid "Ticket #"
58-msgstr "任务单 #"
59+#, python-format
60+msgid "Delete [1:Ticket #%(id)s]"
61+msgstr "删除 [1:任务单 #%(id)s]"
62 
63-#: tracopt/ticket/templates/ticket_delete.html:32
64+#: tracopt/ticket/templates/ticket_delete.html:33
65 msgid "Are you sure you want to delete this ticket?"
66 msgstr "确定删除该工作单?"
67 
68-#: tracopt/ticket/templates/ticket_delete.html:32
69-msgid "(comments:"
70-msgstr "(评论:"
71-
72-#: tracopt/ticket/templates/ticket_delete.html:33
73+#: tracopt/ticket/templates/ticket_delete.html:34
74+#, python-format
75 msgid ""
76-",\n"
77-"                attachments:"
78+"(comments: %(comments)s,\n"
79+"                 attachments: %(attachments)s)"
80 msgstr ""
81-"\",\n"
82-"                        附件："
83+"(评论: %(comments)s,\n"
84+"                 é™„件: %(attachments)s)"
85 
86-#: tracopt/ticket/templates/ticket_delete.html:34
87-#: tracopt/ticket/templates/ticket_delete.html:64
88-#: trac/templates/attachment.html:70 trac/wiki/templates/wiki_delete.html:32
89+#: tracopt/ticket/templates/ticket_delete.html:37
90+#: tracopt/ticket/templates/ticket_delete.html:68
91+#: trac/templates/attachment.html:70 trac/wiki/templates/wiki_delete.html:46
92 msgid "This is an irreversible operation."
93 msgstr "该操作是不可逆的."
94 
95-#: tracopt/ticket/templates/ticket_delete.html:38
96-#: tracopt/ticket/templates/ticket_delete.html:68
97+#: tracopt/ticket/templates/ticket_delete.html:42
98+#: tracopt/ticket/templates/ticket_delete.html:72
99 #: trac/admin/templates/admin_components.html:55
100 #: trac/admin/templates/admin_enums.html:24
101 #: trac/admin/templates/admin_milestones.html:68
102@@ -108,117 +99,125 @@
103 #: trac/ticket/templates/milestone_delete.html:40
104 #: trac/ticket/templates/milestone_edit.html:94
105 #: trac/ticket/templates/report_delete.html:21
106-#: trac/ticket/templates/report_edit.html:42
107+#: trac/ticket/templates/report_edit.html:44
108 #: trac/ticket/templates/ticket_change.html:49
109-#: trac/versioncontrol/templates/admin_repositories.html:83
110-#: trac/wiki/templates/wiki_delete.html:36
111-#: trac/wiki/templates/wiki_edit.html:80
112+#: trac/versioncontrol/templates/admin_repositories.html:84
113+#: trac/wiki/templates/wiki_delete.html:50
114 #: trac/wiki/templates/wiki_edit_form.html:77
115-#: trac/wiki/templates/wiki_rename.html:31
116+#: trac/wiki/templates/wiki_rename.html:32
117 msgid "Cancel"
118 msgstr "取消"
119 
120-#: tracopt/ticket/templates/ticket_delete.html:52
121+#: tracopt/ticket/templates/ticket_delete.html:56
122 msgid "comment:"
123 msgstr "评论:"
124 
125-#: tracopt/ticket/templates/ticket_delete.html:54
126+#: tracopt/ticket/templates/ticket_delete.html:58
127 #: trac/ticket/templates/ticket.html:142
128 #, python-format
129 msgid "Changed %(date)s ago by %(author)s"
130 msgstr "由 %(author)s 在 %(date)s 前变更"
131 
132-#: tracopt/ticket/templates/ticket_delete.html:64
133+#: tracopt/ticket/templates/ticket_delete.html:68
134 msgid "Are you sure you want to delete this ticket comment?"
135 msgstr "确定删除该工作单的评论?"
136 
137-#: trac/about.py:45 trac/templates/about.html:10 trac/templates/about.html:29
138+#: tracopt/ticket/templates/ticket_delete.html:73
139+msgid "Delete comment"
140+msgstr "删除评论"
141+
142+#: trac/about.py:47 trac/templates/about.html:10 trac/templates/about.html:29
143 msgid "About Trac"
144 msgstr "关于Trac"
145 
146-#: trac/attachment.py:152
147+#: trac/attachment.py:151
148 #, python-format
149 msgid "Attachment '%(title)s' does not exist."
150 msgstr "附件 '%(title)s' 不存在。"
151 
152-#: trac/attachment.py:153
153+#: trac/attachment.py:152
154 msgid "Invalid Attachment"
155 msgstr "无效附件"
156 
157-#: trac/attachment.py:193
158+#: trac/attachment.py:192
159 msgid "Could not delete attachment"
160 msgstr "不能删除附件"
161 
162-#: trac/attachment.py:209
163+#: trac/attachment.py:208
164 #, python-format
165 msgid ""
166 "Cannot reparent attachment \"%(att)s\" as it already exists in "
167 "%(realm)s:%(id)s"
168 msgstr "不能为附件 \"%(att)s\" 重定父页面，因为它已在 %(realm)s:%(id)s 中存在"
169 
170-#: trac/attachment.py:228
171+#: trac/attachment.py:227
172 #, python-format
173 msgid "Could not reparent attachment %(name)s"
174 msgstr "不能为附件 %(name)s 重定父页面"
175 
176-#: trac/attachment.py:345
177+#: trac/attachment.py:344
178 #, python-format
179 msgid "Attachment '%(filename)s' not found"
180 msgstr "没有找到附件'%(filename)s'"
181 
182-#: trac/attachment.py:419
183+#: trac/attachment.py:418
184 msgid "Bad request"
185 msgstr "错误请求"
186 
187-#: trac/attachment.py:436
188+#: trac/attachment.py:435
189 #, python-format
190 msgid "Back to %(parent)s"
191 msgstr "返回 %(parent)s"
192 
193-#: trac/attachment.py:529
194+#: trac/attachment.py:528
195 #, python-format
196 msgid "%(attachment)s attached to %(resource)s"
197 msgstr "%(attachment)s 附加到 %(resource)s"
198 
199-#: trac/attachment.py:590
200+#: trac/attachment.py:585
201 #, python-format
202+msgid "Unparented attachment %(id)s"
203+msgstr "无父页面的附件 %(id)s"
204+
205+#: trac/attachment.py:593
206+#, python-format
207 msgid "Attachment '%(id)s' in %(parent)s"
208 msgstr "在 %(parent)s 中的附件 '%(id)s'"
209 
210-#: trac/attachment.py:593
211+#: trac/attachment.py:596
212 #, python-format
213 msgid "Attachments of %(parent)s"
214 msgstr "%(parent)s的附件"
215 
216-#: trac/attachment.py:606 trac/attachment.py:629 trac/admin/web_ui.py:425
217+#: trac/attachment.py:609 trac/attachment.py:632 trac/admin/web_ui.py:425
218 #: trac/admin/web_ui.py:428 trac/admin/web_ui.py:432
219 msgid "No file uploaded"
220 msgstr "没有文件被上传"
221 
222-#: trac/attachment.py:614
223+#: trac/attachment.py:617
224 msgid "Can't upload empty file"
225 msgstr "不能上传空文件"
226 
227-#: trac/attachment.py:619
228+#: trac/attachment.py:622
229 #, python-format
230 msgid "Maximum attachment size: %(num)s bytes"
231 msgstr "附件的最大尺寸为: %(num)s 字节"
232 
233-#: trac/attachment.py:620
234+#: trac/attachment.py:623
235 msgid "Upload failed"
236 msgstr "上传失败"
237 
238-#: trac/attachment.py:641
239+#: trac/attachment.py:644
240 #, python-format
241 msgid "Attachment field %(field)s is invalid: %(message)s"
242 msgstr "附件字段 %(field)s 无效: %(message)s"
243 
244-#: trac/attachment.py:645
245+#: trac/attachment.py:648
246 #, python-format
247 msgid "Invalid attachment: %(message)s"
248 msgstr "无效附件: %(message)s"
249 
250-#: trac/attachment.py:656
251+#: trac/attachment.py:659
252 #, python-format
253 msgid ""
254 "You don't have permission to replace the attachment %(name)s. You can "
255@@ -228,63 +227,65 @@
256 "你没有替换附件 %(name)s 的权限。你只能替换你自己的附件，\n"
257 "替换别人的附件需要 ATTACHMENT_DELETE权限"
258 
259-#: trac/attachment.py:688
260+#: trac/attachment.py:691
261 #, python-format
262 msgid "%(attachment)s (delete)"
263 msgstr "%(attachment)s (删除)"
264 
265-#: trac/attachment.py:749 trac/versioncontrol/web_ui/browser.py:633
266-#: trac/wiki/web_ui.py:69
267+#: trac/attachment.py:752 trac/versioncontrol/web_ui/browser.py:643
268+#: trac/wiki/web_ui.py:68
269 msgid "Plain Text"
270 msgstr "纯文本"
271 
272-#: trac/attachment.py:755 trac/versioncontrol/web_ui/browser.py:639
273+#: trac/attachment.py:758 trac/versioncontrol/web_ui/browser.py:649
274 msgid "Original Format"
275 msgstr "原始格式"
276 
277-#: trac/attachment.py:797 trac/attachment.py:803
278+#: trac/attachment.py:800 trac/attachment.py:806
279+#: trac/templates/list_of_attachments.html:20
280+#: trac/templates/list_of_attachments.html:21
281 #: trac/ticket/templates/ticket_change.html:21
282 #: trac/ticket/templates/ticket_change.html:22
283 msgid "Download"
284 msgstr "下载"
285 
286-#: trac/attachment.py:897
287+#: trac/attachment.py:900
288 #, python-format
289 msgid "Invalid resource identifier '%(id)s'"
290 msgstr "资源标示符'%(id)s'无效"
291 
292-#: trac/attachment.py:933 trac/admin/templates/admin_components.html:80
293+#: trac/attachment.py:936 trac/admin/templates/admin_components.html:80
294 #: trac/admin/templates/admin_enums.html:48
295 #: trac/admin/templates/admin_milestones.html:104
296 #: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:84
297-#: trac/templates/error.html:185 trac/ticket/admin.py:210
298-#: trac/ticket/admin.py:401 trac/ticket/admin.py:560
299-#: trac/versioncontrol/admin.py:108
300-#: trac/versioncontrol/templates/admin_repositories.html:124
301-#: trac/web/session.py:315
302+#: trac/templates/error.html:186 trac/ticket/admin.py:209
303+#: trac/ticket/admin.py:400 trac/ticket/admin.py:559
304+#: trac/versioncontrol/admin.py:110
305+#: trac/versioncontrol/templates/admin_repositories.html:125
306+#: trac/web/session.py:314
307 msgid "Name"
308 msgstr "名称"
309 
310-#: trac/attachment.py:933
311+#: trac/attachment.py:936
312 msgid "Size"
313 msgstr "大小"
314 
315-#: trac/attachment.py:933 trac/templates/history_view.html:29
316+#: trac/attachment.py:936 trac/templates/history_view.html:30
317 #: trac/ticket/templates/ticket.html:360
318-#: trac/versioncontrol/templates/revisionlog.html:96
319+#: trac/versioncontrol/templates/revisionlog.html:98
320 msgid "Author"
321 msgstr "作者"
322 
323-#: trac/attachment.py:933 trac/templates/history_view.html:28
324+#: trac/attachment.py:936 trac/templates/history_view.html:29
325 msgid "Date"
326 msgstr "日期"
327 
328-#: trac/attachment.py:934 trac/templates/attachment.html:93
329+#: trac/attachment.py:937 trac/templates/attachment.html:93
330 #: trac/ticket/api.py:289 trac/ticket/templates/ticket_box.html:60
331 msgid "Description"
332 msgstr "描述"
333 
334-#: trac/attachment.py:959 trac/wiki/admin.py:105
335+#: trac/attachment.py:962 trac/wiki/admin.py:104
336 #, python-format
337 msgid "File '%(name)s' exists"
338 msgstr "文件 '%(name)s' 已经存在."
339@@ -304,22 +305,22 @@
340 msgid "[%(section)s] %(entry)s: expected one of (%(choices)s), got %(value)s"
341 msgstr "[%(section)s] %(entry)s: 期望是 (%(choices)s)之一, 得到 %(value)s"
342 
343-#: trac/env.py:569
344+#: trac/env.py:583
345 msgid "Database newer than Trac version"
346 msgstr "数据库的版本比Trac使用的版本新"
347 
348-#: trac/env.py:583
349+#: trac/env.py:600
350 #, python-format
351 msgid "No upgrade module for version %(num)i (%(version)s.py)"
352 msgstr "版本%(num)i 没有升级模块 (%(version)s.py)"
353 
354-#: trac/env.py:628
355+#: trac/env.py:646
356 msgid ""
357 "Missing environment variable \"TRAC_ENV\". Trac requires this variable to"
358 " point to a valid Trac environment."
359 msgstr "没有环境变量\"TRAC_ENV\". Trac要求使用该变量以指向一个有效的Trac环境."
360 
361-#: trac/env.py:660
362+#: trac/env.py:678
363 #, python-format
364 msgid ""
365 "The Trac Environment needs to be upgraded.\n"
366@@ -330,41 +331,41 @@
367 "\n"
368 "请执行\"trac-admin %(path)s upgrade\""
369 
370-#: trac/env.py:694
371+#: trac/env.py:712
372 msgid "Copying resources from:"
373 msgstr "正在复制资源自："
374 
375-#: trac/env.py:710
376+#: trac/env.py:728
377 msgid "Creating scripts."
378 msgstr "正在创建脚本。"
379 
380-#: trac/env.py:725
381+#: trac/env.py:743
382 #, python-format
383 msgid "hotcopy can't overwrite existing '%(dest)s'"
384 msgstr "热备无法覆盖已存在的 '%(dest)s'"
385 
386-#: trac/env.py:735
387+#: trac/env.py:753
388 #, python-format
389 msgid "Hotcopying %(src)s to %(dst)s ..."
390 msgstr "正在将 %(src)s 热备至 %(dst)s ..."
391 
392-#: trac/env.py:750
393+#: trac/env.py:768
394 msgid "The following errors happened while copying the environment:"
395 msgstr "当复制环境时发生以下错误："
396 
397-#: trac/env.py:761
398+#: trac/env.py:779
399 msgid "Hotcopy done."
400 msgstr "热备结束。"
401 
402-#: trac/env.py:766 trac/admin/api.py:125
403+#: trac/env.py:784 trac/admin/api.py:125
404 msgid "Invalid arguments"
405 msgstr "无效参数"
406 
407-#: trac/env.py:769
408+#: trac/env.py:787
409 msgid "Database is up to date, no upgrade necessary."
410 msgstr "数据库是最新的，无需升级。"
411 
412-#: trac/env.py:777
413+#: trac/env.py:795
414 #, python-format
415 msgid ""
416 "Backup failed with '%(msg)s'.\n"
417@@ -373,7 +374,7 @@
418 "备份失败：'%(msg)s'.\n"
419 "使用 '--no-backup' 执行不做备份的升级。"
420 
421-#: trac/env.py:791
422+#: trac/env.py:809
423 msgid ""
424 "Warning: the wiki-macros directory in the environment is non-empty, but "
425 "Trac\n"
426@@ -382,7 +383,7 @@
427 "警告：Trac环境中的wiki-macro目录非空，但是Trac\n"
428 "无法从该目录加载插件。请手动删除它。"
429 
430-#: trac/env.py:802
431+#: trac/env.py:820
432 #, python-format
433 msgid ""
434 "Error while removing wiki-macros: %(err)s\n"
435@@ -392,7 +393,7 @@
436 "删除wiki-macros时出错: %(err)s\n"
437 "Trac不能从wiki-macros加载插件，请手工删除。"
438 
439-#: trac/env.py:804
440+#: trac/env.py:822
441 msgid "Upgrade done."
442 msgstr "升级完成。"
443 
444@@ -402,55 +403,68 @@
445 
446 #: trac/notification.py:303
447 #, python-format
448-msgid "Invalid email encoding setting: %s"
449-msgstr "无效的email编码设置: %s"
450+msgid "Invalid email encoding setting: %(pref)s"
451+msgstr "无效的email编码设置: %(pref)s"
452 
453-#: trac/notification.py:329
454+#: trac/notification.py:317
455+msgid "Unable to send email due to identity crisis."
456+msgstr "由于认证问题，无法发送Email。"
457+
458+#: trac/notification.py:321
459+#, python-format
460+msgid "Neither %(from_)s nor %(reply_to)s are specified in the configuration."
461+msgstr "配置中即没指定 %(from_)s 也没指定 %(reply_to)s。"
462+
463+#: trac/notification.py:322
464+msgid "SMTP Notification Error"
465+msgstr "SMTP 通知错误"
466+
467+#: trac/notification.py:331
468 msgid "Header length is too short"
469-msgstr "Header长度过短"
470+msgstr "邮件头长度过短"
471 
472-#: trac/perm.py:49
473+#: trac/perm.py:48
474 #, python-format
475 msgid "%(perm)s privileges are required to perform this operation on %(resource)s"
476 msgstr "对 %(resource)s 执行的操作需要 %(perm)s 权限"
477 
478-#: trac/perm.py:51
479+#: trac/perm.py:50
480 #, python-format
481 msgid "%(perm)s privileges are required to perform this operation"
482 msgstr "执行该操作需要 %(perm)s 权限"
483 
484-#: trac/perm.py:56
485+#: trac/perm.py:55
486 msgid "Insufficient privileges to perform this operation."
487 msgstr "没有足够的权限执行该操作。"
488 
489-#: trac/perm.py:331
490+#: trac/perm.py:333
491 #, python-format
492 msgid "%(name)s is not a valid action."
493 msgstr "%(name)s 是无效动作."
494 
495-#: trac/perm.py:640
496+#: trac/perm.py:642
497 msgid "User"
498 msgstr "用户"
499 
500-#: trac/perm.py:640 trac/admin/templates/admin_perms.html:69
501+#: trac/perm.py:642 trac/admin/templates/admin_perms.html:70
502 #: trac/ticket/templates/ticket.html:338
503 msgid "Action"
504 msgstr "动作"
505 
506-#: trac/perm.py:642
507+#: trac/perm.py:644
508 msgid "Available actions:"
509 msgstr "可选动作: "
510 
511-#: trac/perm.py:655
512-msgid "Group names must be in lower case and actions in upper case"
513-msgstr "组名必须小写，而动作名必须大写"
514+#: trac/perm.py:655 trac/admin/web_ui.py:333
515+msgid "All upper-cased tokens are reserved for permission names"
516+msgstr "全部大写的标记已保留为权限名称"
517 
518 #: trac/resource.py:326
519 #, python-format
520 msgid "%(name)s at version %(version)s"
521 msgstr "%(name)s 的版本 %(version)s"
522 
523-#: trac/admin/api.py:129
524+#: trac/admin/api.py:129 trac/admin/console.py:254
525 msgid "Command not found"
526 msgstr "命令无法找到"
527 
528@@ -458,7 +472,7 @@
529 msgid "Error:"
530 msgstr "错误:"
531 
532-#: trac/admin/console.py:129
533+#: trac/admin/console.py:130
534 #, python-format
535 msgid ""
536 "Welcome to trac-admin %(version)s\n"
537@@ -474,38 +488,40 @@
538 "\n"
539 "输入 '?' 或 'help' 获取命令帮助"
540 
541-#: trac/admin/console.py:161
542-msgid "Failed to open environment."
543-msgstr "打开环境失败。"
544+#: trac/admin/console.py:164
545+#, python-format
546+msgid "Failed to open environment: %(err)s"
547+msgstr "打开环境失败：$(err)s"
548 
549-#: trac/admin/console.py:230
550-msgid "Completion error:"
551-msgstr "自动完成错误:"
552+#: trac/admin/console.py:234
553+#, python-format
554+msgid "Completion error: %(err)s"
555+msgstr "自动完成错误: $(err)s"
556 
557-#: trac/admin/console.py:281
558+#: trac/admin/console.py:287
559 #, python-format
560 msgid "No documentation found for '%(cmd)s'"
561 msgstr "没有找到 '%(cmd)s' 的文档"
562 
563-#: trac/admin/console.py:283
564+#: trac/admin/console.py:289
565 #, python-format
566 msgid "trac-admin - The Trac Administration Console %(version)s"
567 msgstr "trac-admin - Trac管理控制台 %(version)s"
568 
569-#: trac/admin/console.py:287
570+#: trac/admin/console.py:293
571 msgid "Usage: trac-admin </path/to/projenv> [command [subcommand] [option ...]]\n"
572 msgstr "用法: trac-admin </path/to/projenv> [command [subcommand] [option ...]]\n"
573 
574-#: trac/admin/console.py:290
575+#: trac/admin/console.py:296
576 msgid "Invoking trac-admin without command starts interactive mode.\n"
577 msgstr "不带命令调用trac-admin将启动交互模式。\n"
578 
579-#: trac/admin/console.py:330
580+#: trac/admin/console.py:336
581 #, python-format
582 msgid "Creating a new Trac environment at %(envname)s"
583 msgstr "在%(envname)s处创建一个新的Trac环境"
584 
585-#: trac/admin/console.py:332
586+#: trac/admin/console.py:338
587 msgid ""
588 "\n"
589 "Trac will first ask a few questions about your environment \n"
590@@ -520,12 +536,12 @@
591 "请输入您项目的名称。\n"
592 "此名称将在页面标题和描述中使用。\n"
593 
594-#: trac/admin/console.py:340
595+#: trac/admin/console.py:346
596 #, python-format
597 msgid "Project Name [%(default)s]> "
598 msgstr "项目名称 [%(default)s]> "
599 
600-#: trac/admin/console.py:342
601+#: trac/admin/console.py:348
602 msgid ""
603 " \n"
604 " Please specify the connection string for the database to use.\n"
605@@ -537,32 +553,44 @@
606 " \n"
607 "请指定所用数据库的连接字符串。缺省情况下，\n"
608 "将在环境目录中创建一个本地SQLite数据库。\n"
609-"使用一个已存在的PostgreSQL数据库也是可行的\n"
610+"也可以使用一个已存在的PostgreSQL数据库\n"
611 "(具体的连接字符串语法请查看Trac文档)。\n"
612 
613-#: trac/admin/console.py:350
614+#: trac/admin/console.py:356
615 #, python-format
616 msgid "Database connection string [%(default)s]> "
617 msgstr "数据库连接字符串 [%(default)s]> "
618 
619-#: trac/admin/console.py:357
620+#: trac/admin/console.py:363
621 #, python-format
622 msgid "Initenv for '%(env)s' failed."
623 msgstr "对'%(env)s' 执行 initenv 失败。"
624 
625-#: trac/admin/console.py:392
626+#: trac/admin/console.py:366
627+msgid "Does an environment already exist?"
628+msgstr "环境是否已经存在？"
629+
630+#: trac/admin/console.py:370
631+msgid "Directory exists and is not empty."
632+msgstr "目录已存在并且非空。"
633+
634+#: trac/admin/console.py:398
635 msgid "Creating and Initializing Project"
636 msgstr "创建和初始化项目"
637 
638 #: trac/admin/console.py:415
639+msgid "Failed to create environment."
640+msgstr "创建环境失败。"
641+
642+#: trac/admin/console.py:421
643 msgid " Installing default wiki pages"
644 msgstr " 安装缺省Wiki页"
645 
646-#: trac/admin/console.py:424
647+#: trac/admin/console.py:430
648 msgid " Indexing default repository"
649 msgstr " 建立缺省版本库索引"
650 
651-#: trac/admin/console.py:427
652+#: trac/admin/console.py:433
653 msgid ""
654 "\n"
655 "---------------------------------------------------------------------\n"
656@@ -587,7 +615,7 @@
657 "您的trac.ini文件以及[trac] repository_type\n"
658 "和repository_path 设置。\n"
659 
660-#: trac/admin/console.py:470
661+#: trac/admin/console.py:476
662 #, python-format
663 msgid ""
664 "\n"
665@@ -628,18 +656,18 @@
666 "  tracd --port 8000 %(project_path)s\n"
667 "\n"
668 "然后使用您的浏览器访问http://localhost:8000/%(project_dir)s。\n"
669-"在那里，您可以可以浏览已安装Trac的文档，包括进行进一步配置的信息\n"
670+"在那里，您可以浏览已安装Trac版本的文档，包括进行进一步配置的信息\n"
671 "（比如将Trac部署到真正的Web服务器上）。\n"
672 "\n"
673-"最新的文档也可以再项目网站上找到：\n"
674+"最新的文档也可以在项目网站上找到：\n"
675 "\n"
676 "  http://trac.edgewall.org/\n"
677 "\n"
678 "恭喜您！\n"
679 
680-#: trac/admin/console.py:530
681+#: trac/admin/console.py:536
682 #, python-format
683-msgid "non-ascii environment path '%(path)s' not supported."
684+msgid "Non-ascii environment path '%(path)s' not supported."
685 msgstr "不支持非ASCII环境路径 '%(path)s'。"
686 
687 #: trac/admin/web_ui.py:64
688@@ -658,15 +686,14 @@
689 msgid "Unknown administration panel"
690 msgstr "未知管理面板"
691 
692-#: trac/admin/web_ui.py:185 trac/ticket/admin.py:66 trac/ticket/admin.py:91
693-#: trac/ticket/admin.py:276 trac/ticket/admin.py:458 trac/ticket/admin.py:610
694-#: trac/ticket/admin.py:698 trac/ticket/report.py:189
695-#: trac/ticket/roadmap.py:689 trac/versioncontrol/admin.py:196
696-#: trac/wiki/web_ui.py:334
697+#: trac/admin/web_ui.py:185 trac/ticket/admin.py:65 trac/ticket/admin.py:90
698+#: trac/ticket/admin.py:275 trac/ticket/admin.py:457 trac/ticket/admin.py:609
699+#: trac/ticket/admin.py:695 trac/ticket/report.py:189
700+#: trac/ticket/roadmap.py:687 trac/versioncontrol/admin.py:198
701 msgid "Your changes have been saved."
702 msgstr "您的修改已保存"
703 
704-#: trac/admin/web_ui.py:190 trac/ticket/admin.py:69
705+#: trac/admin/web_ui.py:190 trac/ticket/admin.py:68
706 msgid ""
707 "Error writing to trac.ini, make sure it is writable by the web server. "
708 "Your changes have not been saved."
709@@ -736,14 +763,10 @@
710 msgid "Missing field"
711 msgstr "缺少字段"
712 
713-#: trac/admin/web_ui.py:319 trac/admin/templates/admin_perms.html:9
714+#: trac/admin/web_ui.py:319 trac/admin/templates/admin_perms.html:10
715 msgid "Permissions"
716 msgstr "权限"
717 
718-#: trac/admin/web_ui.py:333
719-msgid "All upper-cased tokens are reserved for permission names"
720-msgstr "全部大写的标记已保留为权限名称"
721-
722 #: trac/admin/web_ui.py:340
723 msgid "Unknown action"
724 msgstr "未知动作"
725@@ -774,7 +797,7 @@
726 
727 #: trac/admin/web_ui.py:401 trac/admin/templates/admin_plugins.html:9
728 msgid "Plugins"
729-msgstr "插件s"
730+msgstr "插件"
731 
732 #: trac/admin/web_ui.py:435
733 msgid "Uploaded file is not a Python source file or egg"
734@@ -818,14 +841,14 @@
735 #: trac/admin/templates/admin_milestones.html:80
736 #: trac/admin/templates/admin_versions.html:21
737 #: trac/admin/templates/admin_versions.html:56
738-#: trac/versioncontrol/templates/admin_repositories.html:49
739-#: trac/versioncontrol/templates/admin_repositories.html:94
740-#: trac/versioncontrol/templates/admin_repositories.html:111
741+#: trac/versioncontrol/templates/admin_repositories.html:50
742+#: trac/versioncontrol/templates/admin_repositories.html:95
743+#: trac/versioncontrol/templates/admin_repositories.html:112
744 msgid "Name:"
745 msgstr "名称:"
746 
747 #: trac/admin/templates/admin_basics.html:24
748-#: trac/versioncontrol/templates/admin_repositories.html:61
749+#: trac/versioncontrol/templates/admin_repositories.html:62
750 msgid "URL:"
751 msgstr "URL:"
752 
753@@ -844,7 +867,7 @@
754 msgid "Apply changes"
755 msgstr "应用修改"
756 
757-#: trac/admin/templates/admin_components.html:10 trac/ticket/admin.py:77
758+#: trac/admin/templates/admin_components.html:10 trac/ticket/admin.py:76
759 msgid "Components"
760 msgstr "组件"
761 
762@@ -874,7 +897,7 @@
763 #: trac/admin/templates/admin_enums.html:25
764 #: trac/admin/templates/admin_milestones.html:69
765 #: trac/admin/templates/admin_versions.html:46
766-#: trac/versioncontrol/templates/admin_repositories.html:84
767+#: trac/versioncontrol/templates/admin_repositories.html:85
768 msgid "Save"
769 msgstr "保存"
770 
771@@ -886,16 +909,16 @@
772 #: trac/admin/templates/admin_enums.html:33
773 #: trac/admin/templates/admin_enums.html:38
774 #: trac/admin/templates/admin_milestones.html:93
775-#: trac/admin/templates/admin_perms.html:38
776-#: trac/admin/templates/admin_perms.html:60
777+#: trac/admin/templates/admin_perms.html:39
778+#: trac/admin/templates/admin_perms.html:61
779 #: trac/admin/templates/admin_versions.html:67
780-#: trac/versioncontrol/templates/admin_repositories.html:101
781-#: trac/versioncontrol/templates/admin_repositories.html:115
782+#: trac/versioncontrol/templates/admin_repositories.html:102
783+#: trac/versioncontrol/templates/admin_repositories.html:116
784 msgid "Add"
785 msgstr "增加"
786 
787-#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:210
788-#: trac/ticket/api.py:283 trac/ticket/web_ui.py:1324
789+#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:209
790+#: trac/ticket/api.py:283 trac/ticket/web_ui.py:1337
791 msgid "Owner"
792 msgstr "属主"
793 
794@@ -909,9 +932,9 @@
795 #: trac/admin/templates/admin_components.html:98
796 #: trac/admin/templates/admin_enums.html:69
797 #: trac/admin/templates/admin_milestones.html:128
798-#: trac/admin/templates/admin_perms.html:87
799+#: trac/admin/templates/admin_perms.html:88
800 #: trac/admin/templates/admin_versions.html:93
801-#: trac/versioncontrol/templates/admin_repositories.html:144
802+#: trac/versioncontrol/templates/admin_repositories.html:145
803 msgid "Remove selected items"
804 msgstr "删选择项"
805 
806@@ -975,8 +998,8 @@
807 "            [1:log] directory of the project environment ([2:%(dir)s])."
808 msgstr "如果指定了相对路径，日志文件将被存储在项目环境([2:%(dir)s])的 [1:log]目录。"
809 
810-#: trac/admin/templates/admin_milestones.html:10 trac/ticket/admin.py:242
811-#: trac/ticket/roadmap.py:857
812+#: trac/admin/templates/admin_milestones.html:10 trac/ticket/admin.py:241
813+#: trac/ticket/roadmap.py:855
814 msgid "Milestones"
815 msgstr "里程碑"
816 
817@@ -1020,7 +1043,7 @@
818 #: trac/admin/templates/admin_milestones.html:57
819 #: trac/admin/templates/admin_versions.html:35
820 #: trac/ticket/templates/milestone_edit.html:85
821-#: trac/versioncontrol/templates/admin_repositories.html:72
822+#: trac/versioncontrol/templates/admin_repositories.html:73
823 msgid "Description (you may use [1:WikiFormatting] here):"
824 msgstr "描述 (此处可用 [1:WikiFormatting] 格式):"
825 
826@@ -1028,11 +1051,11 @@
827 msgid "Add Milestone:"
828 msgstr "增加里程碑:"
829 
830-#: trac/admin/templates/admin_milestones.html:104 trac/ticket/admin.py:401
831+#: trac/admin/templates/admin_milestones.html:104 trac/ticket/admin.py:400
832 msgid "Due"
833 msgstr "逾期"
834 
835-#: trac/admin/templates/admin_milestones.html:104 trac/ticket/admin.py:401
836+#: trac/admin/templates/admin_milestones.html:104 trac/ticket/admin.py:400
837 msgid "Completed"
838 msgstr "完成"
839 
840@@ -1040,65 +1063,50 @@
841 msgid "Tickets"
842 msgstr "任务单"
843 
844-#: trac/admin/templates/admin_perms.html:13
845+#: trac/admin/templates/admin_perms.html:14
846 msgid "Manage Permissions"
847 msgstr "管理权限"
848 
849-#: trac/admin/templates/admin_perms.html:18
850+#: trac/admin/templates/admin_perms.html:19
851 msgid "Grant Permission:"
852 msgstr "授予权限:"
853 
854-#: trac/admin/templates/admin_perms.html:21
855-#: trac/admin/templates/admin_perms.html:48
856+#: trac/admin/templates/admin_perms.html:22
857+#: trac/admin/templates/admin_perms.html:49
858 msgid "Subject:"
859-msgstr "对象:"
860+msgstr "主体:"
861 
862-#: trac/admin/templates/admin_perms.html:25
863+#: trac/admin/templates/admin_perms.html:26
864 msgid "Action:"
865 msgstr "动作:"
866 
867-#: trac/admin/templates/admin_perms.html:33
868+#: trac/admin/templates/admin_perms.html:34
869 msgid ""
870 "Grant permission for an action to a subject, which can be either a user\n"
871 "          or a group."
872-msgstr ""
873-"为对象设置动作权限，可以授予给用户\n"
874-"          或组。"
875+msgstr "为主体设置动作权限，主体可以是一个用户也可以是一个组。"
876 
877-#: trac/admin/templates/admin_perms.html:45
878+#: trac/admin/templates/admin_perms.html:46
879 msgid "Add Subject to Group:"
880-msgstr "增加一个对象到组中:"
881+msgstr "增加一个主体到组中:"
882 
883-#: trac/admin/templates/admin_perms.html:52
884+#: trac/admin/templates/admin_perms.html:53
885 msgid "Group:"
886 msgstr "组:"
887 
888-#: trac/admin/templates/admin_perms.html:56
889+#: trac/admin/templates/admin_perms.html:57
890 msgid "Add a user or group to an existing permission group."
891 msgstr "在当前的权限组中增加一个用户或组."
892 
893-#: trac/admin/templates/admin_perms.html:69
894-#: trac/admin/templates/admin_perms.html:92
895+#: trac/admin/templates/admin_perms.html:70
896 msgid "Subject"
897-msgstr "对象"
898+msgstr "主体"
899 
900-#: trac/admin/templates/admin_perms.html:91
901-msgid "Note that"
902-msgstr "注意"
903-
904-#: trac/admin/templates/admin_perms.html:92 trac/ticket/templates/query.html:73
905-msgid "or"
906-msgstr "或"
907-
908 #: trac/admin/templates/admin_perms.html:92
909-msgid "Group"
910-msgstr "组"
911-
912-#: trac/admin/templates/admin_perms.html:92
913 msgid ""
914-"names can't be all upper-case,\n"
915+"Note that [1:Subject] or [2:Group] names can't be all upper-case,\n"
916 "      as that is reserved for permission names."
917-msgstr "名不能全部大写，因为这是权限名称的保留格式。"
918+msgstr "注意[1:主体]或者[2:组]的名称不能全部大写，因为这是权限名称的保留格式。"
919 
920 #: trac/admin/templates/admin_plugins.html:41
921 msgid "Manage Plugins"
922@@ -1109,7 +1117,7 @@
923 msgstr "安装插件:"
924 
925 #: trac/admin/templates/admin_plugins.html:47
926-#: trac/versioncontrol/templates/changeset.html:142
927+#: trac/versioncontrol/templates/changeset.html:170
928 msgid "File:"
929 msgid_plural "Files:"
930 msgstr[0] "文件:"
931@@ -1131,8 +1139,8 @@
932 msgid "Install"
933 msgstr "安装"
934 
935-#: trac/admin/templates/admin_plugins.html:84 trac/templates/diff_view.html:45
936-#: trac/versioncontrol/templates/changeset.html:114
937+#: trac/admin/templates/admin_plugins.html:84 trac/templates/diff_view.html:51
938+#: trac/versioncontrol/templates/changeset.html:142
939 msgid "Author:"
940 msgstr "作者:"
941 
942@@ -1152,7 +1160,7 @@
943 msgid "Hide all descriptions"
944 msgstr "隐藏所有描述"
945 
946-#: trac/admin/templates/admin_plugins.html:114 trac/ticket/admin.py:77
947+#: trac/admin/templates/admin_plugins.html:114 trac/ticket/admin.py:76
948 #: trac/ticket/api.py:296
949 msgid "Component"
950 msgstr "组件"
951@@ -1169,7 +1177,7 @@
952 msgid "Toggle the component description"
953 msgstr "切换组建描述"
954 
955-#: trac/admin/templates/admin_versions.html:10 trac/ticket/admin.py:441
956+#: trac/admin/templates/admin_versions.html:10 trac/ticket/admin.py:440
957 msgid "Versions"
958 msgstr "版本"
959 
960@@ -1213,7 +1221,7 @@
961 msgid "Cannot load Python bindings for MySQL"
962 msgstr "无法加载 Python 的 MySQL 访问模块"
963 
964-#: trac/db/pool.py:122
965+#: trac/db/pool.py:118
966 #, python-format
967 msgid "Unable to get database connection within %(time)d seconds"
968 msgstr "无法在 %(time)d 秒内获得数据库连接"
969@@ -1222,61 +1230,61 @@
970 msgid "Cannot load Python bindings for PostgreSQL"
971 msgstr "无法加载 Python 的 PostgreSQL 访问模块"
972 
973-#: trac/db/sqlite_backend.py:153
974+#: trac/db/sqlite_backend.py:154
975 msgid "Cannot load Python bindings for SQLite"
976 msgstr "无法加载 Python 的 SQLite 访问模块"
977 
978-#: trac/db/sqlite_backend.py:157
979+#: trac/db/sqlite_backend.py:158
980 msgid "Need at least PySqlite 2.0.7 or higher"
981 msgstr "至少需要 PySqlite 2.0.7 或以上版本"
982 
983-#: trac/db/sqlite_backend.py:180
984+#: trac/db/sqlite_backend.py:182
985 #, python-format
986 msgid "Database already exists at %(path)s"
987 msgstr "数据库已经存在于 %(path)s"
988 
989-#: trac/db/sqlite_backend.py:240
990+#: trac/db/sqlite_backend.py:242
991 #, python-format
992 msgid "Database \"%(path)s\" not found."
993 msgstr "数据库 \"%(path)s\" 未找到。"
994 
995-#: trac/db/sqlite_backend.py:249
996+#: trac/db/sqlite_backend.py:251
997 #, python-format
998 msgid ""
999 "The user %(user)s requires read _and_ write permissions to the database "
1000 "file %(path)s and the directory it is located in."
1001 msgstr "用户 %(user)s 需要数据库文件 %(path)s 及其所在目录的读/写权限。"
1002 
1003-#: trac/mimeview/api.py:672 trac/mimeview/api.py:683
1004+#: trac/mimeview/api.py:674 trac/mimeview/api.py:685
1005 #, python-format
1006 msgid "No available MIME conversions from %(old)s to %(new)s"
1007 msgstr "没有有效的MIME将 %(old)s 转换为 %(new)s"
1008 
1009-#: trac/mimeview/api.py:791
1010+#: trac/mimeview/api.py:793
1011 #, python-format
1012 msgid "HTML preview using %(renderer)s failed (%(err)s)"
1013 msgstr "使用%(renderer)s进行HTML预览失败 (%(err)s)"
1014 
1015-#: trac/mimeview/api.py:823
1016+#: trac/mimeview/api.py:825
1017 #, python-format
1018 msgid "Can't use %(annotator)s annotator: %(error)s"
1019 msgstr "不能使用%(annotator)s注释: %(error)s"
1020 
1021-#: trac/mimeview/patch.py:53
1022+#: trac/mimeview/patch.py:54
1023 msgid "Invalid unified diff content"
1024 msgstr "无效的unified diff内容"
1025 
1026-#: trac/mimeview/patch.py:163
1027+#: trac/mimeview/patch.py:171
1028 #, python-format
1029 msgid "new file %(new)s"
1030 msgstr "新文件 %(new)s"
1031 
1032-#: trac/mimeview/patch.py:167
1033+#: trac/mimeview/patch.py:175
1034 #, python-format
1035 msgid "deleted file %(deleted)s"
1036 msgstr "已删除文件%(deleted)s"
1037 
1038-#: trac/mimeview/patch.py:239
1039+#: trac/mimeview/patch.py:247
1040 msgid "this hunk was shorter than expected"
1041 msgstr "此块比预期的短"
1042 
1043@@ -1289,8 +1297,6 @@
1044 msgstr "您的个人设置已保存。"
1045 
1046 #: trac/prefs/web_ui.py:52 trac/prefs/templates/prefs.html:16
1047-#: trac/ticket/templates/ticket.html:374
1048-#: trac/wiki/templates/wiki_edit_form.html:50
1049 msgid "Preferences"
1050 msgstr "个人设置"
1051 
1052@@ -1386,13 +1392,10 @@
1053 "配置您的时区将会使这个站点使用您的时区设置来显示时期和时间\n"
1054 "      而不是使用服务器上的设置。"
1055 
1056-#: trac/prefs/templates/prefs_datetime.html:30
1057-msgid "Example: The current time is"
1058-msgstr "例如: 当前时间是"
1059-
1060 #: trac/prefs/templates/prefs_datetime.html:31
1061-msgid "(UTC)."
1062-msgstr "(UTC)。"
1063+#, python-format
1064+msgid "Example: The current time is [1:%(time)s] (UTC)."
1065+msgstr "例如: 当前时间是 [1:%(time)s] (UTC)。"
1066 
1067 #: trac/prefs/templates/prefs_datetime.html:34
1068 #, python-format
1069@@ -1415,14 +1418,12 @@
1070 #: trac/prefs/templates/prefs_datetime.html:47
1071 msgid ""
1072 "Note: Universal Co-ordinated Time (UTC) is also known as Greenwich Mean "
1073-"Time (GMT)."
1074-msgstr "注: 全球统一时间 (UTC) 也被称为格林威治标准时间 (GMT)。"
1075-
1076-#: trac/prefs/templates/prefs_datetime.html:48
1077-msgid ""
1078-"A positive offset is used to indicate a timezone at the east of "
1079+"Time (GMT).[1:]\n"
1080+"        A positive offset is used to indicate a timezone at the east of "
1081 "Greenwich, i.e. ahead of Universal Time."
1082-msgstr "正值表示在格林威治以东的时区，即比标准时间早。"
1083+msgstr ""
1084+"注意：协调世界时（UTC）也称为格林尼治时间（GMT）。[1:]\n"
1085+"正值表示在格林威治以东的时区，即比标准时间早。"
1086 
1087 #: trac/prefs/templates/prefs_general.html:15
1088 msgid "Full name:"
1089@@ -1519,11 +1520,11 @@
1090 msgid "Search query too short. Query must be at least %(num)s characters long."
1091 msgstr "搜索查询太短。查询必须至少包含 %(num)s 字符。"
1092 
1093-#: trac/search/web_ui.py:231 trac/ticket/query.py:763 trac/ticket/report.py:370
1094+#: trac/search/web_ui.py:231 trac/ticket/query.py:763 trac/ticket/report.py:397
1095 msgid "Next Page"
1096 msgstr "下一页"
1097 
1098-#: trac/search/web_ui.py:237 trac/ticket/query.py:768 trac/ticket/report.py:373
1099+#: trac/search/web_ui.py:237 trac/ticket/query.py:768 trac/ticket/report.py:400
1100 msgid "Previous Page"
1101 msgstr "上一页"
1102 
1103@@ -1534,8 +1535,9 @@
1104 msgstr "结果"
1105 
1106 #: trac/search/templates/search.html:48
1107-msgid "Quickjump to"
1108-msgstr "快速跳转到"
1109+#, python-format
1110+msgid "Quickjump to %(name)s"
1111+msgstr "快速跳转到 %(name)s"
1112 
1113 #: trac/search/templates/search.html:56
1114 #, python-format
1115@@ -1543,6 +1545,7 @@
1116 msgstr ": %(author)s"
1117 
1118 #: trac/search/templates/search.html:65
1119+#: trac/ticket/templates/report_view.html:87
1120 #: trac/ticket/templates/report_view.html:193
1121 msgid "No matches found."
1122 msgstr "没有匹配的结果."
1123@@ -1588,12 +1591,20 @@
1124 msgstr "动力源自python"
1125 
1126 #: trac/templates/about.html:44
1127-msgid "Please visit the Trac open source project:"
1128-msgstr "访问Trac开源项目:"
1129+msgid ""
1130+"Please visit the Trac open source project:\n"
1131+"        [1:http://trac.edgewall.org/]"
1132+msgstr ""
1133+"请访问 Trac 开源项目:\n"
1134+"        [1:http://trac.edgewall.org/]"
1135 
1136-#: trac/templates/about.html:45
1137-msgid "http://trac.edgewall.org/"
1138-msgstr "http://trac.edgewall.org/"
1139+#: trac/templates/about.html:46
1140+msgid ""
1141+"Copyright © 2003-2010\n"
1142+"        [1:Edgewall Software]"
1143+msgstr ""
1144+"Copyright © 2003-2010\n"
1145+"        [1:Edgewall Software]"
1146 
1147 #: trac/templates/about.html:54
1148 msgid "System Information"
1149@@ -1603,8 +1614,8 @@
1150 msgid "Installed Plugins"
1151 msgstr "已安装插件"
1152 
1153-#: trac/templates/about.html:72 trac/templates/error.html:83
1154-#: trac/templates/error.html:217
1155+#: trac/templates/about.html:72 trac/templates/error.html:84
1156+#: trac/templates/error.html:218
1157 msgid "N/A"
1158 msgstr "不适用"
1159 
1160@@ -1612,7 +1623,7 @@
1161 msgid "Section"
1162 msgstr "部分"
1163 
1164-#: trac/templates/about.html:85 trac/templates/error.html:185
1165+#: trac/templates/about.html:85 trac/templates/error.html:186
1166 msgid "Value"
1167 msgstr "值"
1168 
1169@@ -1634,12 +1645,14 @@
1170 msgstr "%(filename)s 在 %(parent)s – 附件"
1171 
1172 #: trac/templates/attachment.html:29
1173-msgid "Add Attachment to"
1174-msgstr "增加附件到"
1175+#, python-format
1176+msgid "Add Attachment to [1:%(parent)s]"
1177+msgstr "添加附件到 [1:%(parent)s]"
1178 
1179-#: trac/templates/attachment.html:32
1180-msgid "(size limit"
1181-msgstr "(大小限制"
1182+#: trac/templates/attachment.html:33
1183+#, python-format
1184+msgid "(size limit %(value)s)"
1185+msgstr "(大小限制 %(value)s)"
1186 
1187 #: trac/templates/attachment.html:37
1188 msgid "Attachment Info"
1189@@ -1670,190 +1683,213 @@
1190 msgid "Delete attachment"
1191 msgstr "删除附件"
1192 
1193+#: trac/templates/attachment.html:86
1194+msgid "Attach another file"
1195+msgstr "附加另一个文件"
1196+
1197+#: trac/templates/attachment.html:98 trac/templates/list_of_attachments.html:22
1198+#: trac/templates/macros.html:19 trac/versioncontrol/templates/browser.html:110
1199+#: trac/versioncontrol/templates/dir_entries.html:16
1200+#, python-format
1201+msgid "%(size)s bytes"
1202+msgstr "%(size)s 字节"
1203+
1204 #: trac/templates/attachment.html:96
1205 #, python-format
1206 msgid ""
1207 "File %(file)s,\n"
1208 "                [1:%(size)s]\n"
1209-"                (added by %(author)s,  %(date)s ago)"
1210+"                (added by %(author)s, %(date)s ago)"
1211 msgstr ""
1212 "文件 %(file)s,\n"
1213 "                        [1: %(size)s]\n"
1214-"            (由%(author)s在%(date)s前添加)"
1215+"            (由 %(author)s 在 %(date)s 前添加)"
1216 
1217-#: trac/templates/diff_div.html:59
1218-#: trac/versioncontrol/templates/browser.html:133
1219-msgid "Property"
1220-msgstr "属性"
1221+#: trac/templates/diff_div.html:72
1222+#, python-format
1223+msgid ""
1224+"Property %(name)s\n"
1225+"                  changed from %(old)s to %(new)s"
1226+msgstr ""
1227+"属性 %(name)s\n"
1228+"                  已由 %(old)s 变更为 %(new)s"
1229 
1230-#: trac/templates/diff_div.html:70 trac/ticket/templates/ticket_change.html:27
1231-msgid "to"
1232-msgstr "至"
1233+#: trac/templates/diff_div.html:76
1234+#, python-format
1235+msgid "Property %(name)s set to %(value)s"
1236+msgstr "属性 %(name)s 已设置为 %(value)s"
1237 
1238-#: trac/templates/diff_div.html:75
1239+#: trac/templates/diff_div.html:79
1240+#, python-format
1241+msgid "Property %(name)s deleted"
1242+msgstr "属性 %(name)s 已删除"
1243+
1244+#: trac/templates/diff_div.html:86
1245 msgid "Differences"
1246 msgstr "差异"
1247 
1248-#: trac/templates/diff_options.html:9
1249+#: trac/templates/diff_options.html:10
1250 msgid "View differences"
1251 msgstr "查看差异"
1252 
1253-#: trac/templates/diff_options.html:12
1254+#: trac/templates/diff_options.html:13
1255 msgid "inline"
1256 msgstr "内嵌"
1257 
1258-#: trac/templates/diff_options.html:14
1259+#: trac/templates/diff_options.html:15
1260 msgid "side by side"
1261 msgstr "并排"
1262 
1263 #: trac/templates/diff_options.html:18
1264-msgid "Show"
1265-msgstr "显示"
1266+msgid ""
1267+"[1:[2:]\n"
1268+"             Show]\n"
1269+"      [3:[4:]\n"
1270+"             lines around each change]"
1271+msgstr ""
1272+"[1:[2:]\n"
1273+"             åœ¨æ¯ä¸€å˜æ›´é™„近显示]\n"
1274+"      [3:[4:]\n"
1275+"             è¡Œ]"
1276 
1277-#: trac/templates/diff_options.html:22
1278-msgid "lines around each change"
1279-msgstr "附加显示行数"
1280-
1281-#: trac/templates/diff_options.html:25
1282+#: trac/templates/diff_options.html:28
1283 msgid "Show the changes in full context"
1284 msgstr "在完整上下文中显示修改"
1285 
1286-#: trac/templates/diff_options.html:29
1287+#: trac/templates/diff_options.html:32
1288 msgid "Ignore:"
1289 msgstr "忽略:"
1290 
1291-#: trac/templates/diff_options.html:33
1292+#: trac/templates/diff_options.html:36
1293 msgid "Blank lines"
1294 msgstr "空行"
1295 
1296-#: trac/templates/diff_options.html:38
1297+#: trac/templates/diff_options.html:41
1298 msgid "Case changes"
1299 msgstr "大小写变化"
1300 
1301-#: trac/templates/diff_options.html:43
1302+#: trac/templates/diff_options.html:46
1303 msgid "White space changes"
1304 msgstr "空白字符变化"
1305 
1306-#: trac/templates/diff_options.html:47
1307-#: trac/ticket/templates/milestone_view.html:58
1308-#: trac/ticket/templates/query.html:207
1309+#: trac/templates/diff_options.html:50
1310+#: trac/ticket/templates/milestone_view.html:57
1311+#: trac/ticket/templates/query.html:209
1312 #: trac/ticket/templates/report_view.html:49
1313 #: trac/ticket/templates/roadmap.html:29
1314 #: trac/timeline/templates/timeline.html:31
1315-#: trac/versioncontrol/templates/revisionlog.html:65
1316+#: trac/versioncontrol/templates/revisionlog.html:67
1317 msgid "Update"
1318 msgstr "更新结果"
1319 
1320-#: trac/templates/diff_view.html:17
1321-msgid "Changes"
1322-msgstr "变更"
1323+#: trac/templates/diff_view.html:18
1324+#, python-format
1325+msgid ""
1326+"Changes between\n"
1327+"          [1:Version %(old)s] and\n"
1328+"          [2:Version %(new)s] of\n"
1329+"          [3:%(name)s]"
1330+msgstr ""
1331+"[3:%(name)s] 的\n"
1332+"          [1:版本 %(old)s] 与\n"
1333+"          [2:版本 %(new)s] \n"
1334+"          间的差异"
1335 
1336-#: trac/templates/diff_view.html:18 trac/templates/diff_view.html:21
1337-#: trac/ticket/templates/query.html:115
1338-msgid "between"
1339-msgstr "之间"
1340+#: trac/templates/diff_view.html:23
1341+#, python-format
1342+msgid ""
1343+"Changes between\n"
1344+"          [1:Initial Version] and\n"
1345+"          [2:Version %(new)s] of\n"
1346+"          [3:%(name)s]"
1347+msgstr ""
1348+"[3:%(name)s] 的\n"
1349+"          [1:初始版本] 与\n"
1350+"          [2:版本 %(new)s]\n"
1351+"          间的差异"
1352 
1353-#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:25
1354-#: trac/templates/history_view.html:27 trac/ticket/admin.py:441
1355-#: trac/ticket/api.py:297 trac/ticket/templates/ticket.html:94
1356-msgid "Version"
1357-msgstr "版本"
1358+#: trac/templates/diff_view.html:28
1359+#, python-format
1360+msgid ""
1361+"Changes from\n"
1362+"          [1:Version %(new)s] of\n"
1363+"          [2:%(name)s]"
1364+msgstr ""
1365+"[2:%(name)s] 从\n"
1366+"          [1:版本 %(new)s]\n"
1367+"          起的变更"
1368 
1369-#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:22
1370-#: trac/ticket/templates/query.html:117
1371-msgid "and"
1372-msgstr "和"
1373-
1374-#: trac/templates/diff_view.html:22 trac/ticket/web_ui.py:799
1375-#: trac/ticket/web_ui.py:934 trac/ticket/templates/ticket.html:91
1376-msgid "Initial Version"
1377-msgstr "初始版本"
1378-
1379-#: trac/templates/diff_view.html:24
1380-msgid "from"
1381-msgstr "从"
1382-
1383-#: trac/templates/diff_view.html:25
1384-msgid "of"
1385-msgstr "的"
1386-
1387-#: trac/templates/diff_view.html:38
1388-#: trac/versioncontrol/templates/changeset.html:108
1389+#: trac/templates/diff_view.html:43
1390+#: trac/versioncontrol/templates/changeset.html:136
1391 msgid "Timestamp:"
1392 msgstr "时间戳:"
1393 
1394-#: trac/templates/diff_view.html:40 trac/templates/diff_view.html:47
1395-#: trac/templates/diff_view.html:53
1396+#: trac/templates/diff_view.html:45 trac/templates/diff_view.html:53
1397+#: trac/templates/diff_view.html:59
1398 msgid "(multiple changes)"
1399 msgstr "(多次变更)"
1400 
1401-#: trac/templates/diff_view.html:42
1402+#: trac/templates/diff_view.html:47
1403 #, python-format
1404 msgid "%(date)s (%(duration)s ago)"
1405 msgstr "%(date)s （%(duration)s 前）"
1406 
1407-#: trac/templates/diff_view.html:49
1408-msgid "(IP:"
1409-msgstr "(IP:"
1410+#: trac/templates/diff_view.html:55
1411+#, python-format
1412+msgid "(IP: %(ipnr)s)"
1413+msgstr "(IP: %(ipnr)s)"
1414 
1415-#: trac/templates/diff_view.html:51
1416+#: trac/templates/diff_view.html:57
1417+#: trac/ticket/templates/ticket_notify_email.txt:21
1418 msgid "Comment:"
1419 msgstr "评论:"
1420 
1421-#: trac/templates/diff_view.html:59
1422-#: trac/versioncontrol/templates/changeset.html:170
1423-#: trac/versioncontrol/templates/revisionlog.html:71
1424+#: trac/templates/diff_view.html:65
1425+#: trac/versioncontrol/templates/changeset.html:198
1426+#: trac/versioncontrol/templates/revisionlog.html:73
1427 msgid "Legend:"
1428 msgstr "图例:"
1429 
1430-#: trac/templates/diff_view.html:61
1431-#: trac/versioncontrol/templates/changeset.html:172
1432+#: trac/templates/diff_view.html:67
1433+#: trac/versioncontrol/templates/changeset.html:200
1434 msgid "Unmodified"
1435 msgstr "未修改"
1436 
1437-#: trac/templates/diff_view.html:62
1438-#: trac/versioncontrol/templates/changeset.html:173
1439-#: trac/versioncontrol/templates/revisionlog.html:73
1440+#: trac/templates/diff_view.html:68
1441+#: trac/versioncontrol/templates/changeset.html:201
1442+#: trac/versioncontrol/templates/revisionlog.html:75
1443 msgid "Added"
1444-msgstr "已增加"
1445+msgstr "增加"
1446 
1447-#: trac/templates/diff_view.html:63
1448-#: trac/versioncontrol/templates/changeset.html:174
1449-#: trac/versioncontrol/templates/revisionlog.html:75
1450+#: trac/templates/diff_view.html:69
1451+#: trac/versioncontrol/templates/changeset.html:202
1452+#: trac/versioncontrol/templates/revisionlog.html:77
1453 msgid "Removed"
1454 msgstr "删除"
1455 
1456-#: trac/templates/diff_view.html:64 trac/ticket/api.py:325
1457-#: trac/versioncontrol/templates/changeset.html:176
1458-#: trac/versioncontrol/templates/revisionlog.html:77 trac/wiki/admin.py:202
1459+#: trac/templates/diff_view.html:70 trac/ticket/api.py:325
1460+#: trac/versioncontrol/templates/changeset.html:204
1461+#: trac/versioncontrol/templates/revisionlog.html:79 trac/wiki/admin.py:200
1462 msgid "Modified"
1463 msgstr "修改"
1464 
1465 #: trac/templates/error.html:64
1466-msgid ""
1467-"==== How to Reproduce ====\n"
1468-"\n"
1469-"While doing a"
1470-msgstr ""
1471-"==== 如何重现 ====\n"
1472-"\n"
1473-"当进行"
1474+msgid "==== How to Reproduce ===="
1475+msgstr "==== 如何重现 ===="
1476 
1477-#: trac/templates/error.html:67
1478-msgid "operation on `"
1479-msgstr "操作于 `"
1480-
1481-#: trac/templates/error.html:67
1482+#: trac/templates/error.html:66
1483+#, python-format
1484 msgid ""
1485-"`, Trac issued an internal error.\n"
1486+"While doing a %(request)s operation on `%(path)s`, Trac issued an "
1487+"internal error.\n"
1488 "\n"
1489 "''(please provide additional details here)''"
1490 msgstr ""
1491-"`, Trac产生内部错误.\n"
1492+"当在 `%(path)s` 上执行  %(request)s 操作时，Trac发生了内部错误。\n"
1493 "\n"
1494-"''(请在此附加详细情况)''"
1495+"''(请在此提供其它详细情况)''"
1496 
1497-#: trac/templates/error.html:71
1498+#: trac/templates/error.html:72
1499 msgid ""
1500 "Request parameters:\n"
1501 "{{{"
1502@@ -1861,15 +1897,15 @@
1503 "请求参数:\n"
1504 "{{{"
1505 
1506-#: trac/templates/error.html:76
1507+#: trac/templates/error.html:77
1508 msgid "==== System Information ===="
1509 msgstr "==== 系统信息 ===="
1510 
1511-#: trac/templates/error.html:80
1512+#: trac/templates/error.html:81
1513 msgid "==== Enabled Plugins ===="
1514 msgstr "==== 已启用插件 ===="
1515 
1516-#: trac/templates/error.html:83
1517+#: trac/templates/error.html:84
1518 msgid ""
1519 "==== Python Traceback ====\n"
1520 "{{{"
1521@@ -1877,19 +1913,19 @@
1522 "==== Python Traceback ====\n"
1523 "{{{"
1524 
1525-#: trac/templates/error.html:90
1526+#: trac/templates/error.html:91
1527 msgid "Create"
1528 msgstr "创建"
1529 
1530-#: trac/templates/error.html:105
1531+#: trac/templates/error.html:106
1532 msgid "Oops…"
1533 msgstr "糟了…"
1534 
1535-#: trac/templates/error.html:107
1536+#: trac/templates/error.html:108
1537 msgid "Trac detected an internal error:"
1538 msgstr "Trac检测到一个内部错误:"
1539 
1540-#: trac/templates/error.html:112
1541+#: trac/templates/error.html:113
1542 msgid ""
1543 "There was an internal error in Trac.\n"
1544 "                It is recommended that you notify your local\n"
1545@@ -1898,37 +1934,31 @@
1546 "                reproduce the issue."
1547 msgstr "Trac发生了内部错误。建议您向本地[1:Trac 管理员]提供重现问题所需要的信息。"
1548 
1549-#: trac/templates/error.html:120
1550-msgid "To that end, you could"
1551-msgstr "为此目的, 您可以"
1552+#: trac/templates/error.html:121
1553+#, python-format
1554+msgid "To that end, you could %(create)s a ticket."
1555+msgstr "为此目的, 您可以%(create)s一个任务单。"
1556 
1557-#: trac/templates/error.html:120
1558-msgid "a ticket."
1559-msgstr "一个任务单。"
1560-
1561-#: trac/templates/error.html:122
1562+#: trac/templates/error.html:123
1563 msgid "The action that triggered the error was:"
1564 msgstr "触发此错误的动作是:"
1565 
1566-#: trac/templates/error.html:127
1567+#: trac/templates/error.html:128
1568 msgid "This is probably a local installation issue."
1569 msgstr "这可能是一个本地安装问题。"
1570 
1571-#: trac/templates/error.html:128
1572-msgid "You should"
1573-msgstr "您应该在管理用Trac上"
1574-
1575 #: trac/templates/error.html:129
1576+#, python-format
1577 msgid ""
1578-"a ticket at the admin Trac to report\n"
1579+"You should %(create)s a ticket at the admin Trac to report\n"
1580 "                    the issue."
1581-msgstr "一个任务单报告问题。"
1582+msgstr "你应该在管理用Trac上%(create)s一个任务单来报告这一问题。"
1583 
1584-#: trac/templates/error.html:134
1585+#: trac/templates/error.html:135
1586 msgid "Found a bug in Trac?"
1587 msgstr "发现了一个Trac的Bug？"
1588 
1589-#: trac/templates/error.html:135
1590+#: trac/templates/error.html:136
1591 msgid ""
1592 "If you think this should work and you can reproduce the problem,\n"
1593 "              you should consider creating a bug report."
1594@@ -1936,23 +1966,20 @@
1595 "如果认为此项功能本应可用，并能重现该问题，\n"
1596 "              你应考虑提交一个Bug报告。"
1597 
1598-#: trac/templates/error.html:138
1599-msgid "Note that the"
1600-msgstr "注意："
1601-
1602 #: trac/templates/error.html:139
1603-msgid "plugin seems to be involved."
1604-msgstr "插件可能被涉及。"
1605+#, python-format
1606+msgid "Note that the %(name)s plugin seems to be involved."
1607+msgstr "注意，可能涉及到 %(name)s 插件。"
1608 
1609-#: trac/templates/error.html:141
1610+#: trac/templates/error.html:142
1611 msgid "Note that the following plugins seem to be involved:"
1612-msgstr "注意：下列插件可能被涉及："
1613+msgstr "注意，可能涉及到下列插件："
1614 
1615-#: trac/templates/error.html:145
1616+#: trac/templates/error.html:146
1617 msgid "Please report this issue to the plugin maintainer."
1618 msgstr "请将该情况报告给插件维护者。"
1619 
1620-#: trac/templates/error.html:147
1621+#: trac/templates/error.html:148
1622 msgid ""
1623 "Before you do that, though, please first try\n"
1624 "                [1:[2:searching]\n"
1625@@ -1971,7 +1998,7 @@
1626 "                [3:邮件列表]\n"
1627 "                而不是创建任务单。"
1628 
1629-#: trac/templates/error.html:156
1630+#: trac/templates/error.html:157
1631 #, python-format
1632 msgid ""
1633 "Otherwise, please %(create)s a new bug report\n"
1634@@ -1981,90 +2008,92 @@
1635 "\"\n"
1636 "\"                描述问题并说明如何重现。"
1637 
1638-#: trac/templates/error.html:160
1639+#: trac/templates/error.html:161
1640 msgid "Python Traceback"
1641 msgstr "Python Traceback"
1642 
1643-#: trac/templates/error.html:161
1644+#: trac/templates/error.html:162
1645 msgid "Most recent call last:"
1646 msgstr "最多最近调用的:"
1647 
1648-#: trac/templates/error.html:166 trac/templates/error.html:197
1649-msgid "File \""
1650-msgstr "文件 \""
1651-
1652 #: trac/templates/error.html:166
1653+#, python-format
1654 msgid ""
1655-"\",\n"
1656-"                        line"
1657+"[1:File \"%(file)s\",\n"
1658+"                        line [2:%(line)s], in]\n"
1659+"                        [3:%(function)s]"
1660 msgstr ""
1661-"\",\n"
1662-"                        行"
1663+"[1:File \"%(file)s\",\n"
1664+"                        line [2:%(line)s], in]\n"
1665+"                        [3:%(function)s]"
1666 
1667-#: trac/templates/error.html:167 trac/templates/error.html:197
1668-msgid ", in"
1669-msgstr ", 于"
1670-
1671-#: trac/templates/error.html:171
1672+#: trac/templates/error.html:172
1673 msgid "Code fragment:"
1674 msgstr "部分代码:"
1675 
1676-#: trac/templates/error.html:173
1677+#: trac/templates/error.html:174
1678 msgid "Line"
1679 msgstr "行"
1680 
1681-#: trac/templates/error.html:183
1682+#: trac/templates/error.html:184
1683 msgid "Local variables:"
1684 msgstr "局部变量:"
1685 
1686-#: trac/templates/error.html:197
1687-msgid "\", line"
1688-msgstr "\", 行"
1689+#: trac/templates/error.html:198
1690+#, python-format
1691+msgid "File \"%(file)s\", line %(line)s, in %(function)s"
1692+msgstr "File \"%(file)s\", line %(line)s, in %(function)s"
1693 
1694-#: trac/templates/error.html:200
1695+#: trac/templates/error.html:201
1696 msgid "Switch to plain text view"
1697 msgstr "切换到纯文本视图"
1698 
1699-#: trac/templates/error.html:203
1700+#: trac/templates/error.html:204
1701 msgid "System Information:"
1702 msgstr "系统信息:"
1703 
1704-#: trac/templates/error.html:211
1705+#: trac/templates/error.html:212
1706 msgid "Enabled Plugins:"
1707 msgstr "已启用插件"
1708 
1709-#: trac/templates/error.html:227
1710+#: trac/templates/error.html:228
1711 msgid "TracGuide"
1712 msgstr "TracGuide"
1713 
1714-#: trac/templates/error.html:227
1715+#: trac/templates/error.html:228
1716 msgid "— The Trac User and Administration Guide"
1717 msgstr "— Trac用户及管理员指南"
1718 
1719-#: trac/templates/history_view.html:15
1720-msgid "Change History for"
1721-msgstr "变更历史"
1722+#: trac/templates/history_view.html:16
1723+#, python-format
1724+msgid "Change History for [1:%(name)s]"
1725+msgstr "[1:%(name)s] 的变更历史"
1726 
1727-#: trac/templates/history_view.html:21 trac/templates/history_view.html:54
1728+#: trac/templates/history_view.html:22 trac/templates/history_view.html:55
1729 #: trac/versioncontrol/templates/diff_form.html:58
1730-#: trac/versioncontrol/templates/revisionlog.html:180
1731+#: trac/versioncontrol/templates/revisionlog.html:88
1732+#: trac/versioncontrol/templates/revisionlog.html:182
1733 msgid "View changes"
1734 msgstr "查阅变更"
1735 
1736-#: trac/templates/history_view.html:23
1737+#: trac/templates/history_view.html:24
1738 msgid "Change history"
1739 msgstr "变更历史"
1740 
1741-#: trac/templates/history_view.html:30
1742-#: trac/ticket/templates/ticket_notify_email.txt:21
1743+#: trac/templates/history_view.html:28 trac/ticket/admin.py:440
1744+#: trac/ticket/api.py:297
1745+msgid "Version"
1746+msgstr "版本"
1747+
1748+#: trac/templates/history_view.html:31
1749 msgid "Comment"
1750 msgstr "评论"
1751 
1752-#: trac/templates/history_view.html:42
1753+#: trac/templates/history_view.html:43
1754 msgid "View this version"
1755 msgstr "查看该版本"
1756 
1757-#: trac/templates/history_view.html:45
1758+#: trac/templates/history_view.html:46
1759 #, python-format
1760 msgid "IP-Address: %(ipnr)s"
1761 msgstr "IP地址： %(ipnr)s"
1762@@ -2086,6 +2115,10 @@
1763 msgid "Download in other formats:"
1764 msgstr "用其他格式下载:"
1765 
1766+#: trac/templates/list_of_attachments.html:19
1767+msgid "View attachment"
1768+msgstr "查看附件"
1769+
1770 #: trac/templates/list_of_attachments.html:18
1771 #, python-format
1772 msgid ""
1773@@ -2105,12 +2138,6 @@
1774 msgid "Attachments"
1775 msgstr "附件"
1776 
1777-#: trac/templates/macros.html:19
1778-#: trac/versioncontrol/templates/dir_entries.html:16
1779-#, python-format
1780-msgid "%(size)s bytes"
1781-msgstr "%(size)s 字节"
1782-
1783 #: trac/templates/macros.html:37 trac/templates/macros.html:38
1784 msgid "Previous"
1785 msgstr "上一个"
1786@@ -2123,182 +2150,179 @@
1787 msgid "(The file is empty)"
1788 msgstr "(文件为空)"
1789 
1790-#: trac/templates/preview_file.html:18
1791-msgid "HTML preview not available"
1792-msgstr "HTML预览功能不可用"
1793-
1794-#: trac/templates/preview_file.html:21
1795+#: trac/templates/preview_file.html:19
1796 #, python-format
1797-msgid "since the file size exceeds %(size)s bytes."
1798-msgstr "由于文件大小超过 %(size)s 字节。"
1799+msgid ""
1800+"[1:HTML preview not available], since the file size exceeds %(size)s "
1801+"bytes."
1802+msgstr "[1:无法进行HTML预览]，因为文件大小超过 %(size)s 字节。"
1803 
1804-#: trac/templates/preview_file.html:25
1805-msgid "since no preview renderer could handle it."
1806-msgstr "由于没有合适的渲染器来处理。"
1807+#: trac/templates/preview_file.html:22
1808+msgid "[1:HTML preview not available], since no preview renderer could handle it."
1809+msgstr "[1:无法进行HTML预览]，因为没有预览渲染器能够处理它。"
1810 
1811-#: trac/templates/preview_file.html:28
1812-msgid "Try"
1813-msgstr "尝试"
1814+#: trac/templates/preview_file.html:26
1815+msgid "Try [1:downloading] the file instead."
1816+msgstr "请[1:下载]文件。"
1817 
1818-#: trac/templates/preview_file.html:29
1819-msgid "downloading"
1820-msgstr "下载"
1821+#: trac/templates/progress_bar.html:26
1822+#, python-format
1823+msgid "%(count)s/%(total)s %(title)s"
1824+msgstr "%(count)s/%(total)s %(title)s"
1825 
1826-#: trac/templates/preview_file.html:29
1827-msgid "the file instead."
1828-msgstr "文件代替。"
1829-
1830-#: trac/templates/progress_bar.html:24
1831+#: trac/templates/progress_bar.html:36
1832 #, python-format
1833-msgid "%(num)s of %(total)s %(unit)s %(title)s"
1834-msgid_plural "%(num)s of %(total)s %(units)s %(title)s"
1835-msgstr[0] "%(num)s / %(total)s %(unit)s %(title)s"
1836-msgstr[1] "%(num)s / %(total)s %(units)s %(title)s"
1837+msgid "Number of %(unit)s:"
1838+msgstr "%(unit)s数:"
1839 
1840-#: trac/templates/progress_bar.html:37
1841+#: trac/templates/progress_bar.html:40
1842 #, python-format
1843-msgid "%(title)s %(unit)s:"
1844-msgid_plural "%(title)s %(units)s:"
1845-msgstr[0] "%(title)s %(unit)s:"
1846-msgstr[1] "%(title)s %(units)s:"
1847+msgid ""
1848+"[1:[2:%(title)s:]]\n"
1849+"          [3:[4:%(count)s]]"
1850+msgstr ""
1851+"[1:[2:%(title)s:]]\n"
1852+"          [3:[4:%(count)s]]"
1853 
1854 #: trac/templates/progress_bar.html:47
1855 #, python-format
1856-msgid "Total %(unit)s:"
1857-msgid_plural "Total %(units)s:"
1858-msgstr[0] "总计 %(unit)s:"
1859-msgstr[1] "总计 %(units)s:"
1860+msgid ""
1861+"[1:[2:Total:]]\n"
1862+"      [3:[4:%(count)s]]"
1863+msgstr ""
1864+"[1:[2:共:]]\n"
1865+"      [3:[4:%(count)s]]"
1866 
1867 #: trac/templates/theme.html:26
1868 msgid "Search:"
1869 msgstr "搜索:"
1870 
1871-#: trac/templates/theme.html:37
1872+#: trac/templates/theme.html:39
1873 msgid "Context Navigation"
1874 msgstr "上下文导航"
1875 
1876-#: trac/templates/theme.html:46
1877+#: trac/templates/theme.html:49
1878 msgid "Warning:"
1879 msgstr "警告:"
1880 
1881-#: trac/ticket/admin.py:37
1882+#: trac/ticket/admin.py:36
1883 msgid "(Undefined)"
1884 msgstr "（未定义的）"
1885 
1886-#: trac/ticket/admin.py:48
1887+#: trac/ticket/admin.py:47
1888 msgid "Ticket System"
1889 msgstr "任务单系统"
1890 
1891-#: trac/ticket/admin.py:113
1892+#: trac/ticket/admin.py:112
1893 #, python-format
1894 msgid "The component \"%(name)s\" has been added."
1895 msgstr "组件 '%(name)s' 已添加。"
1896 
1897-#: trac/ticket/admin.py:118 trac/ticket/model.py:816 trac/ticket/model.py:833
1898+#: trac/ticket/admin.py:117 trac/ticket/model.py:841 trac/ticket/model.py:862
1899 msgid "Invalid component name."
1900 msgstr "无效的组件名称。"
1901 
1902-#: trac/ticket/admin.py:119
1903+#: trac/ticket/admin.py:118
1904 #, python-format
1905 msgid "Component %(name)s already exists."
1906 msgstr "组件 %(name)s 已经存在."
1907 
1908-#: trac/ticket/admin.py:126
1909+#: trac/ticket/admin.py:125
1910 msgid "No component selected"
1911 msgstr "没有选择组件"
1912 
1913-#: trac/ticket/admin.py:134
1914+#: trac/ticket/admin.py:133
1915 msgid "The selected components have been removed."
1916 msgstr "选定组件已删除。"
1917 
1918-#: trac/ticket/admin.py:242 trac/ticket/api.py:295
1919+#: trac/ticket/admin.py:241 trac/ticket/api.py:295
1920 #: trac/ticket/templates/milestone_view.html:10
1921-#: trac/ticket/templates/milestone_view.html:21
1922+#: trac/ticket/templates/milestone_view.html:23
1923 msgid "Milestone"
1924 msgstr "里程碑"
1925 
1926-#: trac/ticket/admin.py:271 trac/ticket/roadmap.py:665
1927+#: trac/ticket/admin.py:270 trac/ticket/roadmap.py:663
1928 msgid "Completion date may not be in the future"
1929 msgstr "完成日期不能是未来的日期"
1930 
1931-#: trac/ticket/admin.py:273
1932+#: trac/ticket/admin.py:272
1933 msgid "Invalid Completion Date"
1934 msgstr "无效完成日期"
1935 
1936-#: trac/ticket/admin.py:300
1937+#: trac/ticket/admin.py:299
1938 #, python-format
1939 msgid "The milestone \"%(name)s\" has been added."
1940 msgstr "里程碑 \"%(name)s\" 已添加。"
1941 
1942-#: trac/ticket/admin.py:305 trac/ticket/model.py:942 trac/ticket/model.py:962
1943+#: trac/ticket/admin.py:304 trac/ticket/model.py:978 trac/ticket/model.py:1002
1944 msgid "Invalid milestone name."
1945 msgstr "无效的里程碑名称。"
1946 
1947-#: trac/ticket/admin.py:306
1948+#: trac/ticket/admin.py:305
1949 #, python-format
1950 msgid "Milestone %(name)s already exists."
1951 msgstr "里程碑 %(name)s 已经存在."
1952 
1953-#: trac/ticket/admin.py:314
1954+#: trac/ticket/admin.py:313
1955 msgid "No milestone selected"
1956 msgstr "没有选择里程碑"
1957 
1958-#: trac/ticket/admin.py:322
1959+#: trac/ticket/admin.py:321
1960 msgid "The selected milestones have been removed."
1961 msgstr "选定里程碑已删除。"
1962 
1963-#: trac/ticket/admin.py:481
1964+#: trac/ticket/admin.py:480
1965 #, python-format
1966 msgid "The version \"%(name)s\" has been added."
1967 msgstr "版本 '%(name)s' 已添加。"
1968 
1969-#: trac/ticket/admin.py:486 trac/ticket/model.py:1065 trac/ticket/model.py:1081
1970+#: trac/ticket/admin.py:485 trac/ticket/model.py:1112 trac/ticket/model.py:1132
1971 msgid "Invalid version name."
1972 msgstr "无效的版本名称。"
1973 
1974-#: trac/ticket/admin.py:487
1975+#: trac/ticket/admin.py:486
1976 #, python-format
1977 msgid "Version %(name)s already exists."
1978 msgstr "版本 %(name)s 已经存在."
1979 
1980-#: trac/ticket/admin.py:494
1981+#: trac/ticket/admin.py:493
1982 msgid "No version selected"
1983 msgstr "没有选择版本"
1984 
1985-#: trac/ticket/admin.py:502
1986+#: trac/ticket/admin.py:501
1987 msgid "The selected versions have been removed."
1988 msgstr "选定版本已删除。"
1989 
1990-#: trac/ticket/admin.py:560
1991+#: trac/ticket/admin.py:559
1992 msgid "Time"
1993 msgstr "时间"
1994 
1995-#: trac/ticket/admin.py:630
1996+#: trac/ticket/admin.py:627
1997 #, python-format
1998-msgid "The %(field)s \"%(name)s\" has been added."
1999-msgstr "%(field)s \"%(name)s\" 已添加。"
2000+msgid "The %(field)s value \"%(name)s\" has been added."
2001+msgstr "%(field)s 值 \"%(name)s\" 已添加。"
2002 
2003-#: trac/ticket/admin.py:636 trac/ticket/model.py:687 trac/ticket/model.py:710
2004+#: trac/ticket/admin.py:633
2005 #, python-format
2006-msgid "Invalid %(type)s name."
2007+msgid "Invalid %(type)s value."
2008 msgstr "无效的%(type)s名称。"
2009 
2010-#: trac/ticket/admin.py:638
2011+#: trac/ticket/admin.py:635
2012 #, python-format
2013-msgid "%(type)s %(name)s already exists"
2014-msgstr "%(type)s %(name)s 已经存在"
2015+msgid "%(type)s value \"%(name)s\" already exists"
2016+msgstr "%(type)s 值 %(name)s 已经存在"
2017 
2018-#: trac/ticket/admin.py:644
2019+#: trac/ticket/admin.py:642
2020 #, python-format
2021 msgid "No %s selected"
2022 msgstr "没有 %s 被选择"
2023 
2024-#: trac/ticket/admin.py:654
2025+#: trac/ticket/admin.py:650
2026 #, python-format
2027-msgid "The selected %(fields)s have been removed."
2028-msgstr "选定%(fields)s已删除。"
2029+msgid "The selected %(field)s values have been removed."
2030+msgstr "选定%(field)s值已删除。"
2031 
2032-#: trac/ticket/admin.py:675
2033+#: trac/ticket/admin.py:672
2034 msgid ""
2035 "Error writing to trac.ini, make sure it is writable by the web server. "
2036 "The default value has not been saved."
2037@@ -2306,72 +2330,72 @@
2038 "写入trac.ini错误，请确保它可被Web服务器写入。\n"
2039 "缺省值没有被保存。"
2040 
2041-#: trac/ticket/admin.py:687
2042+#: trac/ticket/admin.py:684
2043 msgid "Order numbers must be unique"
2044 msgstr "序号必须唯一"
2045 
2046-#: trac/ticket/admin.py:749
2047+#: trac/ticket/admin.py:746
2048 msgid "Possible Values"
2049 msgstr "可取值"
2050 
2051-#: trac/ticket/admin.py:771
2052+#: trac/ticket/admin.py:768
2053 #, python-format
2054 msgid "Invalid up/down value: %(value)s"
2055 msgstr "无效的 up/down 值: %(value)s"
2056 
2057-#: trac/ticket/admin.py:793 trac/ticket/api.py:294
2058+#: trac/ticket/admin.py:789 trac/ticket/api.py:294
2059 msgid "Priority"
2060 msgstr "优先级"
2061 
2062-#: trac/ticket/admin.py:793
2063+#: trac/ticket/admin.py:789
2064 msgid "Priorities"
2065 msgstr "优先级"
2066 
2067-#: trac/ticket/admin.py:799 trac/ticket/api.py:299
2068+#: trac/ticket/admin.py:795 trac/ticket/api.py:299
2069 msgid "Resolution"
2070 msgstr "处理结果"
2071 
2072-#: trac/ticket/admin.py:799
2073+#: trac/ticket/admin.py:795
2074 msgid "Resolutions"
2075 msgstr "处理结果"
2076 
2077-#: trac/ticket/admin.py:805 trac/ticket/api.py:298
2078+#: trac/ticket/admin.py:801 trac/ticket/api.py:298
2079 msgid "Severity"
2080 msgstr "严重性"
2081 
2082-#: trac/ticket/admin.py:805
2083+#: trac/ticket/admin.py:801
2084 msgid "Severities"
2085 msgstr "严重性"
2086 
2087-#: trac/ticket/admin.py:811
2088+#: trac/ticket/admin.py:807
2089 msgid "Ticket Type"
2090 msgstr "任务单类型"
2091 
2092-#: trac/ticket/admin.py:811
2093+#: trac/ticket/admin.py:807
2094 msgid "Ticket Types"
2095 msgstr "任务单类型"
2096 
2097-#: trac/ticket/admin.py:839
2098+#: trac/ticket/admin.py:835
2099 msgid "<number> must be a number"
2100 msgstr "<number> 必须是一个数"
2101 
2102-#: trac/ticket/admin.py:844
2103+#: trac/ticket/admin.py:840
2104 #, python-format
2105-msgid "Ticket %(num)s and all associated data removed."
2106-msgstr "任务单 %(num)s 和所有相关数据均已被删除。"
2107+msgid "Ticket #%(num)s and all associated data removed."
2108+msgstr "任务单 #%(num)s 和所有相关数据均已删除。"
2109 
2110 #: trac/ticket/api.py:277
2111 msgid "Summary"
2112-msgstr "概述:"
2113+msgstr "概述"
2114 
2115 #: trac/ticket/api.py:279 trac/ticket/templates/ticket.html:361
2116 msgid "Reporter"
2117-msgstr "报告人:"
2118+msgstr "报告人"
2119 
2120-#: trac/ticket/api.py:292 trac/versioncontrol/admin.py:108
2121-#: trac/versioncontrol/templates/admin_repositories.html:124
2122+#: trac/ticket/api.py:292 trac/versioncontrol/admin.py:110
2123+#: trac/versioncontrol/templates/admin_repositories.html:125
2124 msgid "Type"
2125-msgstr "类型:"
2126+msgstr "类型"
2127 
2128 #: trac/ticket/api.py:293
2129 msgid "Status"
2130@@ -2407,26 +2431,32 @@
2131 msgid "The ticket will be disowned"
2132 msgstr "任务单将将脱离属主"
2133 
2134-#: trac/ticket/default_workflow.py:246 trac/ticket/default_workflow.py:262
2135+#: trac/ticket/default_workflow.py:245 trac/ticket/default_workflow.py:263
2136 #, python-format
2137+msgid "to %(owner)s"
2138+msgstr "到 %(owner)s"
2139+
2140+#: trac/ticket/default_workflow.py:247 trac/ticket/default_workflow.py:266
2141+#, python-format
2142 msgid "The owner will be changed from %(current_owner)s"
2143 msgstr "属主将由%(current_owner)s变更"
2144 
2145-#: trac/ticket/default_workflow.py:252
2146+#: trac/ticket/default_workflow.py:254
2147 #, python-format
2148+msgid "to %(owner)s "
2149+msgstr "到 %(owner)s"
2150+
2151+#: trac/ticket/default_workflow.py:256
2152+#, python-format
2153 msgid "The owner will be changed from %(current_owner)s to %(selected_owner)s"
2154 msgstr "属主将由%(current_owner)s变更为%(selected_owner)s"
2155 
2156-#: trac/ticket/default_workflow.py:257
2157-msgid "to "
2158-msgstr "到"
2159-
2160-#: trac/ticket/default_workflow.py:267
2161+#: trac/ticket/default_workflow.py:271
2162 #, python-format
2163 msgid "The owner will be changed from %(current_owner)s to %(authname)s"
2164 msgstr "属主将由%(current_owner)s变更为%(authname)s"
2165 
2166-#: trac/ticket/default_workflow.py:277
2167+#: trac/ticket/default_workflow.py:281
2168 msgid ""
2169 "Your workflow attempts to set a resolution but none is defined "
2170 "(configuration issue, please contact your Trac admin)."
2171@@ -2434,69 +2464,84 @@
2172 "您的工作流试图设置处理结果，但一个也没有定义\n"
2173 "(配置问题，请联系您的Trac管理员)。"
2174 
2175-#: trac/ticket/default_workflow.py:282
2176+#: trac/ticket/default_workflow.py:289 trac/ticket/default_workflow.py:299
2177 #, python-format
2178+msgid "as %(resolution)s"
2179+msgstr "为 %(resolution)s"
2180+
2181+#: trac/ticket/default_workflow.py:291
2182+#, python-format
2183 msgid "The resolution will be set to %(name)s"
2184 msgstr "处理结果将设置为 %(name)s"
2185 
2186-#: trac/ticket/default_workflow.py:293
2187+#: trac/ticket/default_workflow.py:302
2188 msgid "The resolution will be set"
2189 msgstr "处理结果将设置为"
2190 
2191-#: trac/ticket/default_workflow.py:295
2192+#: trac/ticket/default_workflow.py:304
2193 msgid "The resolution will be deleted"
2194 msgstr "处理结果将被删除"
2195 
2196-#: trac/ticket/default_workflow.py:301
2197+#: trac/ticket/default_workflow.py:307
2198 #, python-format
2199+msgid "as %(status)s "
2200+msgstr "为 %(status)s "
2201+
2202+#: trac/ticket/default_workflow.py:311
2203+#, python-format
2204 msgid "Next status will be '%(name)s'"
2205 msgstr "下一个状态将是 '%(name)s'"
2206 
2207-#: trac/ticket/model.py:106
2208+#: trac/ticket/model.py:105
2209 #, python-format
2210 msgid "Ticket %(id)s does not exist."
2211 msgstr "任务单 %(id)s 不存在."
2212 
2213-#: trac/ticket/model.py:107
2214+#: trac/ticket/model.py:106
2215 msgid "Invalid ticket number"
2216 msgstr "无效的任务单编号"
2217 
2218-#: trac/ticket/model.py:144
2219+#: trac/ticket/model.py:143
2220 msgid "Multi-values fields not supported yet"
2221 msgstr "尚不支持多值字段"
2222 
2223-#: trac/ticket/model.py:651
2224+#: trac/ticket/model.py:657
2225 #, python-format
2226 msgid "%(type)s %(name)s does not exist."
2227 msgstr "%(type)s %(name)s 不存在."
2228 
2229-#: trac/ticket/model.py:789
2230+#: trac/ticket/model.py:701 trac/ticket/model.py:728
2231 #, python-format
2232+msgid "Invalid %(type)s name."
2233+msgstr "无效的%(type)s名称。"
2234+
2235+#: trac/ticket/model.py:806
2236+#, python-format
2237 msgid "Component %(name)s does not exist."
2238 msgstr "组件 '%(name)s' 不存在."
2239 
2240-#: trac/ticket/model.py:894
2241+#: trac/ticket/model.py:922
2242 #, python-format
2243 msgid "Milestone %(name)s does not exist."
2244 msgstr "里程碑 '%(name)s' 不存在."
2245 
2246-#: trac/ticket/model.py:895
2247+#: trac/ticket/model.py:923
2248 msgid "Invalid milestone name"
2249 msgstr "无效的里程碑名称"
2250 
2251-#: trac/ticket/model.py:1016
2252+#: trac/ticket/model.py:1056
2253 msgid "Open (by due date)"
2254 msgstr "开启(有期限)"
2255 
2256-#: trac/ticket/model.py:1017
2257+#: trac/ticket/model.py:1057
2258 msgid "Open (no due date)"
2259 msgstr "开启(无期限)"
2260 
2261-#: trac/ticket/model.py:1020
2262+#: trac/ticket/model.py:1060
2263 msgid "Closed"
2264 msgstr "关闭"
2265 
2266-#: trac/ticket/model.py:1038
2267+#: trac/ticket/model.py:1077
2268 #, python-format
2269 msgid "Version %(name)s does not exist."
2270 msgstr "版本 '%(name)s' 不存在."
2271@@ -2561,25 +2606,28 @@
2272 msgid "Ticket"
2273 msgstr "任务单"
2274 
2275-#: trac/ticket/query.py:776 trac/ticket/report.py:379
2276+#: trac/ticket/query.py:776 trac/ticket/report.py:406
2277 #, python-format
2278 msgid "Page %(num)d"
2279 msgstr "第 %(num)d 页"
2280 
2281-#: trac/ticket/query.py:825 trac/ticket/report.py:539 trac/ticket/web_ui.py:130
2282-#: trac/timeline/web_ui.py:215 trac/versioncontrol/web_ui/log.py:303
2283+#: trac/ticket/query.py:825 trac/ticket/report.py:273 trac/ticket/report.py:566
2284+#: trac/ticket/web_ui.py:130 trac/timeline/web_ui.py:216
2285+#: trac/versioncontrol/web_ui/log.py:304
2286 msgid "RSS Feed"
2287 msgstr "RSS Feed"
2288 
2289-#: trac/ticket/query.py:827 trac/ticket/report.py:541 trac/ticket/web_ui.py:126
2290+#: trac/ticket/query.py:827 trac/ticket/report.py:275 trac/ticket/report.py:568
2291+#: trac/ticket/web_ui.py:126
2292 msgid "Comma-delimited Text"
2293 msgstr "逗号分割文本"
2294 
2295-#: trac/ticket/query.py:829 trac/ticket/report.py:543 trac/ticket/web_ui.py:128
2296+#: trac/ticket/query.py:829 trac/ticket/report.py:277 trac/ticket/report.py:570
2297+#: trac/ticket/web_ui.py:128
2298 msgid "Tab-delimited Text"
2299 msgstr "Tab分割文本"
2300 
2301-#: trac/ticket/query.py:851 trac/ticket/report.py:73
2302+#: trac/ticket/query.py:851 trac/ticket/report.py:72
2303 msgid "View Tickets"
2304 msgstr "查看任务单"
2305 
2306@@ -2629,13 +2677,13 @@
2307 msgstr "删除报表 {%(num)s} %(title)s"
2308 
2309 #: trac/ticket/report.py:204 trac/ticket/report.py:217
2310-#: trac/ticket/report.py:269
2311+#: trac/ticket/report.py:296
2312 #, python-format
2313 msgid "Report {%(num)s} does not exist."
2314 msgstr "报表 {%(num)s} 不存在."
2315 
2316 #: trac/ticket/report.py:205 trac/ticket/report.py:218
2317-#: trac/ticket/report.py:270
2318+#: trac/ticket/report.py:297
2319 msgid "Invalid Report Number"
2320 msgstr "无效报表号"
2321 
2322@@ -2648,101 +2696,102 @@
2323 msgid "Edit Report {%(num)d} %(title)s"
2324 msgstr "编辑报表 {%(num)d} %(title)s"
2325 
2326-#: trac/ticket/report.py:275
2327+#: trac/ticket/report.py:302
2328 #, python-format
2329 msgid "Report failed: %(error)s"
2330 msgstr "报表失败: %(error)s"
2331 
2332-#: trac/ticket/report.py:290
2333+#: trac/ticket/report.py:317
2334 #, python-format
2335 msgid "When specified, the report number should be \"%(num)s\"."
2336 msgstr "当指定后, 报表号应是 \"%(num)s\"."
2337 
2338-#: trac/ticket/report.py:361
2339+#: trac/ticket/report.py:388
2340 #, python-format
2341 msgid "Report execution failed: %(error)s"
2342 msgstr "报表执行失败: %(error)s"
2343 
2344-#: trac/ticket/report.py:547
2345+#: trac/ticket/report.py:574
2346 msgid "SQL Query"
2347 msgstr "SQL查询"
2348 
2349-#: trac/ticket/report.py:571
2350+#: trac/ticket/report.py:598
2351 #, python-format
2352 msgid "The following arguments are missing: %(args)s"
2353 msgstr "缺少如下参数：%(args)s"
2354 
2355-#: trac/ticket/report.py:585
2356+#: trac/ticket/report.py:612
2357 #, python-format
2358 msgid "Report {%(num)s} has no SQL query."
2359 msgstr "报表 {%(num)s} 没有SQL查询."
2360 
2361-#: trac/ticket/report.py:615
2362+#: trac/ticket/report.py:642
2363 #, python-format
2364 msgid "Query parameter \"sort=%(sort_col)s\"  is invalid"
2365 msgstr "查询参数 \"sort=%(sort_col)s\"  无效"
2366 
2367-#: trac/ticket/roadmap.py:208
2368+#: trac/ticket/roadmap.py:205
2369 msgid "ticket status"
2370 msgstr "任务单状态"
2371 
2372-#: trac/ticket/roadmap.py:208
2373-msgid "ticket"
2374-msgstr "任务单"
2375-
2376-#: trac/ticket/roadmap.py:208
2377+#: trac/ticket/roadmap.py:205
2378 msgid "tickets"
2379 msgstr "任务单"
2380 
2381-#: trac/ticket/roadmap.py:218
2382+#: trac/ticket/roadmap.py:215
2383 #, python-format
2384 msgid ""
2385 "'%(group1)s' and '%(group2)s' milestone groups both are declared to be "
2386 "\"catch-all\" groups. Please check your configuration."
2387 msgstr "'%(group1)s' 和 '%(group2)s' 里程碑组都声明为\"catch-all\" 组. 请检查您的配置."
2388 
2389-#: trac/ticket/roadmap.py:234
2390+#: trac/ticket/roadmap.py:231
2391 #, python-format
2392 msgid ""
2393 "'%(groupname)s' milestone group reused status '%(status)s' already taken "
2394 "by other groups. Please check your configuration."
2395 msgstr "'%(groupname)s' 里程碑组重用了已经被其它组使用的状态 '%(status)s'. 请检查您的配置."
2396 
2397-#: trac/ticket/roadmap.py:317 trac/ticket/roadmap.py:439
2398-#: trac/ticket/roadmap.py:573 trac/ticket/templates/roadmap.html:10
2399+#: trac/ticket/roadmap.py:314 trac/ticket/roadmap.py:436
2400+#: trac/ticket/roadmap.py:571 trac/ticket/templates/roadmap.html:10
2401 #: trac/ticket/templates/roadmap.html:15
2402 msgid "Roadmap"
2403 msgstr "路线图"
2404 
2405-#: trac/ticket/roadmap.py:367
2406+#: trac/ticket/roadmap.py:364
2407 msgid "iCalendar"
2408 msgstr "iCalendar"
2409 
2410-#: trac/ticket/roadmap.py:448 trac/ticket/roadmap.py:847
2411+#: trac/ticket/roadmap.py:445 trac/ticket/roadmap.py:845
2412 #, python-format
2413 msgid "Milestone %(name)s"
2414 msgstr "里程碑 %(name)s"
2415 
2416-#: trac/ticket/roadmap.py:467
2417+#: trac/ticket/roadmap.py:464
2418 #, python-format
2419 msgid "Ticket #%(num)s: %(summary)s"
2420 msgstr "任务单 #%(num)s: %(summary)s"
2421 
2422-#: trac/ticket/roadmap.py:528
2423+#: trac/ticket/roadmap.py:525
2424 msgid "Milestones reached"
2425 msgstr "里程碑达成"
2426 
2427-#: trac/ticket/roadmap.py:615
2428+#: trac/ticket/roadmap.py:553
2429 #, python-format
2430+msgid "Milestone %(name)s completed"
2431+msgstr "里程碑 %(name)s 已完成"
2432+
2433+#: trac/ticket/roadmap.py:613
2434+#, python-format
2435 msgid "The milestone \"%(name)s\" has been deleted."
2436 msgstr "里程碑 %(name)s 已删除。"
2437 
2438-#: trac/ticket/roadmap.py:654
2439+#: trac/ticket/roadmap.py:652
2440 #, python-format
2441 msgid "Milestone \"%(name)s\" already exists, please choose another name."
2442 msgstr "里程碑 \"%(name)s\" 已经存在, 请选择其他名称"
2443 
2444-#: trac/ticket/roadmap.py:657
2445+#: trac/ticket/roadmap.py:655
2446 msgid "You must provide a name for the milestone."
2447 msgstr "您必须为里程碑提供名称."
2448 
2449@@ -2790,131 +2839,147 @@
2450 msgid "Ticket %(ticketref)s (%(summary)s) %(verb)s"
2451 msgstr "任务单 %(ticketref)s (%(summary)s) %(verb)s"
2452 
2453-#: trac/ticket/web_ui.py:496
2454+#: trac/ticket/web_ui.py:498
2455 #, python-format
2456-msgid "Invalid action \"%(name)s\""
2457-msgstr "无效动作: \"%(name)s\""
2458+msgid "The action \"%(name)s\" is not available."
2459+msgstr "动作 \"%(name)s\" 无效。"
2460 
2461-#: trac/ticket/web_ui.py:624
2462+#: trac/ticket/web_ui.py:524
2463+#, python-format
2464+msgid ""
2465+"Please review your configuration, probably starting with %(section)s in "
2466+"your %(tracini)s."
2467+msgstr "请检查你的配置, 也许可以从你的 %(tracini)s 中的 %(section)s 开始。"
2468+
2469+#: trac/ticket/web_ui.py:629
2470 msgid "Previous Ticket"
2471 msgstr "上一个任务单"
2472 
2473-#: trac/ticket/web_ui.py:624
2474+#: trac/ticket/web_ui.py:629
2475 msgid "Next Ticket"
2476 msgstr "下一个任务单"
2477 
2478-#: trac/ticket/web_ui.py:625
2479+#: trac/ticket/web_ui.py:630
2480 msgid "Back to Query"
2481 msgstr "返回查询"
2482 
2483-#: trac/ticket/web_ui.py:707 trac/ticket/web_ui.py:855
2484-#: trac/ticket/web_ui.py:863
2485+#: trac/ticket/web_ui.py:712 trac/ticket/web_ui.py:860
2486+#: trac/ticket/web_ui.py:868
2487 msgid "Ticket History"
2488 msgstr "任务单历史"
2489 
2490-#: trac/ticket/web_ui.py:711 trac/ticket/web_ui.py:910
2491+#: trac/ticket/web_ui.py:716 trac/ticket/web_ui.py:915
2492 #, python-format
2493 msgid "Back to Ticket #%(num)s"
2494 msgstr "回到任务单 #%(num)s"
2495 
2496-#: trac/ticket/web_ui.py:753
2497+#: trac/ticket/web_ui.py:758
2498 msgid "No differences to show"
2499 msgstr "没有差异"
2500 
2501-#: trac/ticket/web_ui.py:796 trac/ticket/web_ui.py:852
2502-#: trac/ticket/web_ui.py:860 trac/ticket/web_ui.py:931
2503-#: trac/ticket/web_ui.py:968 trac/ticket/web_ui.py:975 trac/wiki/web_ui.py:431
2504+#: trac/ticket/web_ui.py:801 trac/ticket/web_ui.py:857
2505+#: trac/ticket/web_ui.py:865 trac/ticket/web_ui.py:936
2506+#: trac/ticket/web_ui.py:981 trac/ticket/web_ui.py:988 trac/wiki/web_ui.py:431
2507 #: trac/wiki/web_ui.py:437 trac/wiki/web_ui.py:626 trac/wiki/web_ui.py:640
2508 #, python-format
2509 msgid "Version %(num)s"
2510 msgstr "版本 %(num)s"
2511 
2512-#: trac/ticket/web_ui.py:799 trac/ticket/web_ui.py:934
2513+#: trac/ticket/web_ui.py:804 trac/ticket/web_ui.py:939
2514+msgid "Initial Version"
2515+msgstr "初始版本"
2516+
2517+#: trac/ticket/web_ui.py:804 trac/ticket/web_ui.py:939
2518 msgid "initial"
2519 msgstr "初始"
2520 
2521-#: trac/ticket/web_ui.py:862 trac/ticket/web_ui.py:977
2522+#: trac/ticket/web_ui.py:867 trac/ticket/web_ui.py:990
2523 #: trac/versioncontrol/web_ui/changeset.py:369 trac/wiki/web_ui.py:450
2524 msgid "Previous Change"
2525 msgstr "上一个更改"
2526 
2527-#: trac/ticket/web_ui.py:862 trac/ticket/web_ui.py:977
2528+#: trac/ticket/web_ui.py:867 trac/ticket/web_ui.py:990
2529 #: trac/versioncontrol/web_ui/changeset.py:369 trac/wiki/web_ui.py:450
2530 msgid "Next Change"
2531 msgstr "下一个更改"
2532 
2533-#: trac/ticket/web_ui.py:868
2534+#: trac/ticket/web_ui.py:873
2535 msgid "Ticket Diff"
2536 msgstr "任务单差异"
2537 
2538-#: trac/ticket/web_ui.py:902 trac/ticket/web_ui.py:971
2539-#: trac/ticket/web_ui.py:978
2540+#: trac/ticket/web_ui.py:907 trac/ticket/web_ui.py:984
2541+#: trac/ticket/web_ui.py:991
2542 msgid "Ticket Comment History"
2543 msgstr "任务单评论历史"
2544 
2545-#: trac/ticket/web_ui.py:904 trac/ticket/web_ui.py:928
2546-#: trac/ticket/web_ui.py:985
2547+#: trac/ticket/web_ui.py:909 trac/ticket/web_ui.py:933
2548+#: trac/ticket/web_ui.py:998
2549 #, python-format
2550 msgid "Ticket #%(num)s, comment %(cnum)d"
2551 msgstr "任务单 #%(num)s, 评论 %(cnum)d"
2552 
2553-#: trac/ticket/web_ui.py:983
2554+#: trac/ticket/web_ui.py:956
2555+#, python-format
2556+msgid "No version %(version)d for comment %(cnum)d on ticket #%(ticket)s"
2557+msgstr "任务单 #%(ticket)s 的评论 %(cnum)d 没有版本 %(version)d"
2558+
2559+#: trac/ticket/web_ui.py:996
2560 msgid "Ticket Comment Diff"
2561 msgstr "任务单评论差异"
2562 
2563-#: trac/ticket/web_ui.py:1069
2564+#: trac/ticket/web_ui.py:1082
2565 msgid "No permission to edit the ticket description."
2566 msgstr "无权修改任务单描述。"
2567 
2568-#: trac/ticket/web_ui.py:1075
2569+#: trac/ticket/web_ui.py:1088
2570 msgid "No permission to change the ticket reporter."
2571 msgstr "无权修改任务单报告人。"
2572 
2573-#: trac/ticket/web_ui.py:1080
2574+#: trac/ticket/web_ui.py:1093
2575 msgid "No permission to change ticket fields."
2576 msgstr "无权修改任务单字段。"
2577 
2578-#: trac/ticket/web_ui.py:1089
2579+#: trac/ticket/web_ui.py:1102
2580 msgid "No permissions to add a comment."
2581 msgstr "无权增加评论。"
2582 
2583-#: trac/ticket/web_ui.py:1095
2584+#: trac/ticket/web_ui.py:1108
2585 msgid ""
2586 "Sorry, can not save your changes. This ticket has been modified by "
2587 "someone else since you started"
2588 msgstr "对不起, 无法保存您的修改。该任务单已在您修改过程中被其他人修改"
2589 
2590-#: trac/ticket/web_ui.py:1102
2591+#: trac/ticket/web_ui.py:1115
2592 msgid "Tickets must contain a summary."
2593 msgstr "任务单必须有概述。"
2594 
2595-#: trac/ticket/web_ui.py:1125
2596+#: trac/ticket/web_ui.py:1138
2597 #, python-format
2598 msgid "Ticket description is too long (must be less than %(num)s characters)"
2599 msgstr "任务单描述太长(必须少于 %(num)s 个字符)"
2600 
2601-#: trac/ticket/web_ui.py:1132
2602+#: trac/ticket/web_ui.py:1145
2603 #, python-format
2604 msgid "Ticket comment is too long (must be less than %(num)s characters)"
2605 msgstr "任务单评论太长(必须少于 %(num)s 个字符)"
2606 
2607-#: trac/ticket/web_ui.py:1147
2608+#: trac/ticket/web_ui.py:1160
2609 msgid "Invalid comment threading identifier"
2610 msgstr "无效评论线索标识"
2611 
2612-#: trac/ticket/web_ui.py:1154
2613+#: trac/ticket/web_ui.py:1167
2614 #, python-format
2615 msgid "The ticket field '%(field)s' is invalid: %(message)s"
2616 msgstr "任务单字段 '%(field)s' 无效: %(message)s"
2617 
2618-#: trac/ticket/web_ui.py:1173
2619+#: trac/ticket/web_ui.py:1186
2620 #, python-format
2621 msgid ""
2622 "The ticket has been created, but an error occurred while sending "
2623 "notifications: %(message)s"
2624 msgstr "该任务单已创建，但在发送邮件通知时发生错误： %(message)s"
2625 
2626-#: trac/ticket/web_ui.py:1183
2627+#: trac/ticket/web_ui.py:1196
2628 #, python-format
2629 msgid ""
2630 "Your ticket %(ticketref)s has been created, but you don't have permission"
2631@@ -2922,45 +2987,94 @@
2632 msgstr "你的任务单 %(ticketref)s 已经创建，但你没有权限查看它。"
2633 
2634 #. TRANSLATOR: The 'change' has been saved... (link)
2635-#: trac/ticket/web_ui.py:1214
2636+#: trac/ticket/web_ui.py:1227
2637 msgid "change"
2638 msgstr "变更"
2639 
2640-#: trac/ticket/web_ui.py:1220
2641+#: trac/ticket/web_ui.py:1233
2642 #, python-format
2643 msgid ""
2644 "The %(change)s has been saved, but an error occurred while sending "
2645 "notifications: %(message)s"
2646 msgstr "%(change)s已保存，但在发送邮件通知时发生错误： %(message)s"
2647 
2648-#: trac/ticket/web_ui.py:1354
2649+#: trac/ticket/web_ui.py:1367
2650 msgid "Add to Cc"
2651 msgstr "增加抄送"
2652 
2653-#: trac/ticket/web_ui.py:1355
2654+#: trac/ticket/web_ui.py:1368
2655 msgid "Remove from Cc"
2656 msgstr "删除抄送"
2657 
2658-#: trac/ticket/web_ui.py:1356
2659+#: trac/ticket/web_ui.py:1369
2660 msgid "Add/Remove from Cc"
2661 msgstr "增加/删除抄送"
2662 
2663-#: trac/ticket/web_ui.py:1357
2664+#: trac/ticket/web_ui.py:1370
2665 msgid "<Author field>"
2666 msgstr "<Author field>"
2667 
2668-#: trac/ticket/web_ui.py:1378 trac/ticket/templates/query.html:102
2669+#: trac/ticket/web_ui.py:1391 trac/ticket/templates/query.html:102
2670 msgid "yes"
2671 msgstr "是"
2672 
2673-#: trac/ticket/web_ui.py:1378 trac/ticket/templates/query.html:105
2674+#: trac/ticket/web_ui.py:1391 trac/ticket/templates/query.html:105
2675 msgid "no"
2676 msgstr "否"
2677 
2678-#: trac/ticket/web_ui.py:1567 trac/versioncontrol/templates/changeset.html:161
2679+#: trac/ticket/web_ui.py:1577
2680+msgid "set"
2681+msgstr "设置"
2682+
2683+#: trac/ticket/web_ui.py:1577
2684+msgid "unset"
2685+msgstr "取消"
2686+
2687+#: trac/ticket/web_ui.py:1580 trac/versioncontrol/templates/changeset.html:189
2688+#: trac/versioncontrol/templates/revisionlog.txt:12
2689 msgid "modified"
2690 msgstr "已修改"
2691 
2692+#. TRANSLATOR: modified ('diff') (link)
2693+#: trac/ticket/web_ui.py:1585 trac/ticket/templates/ticket.html:180
2694+#: trac/ticket/templates/ticket_box.html:64 trac/wiki/web_ui.py:722
2695+msgid "diff"
2696+msgstr "差异"
2697+
2698+#: trac/ticket/web_ui.py:1586
2699+#, python-format
2700+msgid "modified (%(diff)s)"
2701+msgstr "已修改 (%(diff)s)"
2702+
2703+#: trac/ticket/web_ui.py:1607
2704+#, python-format
2705+msgid "%(items)s added"
2706+msgid_plural "%(items)s added"
2707+msgstr[0] "%(items)s 已添加"
2708+msgstr[1] "%(items)s 已添加"
2709+
2710+#: trac/ticket/web_ui.py:1609
2711+#, python-format
2712+msgid "%(items)s removed"
2713+msgid_plural "%(items)s removed"
2714+msgstr[0] "%(items)s 已删除"
2715+msgstr[1] "%(items)s 已删除"
2716+
2717+#: trac/ticket/web_ui.py:1618
2718+#, python-format
2719+msgid "%(value)s deleted"
2720+msgstr "%(value)s 已删除"
2721+
2722+#: trac/ticket/web_ui.py:1620
2723+#, python-format
2724+msgid "set to %(value)s"
2725+msgstr "已设置为 %(value)s"
2726+
2727+#: trac/ticket/web_ui.py:1623
2728+#, python-format
2729+msgid "changed from %(old)s to %(new)s"
2730+msgstr "已从 %(old)s 变更为 %(new)s"
2731+
2732 #: trac/ticket/templates/milestone_delete.html:10
2733 #: trac/ticket/templates/milestone_delete.html:22
2734 msgid "Delete Milestone"
2735@@ -2975,7 +3089,7 @@
2736 msgstr "重新关联相关任务单到里程碑"
2737 
2738 #: trac/ticket/templates/milestone_delete.html:41
2739-#: trac/ticket/templates/milestone_view.html:108
2740+#: trac/ticket/templates/milestone_view.html:107
2741 msgid "Delete milestone"
2742 msgstr "删除里程碑"
2743 
2744@@ -3006,7 +3120,7 @@
2745 
2746 #: trac/ticket/templates/milestone_edit.html:71
2747 msgid "Retarget associated open tickets to milestone:"
2748-msgstr "重指定关联活动任务单到里程碑"
2749+msgstr "将未关闭任务单重新指定到里程碑"
2750 
2751 #: trac/ticket/templates/milestone_edit.html:92
2752 #: trac/ticket/templates/ticket.html:397
2753@@ -3021,61 +3135,57 @@
2754 msgstr "增加里程碑"
2755 
2756 #: trac/ticket/templates/milestone_edit.html:98
2757-#: trac/ticket/templates/milestone_view.html:114
2758-#: trac/ticket/templates/roadmap.html:82
2759+#: trac/ticket/templates/milestone_view.html:113
2760+#: trac/ticket/templates/roadmap.html:79
2761 msgid ""
2762 "[1:Note:] See\n"
2763 "        [2:TracRoadmap] for help on using\n"
2764 "        the roadmap."
2765 msgstr "[1:注意:] 使用路线图的帮助参见 [2:TracRoadmap]。"
2766 
2767-#: trac/ticket/templates/milestone_view.html:25
2768+#: trac/ticket/templates/milestone_view.html:11
2769+msgid "Edit this milestone"
2770+msgstr "编辑此里程碑"
2771+
2772+#: trac/ticket/templates/milestone_view.html:27
2773+#: trac/ticket/templates/roadmap.html:42
2774 #, python-format
2775-msgid ""
2776-"Completed %(duration)s ago\n"
2777-"              (%(date)s)"
2778-msgstr ""
2779-"于 %(duration)s 前完成\n"
2780-"              (%(date)s)"
2781+msgid "Completed %(duration)s ago (%(date)s)"
2782+msgstr "已于 %(duration)s 前完成 (%(date)s)"
2783 
2784-#: trac/ticket/templates/milestone_view.html:31
2785+#: trac/ticket/templates/milestone_view.html:32
2786+#: trac/ticket/templates/roadmap.html:47
2787 #, python-format
2788-msgid ""
2789-"[1:%(duration)s late]\n"
2790-"              (%(date)s)"
2791-msgstr ""
2792-"[1:滞后 %(duration)s]\n"
2793-"              (%(date)s)"
2794+msgid "[1:%(duration)s late] (%(date)s)"
2795+msgstr "[1:滞后 %(duration)s] (%(date)s)"
2796 
2797 #: trac/ticket/templates/milestone_view.html:37
2798+#: trac/ticket/templates/roadmap.html:52
2799 #, python-format
2800-msgid ""
2801-"Due in %(duration)s\n"
2802-"              (%(date)s)"
2803-msgstr ""
2804-"Due in %(duration)s\n"
2805-"              (%(date)s)"
2806+msgid "Due in %(duration)s (%(date)s)"
2807+msgstr "还剩 %(duration)s (%(date)s)"
2808 
2809-#: trac/ticket/templates/milestone_view.html:42
2810-#: trac/ticket/templates/roadmap.html:59
2811+#: trac/ticket/templates/milestone_view.html:41
2812+#: trac/ticket/templates/roadmap.html:56
2813 msgid "No date set"
2814 msgstr "没有设置日期"
2815 
2816-#: trac/ticket/templates/milestone_view.html:52
2817-#: trac/timeline/templates/timeline.html:43
2818-msgid "by"
2819-msgstr "按: "
2820+#: trac/ticket/templates/milestone_view.html:51
2821+#, python-format
2822+msgid "%(stat_title)s by"
2823+msgstr "%(stat_title)s by"
2824 
2825-#: trac/ticket/templates/milestone_view.html:66
2826+#: trac/ticket/templates/milestone_view.html:65
2827 msgid "(none)"
2828 msgstr "(无)"
2829 
2830-#: trac/ticket/templates/milestone_view.html:102
2831+#: trac/ticket/templates/milestone_view.html:101
2832 msgid "Edit milestone"
2833 msgstr "编辑里程碑"
2834 
2835 #: trac/ticket/templates/query.html:29
2836 #: trac/ticket/templates/query_results.html:28
2837+#: trac/ticket/templates/report_view.html:21
2838 #: trac/ticket/templates/report_view.html:87
2839 #, python-format
2840 msgid "%(num)s match"
2841@@ -3091,73 +3201,97 @@
2842 msgid "Query filters"
2843 msgstr "查询过滤器"
2844 
2845-#: trac/ticket/templates/query.html:45 trac/ticket/templates/query.html:141
2846+#: trac/ticket/templates/query.html:45 trac/ticket/templates/query.html:143
2847 msgid "Or"
2848 msgstr "或"
2849 
2850-#: trac/ticket/templates/query.html:127
2851+#: trac/ticket/templates/query.html:73
2852+msgid "or"
2853+msgstr "或"
2854+
2855+#: trac/ticket/templates/query.html:115
2856+msgid ""
2857+"[1:between]\n"
2858+"                            [2:]\n"
2859+"                            [3:and]\n"
2860+"                            [4:]"
2861+msgstr ""
2862+"[1:在]\n"
2863+"                            [2:]\n"
2864+"                            [3:和]\n"
2865+"                            [4:]之间"
2866+
2867+#: trac/ticket/templates/query.html:129
2868 msgid "And"
2869 msgstr "和"
2870 
2871-#: trac/ticket/templates/query.html:160
2872+#: trac/ticket/templates/query.html:162
2873 msgid "Columns"
2874 msgstr "列"
2875 
2876-#: trac/ticket/templates/query.html:174
2877+#: trac/ticket/templates/query.html:176
2878 msgid "Group results by"
2879 msgstr "结果分组"
2880 
2881-#: trac/ticket/templates/query.html:185
2882+#: trac/ticket/templates/query.html:187
2883 msgid "descending"
2884 msgstr "降序"
2885 
2886-#: trac/ticket/templates/query.html:189
2887+#: trac/ticket/templates/query.html:191
2888 msgid "Show under each result:"
2889 msgstr "在每个结果下显示:"
2890 
2891-#: trac/ticket/templates/query.html:199
2892+#: trac/ticket/templates/query.html:201
2893 #: trac/ticket/templates/report_view.html:27
2894 msgid "Max items per page"
2895-msgstr "每页最多条目"
2896+msgstr "每页最多显示条目"
2897 
2898-#: trac/ticket/templates/query.html:243
2899+#: trac/ticket/templates/query.html:245
2900 #, python-format
2901 msgid "Edit report {%(id)s} corresponding to this query"
2902 msgstr "编辑该查询相应的报表{%(id)s}"
2903 
2904-#: trac/ticket/templates/query.html:243
2905+#: trac/ticket/templates/query.html:245
2906 msgid "Edit query"
2907 msgstr "编辑查询"
2908 
2909-#: trac/ticket/templates/query.html:252
2910+#: trac/ticket/templates/query.html:254
2911 msgid "Save query"
2912 msgstr "保存查询"
2913 
2914-#: trac/ticket/templates/query.html:252
2915+#: trac/ticket/templates/query.html:254
2916 #, python-format
2917 msgid "Save updated query in report {%(id)s}"
2918 msgstr "在报表 {%(id)s} 中保存更新的查询"
2919 
2920-#: trac/ticket/templates/query.html:252
2921+#: trac/ticket/templates/query.html:254
2922 msgid "Create new report from current query"
2923 msgstr "用当前查询创建新的"
2924 
2925-#: trac/ticket/templates/query.html:260
2926+#: trac/ticket/templates/query.html:262
2927 #, python-format
2928 msgid "Delete report {%(id)s} corresponding to this query"
2929 msgstr "删除该查询相应的报表{%(id)s}"
2930 
2931-#: trac/ticket/templates/query.html:260
2932+#: trac/ticket/templates/query.html:262
2933 msgid "Delete query"
2934 msgstr "删除查询"
2935 
2936-#: trac/ticket/templates/query.html:267
2937+#: trac/ticket/templates/query.html:269
2938 msgid ""
2939 "[1:Note:] See [2:TracQuery]\n"
2940 "        for help on using queries."
2941 msgstr "[1:注意：]有关使用查询的帮助参见[2:TracQuery]"
2942 
2943 #: trac/ticket/templates/query_results.html:35
2944+msgid "(ascending)"
2945+msgstr "(升序)"
2946+
2947+#: trac/ticket/templates/query_results.html:35
2948+msgid "(descending)"
2949+msgstr "(降序)"
2950+
2951+#: trac/ticket/templates/query_results.html:36
2952 #: trac/versioncontrol/templates/sortable_th.html:18
2953 #, python-format
2954 msgid "Sort by %(col)s %(direction)s"
2955@@ -3199,14 +3333,14 @@
2956 msgstr "确定删除此报表吗?"
2957 
2958 #: trac/ticket/templates/report_delete.html:22
2959-#: trac/ticket/templates/report_list.html:36
2960+#: trac/ticket/templates/report_list.html:34
2961 #: trac/ticket/templates/report_view.html:75
2962 msgid "Delete report"
2963 msgstr "删除报表"
2964 
2965 #: trac/ticket/templates/report_delete.html:26
2966-#: trac/ticket/templates/report_edit.html:47
2967-#: trac/ticket/templates/report_list.html:54
2968+#: trac/ticket/templates/report_edit.html:49
2969+#: trac/ticket/templates/report_list.html:52
2970 #: trac/ticket/templates/report_view.html:195
2971 msgid ""
2972 "[1:Note:]\n"
2973@@ -3227,62 +3361,51 @@
2974 
2975 #: trac/ticket/templates/report_edit.html:36
2976 msgid ""
2977-"Query for Report: (can be either SQL or, if starting with [1:query:], a "
2978-"[2:TracQuery] expression)"
2979+"Query for Report: (can be either SQL or, if starting with [1:query:],\n"
2980+"              a [2:TracQuery] expression)"
2981 msgstr "生成报表的查询: (可以是SQL，或者是一个以[1:query:]开头的[2:TracQuery]表达式)"
2982 
2983-#: trac/ticket/templates/report_edit.html:41
2984+#: trac/ticket/templates/report_edit.html:43
2985 msgid "Save report"
2986 msgstr "保存报表"
2987 
2988-#: trac/ticket/templates/report_list.html:18
2989-msgid "This is a list of available reports."
2990-msgstr "有效报表列表."
2991-
2992-#: trac/ticket/templates/report_list.html:25
2993+#: trac/ticket/templates/report_list.html:23
2994 msgid "Report"
2995 msgstr "报表"
2996 
2997-#: trac/ticket/templates/report_list.html:26 trac/wiki/admin.py:202
2998+#: trac/ticket/templates/report_list.html:24 trac/wiki/admin.py:200
2999 msgid "Title"
3000 msgstr "标题"
3001 
3002-#: trac/ticket/templates/report_list.html:27
3003+#: trac/ticket/templates/report_list.html:25
3004 #: trac/wiki/templates/wiki_edit.html:68 trac/wiki/templates/wiki_edit.html:141
3005 msgid "Actions"
3006 msgstr "动作"
3007 
3008-#: trac/ticket/templates/report_list.html:32
3009-#: trac/ticket/templates/report_list.html:33
3010+#: trac/ticket/templates/report_list.html:30
3011+#: trac/ticket/templates/report_list.html:31
3012 #: trac/ticket/templates/report_view.html:121
3013 msgid "View report"
3014 msgstr "查看报表"
3015 
3016-#: trac/ticket/templates/report_list.html:34
3017+#: trac/ticket/templates/report_list.html:32
3018 #: trac/ticket/templates/report_view.html:63
3019 msgid "Edit report"
3020 msgstr "编辑报表"
3021 
3022-#: trac/ticket/templates/report_list.html:35
3023+#: trac/ticket/templates/report_list.html:33
3024 #: trac/ticket/templates/ticket.html:148 trac/wiki/templates/wiki_edit.html:124
3025 msgid "Edit"
3026 msgstr "编辑"
3027 
3028-#: trac/ticket/templates/report_list.html:40
3029+#: trac/ticket/templates/report_list.html:38
3030 msgid "No reports available."
3031 msgstr "没有可用的报表。"
3032 
3033-#: trac/ticket/templates/report_list.html:49
3034+#: trac/ticket/templates/report_list.html:47
3035 msgid "Create new report"
3036 msgstr "新建报表"
3037 
3038-#: trac/ticket/templates/report_view.html:21
3039-#, python-format
3040-msgid "%(num)d match"
3041-msgid_plural "%(num)d matches"
3042-msgstr[0] "%(num)d个匹配"
3043-msgstr[1] "%(num)d个匹配"
3044-
3045 #: trac/ticket/templates/report_view.html:32
3046 msgid "Arguments"
3047 msgstr "参数"
3048@@ -3295,10 +3418,6 @@
3049 msgid "Copy report"
3050 msgstr "复制报表"
3051 
3052-#: trac/ticket/templates/report_view.html:87
3053-msgid "No matches"
3054-msgstr "没有匹配结果"
3055-
3056 #: trac/ticket/templates/report_view.html:128
3057 #: trac/ticket/templates/report_view.html:136
3058 #, python-format
3059@@ -3317,34 +3436,7 @@
3060 msgid "Milestone:"
3061 msgstr "里程碑:"
3062 
3063-#: trac/ticket/templates/roadmap.html:42
3064-#, python-format
3065-msgid ""
3066-"Completed %(duration)s ago\n"
3067-"                  (%(date)s)"
3068-msgstr ""
3069-"于 %(duration)s 前完成\n"
3070-"                  (%(date)s)"
3071-
3072-#: trac/ticket/templates/roadmap.html:48
3073-#, python-format
3074-msgid ""
3075-"[1:%(duration)s late]\n"
3076-"                  (%(date)s)"
3077-msgstr ""
3078-"[1:滞后 %(duration)s]\n"
3079-"                  (%(date)s)"
3080-
3081-#: trac/ticket/templates/roadmap.html:54
3082-#, python-format
3083-msgid ""
3084-"Due in %(duration)s\n"
3085-"                  (%(date)s)"
3086-msgstr ""
3087-"Due in %(duration)s\n"
3088-"                  (%(date)s)"
3089-
3090-#: trac/ticket/templates/roadmap.html:78
3091+#: trac/ticket/templates/roadmap.html:75
3092 msgid "Add new milestone"
3093 msgstr "新建里程碑"
3094 
3095@@ -3356,10 +3448,19 @@
3096 msgid "Modify"
3097 msgstr "修改"
3098 
3099-#: trac/ticket/templates/ticket.html:90 trac/ticket/templates/ticket.html:93
3100-msgid "— at"
3101-msgstr "— 于"
3102+#: trac/ticket/templates/ticket.html:84
3103+msgid "Ticket #"
3104+msgstr "任务单 #"
3105 
3106+#: trac/ticket/templates/ticket.html:91
3107+msgid "at [1:Initial Version]"
3108+msgstr "[1:初始版本]"
3109+
3110+#: trac/ticket/templates/ticket.html:94
3111+#, python-format
3112+msgid "at [1:Version %(version)s]"
3113+msgstr "[1:版本 %(version)s]"
3114+
3115 #: trac/ticket/templates/ticket.html:98
3116 msgid "Create New Ticket"
3117 msgstr "创建新任务单"
3118@@ -3410,7 +3511,7 @@
3119 msgstr "由 %(author)s 于 %(date)s 前最后一次编辑"
3120 
3121 #: trac/ticket/templates/ticket.html:172
3122-#: trac/versioncontrol/templates/changeset.html:101
3123+#: trac/versioncontrol/templates/changeset.html:129
3124 msgid "previous"
3125 msgstr "上一个"
3126 
3127@@ -3418,11 +3519,6 @@
3128 msgid "next"
3129 msgstr "下一个"
3130 
3131-#: trac/ticket/templates/ticket.html:180
3132-#: trac/ticket/templates/ticket_box.html:64
3133-msgid "diff"
3134-msgstr "差异"
3135-
3136 #: trac/ticket/templates/ticket.html:196
3137 msgid "View ticket fields and description"
3138 msgstr "查看任务单字段和描述"
3139@@ -3446,9 +3542,10 @@
3140 msgid "The ticket validation has [1:failed]."
3141 msgstr "任务单校验[1:失败]."
3142 
3143-#: trac/ticket/templates/ticket.html:218
3144-msgid "Changed by"
3145-msgstr "修改者"
3146+#: trac/ticket/templates/ticket.html:219
3147+#, python-format
3148+msgid "Changed by %(author)s"
3149+msgstr "由 %(author)s 变更"
3150 
3151 #: trac/ticket/templates/ticket.html:226
3152 msgid "Modify Ticket"
3153@@ -3492,10 +3589,10 @@
3154 msgid "Space or comma delimited email addresses and usernames are accepted."
3155 msgstr "可以接受使用空格或逗号隔开的email地址或用户名。"
3156 
3157-#: trac/ticket/templates/ticket.html:373
3158-#: trac/wiki/templates/wiki_edit_form.html:49
3159-msgid "E-mail address and user name can be saved in the"
3160-msgstr "E-mail地址和用户名可以保存在"
3161+#: trac/ticket/templates/ticket.html:374
3162+#: trac/wiki/templates/wiki_edit_form.html:50
3163+msgid "E-mail address and user name can be saved in the [1:Preferences]."
3164+msgstr "E-mail地址和用户名可以保存在[1:个人设置]里。"
3165 
3166 #: trac/ticket/templates/ticket.html:382
3167 msgid "I have files to attach to this ticket"
3168@@ -3546,32 +3643,40 @@
3169 msgid "Owned by:"
3170 msgstr "属主:"
3171 
3172-#: trac/ticket/templates/ticket_box.html:62
3173-msgid "(last modified by"
3174-msgstr "(最新修改者"
3175+#: trac/ticket/templates/ticket_box.html:63
3176+#, python-format
3177+msgid "(last modified by %(author)s)"
3178+msgstr "(最后由 %(author)s 修改)"
3179 
3180 #: trac/ticket/templates/ticket_box.html:73
3181 msgid "Reply, quoting this description"
3182 msgstr "回复, 引用此描述"
3183 
3184-#: trac/ticket/templates/ticket_change.html:22
3185-#: trac/versioncontrol/templates/changeset.html:157
3186-msgid "added"
3187-msgstr "增加"
3188+#: trac/ticket/templates/ticket_change.html:19
3189+#, python-format
3190+msgid ""
3191+"[1:[2:%(name)s]]\n"
3192+"          [3:[4:]]\n"
3193+"          added"
3194+msgstr ""
3195+"[1:[2:%(name)s]]\n"
3196+"          [3:[4:]]\n"
3197+"          被添加"
3198 
3199 #: trac/ticket/templates/ticket_change.html:26
3200-msgid "changed from"
3201-msgstr "变更自"
3202+#, python-format
3203+msgid "changed from [1:%(old)s] to [2:%(new)s]"
3204+msgstr "已从 [1:%(old)s] 变更为 [2:%(new)s]"
3205 
3206 #: trac/ticket/templates/ticket_change.html:29
3207-#: trac/versioncontrol/templates/browser.html:134
3208-msgid "set to"
3209-msgstr "设置为"
3210+#, python-format
3211+msgid "set to [1:%(value)s]"
3212+msgstr "已设置为 [1:%(value)s]"
3213 
3214-#: trac/ticket/templates/ticket_change.html:33
3215-#: trac/versioncontrol/templates/changeset.html:158
3216-msgid "deleted"
3217-msgstr "删除"
3218+#: trac/ticket/templates/ticket_change.html:32
3219+#, python-format
3220+msgid "[1:%(value)s] deleted"
3221+msgstr "[1:%(value)s] 已删除"
3222 
3223 #: trac/ticket/templates/ticket_change.html:45
3224 #, python-format
3225@@ -3588,62 +3693,62 @@
3226 msgstr "放弃编辑评论"
3227 
3228 #: trac/ticket/templates/ticket_notify_email.txt:9
3229-msgid "Changes (by"
3230-msgstr "变更人 ("
3231+#, python-format
3232+msgid "Changes (by %(author)s):"
3233+msgstr "变更 (来自 %(author)s):"
3234 
3235 #: trac/ticket/templates/ticket_notify_email.txt:15
3236-msgid "Description changed by"
3237-msgstr "描述变更 操作者:"
3238+#, python-format
3239+msgid "Description changed by %(author)s:"
3240+msgstr "描述被%(author)s改变:"
3241 
3242-#: trac/ticket/templates/ticket_notify_email.txt:28
3243-msgid ""
3244-"-- \n"
3245-"Ticket URL: <"
3246-msgstr ""
3247-"-- \n"
3248-"任务单 URL: <"
3249+#: trac/ticket/templates/ticket_notify_email.txt:21
3250+#, python-format
3251+msgid "Comment (by %(author)s):"
3252+msgstr "评论 (来自 %(author)s):"
3253 
3254+#: trac/ticket/templates/ticket_notify_email.txt:29
3255+#, python-format
3256+msgid "Ticket URL: <%(link)s>"
3257+msgstr "任务单 URL: <%(link)s>"
3258+
3259 #: trac/timeline/web_ui.py:75 trac/timeline/templates/timeline.html:10
3260 #: trac/timeline/templates/timeline.html:16
3261 msgid "Timeline"
3262 msgstr "时间线"
3263 
3264-#: trac/timeline/web_ui.py:228 trac/timeline/web_ui.py:236
3265+#: trac/timeline/web_ui.py:229 trac/timeline/web_ui.py:237
3266 msgid "Previous Period"
3267 msgstr "上一周期"
3268 
3269-#: trac/timeline/web_ui.py:235 trac/timeline/web_ui.py:236
3270+#: trac/timeline/web_ui.py:236 trac/timeline/web_ui.py:237
3271 msgid "Next Period"
3272 msgstr "下一周期"
3273 
3274-#: trac/timeline/web_ui.py:296
3275+#: trac/timeline/web_ui.py:297
3276 #, python-format
3277 msgid "%(date)s in Timeline"
3278 msgstr "时间线中的%(date)s"
3279 
3280-#. TRANSLATOR: other_events
3281-#: trac/timeline/web_ui.py:342
3282-msgid "other kind of events"
3283-msgstr "其他类型事件"
3284+#. TRANSLATOR: ...want to see the 'other kinds of events' from... (link)
3285+#: trac/timeline/web_ui.py:343
3286+msgid "other kinds of events"
3287+msgstr "其他类型的事件"
3288 
3289-#: trac/timeline/web_ui.py:347
3290+#: trac/timeline/web_ui.py:348
3291 #, python-format
3292 msgid "Event provider %(name)s failed for filters %(kinds)s: "
3293 msgstr "事件提供者 %(name)s 失效，过滤器类型为 %(kinds)s："
3294 
3295-#: trac/timeline/web_ui.py:353
3296+#: trac/timeline/web_ui.py:351
3297 #, python-format
3298 msgid ""
3299-"\n"
3300-"              You may want to see the %(other_events)s from the Timeline "
3301-"or \n"
3302-"              notify your Trac administrator about the error (detailed\n"
3303-"              informations were written to the log).\n"
3304-"            "
3305+"You may want to see the %(other_events)s from the Timeline or notify your"
3306+" Trac administrator about the error (detailed information was written to "
3307+"the log)."
3308 msgstr ""
3309-"\n"
3310-"              也许你想要从时间线中查看 %(other_events)s 或者\n"
3311-"              将错误通知你的Trac管理员（详细信息已写入日志）。\n"
3312+"              也许你想要从时间线中查看%(other_events)s，\n"
3313+"              或者通知您的Trac管理员发生了错误（详细信息已写入日志）。\n"
3314 "            "
3315 
3316 #: trac/timeline/templates/timeline.html:19
3317@@ -3664,8 +3769,17 @@
3318 msgid "Yesterday"
3319 msgstr "昨天"
3320 
3321-#: trac/timeline/templates/timeline.html:53
3322+#: trac/timeline/templates/timeline.html:42
3323+#, python-format
3324 msgid ""
3325+"[1:%(time)s] %(title)s\n"
3326+"                  by [2:%(author)s]"
3327+msgstr ""
3328+"[1:%(time)s] %(title)s\n"
3329+"                  来自 [2:%(author)s]"
3330+
3331+#: trac/timeline/templates/timeline.html:58
3332+msgid ""
3333 "[1:Note:] See [2:TracTimeline]\n"
3334 "        for information about the timeline view."
3335 msgstr "[1:注意:] 时间线视图的相关信息参见[2:TracTimeline]。"
3336@@ -3674,50 +3788,50 @@
3337 #, python-format
3338 msgid "%(num)d year"
3339 msgid_plural "%(num)d years"
3340-msgstr[0] "%(num)d å¹´"
3341-msgstr[1] "%(num)d å¹´"
3342+msgstr[0] "%(num)då¹´"
3343+msgstr[1] "%(num)då¹´"
3344 
3345 #: trac/util/datefmt.py:80
3346 #, python-format
3347 msgid "%(num)d month"
3348 msgid_plural "%(num)d months"
3349-msgstr[0] "%(num)d 个月"
3350-msgstr[1] "%(num)d 个月"
3351+msgstr[0] "%(num)d个月"
3352+msgstr[1] "%(num)d个月"
3353 
3354 #: trac/util/datefmt.py:81
3355 #, python-format
3356 msgid "%(num)d week"
3357 msgid_plural "%(num)d weeks"
3358-msgstr[0] "%(num)d 周"
3359-msgstr[1] "%(num)d 周"
3360+msgstr[0] "%(num)d周"
3361+msgstr[1] "%(num)d周"
3362 
3363 #: trac/util/datefmt.py:82
3364 #, python-format
3365 msgid "%(num)d day"
3366 msgid_plural "%(num)d days"
3367-msgstr[0] "%(num)d 天"
3368-msgstr[1] "%(num)d 天"
3369+msgstr[0] "%(num)d天"
3370+msgstr[1] "%(num)d天"
3371 
3372 #: trac/util/datefmt.py:83
3373 #, python-format
3374 msgid "%(num)d hour"
3375 msgid_plural "%(num)d hours"
3376-msgstr[0] "%(num)d 小时"
3377-msgstr[1] "%(num)d 小时"
3378+msgstr[0] "%(num)d小时"
3379+msgstr[1] "%(num)d小时"
3380 
3381 #: trac/util/datefmt.py:84
3382 #, python-format
3383 msgid "%(num)d minute"
3384 msgid_plural "%(num)d minutes"
3385-msgstr[0] "%(num)d 分钟"
3386-msgstr[1] "%(num)d 分钟"
3387+msgstr[0] "%(num)d分钟"
3388+msgstr[1] "%(num)d分钟"
3389 
3390 #: trac/util/datefmt.py:103
3391 #, python-format
3392 msgid "%(num)i second"
3393 msgid_plural "%(num)i seconds"
3394-msgstr[0] "%(num)i 秒"
3395-msgstr[1] "%(num)i 秒"
3396+msgstr[0] "%(num)i秒"
3397+msgstr[1] "%(num)i秒"
3398 
3399 #: trac/util/datefmt.py:247
3400 #, python-format
3401@@ -3747,39 +3861,29 @@
3402 msgid "%(start)d - %(stop)d of %(total)d"
3403 msgstr "%(start)d - %(stop)d 共 %(total)d"
3404 
3405-#: trac/versioncontrol/admin.py:80 trac/versioncontrol/admin.py:105
3406-#: trac/versioncontrol/admin.py:106 trac/versioncontrol/admin.py:296
3407-#: trac/versioncontrol/api.py:38 trac/versioncontrol/api.py:155
3408-#: trac/versioncontrol/api.py:192
3409-#: trac/versioncontrol/templates/admin_repositories.html:20
3410-#: trac/versioncontrol/templates/admin_repositories.html:33
3411-#: trac/versioncontrol/templates/admin_repositories.html:131
3412-#: trac/versioncontrol/templates/admin_repositories.html:133
3413-#: trac/versioncontrol/web_ui/browser.py:809
3414-#: trac/versioncontrol/web_ui/changeset.py:853
3415-#: trac/versioncontrol/web_ui/changeset.py:994
3416-msgid "(default)"
3417-msgstr "(默认)"
3418-
3419-#: trac/versioncontrol/admin.py:108
3420+#: trac/versioncontrol/admin.py:110
3421 msgid "Alias"
3422 msgstr "别名"
3423 
3424-#: trac/versioncontrol/admin.py:108
3425-#: trac/versioncontrol/templates/admin_repositories.html:124
3426+#: trac/versioncontrol/admin.py:110
3427+#: trac/versioncontrol/templates/admin_repositories.html:125
3428 msgid "Directory"
3429 msgstr "目录"
3430 
3431-#: trac/versioncontrol/admin.py:114
3432+#: trac/versioncontrol/admin.py:116
3433 msgid "Cannot synchronize a single revision on multiple repositories"
3434 msgstr "无法在多个版本库中同步单个修订"
3435 
3436-#: trac/versioncontrol/admin.py:123
3437+#: trac/versioncontrol/admin.py:124 trac/versioncontrol/admin.py:182
3438+#: trac/versioncontrol/web_ui/browser.py:349
3439+#: trac/versioncontrol/web_ui/changeset.py:247
3440+#: trac/versioncontrol/web_ui/changeset.py:1087
3441+#: trac/versioncontrol/web_ui/log.py:87 trac/versioncontrol/web_ui/log.py:395
3442 #, python-format
3443-msgid "Unknown repository '%(reponame)s'"
3444-msgstr "未知版本库 '%(reponame)s'"
3445+msgid "Repository '%(repo)s' not found"
3446+msgstr "没有找到版本库 %(repo)s"
3447 
3448-#: trac/versioncontrol/admin.py:127
3449+#: trac/versioncontrol/admin.py:128
3450 #, python-format
3451 msgid "%(rev)s resynced on %(reponame)s."
3452 msgstr "%(rev)s已重新同步至%(reponame)s。"
3453@@ -3789,183 +3893,191 @@
3454 msgid "Resyncing repository history for %(reponame)s... "
3455 msgstr "重新为%(reponame)s同步版本库历史..."
3456 
3457-#: trac/versioncontrol/admin.py:140
3458+#: trac/versioncontrol/admin.py:142
3459 #, python-format
3460 msgid "%(num)s revision cached."
3461 msgid_plural "%(num)s revisions cached."
3462 msgstr[0] "%(num)s个修订已缓存。"
3463 msgstr[1] "%(num)s个修订已缓存。"
3464 
3465-#: trac/versioncontrol/admin.py:142
3466+#: trac/versioncontrol/admin.py:144
3467 msgid "Done."
3468 msgstr "完成。"
3469 
3470-#: trac/versioncontrol/admin.py:164
3471+#: trac/versioncontrol/admin.py:166
3472 msgid "Version Control"
3473 msgstr "版本控制"
3474 
3475-#: trac/versioncontrol/admin.py:165
3476+#: trac/versioncontrol/admin.py:167
3477 #: trac/versioncontrol/templates/admin_repositories.html:10
3478 msgid "Repositories"
3479 msgstr "版本库"
3480 
3481-#: trac/versioncontrol/admin.py:180
3482+#: trac/versioncontrol/admin.py:203 trac/versioncontrol/admin.py:242
3483 #, python-format
3484-msgid "Repository %(name)s does not exist."
3485-msgstr "版本库 '%(name)s' 不存在."
3486+msgid "You should now run %(resync)s to synchronize Trac with the repository."
3487+msgstr "您现在应该运行 %(resync)s 以同步Trac和版本库。"
3488 
3489-#: trac/versioncontrol/admin.py:199 trac/versioncontrol/admin.py:235
3490+#: trac/versioncontrol/admin.py:208
3491 #, python-format
3492-msgid ""
3493-"You should now run \"trac-admin $ENV repository resync %(name)s\" to "
3494-"synchronize Trac with the repository."
3495-msgstr ""
3496-"你现在应执行 \"trac-admin $ENV repository resync %(name)s\" \"\n"
3497-"\"来将Trac与版本库同步。"
3498+msgid "You may have to run %(resync)s to synchronize Trac with the repository."
3499+msgstr "您可能需要运行 %(resync)s 以同步Trac和版本库。"
3500 
3501-#: trac/versioncontrol/admin.py:204
3502+#: trac/versioncontrol/admin.py:216
3503 #, python-format
3504 msgid ""
3505-"You may have to run \"trac-admin $ENV repository resync %(name)s\" to "
3506-"synchronize Trac with the repository."
3507-msgstr ""
3508-"你必须执行 \"trac-admin $ENV repository resync %(name)s\" \"\n"
3509-"\"来将Trac与版本库同步。"
3510+"You will need to update your post-commit hook to call %(cset_added)s with"
3511+" the new repository name."
3512+msgstr "您需要更新您的 post-commit 钩子，以使用新的版本库名调用 %(cset_added)。"
3513 
3514-#: trac/versioncontrol/admin.py:209
3515-msgid ""
3516-"You will need to update your post-commit hook to call \"trac-admin $ENV "
3517-"changeset added\" with the new repository name."
3518-msgstr ""
3519-"你需要更新你的post-commit脚本，用新的版本库名调用\"\n"
3520-"\" \"trac-admin $ENV changeset added\"。"
3521-
3522-#: trac/versioncontrol/admin.py:230
3523+#: trac/versioncontrol/admin.py:238
3524 #, python-format
3525 msgid "The repository \"%(name)s\" has been added."
3526 msgstr "版本库 \"%(name)s\" 已添加。"
3527 
3528-#: trac/versioncontrol/admin.py:237
3529+#: trac/versioncontrol/admin.py:248
3530 #, python-format
3531 msgid ""
3532 "You should also set up a post-commit hook on the repository to call "
3533-"\"trac-admin $ENV changeset added %(name)s $REV\" for each committed "
3534-"changeset."
3535-msgstr ""
3536-"你也应当在版本库中创建一个post-commit脚本，对已提交的每一个\"\n"
3537-"\"变更集调用 \"trac-admin $ENV changeset added %(name)s $REV\"。"
3538+"%(cset_added)s for each committed changeset."
3539+msgstr "您还应该在版本库上设置一个 post-commit 钩子，对每一提交的变更集调用 %(cset_added)s。"
3540 
3541-#: trac/versioncontrol/admin.py:243
3542+#: trac/versioncontrol/admin.py:254
3543 msgid "Missing arguments to add a repository."
3544 msgstr "增加版本库缺少参数。"
3545 
3546-#: trac/versioncontrol/admin.py:252
3547+#: trac/versioncontrol/admin.py:263
3548 #, python-format
3549 msgid "The alias \"%(name)s\" has been added."
3550 msgstr "别名 \"%(name)s\" 已添加。"
3551 
3552-#: trac/versioncontrol/admin.py:255
3553+#: trac/versioncontrol/admin.py:266
3554 msgid "Missing arguments to add an alias."
3555 msgstr "增加别名缺少参数。"
3556 
3557-#: trac/versioncontrol/admin.py:268
3558+#: trac/versioncontrol/admin.py:279
3559 msgid "The selected repositories have been removed."
3560 msgstr "选定版本库已删除。"
3561 
3562-#: trac/versioncontrol/admin.py:271
3563+#: trac/versioncontrol/admin.py:282
3564 msgid "No repositories were selected."
3565 msgstr "没有选择版本库。"
3566 
3567-#: trac/versioncontrol/api.py:189
3568+#: trac/versioncontrol/api.py:32
3569+#: trac/versioncontrol/templates/admin_repositories.html:20
3570+#: trac/versioncontrol/templates/admin_repositories.html:134
3571+#: trac/versioncontrol/web_ui/browser.py:819
3572+#: trac/versioncontrol/web_ui/changeset.py:864
3573+#: trac/versioncontrol/web_ui/changeset.py:1006
3574+msgid "(default)"
3575+msgstr "(默认)"
3576+
3577+#: trac/versioncontrol/api.py:183
3578 #, python-format
3579 msgid "Invalid key \"%(key)s\""
3580 msgstr "非法关键字: \"%(key)s\""
3581 
3582-#: trac/versioncontrol/api.py:194
3583+#: trac/versioncontrol/api.py:188
3584 #, python-format
3585 msgid "You should now run \"repository resync %(name)s\"."
3586 msgstr "你应该执行 \"repository resync %(name)s\"。"
3587 
3588-#: trac/versioncontrol/api.py:197
3589+#: trac/versioncontrol/api.py:191
3590 #, python-format
3591 msgid "You may have to run \"repository resync %(name)s\"."
3592 msgstr "你必须执行 \"repository resync %(name)s\"。"
3593 
3594-#: trac/versioncontrol/api.py:208
3595+#: trac/versioncontrol/api.py:202
3596 #, python-format
3597 msgid "The repository type '%(type)s' is not supported"
3598 msgstr "版本库类型 '%(type)s' 不被支持"
3599 
3600-#: trac/versioncontrol/api.py:337
3601+#: trac/versioncontrol/api.py:331
3602 #, python-format
3603 msgid ""
3604 "Can't synchronize with repository \"%(name)s\" (%(error)s). Look in the "
3605 "Trac log for more information."
3606 msgstr "无法与版本库\"%(name)s\"同步 (%(error)s)。更多信息请查看Trac日志。"
3607 
3608-#: trac/versioncontrol/api.py:356
3609+#: trac/versioncontrol/api.py:350
3610 #, python-format
3611 msgid "Changeset %(rev)s in %(repo)s"
3612 msgstr "在%(repo)s中没有变更集 %(rev)s"
3613 
3614-#: trac/versioncontrol/api.py:358
3615+#: trac/versioncontrol/api.py:352
3616 #, python-format
3617 msgid "Changeset %(rev)s"
3618 msgstr "变更集 %(rev)s"
3619 
3620-#: trac/versioncontrol/api.py:366
3621+#: trac/versioncontrol/api.py:360
3622 msgid "directory"
3623 msgstr "目录"
3624 
3625-#: trac/versioncontrol/api.py:368
3626+#: trac/versioncontrol/api.py:362
3627 msgid "file"
3628 msgstr "文件"
3629 
3630-#: trac/versioncontrol/api.py:370
3631+#: trac/versioncontrol/api.py:364
3632 #, python-format
3633-msgid "at version %(rev)s"
3634-msgstr "于修订 %(rev)s"
3635+msgid " at version %(rev)s"
3636+msgstr "于版本 %(rev)s"
3637 
3638-#: trac/versioncontrol/api.py:372
3639+#: trac/versioncontrol/api.py:366
3640 msgid "path"
3641 msgstr "路径"
3642 
3643-#: trac/versioncontrol/api.py:375
3644+#: trac/versioncontrol/api.py:369
3645 #, python-format
3646 msgid " in %(repo)s"
3647 msgstr "于 %(repo)s"
3648 
3649-#: trac/versioncontrol/api.py:378
3650+#. TRANSLATOR: file /trunk/setup.py at version 13 in trac
3651+#: trac/versioncontrol/api.py:371
3652 #, python-format
3653+msgid "%(kind)s %(id)%(at_version)s%(in_repo)s"
3654+msgstr "%(kind)s %(id)%(at_version)s%(in_repo)s"
3655+
3656+#: trac/versioncontrol/api.py:374
3657+#, python-format
3658 msgid "Repository %(repo)s"
3659 msgstr "版本库 %(repo)s"
3660 
3661-#: trac/versioncontrol/api.py:659
3662+#: trac/versioncontrol/api.py:655
3663 #, python-format
3664 msgid "Unsupported version control system \"%(name)s\": %(error)s"
3665 msgstr "不支持的版本控制系统 \"%(name)s\": %(error)s"
3666 
3667-#: trac/versioncontrol/api.py:662
3668+#: trac/versioncontrol/api.py:658
3669 #, python-format
3670 msgid ""
3671 "Unsupported version control system \"%(name)s\": Can't find an "
3672 "appropriate component, maybe the corresponding plugin was not enabled? "
3673 msgstr "不支持的版本控制系统\"%(name)s\"：未能找到合适的组件，也许相关插件没有被激活？"
3674 
3675-#: trac/versioncontrol/api.py:670
3676+#: trac/versioncontrol/api.py:666
3677 #, python-format
3678 msgid "No changeset %(rev)s in the repository"
3679 msgstr "在版本库中没有变更集 %(rev)s"
3680 
3681-#: trac/versioncontrol/api.py:672
3682+#: trac/versioncontrol/api.py:668
3683 msgid "No such changeset"
3684 msgstr "没有这个变更集"
3685 
3686+#: trac/versioncontrol/api.py:674
3687+#, python-format
3688+msgid "No node %(path)s at revision %(rev)s"
3689+msgstr "在修订版 %(rev)s 没有节点 %(path)s"
3690+
3691+#: trac/versioncontrol/api.py:676
3692+#, python-format
3693+msgid "%(msg)s: No node %(path)s at revision %(rev)s"
3694+msgstr "%(msg)s: 在修订版 %(rev)s 没有节点 %(path)s"
3695+
3696 #: trac/versioncontrol/api.py:678
3697 msgid "No such node"
3698 msgstr "没有这个节点"
3699 
3700-#: trac/versioncontrol/cache.py:143
3701+#: trac/versioncontrol/cache.py:149
3702 msgid ""
3703 "The 'repository_dir' has changed, a 'trac-admin $ENV repository resync' "
3704 "operation is needed."
3705@@ -4096,45 +4208,47 @@
3706 #: trac/versioncontrol/templates/admin_repositories.html:45
3707 msgid ""
3708 "[1:Note:]\n"
3709-"            This repository is defined in [2:[3:trac.ini]] and cannot be "
3710-"edited on this page."
3711+"            This repository is defined in [2:[3:trac.ini]]\n"
3712+"            and cannot be edited on this page."
3713 msgstr ""
3714-"[1:Note:]\n"
3715+"[1:注意：]\n"
3716 "\"\n"
3717 "\"            该版本库在[2:[3:trac.ini]]中定义，无法在本页面中编辑。"
3718 
3719-#: trac/versioncontrol/templates/admin_repositories.html:58
3720-#: trac/versioncontrol/templates/admin_repositories.html:98
3721+#: trac/versioncontrol/templates/admin_repositories.html:59
3722+#: trac/versioncontrol/templates/admin_repositories.html:99
3723 msgid "Directory:"
3724 msgstr "目录："
3725 
3726-#: trac/versioncontrol/templates/admin_repositories.html:66
3727+#: trac/versioncontrol/templates/admin_repositories.html:67
3728 msgid "Hide from repository index"
3729 msgstr "从版本库索引中隐藏"
3730 
3731-#: trac/versioncontrol/templates/admin_repositories.html:92
3732+#: trac/versioncontrol/templates/admin_repositories.html:93
3733 msgid "Add Repository:"
3734 msgstr "新增版本库："
3735 
3736-#: trac/versioncontrol/templates/admin_repositories.html:109
3737+#: trac/versioncontrol/templates/admin_repositories.html:110
3738 msgid "Add Alias:"
3739 msgstr "新增别名："
3740 
3741-#: trac/versioncontrol/templates/admin_repositories.html:124
3742+#: trac/versioncontrol/templates/admin_repositories.html:125
3743 msgid "Revision"
3744 msgstr "修订"
3745 
3746-#: trac/versioncontrol/templates/admin_repositories.html:136
3747-msgid "Alias of"
3748-msgstr "别名属于"
3749+#: trac/versioncontrol/templates/admin_repositories.html:137
3750+#, python-format
3751+msgid "Alias of %(repo)s"
3752+msgstr "%(repo)s 的别名"
3753 
3754-#: trac/versioncontrol/templates/admin_repositories.html:143
3755+#: trac/versioncontrol/templates/admin_repositories.html:144
3756 msgid "Refresh"
3757 msgstr "刷新"
3758 
3759 #: trac/versioncontrol/templates/browser.html:13
3760-msgid "in"
3761-msgstr "在"
3762+#, python-format
3763+msgid "%(basename)s in %(dirname)s"
3764+msgstr "%(dirname)s 中的 %(basename)s "
3765 
3766 #: trac/versioncontrol/templates/browser.html:54
3767 msgid "Default Repository"
3768@@ -4169,7 +4283,7 @@
3769 msgstr "没有找到任何文件"
3770 
3771 #: trac/versioncontrol/templates/browser.html:106
3772-#: trac/wiki/templates/wiki_edit.html:112 trac/wiki/templates/wiki_view.html:36
3773+#: trac/wiki/templates/wiki_edit.html:112 trac/wiki/templates/wiki_view.html:32
3774 msgid "Revision info"
3775 msgstr "修订信息"
3776 
3777@@ -4186,88 +4300,144 @@
3778 "            由%(author)s在%(date)s前签入\n"
3779 "            ([3:diff])"
3780 
3781-#: trac/versioncontrol/templates/browser.html:152
3782+#: trac/versioncontrol/templates/browser.html:140
3783+#, python-format
3784+msgid "Property [1:%(name)s] set to %(value)s"
3785+msgstr "属性 [1:%(name)s] 已设置为 %(value)s"
3786+
3787+#: trac/versioncontrol/templates/browser.html:154
3788 msgid "Repository Index"
3789 msgstr "版本库索引"
3790 
3791-#: trac/versioncontrol/templates/browser.html:162
3792+#: trac/versioncontrol/templates/browser.html:164
3793 msgid ""
3794 "[1:Note:] See [2:TracBrowser]\n"
3795 "        for help on using the repository browser."
3796 msgstr "[1:注意:] 使用版本库浏览器的帮助参见 [2:TracBrowser]。"
3797 
3798-#: trac/versioncontrol/templates/browser.html:174
3799+#: trac/versioncontrol/templates/browser.html:176
3800 msgid "View changes..."
3801 msgstr "查阅变更..."
3802 
3803-#: trac/versioncontrol/templates/browser.html:174
3804+#: trac/versioncontrol/templates/browser.html:176
3805 msgid "Select paths and revs for Diff"
3806 msgstr "选择进行对比的路径和修订"
3807 
3808-#: trac/versioncontrol/templates/changeset.html:25
3809+#: trac/versioncontrol/templates/changeset.html:36
3810+#: trac/versioncontrol/templates/changeset.html:46
3811+#: trac/versioncontrol/templates/changeset.html:48
3812+#: trac/versioncontrol/templates/changeset.html:58
3813+#: trac/versioncontrol/templates/changeset.html:68
3814+#: trac/versioncontrol/templates/changeset.html:70
3815+msgid "Show full changeset"
3816+msgstr "显示完整变更集"
3817+
3818+#: trac/versioncontrol/templates/changeset.html:37
3819+#: trac/versioncontrol/templates/changeset.html:40
3820+#: trac/versioncontrol/templates/changeset.html:45
3821+#: trac/versioncontrol/templates/changeset.html:47
3822+#: trac/versioncontrol/templates/changeset.html:59
3823+#: trac/versioncontrol/templates/changeset.html:62
3824+#: trac/versioncontrol/templates/changeset.html:67
3825+#: trac/versioncontrol/templates/changeset.html:69
3826+#: trac/versioncontrol/templates/changeset.html:105
3827+msgid "Show entry in browser"
3828+msgstr "在源码浏览器中显示条目"
3829+
3830+#: trac/versioncontrol/templates/changeset.html:35
3831 #, python-format
3832 msgid ""
3833 "Changeset [1:%(new_rev)s] in %(reponame)s\n"
3834-"          for [2:%(new_path)s]"
3835+"              for [2:%(new_path)s]"
3836 msgstr ""
3837-"修改集 [1:%(new_rev)s] 在 %(reponame)s\n"
3838-"          相对于for [2:%(new_path)s]"
3839+"变更集 [1:%(new_rev)s] 位于 %(reponame)s\n"
3840+"           ä¸­çš„ [2:%(new_path)s]"
3841 
3842-#: trac/versioncontrol/templates/changeset.html:30
3843+#: trac/versioncontrol/templates/changeset.html:41
3844+#: trac/versioncontrol/templates/changeset.html:63
3845+msgid "Show revision log"
3846+msgstr "查看修订版日志"
3847+
3848+#: trac/versioncontrol/templates/changeset.html:39
3849 #, python-format
3850 msgid ""
3851 "Changes in [1:%(new_path)s]\n"
3852-"          [2:\n"
3853-"            \\[%(old_rev)s:%(new_rev)s\\]] in %(reponame)s"
3854+"              [2:\\[%(old_rev)s:%(new_rev)s\\]] in %(reponame)s"
3855 msgstr ""
3856-"修改 [1:%(new_path)s]\n"
3857-"          [2:\n"
3858-"            \\[%(old_rev)s:%(new_rev)s\\]] 在仓库 %(reponame)s"
3859+"%(reponame)s 中 [1:%(new_path)s]\n"
3860+"              [2:\\[%(old_rev)s:%(new_rev)s\\]] 的变更"
3861 
3862-#: trac/versioncontrol/templates/changeset.html:35
3863+#: trac/versioncontrol/templates/changeset.html:43
3864 #, python-format
3865 msgid ""
3866 "Changes in %(reponame)s\n"
3867-"          from [1:%(old_path)s]\n"
3868-"          at [2:r%(old_rev)s]\n"
3869-"          to [3:%(new_path)s]\n"
3870-"          at [4:r%(new_rev)s]"
3871+"              from [1:%(old_path)s]\n"
3872+"              at [2:r%(old_rev)s]\n"
3873+"              to [3:%(new_path)s]\n"
3874+"              at [4:r%(new_rev)s]"
3875 msgstr ""
3876-"%(reponame)s中的修改\n"
3877+"%(reponame)s中\n"
3878 "          从[1:%(old_path)s]\n"
3879-"          版本[2:r%(old_rev)s]\n"
3880+"          修订版[2:r%(old_rev)s]\n"
3881 "          到[3:%(new_path)s]\n"
3882-"          版本[4:r%(new_rev)s]"
3883+"          修订版[4:r%(new_rev)s]的变更"
3884 
3885-#: trac/versioncontrol/templates/changeset.html:42
3886+#: trac/versioncontrol/templates/changeset.html:50
3887 #, python-format
3888+msgid "Changeset [1:%(new_rev)s] in %(reponame)s"
3889+msgstr "变更集 [1:%(new_rev)s] 位于 %(reponame)s"
3890+
3891+#: trac/versioncontrol/templates/changeset.html:57
3892+#, python-format
3893 msgid ""
3894 "Changeset [1:%(new_rev)s]\n"
3895-"          in %(reponame)s"
3896+"              for [2:%(new_path)s]"
3897 msgstr ""
3898-"变更集 [1:%(new_rev)s]\n"
3899-"          位于 %(reponame)s"
3900+"变更集 [1:%(new_rev)s] \n"
3901+"          限于 [2:%(new_path)s]"
3902 
3903-#: trac/versioncontrol/templates/changeset.html:46
3904+#: trac/versioncontrol/templates/changeset.html:61
3905 #, python-format
3906+msgid ""
3907+"Changes in [1:%(new_path)s]\n"
3908+"              [2:\\[%(old_rev)s:%(new_rev)s\\]]"
3909+msgstr "[1:%(new_path)s] [2:\\[%(old_rev)s:%(new_rev)s\\]] 中的变更"
3910+
3911+#: trac/versioncontrol/templates/changeset.html:65
3912+#, python-format
3913+msgid ""
3914+"Changes\n"
3915+"              from [1:%(old_path)s]\n"
3916+"              at [2:r%(old_rev)s]\n"
3917+"              to [3:%(new_path)s]\n"
3918+"              at [4:r%(new_rev)s]"
3919+msgstr ""
3920+"          从[1:%(old_path)s]\n"
3921+"          修订版[2:r%(old_rev)s]\n"
3922+"          到[3:%(new_path)s]\n"
3923+"          修订版[4:r%(new_rev)s]的变更"
3924+
3925+#: trac/versioncontrol/templates/changeset.html:72
3926+#, python-format
3927 msgid "Changeset [1:%(new_rev)s]"
3928 msgstr "变更集 [1:%(new_rev)s]"
3929 
3930-#: trac/versioncontrol/templates/changeset.html:73
3931+#: trac/versioncontrol/templates/changeset.html:101
3932 #, python-format
3933 msgid "Show what was removed (content at revision %(old_rev)s)"
3934 msgstr "显示已删除的内容(内容版本%(old_rev)s)"
3935 
3936-#: trac/versioncontrol/templates/changeset.html:77
3937-msgid "Show entry in browser"
3938-msgstr "在源码浏览器中显示条目"
3939-
3940-#: trac/versioncontrol/templates/changeset.html:78
3941+#: trac/versioncontrol/templates/changeset.html:106
3942 msgid "(root)"
3943 msgstr "(æ ¹)"
3944 
3945-#: trac/versioncontrol/templates/changeset.html:83
3946+#: trac/versioncontrol/templates/changeset.html:112
3947 #, python-format
3948+msgid "Show original file (revision %(old_rev)s)"
3949+msgstr "显示原始文件 (修订版 %(old_rev)s)"
3950+
3951+#: trac/versioncontrol/templates/changeset.html:111
3952+#, python-format
3953 msgid ""
3954 "(%(kind)s from [1:\n"
3955 "                %(old_path)s])"
3956@@ -4275,98 +4445,110 @@
3957 "(%(kind)s 来自 [1:\n"
3958 "                %(old_path)s])"
3959 
3960-#: trac/versioncontrol/templates/changeset.html:91
3961-#: trac/versioncontrol/templates/changeset.html:94
3962+#: trac/versioncontrol/templates/changeset.html:119
3963+#: trac/versioncontrol/templates/changeset.html:122
3964 msgid "Show differences"
3965 msgstr "显示差异"
3966 
3967-#: trac/versioncontrol/templates/changeset.html:91
3968+#: trac/versioncontrol/templates/changeset.html:119
3969 msgid "view diffs"
3970 msgstr "查看差异"
3971 
3972-#: trac/versioncontrol/templates/changeset.html:94
3973+#: trac/versioncontrol/templates/changeset.html:122
3974 #, python-format
3975 msgid "%(num)d diff"
3976 msgid_plural "%(num)d diffs"
3977 msgstr[0] "%(num)d个差异"
3978 msgstr[1] "%(num)d个差异"
3979 
3980-#: trac/versioncontrol/templates/changeset.html:97
3981+#: trac/versioncontrol/templates/changeset.html:125
3982 #, python-format
3983 msgid "%(num)d prop"
3984 msgid_plural "%(num)d props"
3985 msgstr[0] "%(num)d个属性"
3986 msgstr[1] "%(num)d个属性"
3987 
3988-#: trac/versioncontrol/templates/changeset.html:101
3989+#: trac/versioncontrol/templates/changeset.html:129
3990 msgid "Show previous version in browser"
3991 msgstr "在浏览器中显示上一个版本"
3992 
3993-#: trac/versioncontrol/templates/changeset.html:111
3994+#: trac/versioncontrol/templates/changeset.html:139
3995 msgid "(less than one hour ago)"
3996 msgstr "(一小时以内)"
3997 
3998-#: trac/versioncontrol/templates/changeset.html:112
3999+#: trac/versioncontrol/templates/changeset.html:140
4000 #, python-format
4001 msgid "(%(age)s ago)"
4002 msgstr "(%(age)s 以前)"
4003 
4004-#: trac/versioncontrol/templates/changeset.html:126
4005+#: trac/versioncontrol/templates/changeset.html:154
4006 msgid "Message:"
4007 msgstr "消息:"
4008 
4009-#: trac/versioncontrol/templates/changeset.html:138
4010+#: trac/versioncontrol/templates/changeset.html:166
4011 msgid "Location:"
4012 msgstr "位置:"
4013 
4014-#: trac/versioncontrol/templates/changeset.html:142
4015+#: trac/versioncontrol/templates/changeset.html:170
4016 msgid "(No files)"
4017 msgstr "(没有文件)"
4018 
4019-#: trac/versioncontrol/templates/changeset.html:147
4020+#: trac/versioncontrol/templates/changeset.html:175
4021 #, python-format
4022 msgid "%(num)d added"
4023 msgid_plural "%(num)d added"
4024-msgstr[0] "%(num)d 已添加"
4025-msgstr[1] "%(num)d 已添加"
4026+msgstr[0] "增加了%(num)d个"
4027+msgstr[1] "增加了%(num)d个"
4028 
4029-#: trac/versioncontrol/templates/changeset.html:148
4030+#: trac/versioncontrol/templates/changeset.html:176
4031 #, python-format
4032 msgid "%(num)d deleted"
4033 msgid_plural "%(num)d deleted"
4034-msgstr[0] "%(num)d 已删除"
4035-msgstr[1] "%(num)d 已删除"
4036+msgstr[0] "删除了%(num)d个"
4037+msgstr[1] "删除了%(num)d个"
4038 
4039-#: trac/versioncontrol/templates/changeset.html:149
4040+#: trac/versioncontrol/templates/changeset.html:177
4041 #, python-format
4042 msgid "%(num)d edited"
4043 msgid_plural "%(num)d edited"
4044-msgstr[0] "%(num)d 已编辑"
4045-msgstr[1] "%(num)d 已编辑"
4046+msgstr[0] "修改了%(num)d个"
4047+msgstr[1] "修改了%(num)d个"
4048 
4049-#: trac/versioncontrol/templates/changeset.html:150
4050+#: trac/versioncontrol/templates/changeset.html:178
4051 #, python-format
4052 msgid "%(num)d copied"
4053 msgid_plural "%(num)d copied"
4054-msgstr[0] "%(num)d 已复制"
4055-msgstr[1] "%(num)d 已复制"
4056+msgstr[0] "复制了%(num)d个"
4057+msgstr[1] "复制了%(num)d个"
4058 
4059-#: trac/versioncontrol/templates/changeset.html:151
4060+#: trac/versioncontrol/templates/changeset.html:179
4061 #, python-format
4062 msgid "%(num)d moved"
4063 msgid_plural "%(num)d moved"
4064-msgstr[0] "%(num)d 已移动"
4065-msgstr[1] "%(num)d 已移动"
4066+msgstr[0] "移动了%(num)d个"
4067+msgstr[1] "移动了%(num)d个"
4068 
4069-#: trac/versioncontrol/templates/changeset.html:159
4070+#: trac/versioncontrol/templates/changeset.html:185
4071+#: trac/versioncontrol/templates/revisionlog.txt:12
4072+msgid "added"
4073+msgstr "已增加"
4074+
4075+#: trac/versioncontrol/templates/changeset.html:186
4076+#: trac/versioncontrol/templates/revisionlog.txt:12
4077+msgid "deleted"
4078+msgstr "已删除"
4079+
4080+#: trac/versioncontrol/templates/changeset.html:187
4081+#: trac/versioncontrol/templates/revisionlog.txt:12
4082 msgid "copied"
4083 msgstr "已复制"
4084 
4085-#: trac/versioncontrol/templates/changeset.html:160
4086+#: trac/versioncontrol/templates/changeset.html:188
4087+#: trac/versioncontrol/templates/revisionlog.txt:12
4088 msgid "moved"
4089 msgstr "已移动"
4090 
4091-#: trac/versioncontrol/templates/changeset.html:183
4092+#: trac/versioncontrol/templates/changeset.html:211
4093 msgid ""
4094 "[1:Note:] See [2:TracChangeset]\n"
4095 "          for help on using the changeset viewer."
4096@@ -4413,10 +4595,13 @@
4097 msgstr "[1:注意:] 对比功能的使用帮助参见[2:TracChangeset]"
4098 
4099 #: trac/versioncontrol/templates/dir_entries.html:11
4100-#, python-format
4101-msgid "View %(path_kind)s"
4102-msgstr "查看 %(path_kind)s"
4103+msgid "View Directory"
4104+msgstr "查看目录"
4105 
4106+#: trac/versioncontrol/templates/dir_entries.html:11
4107+msgid "View File"
4108+msgstr "查看文件"
4109+
4110 #: trac/versioncontrol/templates/dir_entries.html:19
4111 #: trac/versioncontrol/templates/repository_index.html:23
4112 msgid "View Revision Log"
4113@@ -4428,13 +4613,13 @@
4114 msgstr "查阅变更"
4115 
4116 #: trac/versioncontrol/templates/dirlist_thead.html:9
4117-#: trac/versioncontrol/templates/revisionlog.html:94
4118-#: trac/versioncontrol/web_ui/browser.py:753
4119+#: trac/versioncontrol/templates/revisionlog.html:96
4120+#: trac/versioncontrol/web_ui/browser.py:763
4121 msgid "Rev"
4122 msgstr "Rev"
4123 
4124 #: trac/versioncontrol/templates/dirlist_thead.html:12
4125-#: trac/versioncontrol/web_ui/browser.py:441
4126+#: trac/versioncontrol/web_ui/browser.py:447
4127 msgid "Last Change"
4128 msgstr "最新变更"
4129 
4130@@ -4470,7 +4655,7 @@
4131 
4132 #: trac/versioncontrol/templates/revisionlog.html:27
4133 msgid "Stop on copy"
4134-msgstr "只显示到复制时的修订"
4135+msgstr "在遇到复制时停止"
4136 
4137 #: trac/versioncontrol/templates/revisionlog.html:33
4138 msgid "Follow copies"
4139@@ -4481,186 +4666,189 @@
4140 msgstr "只显示增加和删除"
4141 
4142 #: trac/versioncontrol/templates/revisionlog.html:44
4143-msgid "View log starting at"
4144-msgstr "查看日志，起始修订:"
4145+msgid ""
4146+"[1:\n"
4147+"              View log starting at\n"
4148+"              [2:]\n"
4149+"            ]\n"
4150+"            [3:\n"
4151+"              and back to\n"
4152+"              [4:]\n"
4153+"            ]"
4154+msgstr ""
4155+"[1:\n"
4156+"              查看由\n"
4157+"              [2:]\n"
4158+"            ]\n"
4159+"            [3:\n"
4160+"              起回溯到\n"
4161+"              [4:]\n"
4162+"            ]的日志"
4163 
4164-#: trac/versioncontrol/templates/revisionlog.html:48
4165-msgid "and back to"
4166-msgstr "结束修订:"
4167+#: trac/versioncontrol/templates/revisionlog.html:54
4168+msgid ""
4169+"[1:\n"
4170+"              Show at most\n"
4171+"              [2:]\n"
4172+"              revisions per page.\n"
4173+"            ]"
4174+msgstr ""
4175+"[1:\n"
4176+"              每页最多显示\n"
4177+"              [2:]\n"
4178+"              个修订版。\n"
4179+"            ]"
4180 
4181-#: trac/versioncontrol/templates/revisionlog.html:53
4182-msgid "Show at most"
4183-msgstr "最多显示"
4184-
4185-#: trac/versioncontrol/templates/revisionlog.html:55
4186-msgid "revisions per page."
4187-msgstr "修订/页."
4188-
4189-#: trac/versioncontrol/templates/revisionlog.html:60
4190+#: trac/versioncontrol/templates/revisionlog.html:62
4191 msgid "Show full log messages"
4192 msgstr "显示完整日志信息"
4193 
4194-#: trac/versioncontrol/templates/revisionlog.html:78
4195+#: trac/versioncontrol/templates/revisionlog.html:80
4196 msgid "Copied or renamed"
4197-msgstr "复制或更名"
4198+msgstr "复制或改名"
4199 
4200-#: trac/versioncontrol/templates/revisionlog.html:86
4201-#: trac/versioncontrol/templates/revisionlog.html:180
4202+#: trac/versioncontrol/templates/revisionlog.html:88
4203+#: trac/versioncontrol/templates/revisionlog.html:182
4204 msgid "Diff from Old Revision to New Revision (as selected in the Diff column)"
4205 msgstr "显示旧修订版到新修订版的差异(根据Diff栏的选择)"
4206 
4207-#: trac/versioncontrol/templates/revisionlog.html:92
4208+#: trac/versioncontrol/templates/revisionlog.html:94
4209 msgid "Old / New"
4210 msgstr "旧/新"
4211 
4212-#: trac/versioncontrol/templates/revisionlog.html:92
4213+#: trac/versioncontrol/templates/revisionlog.html:94
4214 msgid "Diff"
4215 msgstr "差异"
4216 
4217-#: trac/versioncontrol/templates/revisionlog.html:95
4218+#: trac/versioncontrol/templates/revisionlog.html:97
4219 msgid "Age"
4220 msgstr "年龄"
4221 
4222-#: trac/versioncontrol/templates/revisionlog.html:97
4223+#: trac/versioncontrol/templates/revisionlog.html:99
4224 msgid "Log Message"
4225 msgstr "日志消息"
4226 
4227-#: trac/versioncontrol/templates/revisionlog.html:104
4228+#: trac/versioncontrol/templates/revisionlog.html:106
4229 msgid "No revisions found"
4230 msgstr "没有找到任何修订"
4231 
4232-#: trac/versioncontrol/templates/revisionlog.html:117
4233-msgid "copied from"
4234-msgstr "复制于"
4235+#: trac/versioncontrol/templates/revisionlog.html:120
4236+#, python-format
4237+msgid "copied from [1:%(path)s]:"
4238+msgstr "从[1:%(path)s]复制:"
4239 
4240-#: trac/versioncontrol/templates/revisionlog.html:124
4241+#: trac/versioncontrol/templates/revisionlog.html:126
4242 #, python-format
4243-msgid "From r%(rev)s"
4244-msgstr "从 %(rev)s"
4245+msgid "From [%(rev)s]"
4246+msgstr "从 [%(rev)s]"
4247 
4248-#: trac/versioncontrol/templates/revisionlog.html:127
4249+#: trac/versioncontrol/templates/revisionlog.html:129
4250 #, python-format
4251-msgid "To r%(rev)s"
4252-msgstr "到 %(rev)s"
4253+msgid "To [%(rev)s]"
4254+msgstr "到 [%(rev)s]"
4255 
4256-#: trac/versioncontrol/templates/revisionlog.html:133
4257+#: trac/versioncontrol/templates/revisionlog.html:135
4258 msgid "View log starting at this revision"
4259 msgstr "查看此修订之后的日志"
4260 
4261-#: trac/versioncontrol/templates/revisionlog.html:140
4262+#: trac/versioncontrol/templates/revisionlog.html:142
4263 #, python-format
4264 msgid "Browse at revision %(rev)s"
4265 msgstr "浏览版本 %(rev)s"
4266 
4267-#: trac/versioncontrol/templates/revisionlog.html:144
4268+#: trac/versioncontrol/templates/revisionlog.html:146
4269 #, python-format
4270 msgid "View removal changeset [%(rev)s]"
4271 msgstr "查看删除变更集 [%(rev)s]"
4272 
4273-#: trac/versioncontrol/templates/revisionlog.html:146
4274+#: trac/versioncontrol/templates/revisionlog.html:148
4275 #, python-format
4276 msgid "View changeset [%(rev)s] restricted to %(path)s"
4277 msgstr "仅显示路径 %(path)s的变更集[%(rev)s]"
4278 
4279-#: trac/versioncontrol/templates/revisionlog.html:185
4280+#: trac/versioncontrol/templates/revisionlog.html:187
4281 msgid ""
4282 "[1:Note:] See [2:TracRevisionLog]\n"
4283 "        for help on using the revision log."
4284 msgstr "[1:注意:] 使用版本日志的帮助参见[2:TracRevisionLog]。"
4285 
4286-#: trac/versioncontrol/templates/revisionlog.txt:1
4287-msgid ""
4288-"#\n"
4289-"# ChangeLog for"
4290-msgstr ""
4291-"#\n"
4292-"# 变更日志: "
4293-
4294 #: trac/versioncontrol/templates/revisionlog.txt:2
4295-msgid " in $(reponame)s"
4296-msgstr " 在$(reponame)s"
4297+#, python-format
4298+msgid "ChangeLog for %(path)s%(in_repo)s"
4299+msgstr "%(path)s%(in_repo)s 的变更日志"
4300 
4301-#: trac/versioncontrol/templates/revisionlog.txt:2
4302-msgid ""
4303-"# \n"
4304-"# Generated by Trac"
4305-msgstr ""
4306-"# \n"
4307-"# 由Trac生成"
4308+#: trac/versioncontrol/templates/revisionlog.txt:4
4309+#, python-format
4310+msgid "Generated by Trac %(version)s"
4311+msgstr "由Trac %(version)s 生成"
4312 
4313 #: trac/versioncontrol/web_ui/browser.py:298
4314 msgid "Browse Source"
4315 msgstr "源码浏览"
4316 
4317-#: trac/versioncontrol/web_ui/browser.py:347
4318-#: trac/versioncontrol/web_ui/log.py:87
4319-#, python-format
4320-msgid "No repository '%(repo)s' found"
4321-msgstr "找不到版本库 '%(repo)s'"
4322-
4323-#: trac/versioncontrol/web_ui/browser.py:369
4324+#: trac/versioncontrol/web_ui/browser.py:372
4325 msgid "Invalid changeset number"
4326 msgstr "无效变更集版本号"
4327 
4328-#: trac/versioncontrol/web_ui/browser.py:424
4329-#: trac/versioncontrol/web_ui/browser.py:434
4330+#: trac/versioncontrol/web_ui/browser.py:430
4331+#: trac/versioncontrol/web_ui/browser.py:440
4332 #, python-format
4333 msgid "Revision %(num)s"
4334 msgstr "修订 %(num)s"
4335 
4336-#: trac/versioncontrol/web_ui/browser.py:435
4337+#: trac/versioncontrol/web_ui/browser.py:441
4338 msgid "Previous Revision"
4339 msgstr "上一修订"
4340 
4341-#: trac/versioncontrol/web_ui/browser.py:435
4342+#: trac/versioncontrol/web_ui/browser.py:441
4343 msgid "Next Revision"
4344 msgstr "下一修订"
4345 
4346-#: trac/versioncontrol/web_ui/browser.py:436
4347+#: trac/versioncontrol/web_ui/browser.py:442
4348 msgid "Latest Revision"
4349 msgstr "最新修订"
4350 
4351-#: trac/versioncontrol/web_ui/browser.py:440
4352-#: trac/versioncontrol/web_ui/log.py:299
4353+#: trac/versioncontrol/web_ui/browser.py:446
4354+#: trac/versioncontrol/web_ui/log.py:300
4355 msgid "Parent directory"
4356 msgstr "父目录"
4357 
4358-#: trac/versioncontrol/web_ui/browser.py:446
4359+#: trac/versioncontrol/web_ui/browser.py:452
4360 msgid "Normal"
4361 msgstr "正常"
4362 
4363-#: trac/versioncontrol/web_ui/browser.py:447
4364+#: trac/versioncontrol/web_ui/browser.py:453
4365 msgid "View file without annotations"
4366 msgstr "查看文件(不包含注解)"
4367 
4368-#: trac/versioncontrol/web_ui/browser.py:452
4369+#: trac/versioncontrol/web_ui/browser.py:458
4370 msgid "Annotate"
4371 msgstr "注解"
4372 
4373-#: trac/versioncontrol/web_ui/browser.py:453
4374+#: trac/versioncontrol/web_ui/browser.py:459
4375 msgid ""
4376 "Annotate each line with the last changed revision (this can be time "
4377 "consuming...)"
4378 msgstr "给最新修订每行都加注解 (这可能是耗时操作...)"
4379 
4380-#: trac/versioncontrol/web_ui/browser.py:460
4381+#: trac/versioncontrol/web_ui/browser.py:466
4382 msgid "Revision Log"
4383 msgstr "修订日志"
4384 
4385-#: trac/versioncontrol/web_ui/browser.py:466
4386+#: trac/versioncontrol/web_ui/browser.py:472
4387 msgid "Repository URL"
4388 msgstr "版本库URL"
4389 
4390-#: trac/versioncontrol/web_ui/browser.py:580
4391+#: trac/versioncontrol/web_ui/browser.py:586
4392 #: trac/versioncontrol/web_ui/changeset.py:362
4393 msgid "Zip Archive"
4394 msgstr "Zip归档"
4395 
4396-#: trac/versioncontrol/web_ui/browser.py:753
4397+#: trac/versioncontrol/web_ui/browser.py:763
4398 msgid "Revision in which the line changed"
4399 msgstr "该行发生变更的修订"
4400 
4401-#: trac/versioncontrol/web_ui/browser.py:811
4402+#: trac/versioncontrol/web_ui/browser.py:821
4403 #, python-format
4404 msgid "View repository %(repo)s"
4405 msgstr "查看版本库 %(repo)s"
4406@@ -4670,11 +4858,6 @@
4407 msgid "Can't compare across different repositories: %(old)s vs. %(new)s"
4408 msgstr "无法从不同的版本库进行比较：%(old)s <-> %(new)s"
4409 
4410-#: trac/versioncontrol/web_ui/changeset.py:247
4411-#, python-format
4412-msgid "No repository found for '%(reponame)s'"
4413-msgstr "没有找到 '%(reponame)s' 的版本库"
4414-
4415 #: trac/versioncontrol/web_ui/changeset.py:249
4416 msgid "No repository specified and no default repository configured."
4417 msgstr "没有指定版本库，也没有配置缺省版本库。"
4418@@ -4699,288 +4882,310 @@
4419 msgid "Reverse Diff"
4420 msgstr "反向对比"
4421 
4422-#: trac/versioncontrol/web_ui/changeset.py:410
4423+#: trac/versioncontrol/web_ui/changeset.py:413
4424 #, python-format
4425 msgid "Changeset %(id)s for %(path)s"
4426 msgstr "变更集 %(id)s 为 %(path)s"
4427 
4428-#: trac/versioncontrol/web_ui/changeset.py:413
4429-#: trac/versioncontrol/web_ui/changeset.py:439
4430-#: trac/versioncontrol/web_ui/changeset.py:460
4431+#: trac/versioncontrol/web_ui/changeset.py:416
4432+#: trac/versioncontrol/web_ui/changeset.py:442
4433+#: trac/versioncontrol/web_ui/changeset.py:464
4434 #, python-format
4435 msgid "Changeset %(id)s"
4436 msgstr "变更集 %(id)s"
4437 
4438-#: trac/versioncontrol/web_ui/changeset.py:486
4439+#: trac/versioncontrol/web_ui/changeset.py:491
4440 #, python-format
4441 msgid "Show revision %(rev)s of this file in browser"
4442 msgstr "在浏览器中显示文件的修订 %(rev)s"
4443 
4444-#: trac/versioncontrol/web_ui/changeset.py:632
4445+#: trac/versioncontrol/web_ui/changeset.py:637
4446 #, python-format
4447 msgid "Show the changeset %(id)s restricted to %(path)s"
4448 msgstr "显示变更集 %(id)s , 仅包含路径 %(path)s"
4449 
4450-#: trac/versioncontrol/web_ui/changeset.py:643
4451+#: trac/versioncontrol/web_ui/changeset.py:649
4452 #, python-format
4453 msgid "Show the %(range)s differences restricted to %(path)s"
4454 msgstr "显示差异范围 %(range)s , 仅包含路径 %(path)s"
4455 
4456-#: trac/versioncontrol/web_ui/changeset.py:859
4457+#. TRANSLATOR: 'latest' (revision)
4458+#: trac/versioncontrol/web_ui/changeset.py:789
4459+msgid "latest"
4460+msgstr "最新"
4461+
4462+#: trac/versioncontrol/web_ui/changeset.py:792
4463+#, python-format
4464+msgid "Diff [%(old_rev)s:%(new_rev)s] for %(path)s"
4465+msgstr "%(path)s 版本 [%(old_rev)s:%(new_rev)s] 的差异"
4466+
4467+#: trac/versioncontrol/web_ui/changeset.py:798
4468+#, python-format
4469+msgid "Diff from %(old_path)s@%(old_rev)s to %(new_path)s@%(new_rev)s"
4470+msgstr "从 %(old_path)s@%(old_rev)s 到 %(new_path)s@%(new_rev)s 的差异"
4471+
4472+#: trac/versioncontrol/web_ui/changeset.py:870
4473 msgid "Changesets in all repositories"
4474 msgstr "所有版本库中的变更集"
4475 
4476-#: trac/versioncontrol/web_ui/changeset.py:861
4477+#: trac/versioncontrol/web_ui/changeset.py:872
4478 msgid "Repository changesets"
4479 msgstr "版本库变更集"
4480 
4481-#: trac/versioncontrol/web_ui/changeset.py:998
4482+#: trac/versioncontrol/web_ui/changeset.py:1010
4483 #, python-format
4484 msgid "Changeset in %(repo)s "
4485 msgid_plural "Changesets in %(repo)s "
4486 msgstr[0] "%(repo)s中的变更集"
4487 msgstr[1] "%(repo)s中的变更集"
4488 
4489-#: trac/versioncontrol/web_ui/changeset.py:1000
4490+#: trac/versioncontrol/web_ui/changeset.py:1012
4491 msgid "Changeset "
4492 msgid_plural "Changesets "
4493 msgstr[0] "变更集"
4494 msgstr[1] "变更集"
4495 
4496-#: trac/versioncontrol/web_ui/changeset.py:1009
4497+#: trac/versioncontrol/web_ui/changeset.py:1023
4498 #, python-format
4499 msgid "%(title)s: %(message)s"
4500 msgstr "%(title)s： %(message)s:"
4501 
4502-#: trac/versioncontrol/web_ui/changeset.py:1069
4503+#: trac/versioncontrol/web_ui/changeset.py:1083
4504 #, python-format
4505 msgid "No permission to view changeset %(rev)s on %(repos)s"
4506 msgstr "无权查看%(repos)s中的变更集%(rev)s"
4507 
4508-#: trac/versioncontrol/web_ui/changeset.py:1073
4509-#: trac/versioncontrol/web_ui/log.py:393
4510-#, python-format
4511-msgid "Repository %(repos)s not found"
4512-msgstr "没有找到版本库 %(repos)s"
4513-
4514-#: trac/versioncontrol/web_ui/changeset.py:1075
4515-#: trac/versioncontrol/web_ui/log.py:395
4516+#: trac/versioncontrol/web_ui/changeset.py:1089
4517+#: trac/versioncontrol/web_ui/log.py:397
4518 msgid "No default repository defined"
4519 msgstr "没有定义缺省版本库"
4520 
4521-#: trac/versioncontrol/web_ui/changeset.py:1114
4522+#: trac/versioncontrol/web_ui/changeset.py:1128
4523 msgid "Changesets"
4524 msgstr "变更集"
4525 
4526-#: trac/versioncontrol/web_ui/log.py:196
4527+#: trac/versioncontrol/web_ui/log.py:199
4528 #, python-format
4529 msgid ""
4530 "The file or directory '%(path)s' doesn't exist at revision %(rev)s or at "
4531 "any previous revision."
4532 msgstr "文件或目录 '%(path)s' 不存在 %(rev)s 及以前的修订。"
4533 
4534-#: trac/versioncontrol/web_ui/log.py:198
4535+#: trac/versioncontrol/web_ui/log.py:199
4536 msgid "Nonexistent path"
4537 msgstr "路径不存在"
4538 
4539-#: trac/versioncontrol/web_ui/log.py:225
4540+#: trac/versioncontrol/web_ui/log.py:227
4541 #, python-format
4542 msgid "Revision Log (restarting at %(path)s, rev. %(rev)s)"
4543 msgstr "修订日志 (起始于 %(path)s, 修订 %(rev)s)"
4544 
4545-#: trac/versioncontrol/web_ui/log.py:307
4546+#: trac/versioncontrol/web_ui/log.py:308
4547 msgid "ChangeLog"
4548 msgstr "变更日志"
4549 
4550-#: trac/versioncontrol/web_ui/log.py:309
4551+#: trac/versioncontrol/web_ui/log.py:310
4552 msgid "View Latest Revision"
4553 msgstr "查看最新修订"
4554 
4555-#: trac/versioncontrol/web_ui/log.py:313
4556+#: trac/versioncontrol/web_ui/log.py:314
4557 msgid "Older Revisions"
4558 msgstr "更早版本"
4559 
4560-#: trac/versioncontrol/web_ui/log.py:391
4561+#: trac/versioncontrol/web_ui/log.py:393
4562 msgid "No permission to view change log"
4563 msgstr "无权查看变更记录"
4564 
4565-#: trac/versioncontrol/web_ui/util.py:64
4566+#. TRANSLATOR: You can 'search' in the repository history... (link)
4567+#: trac/versioncontrol/web_ui/util.py:65
4568 msgid "search"
4569 msgstr "搜索"
4570 
4571-#: trac/versioncontrol/web_ui/util.py:68
4572+#: trac/versioncontrol/web_ui/util.py:69
4573 #, python-format
4574 msgid ""
4575 "You can %(search)s in the repository history to see if that path existed "
4576 "but was later removed"
4577 msgstr "您可以在版本库历史中%(search)s，以判断是否路径曾经存在但后来被删除了。"
4578 
4579-#: trac/web/api.py:232
4580+#: trac/web/api.py:236
4581 #, python-format
4582 msgid "Invalid URL encoding (was %(path_info)r)"
4583 msgstr "无效URL编码 (原来是 %(path_info)r)"
4584 
4585-#: trac/web/api.py:447
4586+#: trac/web/api.py:474
4587 #, python-format
4588 msgid "File %(path)s not found"
4589 msgstr "文件 \"%(path)s\" 未找到。"
4590 
4591-#: trac/web/auth.py:104
4592+#: trac/web/auth.py:99
4593 #, python-format
4594 msgid "logged in as %(user)s"
4595 msgstr "登录为 %(user)s"
4596 
4597-#: trac/web/auth.py:107
4598+#: trac/web/auth.py:102
4599 msgid "Logout"
4600 msgstr "注销"
4601 
4602-#: trac/web/auth.py:110
4603+#: trac/web/auth.py:105
4604 msgid "Login"
4605 msgstr "登录"
4606 
4607-#: trac/web/auth.py:152
4608+#. TRANSLATOR: ... refer to the 'installation documentation'. (link)
4609+#: trac/web/auth.py:137
4610+msgid "installation documentation"
4611+msgstr "安装文档"
4612+
4613+#: trac/web/auth.py:138
4614+msgid "Configuring Authentication"
4615+msgstr "配置身份认证"
4616+
4617+#: trac/web/auth.py:141
4618 #, python-format
4619+msgid ""
4620+"Authentication information not available. Please refer to the "
4621+"%(inst_doc)s."
4622+msgstr "缺少身份认证信息，请查看 %(inst_doc)s 。"
4623+
4624+#: trac/web/auth.py:149
4625+#, python-format
4626 msgid "Already logged in as %(user)s."
4627 msgstr "已经登录为 %(user)s."
4628 
4629-#: trac/web/chrome.py:580
4630+#: trac/web/chrome.py:582
4631 #, python-format
4632 msgid "Error with navigation contributor \"%(name)s\""
4633 msgstr "导航贡献者 \"%(name)s\" 错误"
4634 
4635-#: trac/web/chrome.py:875
4636+#: trac/web/chrome.py:877
4637 msgid "(unknown template location)"
4638 msgstr "(未知模板路径)"
4639 
4640-#: trac/web/chrome.py:876
4641+#: trac/web/chrome.py:878
4642 #, python-format
4643 msgid "Genshi %(error)s error while rendering template %(location)s"
4644 msgstr "Genshi在渲染模板%(location)s时，发生错误%(error)s。"
4645 
4646-#: trac/web/main.py:227
4647+#: trac/web/main.py:225
4648 msgid "Secure cookies are enabled, you must use https to submit forms."
4649 msgstr "安全cookies已启动，您必须使用https提交表单。"
4650 
4651-#: trac/web/main.py:230
4652+#: trac/web/main.py:228
4653 msgid "Do you have cookies enabled?"
4654 msgstr "你启用cookie了吗？"
4655 
4656-#: trac/web/main.py:231
4657+#: trac/web/main.py:229
4658 #, python-format
4659 msgid "Missing or invalid form token. %(msg)s"
4660 msgstr "标记确实或格式无效。 %(msg)s"
4661 
4662-#: trac/web/main.py:519
4663+#: trac/web/main.py:527
4664 #, python-format
4665 msgid "Error: %(message)s"
4666 msgstr "错误: %(message)s"
4667 
4668 #. TRANSLATOR: ... not logged in, you may want to 'do so' now (link)
4669-#: trac/web/main.py:533
4670+#: trac/web/main.py:541
4671 msgid "do so"
4672 msgstr "这样做"
4673 
4674-#: trac/web/main.py:535
4675+#: trac/web/main.py:543
4676 #, python-format
4677 msgid "You are currently not logged in. You may want to %(do_so)s now."
4678 msgstr "您现在没有登录，您也许想要现在就%(do_so)s。"
4679 
4680-#: trac/web/session.py:204
4681+#: trac/web/session.py:203
4682 #, python-format
4683 msgid ""
4684 "Session '%(id)s' already exists.<br />Please choose a different session "
4685 "ID."
4686 msgstr "会话'%(id)s'已经存在，<br />请选择其它会话标识。"
4687 
4688-#: trac/web/session.py:206
4689+#: trac/web/session.py:205
4690 msgid "Error renaming session"
4691 msgstr "会话更名出错"
4692 
4693-#: trac/web/session.py:313
4694+#: trac/web/session.py:312
4695 msgid "No SID found"
4696 msgstr "没有找到SID"
4697 
4698-#: trac/web/session.py:315
4699+#: trac/web/session.py:314
4700 msgid "SID"
4701 msgstr "SID"
4702 
4703-#: trac/web/session.py:315
4704+#: trac/web/session.py:314
4705 msgid "Email"
4706 msgstr "邮件地址"
4707 
4708-#: trac/web/session.py:319
4709-msgid "Session alread exists. Unable to add a duplicate session."
4710+#: trac/web/session.py:318
4711+msgid "Session already exists. Unable to add a duplicate session."
4712 msgstr "会话已经存在，不能添加重复的会话。"
4713 
4714-#: trac/web/session.py:326
4715+#: trac/web/session.py:325
4716 msgid "Unable to set session attribute on a non-existent SID"
4717 msgstr "无法给一个不存在的SID设置会话属性"
4718 
4719-#: trac/web/session.py:439
4720+#: trac/web/session.py:438
4721 #, python-format
4722 msgid "Session id %(sid)s not found"
4723 msgstr "没有找到会话标识%(sid)s"
4724 
4725-#: trac/web/session.py:475
4726-msgid "A datetime object must be specified"
4727-msgstr "必须指定一个时间对象"
4728-
4729-#: trac/wiki/admin.py:117
4730+#: trac/wiki/admin.py:116
4731 #, python-format
4732 msgid "'%(name)s' is not a file"
4733 msgstr "'%(name)s'不是一个文件。"
4734 
4735-#: trac/wiki/admin.py:170 trac/wiki/admin.py:267
4736+#: trac/wiki/admin.py:168 trac/wiki/admin.py:265
4737 #, python-format
4738 msgid "  %(page)s imported from %(filename)s"
4739 msgstr "已从%(filename)s中导入%(page)s"
4740 
4741-#: trac/wiki/admin.py:202
4742+#: trac/wiki/admin.py:200
4743 msgid "Edits"
4744 msgstr "编辑次数"
4745 
4746-#: trac/wiki/admin.py:208 trac/wiki/web_ui.py:296
4747+#: trac/wiki/admin.py:206 trac/wiki/web_ui.py:295
4748 msgid "A new name is mandatory for a rename."
4749 msgstr "重命名必须提供新的名称。"
4750 
4751-#: trac/wiki/admin.py:212 trac/wiki/web_ui.py:300
4752+#: trac/wiki/admin.py:210 trac/wiki/web_ui.py:299
4753 #, python-format
4754 msgid "The page %(name)s already exists."
4755 msgstr "页面 %(name)s 已经存在"
4756 
4757-#: trac/wiki/admin.py:226
4758+#: trac/wiki/admin.py:224
4759 msgid "Deleted pages"
4760 msgstr "已删除页面 "
4761 
4762-#: trac/wiki/admin.py:245
4763+#: trac/wiki/admin.py:243
4764 #, python-format
4765 msgid "'%(name)s' is not a directory"
4766 msgstr "'%(name)s'不是一个目录。"
4767 
4768-#: trac/wiki/api.py:319
4769+#: trac/wiki/api.py:361
4770 msgid "no permission to view this wiki page"
4771 msgstr "无权查看此Wiki页面"
4772 
4773-#: trac/wiki/formatter.py:169
4774+#: trac/wiki/formatter.py:174
4775 #, python-format
4776 msgid "HTML parsing error: %(message)s"
4777 msgstr "HTML处理错误: %(message)s"
4778 
4779-#: trac/wiki/formatter.py:173
4780+#: trac/wiki/formatter.py:178
4781 msgid "Error: Forbidden character sequence \"--\" in htmlcomment wiki code block"
4782 msgstr "错误: htmlcomment wiki代码块中存在非法字符序列 \"--\" "
4783 
4784-#: trac/wiki/formatter.py:247
4785+#: trac/wiki/formatter.py:252
4786 #, python-format
4787 msgid "!#%(name)s must contain at most one table"
4788 msgstr "!#%(name)s 必须包含在至少一个表中"
4789 
4790-#: trac/wiki/formatter.py:251
4791+#: trac/wiki/formatter.py:256
4792 #, python-format
4793 msgid "!#%(name)s must contain at least one table cell (and table cells only)"
4794 msgstr "!#%(name)s 必须包含在至少一个表单元中（也只允许在表单元中）"
4795 
4796-#: trac/wiki/formatter.py:564 trac/wiki/interwiki.py:88
4797+#: trac/wiki/formatter.py:629 trac/wiki/interwiki.py:88
4798 #, python-format
4799 msgid "%(target)s in %(name)s"
4800 msgstr "%(target)s 在 %(name)s"
4801@@ -4990,93 +5195,103 @@
4802 msgid "Can't view %(link)s:"
4803 msgstr "无法查看 %(link)s:"
4804 
4805-#: trac/wiki/macros.py:526
4806+#: trac/wiki/macros.py:519
4807 #, python-format
4808+msgid "No image \"%(id)s\" attached to %(parent)s"
4809+msgstr "没有图像 \"%(id)s\" 附加到 %(parent)s"
4810+
4811+#: trac/wiki/macros.py:562
4812+#, python-format
4813 msgid "Error: Can't get description for macro %(name)s"
4814 msgstr "错误: 无法得到宏 %(name)s 的描述"
4815 
4816-#: trac/wiki/macros.py:544
4817+#: trac/wiki/macros.py:580
4818 msgid "Aliases:"
4819 msgstr "别名："
4820 
4821-#: trac/wiki/macros.py:547
4822+#: trac/wiki/macros.py:583
4823 msgid "Sorry, no documentation found"
4824 msgstr "抱歉，没有找到文档"
4825 
4826-#: trac/wiki/macros.py:612
4827+#: trac/wiki/macros.py:648
4828 msgid "MIME Types"
4829 msgstr "MIME类型"
4830 
4831-#: trac/wiki/macros.py:670
4832+#: trac/wiki/macros.py:706
4833 msgid "Table of Contents"
4834 msgstr "内容索引"
4835 
4836-#: trac/wiki/model.py:124
4837+#: trac/wiki/model.py:123
4838 msgid "Page not modified"
4839 msgstr "未修改的页面"
4840 
4841-#: trac/wiki/model.py:175
4842+#: trac/wiki/model.py:174
4843 #, python-format
4844 msgid "Can't rename to existing %(name)s page."
4845 msgstr "不能重命名为已有页面 %(name)s 。"
4846 
4847-#: trac/wiki/web_ui.py:88 trac/wiki/web_ui.py:718
4848+#: trac/wiki/web_ui.py:87 trac/wiki/web_ui.py:729
4849 msgid "Wiki"
4850 msgstr "Wiki"
4851 
4852-#: trac/wiki/web_ui.py:90
4853+#: trac/wiki/web_ui.py:89
4854 msgid "Help/Guide"
4855 msgstr "帮助/指南"
4856 
4857-#: trac/wiki/web_ui.py:126
4858+#: trac/wiki/web_ui.py:125
4859 #, python-format
4860 msgid "No version \"%(num)s\" for Wiki page \"%(name)s\""
4861 msgstr "无版本 \"%(num)s\" , Wiki页面 \"%(name)s\""
4862 
4863-#: trac/wiki/web_ui.py:191
4864+#: trac/wiki/web_ui.py:190
4865 #, python-format
4866 msgid "The wiki page is too long (must be less than %(num)s characters)"
4867 msgstr "任务单描述太长(必须少于 %(num)s 个字符)"
4868 
4869-#: trac/wiki/web_ui.py:201
4870+#: trac/wiki/web_ui.py:200
4871 #, python-format
4872 msgid "The Wiki page field '%(field)s' is invalid: %(message)s"
4873 msgstr "Wiki页面字段 '%(field)s' 无效: %(message)s"
4874 
4875-#: trac/wiki/web_ui.py:205
4876+#: trac/wiki/web_ui.py:204
4877 #, python-format
4878 msgid "Invalid Wiki page: %(message)s"
4879 msgstr "无效的Wiki页面: %(message)s"
4880 
4881 #. TRANSLATOR: wiki page
4882-#: trac/wiki/web_ui.py:232
4883+#: trac/wiki/web_ui.py:231
4884 msgid "currently edited"
4885 msgstr "正在编辑"
4886 
4887-#: trac/wiki/web_ui.py:266
4888+#: trac/wiki/web_ui.py:265
4889 #, python-format
4890 msgid "The page %(name)s has been deleted."
4891 msgstr "页面 %(name)s 已删除。"
4892 
4893-#: trac/wiki/web_ui.py:271
4894+#: trac/wiki/web_ui.py:270
4895 #, python-format
4896 msgid "The versions %(from_)d to %(to)d of the page %(name)s have been deleted."
4897 msgstr "页面 %(name)s 的版本 %(from_)d 到 %(to)d 已删除。"
4898 
4899-#: trac/wiki/web_ui.py:275
4900+#: trac/wiki/web_ui.py:274
4901 #, python-format
4902 msgid "The version %(version)d of the page %(name)s has been deleted."
4903 msgstr "页面 %(name)s 版本 %(version)d 已删除。"
4904 
4905-#: trac/wiki/web_ui.py:298
4906+#: trac/wiki/web_ui.py:297
4907 msgid "The new name must be different from the old name."
4908 msgstr "新名称必须与旧名称不同。"
4909 
4910-#: trac/wiki/web_ui.py:310
4911+#: trac/wiki/web_ui.py:309
4912 #, python-format
4913 msgid "See [wiki:\"%(name)s\"]."
4914 msgstr "查看 [wiki:\"%(name)s\"]."
4915 
4916+#: trac/wiki/web_ui.py:333
4917+#, python-format
4918+msgid "Your changes have been saved in version %(version)s."
4919+msgstr "您的修改已保存在版本%(version)s中。"
4920+
4921 #: trac/wiki/web_ui.py:338
4922 msgid "Page not modified, showing latest version."
4923 msgstr "页面未修改，显示最新版本"
4924@@ -5133,47 +5348,79 @@
4925 msgid "Up"
4926 msgstr "向上"
4927 
4928-#: trac/wiki/web_ui.py:665
4929+#: trac/wiki/web_ui.py:673
4930 msgid "Start Page"
4931 msgstr "起始页"
4932 
4933-#: trac/wiki/web_ui.py:666
4934+#: trac/wiki/web_ui.py:674
4935 msgid "Index"
4936 msgstr "索引"
4937 
4938-#: trac/wiki/web_ui.py:668
4939+#: trac/wiki/web_ui.py:676
4940 msgid "History"
4941 msgstr "历史"
4942 
4943-#: trac/wiki/web_ui.py:675
4944+#: trac/wiki/web_ui.py:683
4945 msgid "Wiki changes"
4946 msgstr "Wiki变更"
4947 
4948-#. TRANSLATOR: wiki page
4949-#: trac/wiki/web_ui.py:704
4950-msgid " edited"
4951-msgstr "已编辑"
4952+#: trac/wiki/web_ui.py:712
4953+#, python-format
4954+msgid "%(page)s edited"
4955+msgstr "%(page)s 已编辑"
4956 
4957-#: trac/wiki/web_ui.py:704
4958-msgid " created"
4959-msgstr "已创建"
4960+#: trac/wiki/web_ui.py:714
4961+#, python-format
4962+msgid "%(page)s created"
4963+msgstr "%(page)s 已创建"
4964 
4965-#: trac/wiki/templates/wiki_delete.html:26
4966-msgid "Are you sure you want to"
4967-msgstr "您确认"
4968+#: trac/wiki/templates/wiki_delete.html:19
4969+#, python-format
4970+msgid "Delete versions %(from)s to %(to)s of [1:%(name)s]"
4971+msgstr "删除 [1:%(name)s] 从%(from)s 到 %(to)s 的版本。"
4972 
4973-#: trac/wiki/templates/wiki_delete.html:26
4974-msgid "delete"
4975-msgstr "删除"
4976+#: trac/wiki/templates/wiki_delete.html:22
4977+#, python-format
4978+msgid "Delete version %(version)s of [1:%(name)s]"
4979+msgstr "删除 [1:%(name)s] 的版本 %(version)s"
4980 
4981-#: trac/wiki/templates/wiki_delete.html:26
4982-msgid "this page?"
4983-msgstr "此页?"
4984+#: trac/wiki/templates/wiki_delete.html:25
4985+#, python-format
4986+msgid "Delete [1:%(name)s]"
4987+msgstr "删除 [1:%(name)s]"
4988 
4989-#: trac/wiki/templates/wiki_delete.html:28
4990+#: trac/wiki/templates/wiki_delete.html:33
4991+#, python-format
4992+msgid "Are you sure you want to delete versions %(from)s to %(to)s of this page?"
4993+msgstr "你确定删除此页面从 %(from)s 到 %(to)s 的版本吗？"
4994+
4995+#: trac/wiki/templates/wiki_delete.html:36
4996+#, python-format
4997+msgid "Are you sure you want to delete version %(version)s of this page?"
4998+msgstr "你确定删除此页面的版本 %(version)s 吗？"
4999+
5000+#: trac/wiki/templates/wiki_delete.html:39
5001+msgid "Are you sure you want to completely delete this page?"
5002+msgstr "你确定要完全删除此页面吗？"
5003+
5004+#: trac/wiki/templates/wiki_delete.html:42
5005 msgid "This is the only version the page, so the page will be removed completely!"
5006 msgstr "这是此页面的唯一版本, 因此该页面将彻底删除!"
5007 
5008+#: trac/wiki/templates/wiki_delete.html:51
5009+msgid "Delete those versions"
5010+msgstr "删除这些版本"
5011+
5012+#: trac/wiki/templates/wiki_delete.html:51
5013+#: trac/wiki/templates/wiki_view.html:117
5014+msgid "Delete this version"
5015+msgstr "删除此版本"
5016+
5017+#: trac/wiki/templates/wiki_delete.html:51
5018+#: trac/wiki/templates/wiki_view.html:119
5019+msgid "Delete page"
5020+msgstr "删除页面 "
5021+
5022 #: trac/wiki/templates/wiki_diff.html:17
5023 #, python-format
5024 msgid "Delete version %(old_version)d to version %(version)d"
5025@@ -5210,40 +5457,38 @@
5026 msgstr "已有其他人修改了该页面."
5027 
5028 #: trac/wiki/templates/wiki_edit.html:76
5029-msgid "If you save right away, you risk to revert those changes"
5030-msgstr "如果您现在保存, 可能将那些修改覆盖"
5031+msgid ""
5032+"[1:If you save right away, you risk to revert those changes]\n"
5033+"        (highlighted below as deletions)."
5034+msgstr ""
5035+"[1:如果您现在保存, 可能将那些修改覆盖]\n"
5036+"        (下面高亮显示了删除部分)。"
5037 
5038-#: trac/wiki/templates/wiki_edit.html:76
5039-msgid "(highlighted below as deletions)."
5040-msgstr "(删除部分在下面高亮显示)."
5041-
5042 #: trac/wiki/templates/wiki_edit.html:78
5043 msgid ""
5044 "Please review all those changes and manually merge them with your\n"
5045-"        own changes."
5046-msgstr "请检查所有修改, 并手工合并到您的修改中."
5047-
5048-#: trac/wiki/templates/wiki_edit.html:79
5049-msgid "If you're unsure about what you're doing, please press"
5050-msgstr "如果您对所做的不确定, 请按"
5051-
5052-#: trac/wiki/templates/wiki_edit.html:80
5053-msgid ""
5054-"(losing your changes) and start editing the latest version of the page\n"
5055+"        own changes. [1:]\n"
5056+"        If you're unsure about what you're doing, please press [2:Cancel]"
5057+"\n"
5058+"        (losing your changes) and start editing the latest version of the"
5059+" page\n"
5060 "        again."
5061-msgstr "(失去您的修改) 然后重新开始编辑页面的最先版本."
5062+msgstr ""
5063+"请检查所有这些变更，并将其与您自己的变更手动合并\n"
5064+"        [1:]\n"
5065+"        如果你不确定自己在做什么，请按 [2:取消]\n"
5066+"        （丢失您进行的修改） 开始再次编辑页面的最新版本。"
5067 
5068 #: trac/wiki/templates/wiki_edit.html:114
5069-msgid "Change information for future version"
5070-msgstr "未来版本的变更信息"
5071+#, python-format
5072+msgid ""
5073+"Change information for future version %(version)s (modified by "
5074+"%(author)s):"
5075+msgstr "未来版本 %(version)s 的变更信息(由 %(author)s 修改):"
5076 
5077-#: trac/wiki/templates/wiki_edit.html:115
5078-msgid "(modified by"
5079-msgstr "(修改者"
5080-
5081 #: trac/wiki/templates/wiki_edit.html:124
5082 msgid "Go to the editor"
5083-msgstr "转向编辑器"
5084+msgstr "转到编辑器"
5085 
5086 #: trac/wiki/templates/wiki_edit.html:127
5087 #: trac/wiki/templates/wiki_edit_form.html:74
5088@@ -5308,47 +5553,51 @@
5089 msgid "Preview Page"
5090 msgstr "页面预览"
5091 
5092-#: trac/wiki/templates/wiki_rename.html:14
5093-msgid "Rename"
5094-msgstr "重命名"
5095+#: trac/wiki/templates/wiki_page_path.html:6
5096+msgid "View WikiStart"
5097+msgstr "查看 WikiStart"
5098 
5099-#: trac/wiki/templates/wiki_rename.html:18
5100+#: trac/wiki/templates/wiki_page_path.html:6
5101+msgid "wiki:"
5102+msgstr "wiki"
5103+
5104+#: trac/wiki/templates/wiki_page_path.html:8
5105+#, python-format
5106+msgid "View %(path)s"
5107+msgstr "查看 %(path)s"
5108+
5109+#: trac/wiki/templates/wiki_rename.html:15
5110+#, python-format
5111+msgid "Rename [1:%(name)s]"
5112+msgstr "重命名 [1:%(name)s]"
5113+
5114+#: trac/wiki/templates/wiki_rename.html:19
5115 msgid "Renaming the page will rename all existing versions of the page in place."
5116 msgstr "重命名页面将会重命名页面的所有版本。"
5117 
5118-#: trac/wiki/templates/wiki_rename.html:18
5119+#: trac/wiki/templates/wiki_rename.html:19
5120 msgid "The complete history of the page will be moved to the new location."
5121 msgstr "页面的完整历史将被移动到新位置。"
5122 
5123-#: trac/wiki/templates/wiki_rename.html:22
5124-#, python-format
5125+#: trac/wiki/templates/wiki_rename.html:23
5126 msgid "New name:"
5127 msgstr "新名称:"
5128 
5129-#: trac/wiki/templates/wiki_rename.html:26
5130+#: trac/wiki/templates/wiki_rename.html:27
5131 msgid "Leave a redirection page at the old location"
5132 msgstr "在旧位置放置一个重定向页面"
5133 
5134-#: trac/wiki/templates/wiki_rename.html:32
5135-#: trac/wiki/templates/wiki_view.html:109
5136+#: trac/wiki/templates/wiki_rename.html:33
5137+#: trac/wiki/templates/wiki_view.html:108
5138 msgid "Rename page"
5139 msgstr "重命名页面"
5140 
5141-#: trac/wiki/templates/wiki_view.html:25
5142-msgid "View WikiStart"
5143-msgstr "查看 WikiStart"
5144+#: trac/wiki/templates/wiki_view.html:14 trac/wiki/templates/wiki_view.html:84
5145+msgid "Edit this page"
5146+msgstr "编辑此页面"
5147 
5148-#: trac/wiki/templates/wiki_view.html:25
5149-msgid "wiki:"
5150-msgstr "wiki"
5151-
5152-#: trac/wiki/templates/wiki_view.html:26
5153+#: trac/wiki/templates/wiki_view.html:34
5154 #, python-format
5155-msgid "View %(path)s"
5156-msgstr "查看 %(path)s"
5157-
5158-#: trac/wiki/templates/wiki_view.html:38
5159-#, python-format
5160 msgid ""
5161 "Version %(version)s (modified by %(author)s, %(date)s ago)\n"
5162 "               ([1:diff])"
5163@@ -5357,52 +5606,43 @@
5164 "\"\n"
5165 "\"               ([1:diff])"
5166 
5167-#: trac/wiki/templates/wiki_view.html:51
5168+#: trac/wiki/templates/wiki_view.html:47
5169 #, python-format
5170-msgid ""
5171-"[1:\n"
5172-"              Last modified] %(reldate)s ago"
5173-msgstr ""
5174-"[1:\n"
5175-"              最后修改于] %(reldate)s 前"
5176+msgid "Version %(version)s by %(author)s: %(comment)s"
5177+msgstr "由 %(author)s 编辑的 %(version)s: %(comment)s"
5178 
5179-#: trac/wiki/templates/wiki_view.html:60
5180-msgid "The page"
5181-msgstr "此页面"
5182+#: trac/wiki/templates/wiki_view.html:47
5183+#, python-format
5184+msgid "Version %(version)s by %(author)s"
5185+msgstr "版本 %(version)s 来自 %(author)s"
5186 
5187-#: trac/wiki/templates/wiki_view.html:60
5188-msgid "does not exist. You can create it here."
5189-msgstr "不存在。你可以在此创建它。"
5190+#: trac/wiki/templates/wiki_view.html:54
5191+#, python-format
5192+msgid "[1:Last modified] %(reldate)s ago"
5193+msgstr "[1:最后修改于] %(reldate)s 前"
5194 
5195-#: trac/wiki/templates/wiki_view.html:62
5196+#: trac/wiki/templates/wiki_view.html:61
5197+#, python-format
5198+msgid "The page %(name)s does not exist. You can create it here."
5199+msgstr "页面 %(name)s 不存在。你可以在此创建它。"
5200+
5201+#: trac/wiki/templates/wiki_view.html:63
5202 msgid "You could also create the same page higher in the hierarchy:"
5203 msgstr "此外，您也可以创建目录层次更高的页面:"
5204 
5205-#: trac/wiki/templates/wiki_view.html:85
5206-msgid "Edit this page"
5207-msgstr "编辑此页面"
5208-
5209-#: trac/wiki/templates/wiki_view.html:88
5210+#: trac/wiki/templates/wiki_view.html:87
5211 msgid "Create this page"
5212 msgstr "创建此页面"
5213 
5214-#: trac/wiki/templates/wiki_view.html:90
5215+#: trac/wiki/templates/wiki_view.html:89
5216 msgid "Using the template:"
5217 msgstr "使用模板:"
5218 
5219-#: trac/wiki/templates/wiki_view.html:93
5220+#: trac/wiki/templates/wiki_view.html:92
5221 msgid "(blank page)"
5222 msgstr "(空白页面)"
5223 
5224-#: trac/wiki/templates/wiki_view.html:118
5225-msgid "Delete this version"
5226-msgstr "删除此版本"
5227-
5228-#: trac/wiki/templates/wiki_view.html:120
5229-msgid "Delete page"
5230-msgstr "删除页面 "
5231-
5232-#: trac/wiki/templates/wiki_view.html:129
5233+#: trac/wiki/templates/wiki_view.html:128
5234 msgid "The following pages have a name similar to this page, and may be related:"
5235 msgstr "以下页面与此页面名称相似，可能会有关联："
5236