Edgewall Software

Ticket #5472: zh_CN-lang-r8177.patch

File zh_CN-lang-r8177.patch, 127.8 KB (added by zengjie@…, 3 years ago)

Updated zh_CN translations for r8177

Line 
1Index: messages.po
2===================================================================
3--- messages.po (°æ±¾ 8177)
4+++ messages.po (¹¤×÷¸±±¾)
5@@ -9,122 +9,162 @@
6 "Project-Id-Version: Trac 0.12\n"
7 "Report-Msgid-Bugs-To: trac-dev@googlegroups.com\n"
8 "POT-Creation-Date: 2007-06-23 15:38+0200\n"
9-"PO-Revision-Date: 2008-06-28 21:56+0200\n"
10+"PO-Revision-Date: 2009-05-06 17:54+0800\n"
11 "Last-Translator: Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>\n"
12 "Language-Team: zh_CN <trac-dev@googlegroups.com>\n"
13 "Plural-Forms: nplurals=1; plural=0\n"
14 "MIME-Version: 1.0\n"
15 "Content-Type: text/plain; charset=utf-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
17-"Generated-By: Babel 1.0dev-r404\n"
18+"Generated-By: Babel 0.9.2\n"
19 
20-#: trac/about.py:43 trac/templates/about.html:9 trac/templates/about.html:26
21+#: trac/about.py:43 trac/templates/about.html:9 trac/templates/about.html:28
22 msgid "About Trac"
23 msgstr "关于Trac"
24 
25-#: trac/attachment.py:144
26+#: trac/attachment.py:149
27 #, python-format
28 msgid "Attachment '%(title)s' does not exist."
29 msgstr "附件 '%(title)s' 不存在."
30 
31-#: trac/attachment.py:145
32+#: trac/attachment.py:150
33 msgid "Invalid Attachment"
34 msgstr "无效附件"
35 
36-#: trac/attachment.py:187
37+#: trac/attachment.py:192
38 msgid "Could not delete attachment"
39 msgstr "不能删除附件"
40 
41-#: trac/attachment.py:291
42+#: trac/attachment.py:298
43 #, python-format
44 msgid "Attachment '%(filename)s' not found"
45 msgstr "没有找到文件名为 '%(filename)s' 的附件"
46 
47-#: trac/attachment.py:365
48+#: trac/attachment.py:372
49 msgid "Bad request"
50 msgstr "错误请求"
51 
52-#: trac/attachment.py:382
53+#: trac/attachment.py:389
54 #, python-format
55 msgid "Back to %(parent)s"
56 msgstr "返回 %(parent)s"
57 
58-#: trac/attachment.py:474
59+#: trac/attachment.py:481
60 msgid " attached to "
61 msgstr "附加 "
62 
63-#: trac/attachment.py:513
64+#: trac/attachment.py:542
65 #, python-format
66 msgid "Attachment '%(id)s' in %(parent)s"
67-msgstr "附件 '%(id)s' 在 %(parent)s 中"
68+msgstr "在 %(parent)s 中的附件 '%(id)s'"
69 
70-#: trac/attachment.py:516
71+#: trac/attachment.py:545
72 #, python-format
73 msgid "Attachments of %(parent)s"
74 msgstr "在 %(parent)s 中的附件"
75 
76-#: trac/attachment.py:529 trac/attachment.py:552 trac/admin/web_ui.py:403
77-#: trac/admin/web_ui.py:406 trac/admin/web_ui.py:410
78+#: trac/attachment.py:558 trac/attachment.py:581 trac/admin/web_ui.py:406
79+#: trac/admin/web_ui.py:409 trac/admin/web_ui.py:413
80 msgid "No file uploaded"
81-msgstr "没有上传文件"
82+msgstr "没有上传的文件"
83 
84-#: trac/attachment.py:537
85+#: trac/attachment.py:566
86 msgid "Can't upload empty file"
87 msgstr "不能上传空文件"
88 
89-#: trac/attachment.py:542
90+#: trac/attachment.py:571
91 #, python-format
92 msgid "Maximum attachment size: %(num)s bytes"
93 msgstr "附件的最大尺寸为: %(num)s 字节"
94 
95-#: trac/attachment.py:543
96+#: trac/attachment.py:572
97 msgid "Upload failed"
98 msgstr "上传失败"
99 
100-#: trac/attachment.py:564
101+#: trac/attachment.py:593
102 #, python-format
103 msgid "Attachment field %(field)s is invalid: %(message)s"
104 msgstr "附件字段 %(field)s 无效: %(message)s"
105 
106-#: trac/attachment.py:568
107+#: trac/attachment.py:597
108 #, python-format
109 msgid "Invalid attachment: %(message)s"
110 msgstr "无效附件: %(message)s"
111 
112-#: trac/attachment.py:602
113+#: trac/attachment.py:634
114 #, python-format
115 msgid "%(attachment)s (delete)"
116 msgstr "%(attachment)s (删除)"
117 
118-#: trac/attachment.py:664 trac/versioncontrol/web_ui/browser.py:511
119-#: trac/wiki/web_ui.py:66
120+#: trac/attachment.py:696 trac/versioncontrol/web_ui/browser.py:510
121+#: trac/wiki/web_ui.py:70
122 msgid "Plain Text"
123 msgstr "纯文本"
124 
125-#: trac/attachment.py:670 trac/versioncontrol/web_ui/browser.py:516
126+#: trac/attachment.py:702 trac/versioncontrol/web_ui/browser.py:515
127 msgid "Original Format"
128 msgstr "原始格式"
129 
130-#: trac/env.py:404
131-msgid "Can only backup sqlite databases"
132-msgstr "只能备份sqlite数据库"
133+#: trac/attachment.py:744 trac/attachment.py:750 trac/templates/macros.html:164
134+#: trac/templates/macros.html:165 trac/ticket/templates/ticket.html:58
135+#: trac/ticket/templates/ticket.html:59
136+msgid "Download"
137+msgstr "下载"
138 
139-#: trac/env.py:489
140+#: trac/attachment.py:844
141+#, python-format
142+msgid "Invalid resource identifier '%(id)s'"
143+msgstr "资源标示符'%(id)s'无效"
144+
145+#: trac/attachment.py:880 trac/admin/templates/admin_components.html:80
146+#: trac/admin/templates/admin_enums.html:47
147+#: trac/admin/templates/admin_milestones.html:103
148+#: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:68
149+#: trac/templates/error.html:166 trac/ticket/admin.py:181
150+#: trac/ticket/admin.py:366 trac/ticket/admin.py:519
151+msgid "Name"
152+msgstr "名称"
153+
154+#: trac/attachment.py:880
155+msgid "Size"
156+msgstr "大小"
157+
158+#: trac/attachment.py:880 trac/templates/history_view.html:28
159+#: trac/versioncontrol/templates/revisionlog.html:96
160+msgid "Author"
161+msgstr "作者"
162+
163+#: trac/attachment.py:880 trac/templates/history_view.html:27
164+#: trac/versioncontrol/templates/revisionlog.html:95
165+msgid "Date"
166+msgstr "日期"
167+
168+#: trac/attachment.py:881 trac/templates/attachment.html:86
169+#: trac/ticket/api.py:214 trac/ticket/templates/ticket.html:173
170+msgid "Description"
171+msgstr "描述"
172+
173+#: trac/attachment.py:906 trac/wiki/admin.py:74
174+#, python-format
175+msgid "File '%(name)s' exists"
176+msgstr "文件 '%(name)s' 已经存在."
177+
178+#: trac/env.py:506
179 msgid "Database newer than Trac version"
180 msgstr "数据库的版本比Trac使用的版本新"
181 
182-#: trac/env.py:501
183+#: trac/env.py:518
184 #, python-format
185 msgid "No upgrade module for version %(num)i (%(version)s.py)"
186-msgstr "没有版本为 %(num)i 的升级模块 (%(version)s.py)"
187+msgstr "版本%(num)i 没有升级模块 (%(version)s.py)"
188 
189-#: trac/env.py:546
190+#: trac/env.py:563
191 msgid ""
192 "Missing environment variable \"TRAC_ENV\". Trac requires this variable to"
193 " point to a valid Trac environment."
194 msgstr "没有环境变量\"TRAC_ENV\". Trac要求使用该变量以指向一个有效的Trac环境."
195 
196-#: trac/env.py:578
197+#: trac/env.py:595
198 #, python-format
199 msgid ""
200 "The Trac Environment needs to be upgraded.\n"
201@@ -133,54 +173,121 @@
202 msgstr ""
203 "Trac环境需要升级.\n"
204 "\n"
205-"执行\"trac-admin %(path)s upgrade\""
206+"请执行\"trac-admin %(path)s upgrade\""
207 
208-#: trac/notification.py:216
209+#: trac/env.py:629
210+msgid "Copying resources from:"
211+msgstr "Copying resources from:"
212+
213+#: trac/env.py:645
214+msgid "Creating scripts."
215+msgstr "Creating scripts."
216+
217+#: trac/env.py:662
218 #, python-format
219+msgid "hotcopy can't overwrite existing '%(dest)s'"
220+msgstr "热备无法覆盖已存在的 '%(dest)s'"
221+
222+#: trac/env.py:672
223+#, python-format
224+msgid "Hotcopying %(src)s to %(dst)s ..."
225+msgstr "Hotcopying %(src)s to %(dst)s ..."
226+
227+#: trac/env.py:687
228+msgid "The following errors happened while copying the environment:"
229+msgstr "The following errors happened while copying the environment:"
230+
231+#: trac/env.py:698
232+msgid "Hotcopy done."
233+msgstr "热备结束。"
234+
235+#: trac/env.py:703 trac/admin/api.py:126
236+msgid "Invalid arguments"
237+msgstr "无效参数"
238+
239+#: trac/env.py:706
240+msgid "Database is up to date, no upgrade necessary."
241+msgstr "Database is up to date, no upgrade necessary."
242+
243+#: trac/env.py:714
244+#, python-format
245+msgid ""
246+"Backup failed with '%(msg)s'.\n"
247+"Use '--no-backup' to upgrade without doing a backup."
248+msgstr ""
249+"Backup failed with '%(msg)s'.\n"
250+"Use '--no-backup' to upgrade without doing a backup."
251+
252+#: trac/env.py:719
253+msgid "Upgrade done."
254+msgstr "Upgrade done."
255+
256+#: trac/notification.py:155
257+msgid "TLS enabled but server does not support TLS"
258+msgstr "启用了TLS, 但是服务器并不支持TLS"
259+
260+#: trac/notification.py:309
261+#, python-format
262 msgid "Invalid email encoding setting: %s"
263 msgstr "无效的email编码设置: %s"
264 
265-#: trac/notification.py:248
266+#: trac/notification.py:335
267 msgid "Header length is too short"
268 msgstr "Header长度过短"
269 
270-#: trac/notification.py:318
271-msgid "TLS enabled but server does not support TLS"
272-msgstr "启用了TLS, 但是服务器并不支持TLS"
273-
274-#: trac/notification.py:390
275+#: trac/notification.py:464
276 msgid "Ticket contains non-ASCII chars. Please change encoding setting"
277-msgstr "传票包含非ASCII字符. 请修改编码设置"
278+msgstr "任务单包含非ASCII字符. 请修改编码设置"
279 
280-#: trac/perm.py:47
281+#: trac/perm.py:49
282 #, python-format
283 msgid "%(perm)s privileges are required to perform this operation on %(resource)s"
284 msgstr "对 %(resource)s 执行的操作需要 %(perm)s 权限"
285 
286-#: trac/perm.py:49
287+#: trac/perm.py:51
288 #, python-format
289 msgid "%(perm)s privileges are required to perform this operation"
290 msgstr "执行该操作需要 %(perm)s 权限"
291 
292-#: trac/perm.py:52
293+#: trac/perm.py:54
294 msgid "Insufficient privileges to perform this operation."
295 msgstr "没有足够的权限执行该操作."
296 
297-#: trac/perm.py:318
298+#: trac/perm.py:320
299 #, python-format
300 msgid "%(name)s is not a valid action."
301 msgstr "%(name)s 是无效动作."
302 
303+#: trac/perm.py:616
304+msgid "User"
305+msgstr "用户"
306+
307+#: trac/perm.py:616 trac/admin/templates/admin_perms.html:69
308+#: trac/ticket/templates/ticket.html:379
309+msgid "Action"
310+msgstr "动作"
311+
312+#: trac/perm.py:618
313+msgid "Available actions:"
314+msgstr "可选动作: "
315+
316+#: trac/perm.py:631
317+msgid "Group names must be in lower case and actions in upper case"
318+msgstr "组名必须小写，而动作名必须大写"
319+
320 #: trac/resource.py:329
321 #, python-format
322 msgid " at version %(version)s"
323 msgstr "于版本 %(version)s"
324 
325-#: trac/admin/console.py:1143
326-#, python-format
327-msgid "hotcopy can't overwrite existing '%(dest)s'"
328-msgstr "热备无法覆写己有的 '%(dest)s'"
329+#: trac/admin/api.py:130
330+msgid "Command not found"
331+msgstr "命令无法找到"
332 
333+#: trac/admin/console.py:81 trac/ticket/templates/report_edit.html:34
334+msgid "Error:"
335+msgstr "错误:"
336+
337 #: trac/admin/web_ui.py:66
338 msgid "Admin"
339 msgstr "管理"
340@@ -193,104 +300,104 @@
341 msgid "No administration panels available"
342 msgstr "没有可用的管理面板"
343 
344-#: trac/admin/web_ui.py:105
345+#: trac/admin/web_ui.py:105 trac/admin/web_ui.py:109
346 msgid "Unknown administration panel"
347 msgstr "未知管理面板"
348 
349-#: trac/admin/web_ui.py:180 trac/admin/web_ui.py:207 trac/admin/web_ui.py:296
350-#: trac/admin/web_ui.py:379 trac/prefs/web_ui.py:89
351+#: trac/admin/web_ui.py:184 trac/admin/web_ui.py:211 trac/admin/web_ui.py:299
352+#: trac/admin/web_ui.py:382 trac/prefs/web_ui.py:88
353 #: trac/prefs/templates/prefs_general.html:9
354 msgid "General"
355 msgstr "一般"
356 
357-#: trac/admin/web_ui.py:180 trac/admin/templates/admin_basics.html:13
358+#: trac/admin/web_ui.py:184 trac/admin/templates/admin_basics.html:13
359 msgid "Basic Settings"
360 msgstr "基础设置"
361 
362-#: trac/admin/web_ui.py:207 trac/admin/templates/admin_logging.html:9
363-#: trac/admin/templates/admin_logging.html:21
364+#: trac/admin/web_ui.py:211 trac/admin/templates/admin_logging.html:10
365+#: trac/admin/templates/admin_logging.html:22
366 msgid "Logging"
367 msgstr "日志"
368 
369-#: trac/admin/web_ui.py:216 trac/ticket/templates/milestone_delete.html:29
370+#: trac/admin/web_ui.py:220 trac/ticket/templates/milestone_delete.html:31
371 #: trac/ticket/templates/milestone_edit.html:73
372 msgid "None"
373 msgstr "无"
374 
375-#: trac/admin/web_ui.py:217
376+#: trac/admin/web_ui.py:221
377 msgid "Console"
378 msgstr "控制台"
379 
380-#: trac/admin/web_ui.py:219 trac/templates/attachment.html:20
381-#: trac/templates/attachment.html:81 trac/versioncontrol/api.py:105
382+#: trac/admin/web_ui.py:223 trac/templates/attachment.html:28
383+#: trac/templates/attachment.html:89 trac/versioncontrol/api.py:114
384 msgid "File"
385 msgstr "文件"
386 
387-#: trac/admin/web_ui.py:221
388+#: trac/admin/web_ui.py:225
389 msgid "Syslog"
390 msgstr "Syslog"
391 
392-#: trac/admin/web_ui.py:223
393+#: trac/admin/web_ui.py:227
394 msgid "Windows event log"
395 msgstr "Windows事件日志"
396 
397-#: trac/admin/web_ui.py:237
398+#: trac/admin/web_ui.py:240
399 #, python-format
400 msgid "Unknown log type %(type)s"
401 msgstr "未知日志类型 %(type)s"
402 
403-#: trac/admin/web_ui.py:238
404+#: trac/admin/web_ui.py:241
405 msgid "Invalid log type"
406 msgstr "无效日志类型"
407 
408-#: trac/admin/web_ui.py:249
409+#: trac/admin/web_ui.py:255
410 #, python-format
411 msgid "Unknown log level %(level)s"
412 msgstr "未知日志级别 %(level)s"
413 
414-#: trac/admin/web_ui.py:250
415+#: trac/admin/web_ui.py:256
416 msgid "Invalid log level"
417 msgstr "无效日志级别"
418 
419-#: trac/admin/web_ui.py:266
420+#: trac/admin/web_ui.py:269
421 msgid "You must specify a log file"
422 msgstr "必须指定一个日志文件"
423 
424-#: trac/admin/web_ui.py:267
425+#: trac/admin/web_ui.py:270
426 msgid "Missing field"
427 msgstr "缺少字段"
428 
429-#: trac/admin/web_ui.py:296 trac/admin/templates/admin_perms.html:9
430+#: trac/admin/web_ui.py:299 trac/admin/templates/admin_perms.html:9
431 msgid "Permissions"
432 msgstr "权限"
433 
434-#: trac/admin/web_ui.py:310
435+#: trac/admin/web_ui.py:313
436 msgid "All upper-cased tokens are reserved for permission names"
437 msgstr "全部大写的标记已保留为权限名称"
438 
439-#: trac/admin/web_ui.py:317
440+#: trac/admin/web_ui.py:320
441 msgid "Unknown action"
442 msgstr "未知动作"
443 
444-#: trac/admin/web_ui.py:324
445+#: trac/admin/web_ui.py:327
446 #, python-format
447 msgid "Permission \"%(action)s\" was already granted to \"%(subject)s\""
448 msgstr "权限 \"%(action)s\" 已分配给 \"%(subject)s\""
449 
450-#: trac/admin/web_ui.py:343
451+#: trac/admin/web_ui.py:346
452 #, python-format
453 msgid "\"%(subject)s\" was already added to group \"%(group)s\""
454 msgstr "\"%(subject)s\" 已增加给用户组 \"%(group)s\""
455 
456-#: trac/admin/web_ui.py:379 trac/admin/templates/admin_plugins.html:9
457+#: trac/admin/web_ui.py:382 trac/admin/templates/admin_plugins.html:9
458 msgid "Plugins"
459 msgstr "插件s"
460 
461-#: trac/admin/web_ui.py:413
462+#: trac/admin/web_ui.py:416
463 msgid "Uploaded file is not a Python source file or egg"
464 msgstr "上传的文件不是Python源文件或者egg包"
465 
466-#: trac/admin/web_ui.py:418
467+#: trac/admin/web_ui.py:421
468 #, python-format
469 msgid "Plugin %(name)s already installed"
470 msgstr "插件 %(name)s 已安装"
471@@ -312,8 +419,8 @@
472 #: trac/admin/templates/admin_components.html:66
473 #: trac/admin/templates/admin_enums.html:20
474 #: trac/admin/templates/admin_enums.html:34
475-#: trac/admin/templates/admin_milestones.html:21
476-#: trac/admin/templates/admin_milestones.html:77
477+#: trac/admin/templates/admin_milestones.html:22
478+#: trac/admin/templates/admin_milestones.html:79
479 #: trac/admin/templates/admin_versions.html:21
480 #: trac/admin/templates/admin_versions.html:56
481 msgid "Name:"
482@@ -324,16 +431,16 @@
483 msgstr "URL:"
484 
485 #: trac/admin/templates/admin_basics.html:29
486-#: trac/ticket/templates/ticket.html:291
487+#: trac/ticket/templates/ticket.html:302
488 msgid "Description:"
489 msgstr "描述:"
490 
491 #: trac/admin/templates/admin_basics.html:36
492 #: trac/admin/templates/admin_components.html:99
493 #: trac/admin/templates/admin_enums.html:69
494-#: trac/admin/templates/admin_logging.html:53
495-#: trac/admin/templates/admin_milestones.html:124
496-#: trac/admin/templates/admin_plugins.html:102
497+#: trac/admin/templates/admin_logging.html:54
498+#: trac/admin/templates/admin_milestones.html:128
499+#: trac/admin/templates/admin_plugins.html:103
500 #: trac/admin/templates/admin_versions.html:94
501 msgid "Apply changes"
502 msgstr "应用修改"
503@@ -366,22 +473,21 @@
504 
505 #: trac/admin/templates/admin_components.html:55
506 #: trac/admin/templates/admin_enums.html:23
507-#: trac/admin/templates/admin_milestones.html:65
508+#: trac/admin/templates/admin_milestones.html:67
509 #: trac/admin/templates/admin_versions.html:45
510-#: trac/templates/attachment.html:49 trac/templates/attachment.html:62
511-#: trac/ticket/templates/milestone_delete.html:33
512-#: trac/ticket/templates/milestone_edit.html:91
513-#: trac/ticket/templates/report_delete.html:20
514+#: trac/templates/attachment.html:57 trac/templates/attachment.html:70
515+#: trac/ticket/templates/milestone_delete.html:40
516+#: trac/ticket/templates/milestone_edit.html:94
517+#: trac/ticket/templates/report_delete.html:21
518 #: trac/ticket/templates/report_edit.html:42
519 #: trac/wiki/templates/wiki_delete.html:36
520-#: trac/wiki/templates/wiki_edit.html:35 trac/wiki/templates/wiki_edit.html:45
521-#: trac/wiki/templates/wiki_edit.html:133
522+#: trac/wiki/templates/wiki_edit.html:35 trac/wiki/templates/wiki_edit.html:126
523 msgid "Cancel"
524 msgstr "取消"
525 
526 #: trac/admin/templates/admin_components.html:56
527 #: trac/admin/templates/admin_enums.html:24
528-#: trac/admin/templates/admin_milestones.html:66
529+#: trac/admin/templates/admin_milestones.html:68
530 #: trac/admin/templates/admin_versions.html:46
531 msgid "Save"
532 msgstr "保存"
533@@ -393,43 +499,35 @@
534 #: trac/admin/templates/admin_components.html:70
535 #: trac/admin/templates/admin_enums.html:32
536 #: trac/admin/templates/admin_enums.html:37
537-#: trac/admin/templates/admin_milestones.html:90
538-#: trac/admin/templates/admin_perms.html:44
539-#: trac/admin/templates/admin_perms.html:66
540+#: trac/admin/templates/admin_milestones.html:92
541+#: trac/admin/templates/admin_perms.html:38
542+#: trac/admin/templates/admin_perms.html:60
543 #: trac/admin/templates/admin_versions.html:67
544 msgid "Add"
545 msgstr "增加"
546 
547-#: trac/admin/templates/admin_components.html:80
548-#: trac/admin/templates/admin_enums.html:47
549-#: trac/admin/templates/admin_milestones.html:100
550-#: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:66
551-#: trac/templates/error.html:162
552-msgid "Name"
553-msgstr "名称"
554-
555-#: trac/admin/templates/admin_components.html:80
556+#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:181
557 msgid "Owner"
558 msgstr "属主"
559 
560 #: trac/admin/templates/admin_components.html:80
561 #: trac/admin/templates/admin_enums.html:47
562-#: trac/admin/templates/admin_milestones.html:100
563+#: trac/admin/templates/admin_milestones.html:103
564 #: trac/admin/templates/admin_versions.html:77
565 msgid "Default"
566 msgstr "默认"
567 
568 #: trac/admin/templates/admin_components.html:98
569 #: trac/admin/templates/admin_enums.html:68
570-#: trac/admin/templates/admin_milestones.html:123
571-#: trac/admin/templates/admin_perms.html:93
572+#: trac/admin/templates/admin_milestones.html:127
573+#: trac/admin/templates/admin_perms.html:87
574 #: trac/admin/templates/admin_versions.html:93
575 msgid "Remove selected items"
576 msgstr "删选择项"
577 
578 #: trac/admin/templates/admin_components.html:101
579 #: trac/admin/templates/admin_enums.html:71
580-#: trac/admin/templates/admin_milestones.html:126
581+#: trac/admin/templates/admin_milestones.html:130
582 #: trac/admin/templates/admin_versions.html:96
583 msgid ""
584 "You can remove all items from this list to completely hide this\n"
585@@ -440,7 +538,7 @@
586 
587 #: trac/admin/templates/admin_components.html:107
588 #: trac/admin/templates/admin_enums.html:77
589-#: trac/admin/templates/admin_milestones.html:132
590+#: trac/admin/templates/admin_milestones.html:136
591 #: trac/admin/templates/admin_versions.html:102
592 msgid ""
593 "As long as you don't add any items to the list, this field\n"
594@@ -461,35 +559,30 @@
595 msgid "Order"
596 msgstr "排序"
597 
598-#: trac/admin/templates/admin_logging.html:25 trac/templates/about.html:61
599+#: trac/admin/templates/admin_logging.html:26 trac/templates/about.html:63
600 msgid "Configuration"
601 msgstr "配置"
602 
603-#: trac/admin/templates/admin_logging.html:27
604+#: trac/admin/templates/admin_logging.html:28
605 msgid "Type:"
606 msgstr "类型:"
607 
608-#: trac/admin/templates/admin_logging.html:36
609+#: trac/admin/templates/admin_logging.html:37
610 msgid "Log level:"
611 msgstr "日志级别:"
612 
613-#: trac/admin/templates/admin_logging.html:44
614+#: trac/admin/templates/admin_logging.html:45
615 msgid "Log file:"
616 msgstr "日志文件"
617 
618-#: trac/admin/templates/admin_logging.html:47
619-msgid "If you specify a relative path, the log file will be stored inside the"
620-msgstr "如果指定相对路径,日志文件将被存储在"
621+#: trac/admin/templates/admin_logging.html:48
622+#, python-format
623+msgid ""
624+"If you specify a relative path, the log file will be stored inside the\n"
625+"            [1:log] directory of the project environment ([2:%(dir)s])."
626+msgstr "如果指定了相对路径，日志文件将被存储在项目环境([2:%(dir)s])的 [1:log]目录。"
627 
628-#: trac/admin/templates/admin_logging.html:49
629-msgid "log"
630-msgstr "日志"
631-
632-#: trac/admin/templates/admin_logging.html:49
633-msgid "directory of the project environment ("
634-msgstr "项目环境目录 ("
635-
636-#: trac/admin/templates/admin_milestones.html:10 trac/ticket/roadmap.py:503
637+#: trac/admin/templates/admin_milestones.html:10 trac/ticket/roadmap.py:828
638 msgid "Milestones"
639 msgstr "里程碑"
640 
641@@ -497,19 +590,19 @@
642 msgid "Manage Milestones"
643 msgstr "管理里程碑"
644 
645-#: trac/admin/templates/admin_milestones.html:19
646+#: trac/admin/templates/admin_milestones.html:20
647 msgid "Modify Milestone:"
648-msgstr "修订里程碑:"
649+msgstr "修改里程碑:"
650 
651-#: trac/admin/templates/admin_milestones.html:24
652-#: trac/admin/templates/admin_milestones.html:82
653+#: trac/admin/templates/admin_milestones.html:25
654+#: trac/admin/templates/admin_milestones.html:84
655 #: trac/ticket/templates/milestone_edit.html:51
656 msgid "Due:"
657-msgstr "预期:"
658+msgstr "逾期日:"
659 
660-#: trac/admin/templates/admin_milestones.html:27
661-#: trac/admin/templates/admin_milestones.html:41
662-#: trac/admin/templates/admin_milestones.html:86
663+#: trac/admin/templates/admin_milestones.html:29
664+#: trac/admin/templates/admin_milestones.html:43
665+#: trac/admin/templates/admin_milestones.html:88
666 #: trac/admin/templates/admin_versions.html:30
667 #: trac/admin/templates/admin_versions.html:63
668 #: trac/ticket/templates/milestone_edit.html:54
669@@ -517,74 +610,53 @@
670 msgid "Format:"
671 msgstr "格式:"
672 
673-#: trac/admin/templates/admin_milestones.html:33
674+#: trac/admin/templates/admin_milestones.html:35
675 #: trac/ticket/templates/milestone_edit.html:59
676 msgid "Completed:"
677-msgstr "完成:"
678+msgstr "完成日:"
679 
680-#: trac/admin/templates/admin_milestones.html:55
681+#: trac/admin/templates/admin_milestones.html:57
682 #: trac/admin/templates/admin_versions.html:35
683-#: trac/ticket/templates/milestone_edit.html:82
684+#: trac/ticket/templates/milestone_edit.html:85
685 msgid "Description (you may use [1:WikiFormatting] here):"
686 msgstr "描述 (此处可用 [1:WikiFormatting] 格式):"
687 
688-#: trac/admin/templates/admin_milestones.html:75
689+#: trac/admin/templates/admin_milestones.html:77
690 msgid "Add Milestone:"
691 msgstr "增加里程碑:"
692 
693-#: trac/admin/templates/admin_milestones.html:100
694+#: trac/admin/templates/admin_milestones.html:103 trac/ticket/admin.py:366
695 msgid "Due"
696 msgstr "预期"
697 
698-#: trac/admin/templates/admin_milestones.html:100
699-#: trac/ticket/templates/milestone_view.html:25
700-#: trac/ticket/templates/roadmap.html:38
701+#: trac/admin/templates/admin_milestones.html:103 trac/ticket/admin.py:366
702+#: trac/ticket/templates/milestone_view.html:26
703+#: trac/ticket/templates/roadmap.html:37
704 msgid "Completed"
705 msgstr "完成"
706 
707+#: trac/admin/templates/admin_milestones.html:103
708+msgid "Tickets"
709+msgstr "任务单"
710+
711 #: trac/admin/templates/admin_perms.html:13
712 msgid "Manage Permissions"
713 msgstr "管理权限"
714 
715-#: trac/admin/templates/admin_perms.html:15
716-msgid "Note that"
717-msgstr "注意"
718-
719-#: trac/admin/templates/admin_perms.html:16
720-#: trac/admin/templates/admin_perms.html:75
721-msgid "Subject"
722-msgstr "对象"
723-
724-#: trac/admin/templates/admin_perms.html:16 trac/ticket/templates/query.html:60
725-msgid "or"
726-msgstr "或"
727-
728-#: trac/admin/templates/admin_perms.html:16
729-msgid "Group"
730-msgstr "组"
731-
732-#: trac/admin/templates/admin_perms.html:16
733-msgid "names can't be all upper cased,"
734-msgstr "不能使用全部大写字母的名称,"
735-
736-#: trac/admin/templates/admin_perms.html:16
737-msgid "as this is reserved for permission names."
738-msgstr "保留为权限名."
739-
740-#: trac/admin/templates/admin_perms.html:24
741+#: trac/admin/templates/admin_perms.html:18
742 msgid "Grant Permission:"
743 msgstr "授予权限:"
744 
745-#: trac/admin/templates/admin_perms.html:27
746-#: trac/admin/templates/admin_perms.html:54
747+#: trac/admin/templates/admin_perms.html:21
748+#: trac/admin/templates/admin_perms.html:48
749 msgid "Subject:"
750 msgstr "对象:"
751 
752-#: trac/admin/templates/admin_perms.html:31
753+#: trac/admin/templates/admin_perms.html:25
754 msgid "Action:"
755 msgstr "动作:"
756 
757-#: trac/admin/templates/admin_perms.html:39
758+#: trac/admin/templates/admin_perms.html:33
759 msgid ""
760 "Grant permission for an action to a subject, which can be either a user\n"
761 "          or a group."
762@@ -592,23 +664,41 @@
763 "为对象设置动作权限，可以授予给用户\n"
764 "          或组."
765 
766-#: trac/admin/templates/admin_perms.html:51
767+#: trac/admin/templates/admin_perms.html:45
768 msgid "Add Subject to Group:"
769 msgstr "增加一个对象到组中:"
770 
771-#: trac/admin/templates/admin_perms.html:58
772+#: trac/admin/templates/admin_perms.html:52
773 msgid "Group:"
774 msgstr "组:"
775 
776-#: trac/admin/templates/admin_perms.html:62
777+#: trac/admin/templates/admin_perms.html:56
778 msgid "Add a user or group to an existing permission group."
779 msgstr "在当前的权限组中增加一个用户或组."
780 
781-#: trac/admin/templates/admin_perms.html:75
782-#: trac/ticket/templates/ticket.html:365
783-msgid "Action"
784-msgstr "动作"
785+#: trac/admin/templates/admin_perms.html:69
786+#: trac/admin/templates/admin_perms.html:92
787+msgid "Subject"
788+msgstr "对象"
789 
790+#: trac/admin/templates/admin_perms.html:91
791+msgid "Note that"
792+msgstr "注意"
793+
794+#: trac/admin/templates/admin_perms.html:92 trac/ticket/templates/query.html:62
795+msgid "or"
796+msgstr "或"
797+
798+#: trac/admin/templates/admin_perms.html:92
799+msgid "Group"
800+msgstr "组"
801+
802+#: trac/admin/templates/admin_perms.html:92
803+msgid ""
804+"names can't be all upper-case,\n"
805+"      as that is reserved for permission names."
806+msgstr "名不能全部大写，因为这是权限名称的保留格式。"
807+
808 #: trac/admin/templates/admin_plugins.html:17
809 msgid "Manage Plugins"
810 msgstr "管理插件"
811@@ -637,28 +727,24 @@
812 msgid "Install"
813 msgstr "安装"
814 
815-#: trac/admin/templates/admin_plugins.html:49
816-msgid "Uninstall"
817-msgstr "卸载"
818-
819-#: trac/admin/templates/admin_plugins.html:59 trac/templates/diff_view.html:43
820+#: trac/admin/templates/admin_plugins.html:60 trac/templates/diff_view.html:43
821 #: trac/versioncontrol/templates/changeset.html:97
822 msgid "Author:"
823 msgstr "作者:"
824 
825-#: trac/admin/templates/admin_plugins.html:68
826+#: trac/admin/templates/admin_plugins.html:69
827 msgid "Home page:"
828 msgstr "首页:"
829 
830-#: trac/admin/templates/admin_plugins.html:75
831+#: trac/admin/templates/admin_plugins.html:76
832 msgid "License:"
833 msgstr "授权:"
834 
835-#: trac/admin/templates/admin_plugins.html:82
836+#: trac/admin/templates/admin_plugins.html:83
837 msgid "Component"
838 msgstr "组件"
839 
840-#: trac/admin/templates/admin_plugins.html:82
841+#: trac/admin/templates/admin_plugins.html:83
842 msgid "Enabled"
843 msgstr "启用"
844 
845@@ -690,16 +776,16 @@
846 msgid "Released"
847 msgstr "发布"
848 
849-#: trac/db/api.py:98
850+#: trac/db/api.py:126
851 #, python-format
852 msgid "Unsupported database type \"%(scheme)s\""
853 msgstr "不支持的数据库 \"%(scheme)s\""
854 
855-#: trac/db/api.py:121
856+#: trac/db/api.py:149
857 msgid "Database connection string must start with scheme:/"
858 msgstr "数据库链接字符串必须始于scheme:/"
859 
860-#: trac/db/pool.py:113
861+#: trac/db/pool.py:120
862 #, python-format
863 msgid "Unable to get database connection within %(time)d seconds"
864 msgstr "无法在%(time)d 秒内获得数据库连接"
865@@ -709,27 +795,46 @@
866 msgid "Database already exists at %(path)s"
867 msgstr "数据库已经存在于 %(path)s"
868 
869-#: trac/db/sqlite_backend.py:161
870+#: trac/db/sqlite_backend.py:173
871 #, python-format
872 msgid "Database \"%(path)s\" not found."
873 msgstr "数据库 \"%(path)s\" 未找到."
874 
875-#: trac/db/sqlite_backend.py:170
876+#: trac/db/sqlite_backend.py:182
877 #, python-format
878 msgid ""
879 "The user %(user)s requires read _and_ write permission to the database "
880 "file %(path)s and the directory it is located in."
881 msgstr "用户 %(user)s 需要数据库文件 %(path)s 即其所在目录的读/写权限."
882 
883-#: trac/mimeview/api.py:553 trac/mimeview/api.py:563
884+#: trac/mimeview/api.py:644 trac/mimeview/api.py:654
885 #, python-format
886 msgid "No available MIME conversions from %(old)s to %(new)s"
887 msgstr "没有有效的MIME将 %(old)s 转换为 %(new)s"
888 
889+#: trac/mimeview/api.py:756
890+#, python-format
891+msgid "HTML preview using %(renderer)s failed (%(err)s)"
892+msgstr "使用%(renderer)s进行HTML预览失败 (%(err)s)"
893+
894 #: trac/mimeview/patch.py:55
895 msgid "Invalid unified diff content"
896 msgstr "无效的unified diff内容"
897 
898+#: trac/mimeview/patch.py:165
899+#, python-format
900+msgid "new file %(new)s"
901+msgstr "新文件 %(new)s"
902+
903+#: trac/mimeview/patch.py:169
904+#, python-format
905+msgid "deleted file %(deleted)s"
906+msgstr "已删除文件%(deleted)s"
907+
908+#: trac/mimeview/patch.py:241
909+msgid "this hunk was shorter than expected"
910+msgstr "此块比预期的短"
911+
912 #: trac/mimeview/php.py:98
913 msgid ""
914 "You appear to be using the PHP CGI binary. Trac requires the CLI version "
915@@ -745,27 +850,28 @@
916 msgid "Docutils version >= %(version)s required, %(found)s found"
917 msgstr "需要Docutils版本 >= %(version)s, 现有版本为%(found)s"
918 
919-#: trac/prefs/web_ui.py:54 trac/prefs/templates/prefs.html:16
920+#: trac/prefs/web_ui.py:53 trac/prefs/templates/prefs.html:16
921+#: trac/ticket/templates/ticket.html:263 trac/wiki/templates/wiki_edit.html:99
922 msgid "Preferences"
923 msgstr "选项"
924 
925-#: trac/prefs/web_ui.py:77
926+#: trac/prefs/web_ui.py:76
927 msgid "Unknown preference panel"
928 msgstr "未知选项面板"
929 
930-#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_datetime.html:9
931+#: trac/prefs/web_ui.py:89 trac/prefs/templates/prefs_datetime.html:10
932 msgid "Date & Time"
933 msgstr "日期和时间"
934 
935-#: trac/prefs/web_ui.py:91 trac/prefs/templates/prefs_keybindings.html:9
936+#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_keybindings.html:10
937 msgid "Keyboard Shortcuts"
938 msgstr "键盘快捷方式"
939 
940-#: trac/prefs/web_ui.py:93 trac/prefs/templates/prefs_language.html:9
941+#: trac/prefs/web_ui.py:92 trac/prefs/templates/prefs_language.html:9
942 msgid "Language"
943 msgstr "语言"
944 
945-#: trac/prefs/web_ui.py:95 trac/prefs/templates/prefs_advanced.html:9
946+#: trac/prefs/web_ui.py:94 trac/prefs/templates/prefs_advanced.html:9
947 msgid "Advanced"
948 msgstr "高级"
949 
950@@ -824,15 +930,15 @@
951 "通过在下面输入相应的会话标志, 你可以载入先前创建的会话.\n"
952 "      这将让你能在多台计算机和web浏览器间共享设置."
953 
954-#: trac/prefs/templates/prefs_datetime.html:15
955+#: trac/prefs/templates/prefs_datetime.html:16
956 msgid "Time zone:"
957 msgstr "时区:"
958 
959-#: trac/prefs/templates/prefs_datetime.html:17
960+#: trac/prefs/templates/prefs_datetime.html:18
961 msgid "Default time zone"
962 msgstr "默认时区"
963 
964-#: trac/prefs/templates/prefs_datetime.html:24
965+#: trac/prefs/templates/prefs_datetime.html:25
966 msgid ""
967 "Configuring your time zone will result in all\n"
968 "      dates and times displayed on this site to use your time zone\n"
969@@ -841,38 +947,37 @@
970 "配置你的时区将导致这个站点使用你的时区设置来显示时期和时间\n"
971 "      而不是使用服务器上的设置."
972 
973-#: trac/prefs/templates/prefs_datetime.html:28
974+#: trac/prefs/templates/prefs_datetime.html:30
975 msgid "Example: The current time is"
976 msgstr "例如: 当前时间是"
977 
978-#: trac/prefs/templates/prefs_datetime.html:29
979+#: trac/prefs/templates/prefs_datetime.html:31
980 msgid "(UTC)."
981 msgstr "(UTC)."
982 
983-#: trac/prefs/templates/prefs_datetime.html:30
984+#: trac/prefs/templates/prefs_datetime.html:32
985 msgid "In"
986 msgstr "在"
987 
988-#: trac/prefs/templates/prefs_datetime.html:31
989+#: trac/prefs/templates/prefs_datetime.html:33
990 msgid "time zone"
991 msgstr "时区"
992 
993-#: trac/prefs/templates/prefs_datetime.html:31
994+#: trac/prefs/templates/prefs_datetime.html:33
995 msgid ", this would be displayed as"
996 msgstr ", 将显示为"
997 
998-#: trac/prefs/templates/prefs_datetime.html:35
999+#: trac/prefs/templates/prefs_datetime.html:37
1000 msgid ""
1001 "Note: Universal Co-ordinated Time (UTC) is also known as Greenwich Mean "
1002 "Time (GMT)."
1003 msgstr "注: 全球统一时间 (UTC) 也被称为格林威治标准时间 (GMT)."
1004 
1005-#: trac/prefs/templates/prefs_datetime.html:36
1006-#, fuzzy
1007+#: trac/prefs/templates/prefs_datetime.html:38
1008 msgid ""
1009 "A positive offset is used to indicate a timezone at the east of "
1010 "Greenwich, i.e. ahead of Universal Time."
1011-msgstr "正值表示在格林威治东方的事前, 即: 比标准时间早."
1012+msgstr "正值表示在格林威治以东的时区，即比标准时间早。"
1013 
1014 #: trac/prefs/templates/prefs_general.html:15
1015 msgid "Full name:"
1016@@ -897,35 +1002,30 @@
1017 "该信息用于将你的登录名关联到邮件地址和全名,\n"
1018 "        例如: 用于邮件通知和RSS中."
1019 
1020-#: trac/prefs/templates/prefs_keybindings.html:17
1021+#: trac/prefs/templates/prefs_keybindings.html:18
1022 msgid "Enable access keys"
1023 msgstr "启用存取关键字"
1024 
1025-#: trac/prefs/templates/prefs_keybindings.html:20
1026+#: trac/prefs/templates/prefs_keybindings.html:21
1027 msgid ""
1028-"This site provides keyboard shortcuts for faster\n"
1029-"      access to certain functions of this site. As these shortcuts can\n"
1030+"This site provides keyboard shortcuts for\n"
1031+"      faster access to certain functions of this site. As these shortcuts"
1032+" can\n"
1033 "      cause conflicts with shortcuts provided by the desktop system or\n"
1034-"      web browser, they are disabled by default. See"
1035+"      web browser, they are disabled by default. See\n"
1036+"      [1:TracAccessibility]\n"
1037+"      for more information on access keys."
1038 msgstr ""
1039-"该站点提供快捷键用于更加快速访问这个站点的某些功能.\n"
1040-"      由于这些快捷键可能与桌面系统或者浏览器本身冲突,\n"
1041-"      默认这些快捷键是没有启用的. 参见"
1042+"该站点提供快捷键用于更加快速访问这个站点的某些功能。\n"
1043+"      由于这些快捷键可能与桌面系统或者浏览器本身冲突，\n"
1044+"      缺省情况下，这些快捷键是没有启用的. \n"
1045+"      有关快捷键的详情参见[1:TracAccessibility]。"
1046 
1047-#: trac/prefs/templates/prefs_keybindings.html:24
1048-msgid "TracAccessibility"
1049-msgstr "TracAccessibility"
1050-
1051-#: trac/prefs/templates/prefs_keybindings.html:24
1052-msgid "for more information on access keys."
1053-msgstr "存取关键字的更多信息."
1054-
1055 #: trac/prefs/templates/prefs_language.html:14
1056 msgid "Language:"
1057 msgstr "语言:"
1058 
1059 #: trac/prefs/templates/prefs_language.html:16
1060-#, fuzzy
1061 msgid "default language"
1062 msgstr "默认语言"
1063 
1064@@ -943,7 +1043,7 @@
1065 msgid ""
1066 "The 'default language' option uses the browser's\n"
1067 "        language negotiation feature to select the appropriate language."
1068-msgstr ""
1069+msgstr "“缺省语言”选项使用浏览器的语言协商功能选择合适的语言。"
1070 
1071 #: trac/prefs/templates/prefs_pygments.html:9
1072 msgid "Pygments Theme"
1073@@ -963,98 +1063,64 @@
1074 msgid "Preview:"
1075 msgstr "预览:"
1076 
1077-#: trac/search/web_ui.py:58 trac/search/templates/search.html:10
1078-#: trac/search/templates/search.html:23 trac/search/templates/search.html:28
1079+#: trac/search/web_ui.py:64 trac/search/templates/search.html:11
1080+#: trac/search/templates/search.html:24 trac/search/templates/search.html:29
1081 #: trac/templates/theme.html:28
1082 msgid "Search"
1083 msgstr "搜索"
1084 
1085-#: trac/search/web_ui.py:100
1086+#: trac/search/web_ui.py:108
1087 #, python-format
1088 msgid "Search query too short. Query must be at least %(num)s characters long."
1089 msgstr "搜索查询太短. 查询必须至少包含 %(num)s 字符."
1090 
1091-#: trac/search/web_ui.py:102
1092+#: trac/search/web_ui.py:110
1093 msgid "Search Error"
1094 msgstr "搜索错误"
1095 
1096-#: trac/search/web_ui.py:137 trac/ticket/query.py:659 trac/ticket/report.py:316
1097+#: trac/search/web_ui.py:145 trac/ticket/query.py:682 trac/ticket/report.py:321
1098 msgid "Next Page"
1099 msgstr "下一页"
1100 
1101-#: trac/search/web_ui.py:143 trac/ticket/query.py:664 trac/ticket/report.py:320
1102+#: trac/search/web_ui.py:151 trac/ticket/query.py:687 trac/ticket/report.py:325
1103 msgid "Previous Page"
1104 msgstr "上一页"
1105 
1106-#: trac/search/web_ui.py:185
1107+#: trac/search/web_ui.py:193
1108 #, python-format
1109 msgid "Browse repository path %(path)s"
1110-msgstr "浏览仓库路径 %(path)s"
1111+msgstr "浏览版本库路径 %(path)s"
1112 
1113-#: trac/search/templates/search.html:10 trac/search/templates/search.html:40
1114+#: trac/search/templates/search.html:11 trac/search/templates/search.html:41
1115 #: trac/ticket/templates/query_results.html:21
1116-#: trac/ticket/templates/report_view.html:44
1117+#: trac/ticket/templates/report_view.html:87
1118 msgid "Results"
1119 msgstr "结果"
1120 
1121-#: trac/search/templates/search.html:48
1122+#: trac/search/templates/search.html:49
1123 msgid "Quickjump to"
1124 msgstr "快速跳转到"
1125 
1126-#: trac/search/templates/search.html:56
1127+#: trac/search/templates/search.html:57
1128 msgid "By"
1129-msgstr "由"
1130+msgstr "操作者:"
1131 
1132-#: trac/search/templates/search.html:65
1133-#: trac/ticket/templates/report_view.html:166
1134+#: trac/search/templates/search.html:66
1135+#: trac/ticket/templates/report_view.html:216
1136 msgid "No matches found."
1137 msgstr "没有匹配的结果."
1138 
1139 #: trac/search/templates/search.html:70
1140-#: trac/ticket/templates/milestone_delete.html:38
1141-#: trac/ticket/templates/milestone_edit.html:95
1142-#: trac/ticket/templates/milestone_view.html:96
1143-#: trac/ticket/templates/query.html:238
1144-#: trac/ticket/templates/report_delete.html:26
1145-#: trac/ticket/templates/report_edit.html:49
1146-#: trac/ticket/templates/report_view.html:169
1147-#: trac/ticket/templates/roadmap.html:71 trac/ticket/templates/ticket.html:395
1148-#: trac/timeline/templates/timeline.html:53
1149-#: trac/versioncontrol/templates/browser.html:142
1150-#: trac/versioncontrol/templates/diff_form.html:62
1151-#: trac/versioncontrol/templates/revisionlog.html:168
1152-msgid "Note:"
1153-msgstr "注:"
1154+msgid ""
1155+"[1:Note:] See [2:TracSearch]\n"
1156+"        for help on searching."
1157+msgstr "[1:注意：] 关于搜索的帮助参见 [2:TracSearch]"
1158 
1159-#: trac/search/templates/search.html:70
1160-#: trac/ticket/templates/milestone_delete.html:38
1161-#: trac/ticket/templates/milestone_edit.html:95
1162-#: trac/ticket/templates/milestone_view.html:96
1163-#: trac/ticket/templates/query.html:238
1164-#: trac/ticket/templates/report_delete.html:26
1165-#: trac/ticket/templates/report_edit.html:49
1166-#: trac/ticket/templates/report_view.html:169
1167-#: trac/ticket/templates/roadmap.html:71 trac/ticket/templates/ticket.html:395
1168-#: trac/timeline/templates/timeline.html:53
1169-#: trac/versioncontrol/templates/browser.html:142
1170-#: trac/versioncontrol/templates/diff_form.html:62
1171-#: trac/versioncontrol/templates/revisionlog.html:168
1172-msgid "See"
1173-msgstr "参见"
1174-
1175-#: trac/search/templates/search.html:70
1176-msgid "TracSearch"
1177-msgstr "TracSearch"
1178-
1179-#: trac/search/templates/search.html:70
1180-msgid "for help on searching."
1181-msgstr "获得搜索帮助."
1182-
1183-#: trac/templates/about.html:23
1184+#: trac/templates/about.html:25
1185 msgid "Trac: Integrated SCM & Project Management"
1186-msgstr "Trac: 集成SCM和项目管理"
1187+msgstr "Trac: 集成的源码管理和项目管理"
1188 
1189-#: trac/templates/about.html:27
1190+#: trac/templates/about.html:29
1191 msgid ""
1192 "Trac is a web-based software project management and bug/issue\n"
1193 "        tracking system emphasizing ease of use and low ceremony.\n"
1194@@ -1068,51 +1134,51 @@
1195 "        它提供了集成Wiki/版本控制系统界面, \n"
1196 "        以及更多方便的项目管理渠道, 来掌控项目的事件和变化."
1197 
1198-#: trac/templates/about.html:33
1199+#: trac/templates/about.html:35
1200 msgid "Trac is distributed under the modified BSD License."
1201-msgstr "Trac是以修订BSD许可证分发的."
1202+msgstr "Trac是以modified BSD许可证分发的。"
1203 
1204-#: trac/templates/about.html:33
1205+#: trac/templates/about.html:35
1206 msgid "The complete text of the license can be found"
1207 msgstr "查看许可证的完整内容"
1208 
1209-#: trac/templates/about.html:35
1210+#: trac/templates/about.html:37
1211 msgid "online"
1212 msgstr "在线版本"
1213 
1214-#: trac/templates/about.html:35
1215+#: trac/templates/about.html:37
1216 msgid "as well as in the"
1217 msgstr "以及在"
1218 
1219-#: trac/templates/about.html:36
1220+#: trac/templates/about.html:38
1221 msgid "COPYING"
1222 msgstr "COPYING"
1223 
1224-#: trac/templates/about.html:36
1225+#: trac/templates/about.html:38
1226 msgid "file included in the distribution."
1227 msgstr "文件中(包含的发布文件中)."
1228 
1229-#: trac/templates/about.html:38
1230+#: trac/templates/about.html:40
1231 msgid "python powered"
1232 msgstr "动力源自python"
1233 
1234-#: trac/templates/about.html:41
1235+#: trac/templates/about.html:43
1236 msgid "Please visit the Trac open source project:"
1237 msgstr "访问Trac开源项目:"
1238 
1239-#: trac/templates/about.html:42
1240+#: trac/templates/about.html:44
1241 msgid "http://trac.edgewall.org/"
1242 msgstr "http://trac.edgewall.org/"
1243 
1244-#: trac/templates/about.html:51
1245+#: trac/templates/about.html:53
1246 msgid "System Information"
1247 msgstr "系统信息"
1248 
1249-#: trac/templates/about.html:65
1250+#: trac/templates/about.html:67
1251 msgid "Section"
1252 msgstr "部分"
1253 
1254-#: trac/templates/about.html:67 trac/templates/error.html:162
1255+#: trac/templates/about.html:69 trac/templates/error.html:166
1256 msgid "Value"
1257 msgstr "值"
1258 
1259@@ -1120,74 +1186,72 @@
1260 msgid "Attachment"
1261 msgstr "附件"
1262 
1263-#: trac/templates/attachment.html:17
1264+#: trac/templates/attachment.html:25
1265 msgid "Add Attachment to"
1266 msgstr "增加附件到"
1267 
1268-#: trac/templates/attachment.html:20
1269+#: trac/templates/attachment.html:28
1270 msgid "(size limit"
1271 msgstr "(大小限制"
1272 
1273-#: trac/templates/attachment.html:25
1274+#: trac/templates/attachment.html:33
1275 msgid "Attachment Info"
1276 msgstr "附件信息"
1277 
1278-#: trac/templates/attachment.html:28 trac/ticket/templates/ticket.html:246
1279-#: trac/wiki/templates/wiki_edit.html:105
1280+#: trac/templates/attachment.html:36 trac/ticket/templates/ticket.html:254
1281+#: trac/wiki/templates/wiki_edit.html:95
1282 msgid "Your email or username:"
1283 msgstr "你的email或用户名:"
1284 
1285-#: trac/templates/attachment.html:34
1286+#: trac/templates/attachment.html:42
1287 msgid "Description of the file (optional):"
1288 msgstr "文件描述(可选):"
1289 
1290-#: trac/templates/attachment.html:39
1291+#: trac/templates/attachment.html:47
1292 msgid "Replace existing attachment of the same name"
1293 msgstr "替换已有同名附件"
1294 
1295-#: trac/templates/attachment.html:48
1296+#: trac/templates/attachment.html:56
1297 msgid "Add attachment"
1298 msgstr "追加附件"
1299 
1300-#: trac/templates/attachment.html:56
1301+#: trac/templates/attachment.html:64
1302 msgid "Are you sure you want to delete this attachment?"
1303 msgstr "确定删除该附件?"
1304 
1305-#: trac/templates/attachment.html:56 trac/wiki/templates/wiki_delete.html:32
1306+#: trac/templates/attachment.html:64 trac/wiki/templates/wiki_delete.html:32
1307 msgid "This is an irreversible operation."
1308 msgstr "该操作是不可逆的."
1309 
1310-#: trac/templates/attachment.html:63 trac/templates/attachment.html:103
1311+#: trac/templates/attachment.html:71 trac/templates/attachment.html:111
1312 msgid "Delete attachment"
1313 msgstr "删除附件"
1314 
1315-#: trac/templates/attachment.html:78 trac/ticket/api.py:212
1316-#: trac/ticket/templates/ticket.html:165
1317-msgid "Description"
1318-msgstr "描述"
1319+#: trac/templates/attachment.html:80
1320+msgid "Attach another file"
1321+msgstr "附加另一个文件"
1322 
1323-#: trac/templates/attachment.html:82
1324+#: trac/templates/attachment.html:90
1325 msgid "(added by"
1326 msgstr "(添加者"
1327 
1328-#: trac/templates/attachment.html:83 trac/templates/diff_view.html:40
1329-#: trac/versioncontrol/templates/browser.html:104
1330+#: trac/templates/attachment.html:91 trac/templates/diff_view.html:40
1331 #: trac/versioncontrol/templates/changeset.html:96
1332-#: trac/wiki/templates/wiki_view.html:26
1333+#: trac/wiki/templates/wiki_view.html:33
1334 msgid "ago)"
1335 msgstr "前)"
1336 
1337-#: trac/templates/diff_div.html:53
1338-#: trac/versioncontrol/templates/browser.html:124
1339+#: trac/templates/diff_div.html:58
1340+#: trac/versioncontrol/templates/browser.html:134
1341 msgid "Property"
1342 msgstr "属性"
1343 
1344-#: trac/templates/diff_div.html:64 trac/ticket/templates/ticket.html:61
1345+#: trac/templates/diff_div.html:69 trac/ticket/templates/ticket.html:64
1346 #: trac/versioncontrol/templates/changeset.html:32
1347 msgid "to"
1348 msgstr "至"
1349 
1350-#: trac/templates/diff_div.html:69
1351+#: trac/templates/diff_div.html:74
1352 msgid "Differences"
1353 msgstr "差异"
1354 
1355@@ -1196,22 +1260,23 @@
1356 msgstr "变更"
1357 
1358 #: trac/templates/diff_view.html:18 trac/templates/diff_view.html:21
1359+#: trac/ticket/templates/query.html:104
1360 msgid "between"
1361 msgstr "之间"
1362 
1363 #: trac/templates/diff_view.html:19 trac/templates/diff_view.html:25
1364-#: trac/templates/history_view.html:26 trac/ticket/templates/ticket.html:98
1365-#: trac/wiki/web_ui.py:519 trac/wiki/templates/wiki_view.html:25
1366+#: trac/templates/history_view.html:26 trac/ticket/templates/ticket.html:103
1367+#: trac/wiki/web_ui.py:538 trac/wiki/templates/wiki_view.html:32
1368 msgid "Version"
1369 msgstr "版本"
1370 
1371 #: trac/templates/diff_view.html:19 trac/templates/diff_view.html:22
1372-#: trac/timeline/templates/timeline.html:20
1373+#: trac/ticket/templates/query.html:106
1374 msgid "and"
1375 msgstr "和"
1376 
1377-#: trac/templates/diff_view.html:22 trac/ticket/web_ui.py:716
1378-#: trac/ticket/templates/ticket.html:95
1379+#: trac/templates/diff_view.html:22 trac/ticket/web_ui.py:765
1380+#: trac/ticket/templates/ticket.html:100
1381 msgid "Initial Version"
1382 msgstr "初始版本"
1383 
1384@@ -1230,44 +1295,44 @@
1385 msgstr "时间戳:"
1386 
1387 #: trac/templates/diff_view.html:39 trac/templates/diff_view.html:45
1388-#: trac/templates/diff_view.html:50
1389+#: trac/templates/diff_view.html:51
1390 msgid "(multiple changes)"
1391 msgstr "(多次变更)"
1392 
1393-#: trac/templates/diff_view.html:46
1394+#: trac/templates/diff_view.html:47
1395 msgid "(IP:"
1396 msgstr "(IP:"
1397 
1398-#: trac/templates/diff_view.html:48
1399+#: trac/templates/diff_view.html:49
1400 msgid "Comment:"
1401 msgstr "评论:"
1402 
1403-#: trac/templates/diff_view.html:56
1404+#: trac/templates/diff_view.html:57
1405 #: trac/versioncontrol/templates/changeset.html:151
1406-#: trac/versioncontrol/templates/revisionlog.html:70
1407+#: trac/versioncontrol/templates/revisionlog.html:71
1408 msgid "Legend:"
1409 msgstr "图例:"
1410 
1411-#: trac/templates/diff_view.html:58
1412+#: trac/templates/diff_view.html:59
1413 #: trac/versioncontrol/templates/changeset.html:153
1414 msgid "Unmodified"
1415 msgstr "未修改"
1416 
1417-#: trac/templates/diff_view.html:59
1418+#: trac/templates/diff_view.html:60
1419 #: trac/versioncontrol/templates/changeset.html:154
1420-#: trac/versioncontrol/templates/revisionlog.html:72
1421+#: trac/versioncontrol/templates/revisionlog.html:73
1422 msgid "Added"
1423 msgstr "已增加"
1424 
1425-#: trac/templates/diff_view.html:60
1426+#: trac/templates/diff_view.html:61
1427 #: trac/versioncontrol/templates/changeset.html:155
1428-#: trac/versioncontrol/templates/revisionlog.html:74
1429+#: trac/versioncontrol/templates/revisionlog.html:75
1430 msgid "Removed"
1431 msgstr "删除"
1432 
1433-#: trac/templates/diff_view.html:61 trac/ticket/query.py:588
1434+#: trac/templates/diff_view.html:62 trac/ticket/api.py:250
1435 #: trac/versioncontrol/templates/changeset.html:157
1436-#: trac/versioncontrol/templates/revisionlog.html:76
1437+#: trac/versioncontrol/templates/revisionlog.html:77 trac/wiki/admin.py:154
1438 msgid "Modified"
1439 msgstr "修改"
1440 
1441@@ -1329,92 +1394,103 @@
1442 
1443 #: trac/templates/error.html:106
1444 msgid ""
1445-"There was an internal error in Trac. It is recommended\n"
1446-"              that you inform your local"
1447-msgstr ""
1448-"Trac中有一个内部错误. 建议\n"
1449-"              通知你的本地"
1450+"There was an internal error in Trac. \n"
1451+"                It is recommended that you notify your local \n"
1452+"                [1:\n"
1453+"                    Trac administrator] with the information needed to \n"
1454+"                reproduce the issue."
1455+msgstr "Trac发生了内部错误。建议您向本地[1:Trac 管理员]提供重现问题所需要的信息。"
1456 
1457-#: trac/templates/error.html:108
1458-msgid ""
1459-"Trac\n"
1460-"              administrator"
1461-msgstr ""
1462-"Trac\n"
1463-"              管理员"
1464-
1465-#: trac/templates/error.html:109
1466-msgid ""
1467-"and give him all the information he needs to\n"
1468-"              reproduce the issue."
1469-msgstr "并将如何重现该问题的所有信息都告诉他."
1470-
1471 #: trac/templates/error.html:114
1472 msgid "To that end, you could"
1473-msgstr "最后, 你可以"
1474+msgstr "为此目的, 你可以"
1475 
1476 #: trac/templates/error.html:114
1477-msgid ""
1478-"a ticket at this\n"
1479-"                  site."
1480-msgstr "一个传票于这个站点."
1481+msgid "a ticket."
1482+msgstr "一个任务单。"
1483 
1484-#: trac/templates/error.html:118
1485+#: trac/templates/error.html:116
1486 msgid "The action that triggered the error was:"
1487 msgstr "触发此错误的动作是:"
1488 
1489-#: trac/templates/error.html:124
1490+#: trac/templates/error.html:121
1491+msgid "This is probably a local installation issue."
1492+msgstr "这可能是一个本地安装问题。"
1493+
1494+#: trac/templates/error.html:122
1495+msgid "You should"
1496+msgstr "你应该在管理用Trac上"
1497+
1498+#: trac/templates/error.html:123
1499 msgid ""
1500-"If you think this should work you can reproduce the problem,\n"
1501+"a ticket at the admin Trac to report\n"
1502+"                    the issue."
1503+msgstr "一个任务单报告问题。"
1504+
1505+#: trac/templates/error.html:128
1506+msgid "Found a bug in Trac?"
1507+msgstr "发现了一个Trac的Bug？"
1508+
1509+#: trac/templates/error.html:129
1510+msgid ""
1511+"If you think this should work and you can reproduce the problem,\n"
1512 "              you should consider reporting this to the Trac team."
1513 msgstr ""
1514-"如果认为这应当可用,且你也可以重现该问题,\n"
1515-"              应考虑向Trac开发团队报告这个问题."
1516+"如果认为此项功能本应可用，并能重现该问题，\n"
1517+"              应考虑向Trac开发团队报告这个问题。"
1518 
1519-#: trac/templates/error.html:126
1520-#, fuzzy
1521+#: trac/templates/error.html:131
1522+msgid "Before you do that, though, please first try"
1523+msgstr "在此之前，请首先尝试"
1524+
1525+#: trac/templates/error.html:132
1526+msgid "searching"
1527+msgstr "搜索"
1528+
1529+#: trac/templates/error.html:132
1530+msgid "for similar issues"
1531+msgstr "类似问题"
1532+
1533+#: trac/templates/error.html:133
1534 msgid ""
1535-"Before you do that, though, please first try\n"
1536-"                [1:searching]\n"
1537-"                for similar issues, as it is quite likely that this "
1538-"problem\n"
1539+", as it is quite likely that this problem\n"
1540 "                has been reported before. For questions about "
1541 "installation\n"
1542-"                and configuration of Trac, please try the\n"
1543-"                [2:mailing list]\n"
1544-"                instead of filing a ticket."
1545+"                and configuration of Trac, please try the"
1546 msgstr ""
1547-"然而, 在你这样做之前, 请先尝试[1:搜索]类似提案, 因为通常这个问题\n"
1548-"已经被其他人报告了. 对于有关Trac安装和配置的问题请尝试[2:邮件列表]而不是发出一个传票."
1549+"，因为很可能这个问题以前已经报告过了。\n"
1550+"有关Trac安装和配置的问题，请尝试"
1551 
1552 #: trac/templates/error.html:136
1553-msgid "Otherwise, please"
1554-msgstr "然而, 请"
1555+msgid "mailing list"
1556+msgstr "邮件列表"
1557 
1558 #: trac/templates/error.html:136
1559+msgid "instead of filing a ticket."
1560+msgstr "而不是填写任务单"
1561+
1562+#: trac/templates/error.html:140
1563+#, python-format
1564 msgid ""
1565-"a new ticket at\n"
1566+"Otherwise, please %(create)s a new ticket at\n"
1567 "                the Trac project site, where you can describe the problem"
1568 " and\n"
1569 "                explain how to reproduce it."
1570-msgstr ""
1571-"一个新传票于\n"
1572-"                Trac项目站点, 在此你可以描述问题\n"
1573-"                并解释如何重现这个问题."
1574+msgstr "如果不是，就请在Trac项目网站上%(create)s一个新任务单，描述问题并说明如何重现。"
1575 
1576-#: trac/templates/error.html:141
1577+#: trac/templates/error.html:145
1578 msgid "Python Traceback"
1579 msgstr "Python Traceback"
1580 
1581-#: trac/templates/error.html:142
1582+#: trac/templates/error.html:146
1583 msgid "Most recent call last:"
1584 msgstr "最多最近调用的:"
1585 
1586-#: trac/templates/error.html:147 trac/templates/error.html:174
1587+#: trac/templates/error.html:151 trac/templates/error.html:178
1588 msgid "File \""
1589 msgstr "文件 \""
1590 
1591-#: trac/templates/error.html:147
1592+#: trac/templates/error.html:151
1593 msgid ""
1594 "\",\n"
1595 "                        line"
1596@@ -1422,35 +1498,35 @@
1597 "\",\n"
1598 "                        行"
1599 
1600-#: trac/templates/error.html:148 trac/templates/error.html:174
1601+#: trac/templates/error.html:152 trac/templates/error.html:178
1602 msgid ", in"
1603 msgstr ", 于"
1604 
1605-#: trac/templates/error.html:152
1606+#: trac/templates/error.html:156
1607 msgid "Code fragment:"
1608 msgstr "部分代码:"
1609 
1610-#: trac/templates/error.html:160
1611+#: trac/templates/error.html:164
1612 msgid "Local variables:"
1613 msgstr "局部变量:"
1614 
1615-#: trac/templates/error.html:174
1616+#: trac/templates/error.html:178
1617 msgid "\", line"
1618 msgstr "\", 行"
1619 
1620-#: trac/templates/error.html:177
1621+#: trac/templates/error.html:181
1622 msgid "Switch to plain text view"
1623 msgstr "切换到纯文本视图"
1624 
1625-#: trac/templates/error.html:180
1626+#: trac/templates/error.html:184
1627 msgid "System Information:"
1628 msgstr "系统信息:"
1629 
1630-#: trac/templates/error.html:192
1631+#: trac/templates/error.html:196
1632 msgid "TracGuide"
1633 msgstr "TracGuide"
1634 
1635-#: trac/templates/error.html:192
1636+#: trac/templates/error.html:196
1637 msgid "— The Trac User and Administration Guide"
1638 msgstr "— Trac用户及管理员指南"
1639 
1640@@ -1459,9 +1535,9 @@
1641 msgstr "变更历史"
1642 
1643 #: trac/templates/history_view.html:20 trac/templates/history_view.html:51
1644-#: trac/versioncontrol/templates/diff_form.html:57
1645-#: trac/versioncontrol/templates/revisionlog.html:84
1646-#: trac/versioncontrol/templates/revisionlog.html:162
1647+#: trac/versioncontrol/templates/diff_form.html:58
1648+#: trac/versioncontrol/templates/revisionlog.html:85
1649+#: trac/versioncontrol/templates/revisionlog.html:171
1650 msgid "View changes"
1651 msgstr "查阅变更"
1652 
1653@@ -1469,16 +1545,6 @@
1654 msgid "Change history"
1655 msgstr "变更历史"
1656 
1657-#: trac/templates/history_view.html:27
1658-#: trac/versioncontrol/templates/revisionlog.html:94
1659-msgid "Date"
1660-msgstr "日期"
1661-
1662-#: trac/templates/history_view.html:28
1663-#: trac/versioncontrol/templates/revisionlog.html:95
1664-msgid "Author"
1665-msgstr "作者"
1666-
1667 #: trac/templates/history_view.html:29
1668 #: trac/ticket/templates/ticket_notify_email.txt:21
1669 msgid "Comment"
1670@@ -1496,7 +1562,7 @@
1671 msgid "Error"
1672 msgstr "错误"
1673 
1674-#: trac/templates/layout.html:43
1675+#: trac/templates/layout.html:42
1676 msgid "Download in other formats:"
1677 msgstr "用其他格式下载:"
1678 
1679@@ -1548,86 +1614,73 @@
1680 msgid "White space changes"
1681 msgstr "空字符变化"
1682 
1683-#: trac/templates/macros.html:125 trac/ticket/templates/milestone_view.html:53
1684-#: trac/ticket/templates/query.html:179 trac/ticket/templates/roadmap.html:26
1685-#: trac/timeline/templates/timeline.html:30
1686-#: trac/versioncontrol/templates/revisionlog.html:64
1687+#: trac/templates/macros.html:125 trac/ticket/templates/milestone_view.html:54
1688+#: trac/ticket/templates/query.html:191
1689+#: trac/ticket/templates/report_view.html:33
1690+#: trac/ticket/templates/roadmap.html:25
1691+#: trac/timeline/templates/timeline.html:32
1692+#: trac/versioncontrol/templates/revisionlog.html:65
1693 msgid "Update"
1694 msgstr "更新结果"
1695 
1696-#: trac/templates/macros.html:138 trac/templates/macros.html:151
1697+#: trac/templates/macros.html:138
1698+msgid "(The file is empty)"
1699+msgstr "(文件为空)"
1700+
1701+#: trac/templates/macros.html:141
1702 msgid "HTML preview not available"
1703 msgstr "HTML预览功能不可用"
1704 
1705-#: trac/templates/macros.html:140
1706+#: trac/templates/macros.html:143
1707 msgid "since the file size exceeds"
1708 msgstr "由于文件大小超过"
1709 
1710-#: trac/templates/macros.html:141
1711+#: trac/templates/macros.html:144
1712 msgid "bytes."
1713 msgstr "字节."
1714 
1715-#: trac/templates/macros.html:143
1716+#: trac/templates/macros.html:146
1717 msgid "since no preview renderer could handle it."
1718 msgstr "由于没有合适的渲染器来处理."
1719 
1720-#: trac/templates/macros.html:146
1721+#: trac/templates/macros.html:149
1722 msgid "Try"
1723 msgstr "尝试"
1724 
1725-#: trac/templates/macros.html:147
1726+#: trac/templates/macros.html:150
1727 msgid "downloading"
1728 msgstr "下载"
1729 
1730-#: trac/templates/macros.html:147
1731+#: trac/templates/macros.html:150
1732 msgid "the file instead."
1733 msgstr "文件代替."
1734 
1735-#: trac/templates/macros.html:151
1736-msgid ""
1737-".\n"
1738-"          To view,"
1739-msgstr ""
1740-".\n"
1741-"          查看,"
1742-
1743-#: trac/templates/macros.html:152
1744-msgid "download"
1745-msgstr "下载"
1746-
1747-#: trac/templates/macros.html:152
1748-msgid "the file."
1749-msgstr "文件."
1750-
1751-#: trac/templates/macros.html:154
1752-msgid "found:"
1753-msgstr "找到:"
1754-
1755-#: trac/templates/macros.html:171
1756+#: trac/templates/macros.html:163
1757 msgid "View attachment"
1758 msgstr "查看附件"
1759 
1760-#: trac/templates/macros.html:172
1761+#: trac/templates/macros.html:166
1762 msgid ") - added by"
1763 msgstr ") - 添加者"
1764 
1765-#: trac/templates/macros.html:173 trac/ticket/templates/query_results.html:70
1766+#: trac/templates/macros.html:167 trac/ticket/templates/query_results.html:77
1767 msgid "ago."
1768 msgstr "前."
1769 
1770-#: trac/templates/macros.html:178 trac/templates/macros.html:189
1771+#: trac/templates/macros.html:172 trac/templates/macros.html:183
1772 msgid "Attachments"
1773 msgstr "附件"
1774 
1775-#: trac/templates/macros.html:214
1776+#: trac/templates/macros.html:208
1777 msgid "Attach file"
1778 msgstr "附加文件"
1779 
1780-#: trac/templates/macros.html:238 trac/templates/macros.html:242
1781+#: trac/templates/macros.html:236 trac/templates/macros.html:237
1782+#: trac/templates/macros.html:245
1783 msgid "s:"
1784 msgstr "s:"
1785 
1786-#: trac/templates/macros.html:242
1787+#: trac/templates/macros.html:245
1788 msgid "Total"
1789 msgstr "总计"
1790 
1791@@ -1639,298 +1692,351 @@
1792 msgid "Context Navigation"
1793 msgstr "上下文导航"
1794 
1795-#: trac/templates/theme.html:46
1796+#: trac/templates/theme.html:47
1797 msgid "Warning:"
1798 msgstr "警告:"
1799 
1800-#: trac/templates/theme.html:49
1801+#: trac/templates/theme.html:50
1802 msgid "Warnings:"
1803 msgstr "警告s:"
1804 
1805-#: trac/templates/theme.html:57
1806+#: trac/templates/theme.html:58
1807 msgid "Notice:"
1808 msgstr "注意:"
1809 
1810-#: trac/templates/theme.html:60
1811+#: trac/templates/theme.html:61
1812 msgid "Notices:"
1813 msgstr "注意s:"
1814 
1815-#: trac/ticket/admin.py:87
1816+#: trac/ticket/admin.py:90
1817 #, python-format
1818 msgid "Component %(name)s already exists."
1819 msgstr "组件 %(name)s 已经存在."
1820 
1821-#: trac/ticket/admin.py:94
1822+#: trac/ticket/admin.py:97
1823 msgid "No component selected"
1824 msgstr "没有选择组件"
1825 
1826-#: trac/ticket/admin.py:157 trac/ticket/roadmap.py:632
1827+#: trac/ticket/admin.py:242 trac/ticket/roadmap.py:641
1828 msgid "Completion date may not be in the future"
1829 msgstr "完成日期不能是未来的日期"
1830 
1831-#: trac/ticket/admin.py:159
1832+#: trac/ticket/admin.py:244
1833 msgid "Invalid Completion Date"
1834 msgstr "无效完成日期"
1835 
1836-#: trac/ticket/admin.py:185
1837+#: trac/ticket/admin.py:271
1838 #, python-format
1839 msgid "Milestone %(name)s already exists."
1840 msgstr "里程碑 %(name)s 已经存在."
1841 
1842-#: trac/ticket/admin.py:192
1843+#: trac/ticket/admin.py:279
1844 msgid "No milestone selected"
1845 msgstr "没有选择里程碑"
1846 
1847-#: trac/ticket/admin.py:267
1848+#: trac/ticket/admin.py:446
1849 #, python-format
1850 msgid "Version %(name)s already exists."
1851 msgstr "版本 %(name)s 已经存在."
1852 
1853-#: trac/ticket/admin.py:274
1854+#: trac/ticket/admin.py:453
1855 msgid "No version selected"
1856 msgstr "没有选择版本"
1857 
1858-#: trac/ticket/admin.py:348
1859+#: trac/ticket/admin.py:519
1860+msgid "Time"
1861+msgstr "时间"
1862+
1863+#: trac/ticket/admin.py:591
1864 #, python-format
1865 msgid "%(type)s %(name)s already exists"
1866 msgstr "%(type)s %(name)s 已经存在"
1867 
1868-#: trac/ticket/admin.py:354
1869-#, fuzzy, python-format
1870+#: trac/ticket/admin.py:597
1871+#, python-format
1872 msgid "No %s selected"
1873 msgstr "没有 %s 被选择"
1874 
1875-#: trac/ticket/admin.py:383
1876+#: trac/ticket/admin.py:626
1877 msgid "Order numbers must be unique"
1878 msgstr "序号必须唯一"
1879 
1880-#: trac/ticket/api.py:362
1881+#: trac/ticket/admin.py:685
1882+msgid "Possible Values"
1883+msgstr "可取值"
1884+
1885+#: trac/ticket/admin.py:707
1886 #, python-format
1887+msgid "Invalid up/down value: %(value)s"
1888+msgstr "无效的 up/down 值: %(value)s"
1889+
1890+#: trac/ticket/admin.py:773
1891+msgid "<number> must be a number"
1892+msgstr "<number> 必须是一个数"
1893+
1894+#: trac/ticket/admin.py:778
1895+#, python-format
1896+msgid "Ticket %(num)s and all associated data removed."
1897+msgstr "任务单 %(num)s 和所有相关数据均已被删除。"
1898+
1899+#: trac/ticket/api.py:248
1900+msgid "Created"
1901+msgstr "创建"
1902+
1903+#: trac/ticket/api.py:405
1904+#, python-format
1905 msgid "Comment %(cnum)s for Ticket #%(id)s"
1906-msgstr "评论 %(cnum)s 传票 #%(id)s"
1907+msgstr "评论 %(cnum)s 任务单 #%(id)s"
1908 
1909-#: trac/ticket/api.py:383
1910+#: trac/ticket/api.py:426
1911 #, python-format
1912 msgid "Ticket #%(shortname)s"
1913-msgstr "传票 #%(shortname)s"
1914+msgstr "任务单 #%(shortname)s"
1915 
1916-#: trac/ticket/default_workflow.py:226
1917+#: trac/ticket/default_workflow.py:222
1918 msgid "Current state no longer exists"
1919 msgstr "当前状态己不存在"
1920 
1921-#: trac/ticket/default_workflow.py:228
1922+#: trac/ticket/default_workflow.py:224
1923 msgid "The ticket will be disowned"
1924-msgstr "传票将将脱离属主"
1925+msgstr "任务单将将脱离属主"
1926 
1927-#: trac/ticket/default_workflow.py:247 trac/ticket/default_workflow.py:258
1928-msgid "The owner will change"
1929-msgstr "属主将变更"
1930+#: trac/ticket/default_workflow.py:243 trac/ticket/default_workflow.py:257
1931+#, python-format
1932+msgid "The owner will change from %(current_owner)s"
1933+msgstr "属主将由%(current_owner)s变更"
1934 
1935-#: trac/ticket/default_workflow.py:251 trac/ticket/default_workflow.py:261
1936+#: trac/ticket/default_workflow.py:248
1937 #, python-format
1938-msgid "The owner will change to %(name)s"
1939-msgstr "属主将变更为 %(name)s"
1940+msgid "The owner will change from %(current_owner)s to %(selected_owner)s"
1941+msgstr "属主将由%(current_owner)s变更为%(selected_owner)s"
1942 
1943-#: trac/ticket/default_workflow.py:254
1944+#: trac/ticket/default_workflow.py:253
1945 msgid "to "
1946 msgstr "到"
1947 
1948-#: trac/ticket/default_workflow.py:273
1949+#: trac/ticket/default_workflow.py:261
1950 #, python-format
1951+msgid "The owner will change from %(current_owner)s to %(authname)s"
1952+msgstr "属主将由%(current_owner)s变更为%(authname)s"
1953+
1954+#: trac/ticket/default_workflow.py:272
1955+msgid ""
1956+"Your workflow attempts to set a resolution but none is defined "
1957+"(configuration issue, please contact your Trac admin)."
1958+msgstr ""
1959+"您的工作流试图设置处理结果，但一个也没有定义\n"
1960+"(配置问题，请联系您的Trac管理员)。"
1961+
1962+#: trac/ticket/default_workflow.py:277
1963+#, python-format
1964 msgid "The resolution will be set to %(name)s"
1965 msgstr "处理结果将设置为 %(name)s"
1966 
1967-#: trac/ticket/default_workflow.py:283
1968+#: trac/ticket/default_workflow.py:287
1969 msgid "The resolution will be set"
1970 msgstr "处理结果将设置为"
1971 
1972-#: trac/ticket/default_workflow.py:288
1973+#: trac/ticket/default_workflow.py:293
1974 #, python-format
1975 msgid "Next status will be '%(name)s'"
1976 msgstr "下一个状态将是 '%(name)s'"
1977 
1978-#: trac/ticket/model.py:128
1979+#: trac/ticket/model.py:140
1980 msgid "Multi-values fields not supported yet"
1981-msgstr ""
1982+msgstr "尚不支持多值字段"
1983 
1984-#: trac/ticket/model.py:363
1985+#: trac/ticket/model.py:391
1986 #, python-format
1987 msgid "%(type)s %(name)s does not exist."
1988 msgstr "%(type)s %(name)s 不存在."
1989 
1990-#: trac/ticket/model.py:507
1991+#: trac/ticket/model.py:539
1992 #, python-format
1993 msgid "Component %(name)s does not exist."
1994 msgstr "组件 '%(name)s' 不存在."
1995 
1996-#: trac/ticket/model.py:737
1997+#: trac/ticket/model.py:772
1998+msgid "Open (by due date)"
1999+msgstr "开启(有期限)"
2000+
2001+#: trac/ticket/model.py:773
2002+msgid "Open (no due date)"
2003+msgstr "开启(无期限)"
2004+
2005+#: trac/ticket/model.py:776
2006+msgid "Closed"
2007+msgstr "关闭"
2008+
2009+#: trac/ticket/model.py:792
2010 #, python-format
2011 msgid "Version %(name)s does not exist."
2012 msgstr "版本 '%(name)s' 不存在."
2013 
2014-#: trac/ticket/query.py:72
2015+#: trac/ticket/query.py:76
2016 #, python-format
2017 msgid "Query page %(page)s is invalid."
2018 msgstr "查询页面 %(page)s 无效"
2019 
2020-#: trac/ticket/query.py:88
2021+#: trac/ticket/query.py:91
2022 #, python-format
2023 msgid "Query max %(max)s is invalid."
2024 msgstr "Query max %(max)s 无效"
2025 
2026-#: trac/ticket/query.py:135
2027+#: trac/ticket/query.py:130
2028 msgid "Query filter requires field and constraints separated by a \"=\""
2029-msgstr ""
2030+msgstr "查询过滤器要求使用\"=\"分隔字段和约束"
2031 
2032-#: trac/ticket/query.py:139
2033+#: trac/ticket/query.py:143
2034 msgid "Query filter requires field name"
2035-msgstr ""
2036+msgstr "查询过滤器需要字段名"
2037 
2038-#: trac/ticket/query.py:271
2039+#: trac/ticket/query.py:273
2040 #, python-format
2041 msgid "Page %(page)s is beyond the number of pages in the query"
2042 msgstr "页面 %(page)s 已超出查询结果页数"
2043 
2044-#: trac/ticket/query.py:589
2045-msgid "Created"
2046-msgstr "创建"
2047-
2048-#: trac/ticket/query.py:592 trac/ticket/web_ui.py:548
2049+#: trac/ticket/query.py:609 trac/ticket/web_ui.py:601
2050 msgid "Ticket"
2051-msgstr "传票"
2052+msgstr "任务单"
2053 
2054-#: trac/ticket/query.py:608
2055+#: trac/ticket/query.py:627 trac/ticket/query.py:635
2056 msgid "contains"
2057 msgstr "包含"
2058 
2059-#: trac/ticket/query.py:609
2060+#: trac/ticket/query.py:628 trac/ticket/query.py:636
2061 msgid "doesn't contain"
2062 msgstr "不包含"
2063 
2064-#: trac/ticket/query.py:610
2065+#: trac/ticket/query.py:629
2066 msgid "begins with"
2067 msgstr "起始于"
2068 
2069-#: trac/ticket/query.py:611
2070+#: trac/ticket/query.py:630
2071 msgid "ends with"
2072 msgstr "结束于"
2073 
2074-#: trac/ticket/query.py:612 trac/ticket/query.py:616
2075+#: trac/ticket/query.py:631 trac/ticket/query.py:639
2076 msgid "is"
2077 msgstr "是"
2078 
2079-#: trac/ticket/query.py:613 trac/ticket/query.py:617
2080+#: trac/ticket/query.py:632 trac/ticket/query.py:640
2081 msgid "is not"
2082 msgstr "不是"
2083 
2084-#: trac/ticket/query.py:672 trac/ticket/report.py:327
2085+#: trac/ticket/query.py:695 trac/ticket/report.py:332
2086 #, python-format
2087 msgid "Page %(num)d"
2088 msgstr "第 %(num)d 页"
2089 
2090-#: trac/ticket/query.py:713 trac/ticket/report.py:511 trac/ticket/web_ui.py:113
2091-#: trac/timeline/web_ui.py:190 trac/versioncontrol/web_ui/log.py:241
2092+#: trac/ticket/query.py:744 trac/ticket/report.py:523 trac/ticket/web_ui.py:151
2093+#: trac/timeline/web_ui.py:216 trac/versioncontrol/web_ui/log.py:240
2094 msgid "RSS Feed"
2095 msgstr "RSS Feed"
2096 
2097-#: trac/ticket/query.py:715 trac/ticket/report.py:514 trac/ticket/web_ui.py:109
2098+#: trac/ticket/query.py:746 trac/ticket/report.py:526 trac/ticket/web_ui.py:147
2099 msgid "Comma-delimited Text"
2100 msgstr "逗号分割文本"
2101 
2102-#: trac/ticket/query.py:717 trac/ticket/report.py:516 trac/ticket/web_ui.py:111
2103+#: trac/ticket/query.py:748 trac/ticket/report.py:528 trac/ticket/web_ui.py:149
2104 msgid "Tab-delimited Text"
2105 msgstr "Tab分割文本"
2106 
2107-#: trac/ticket/query.py:739 trac/ticket/report.py:62
2108+#: trac/ticket/query.py:770 trac/ticket/report.py:63
2109 msgid "View Tickets"
2110-msgstr "查看传票"
2111+msgstr "查看任务单"
2112 
2113-#: trac/ticket/query.py:890 trac/ticket/query.py:901 trac/ticket/report.py:120
2114+#: trac/ticket/query.py:948 trac/ticket/query.py:959 trac/ticket/report.py:121
2115 msgid "Custom Query"
2116 msgstr "定制查询"
2117 
2118-#: trac/ticket/query.py:900 trac/ticket/report.py:110 trac/ticket/report.py:111
2119-#: trac/ticket/report.py:113 trac/ticket/report.py:230
2120+#: trac/ticket/query.py:958 trac/ticket/report.py:111 trac/ticket/report.py:112
2121+#: trac/ticket/report.py:114 trac/ticket/report.py:226
2122 msgid "Available Reports"
2123 msgstr "可用的报表"
2124 
2125-#: trac/ticket/query.py:987
2126+#: trac/ticket/query.py:1046
2127 #, python-format
2128 msgid "[Error: %(error)s]"
2129 msgstr "[Error: %(error)s]"
2130 
2131-#: trac/ticket/query.py:1076
2132+#: trac/ticket/query.py:1144
2133 msgid "No results"
2134 msgstr "没有结果"
2135 
2136-#: trac/ticket/query.py:1114
2137+#: trac/ticket/query.py:1162
2138 #, python-format
2139+msgid "%(groupvalue)s %(groupname)s tickets matching %(query)s"
2140+msgstr "%(groupvalue)s %(groupname)s 任务单匹配 %(query)s"
2141+
2142+#: trac/ticket/query.py:1184
2143+#, python-format
2144 msgid "%(groupvalue)s %(groupname)s tickets:"
2145-msgstr ""
2146+msgstr "%(groupvalue)s %(groupname)s 任务单："
2147 
2148-#: trac/ticket/report.py:177
2149+#: trac/ticket/report.py:178
2150 #, python-format
2151 msgid "Delete Report {%(num)s} %(title)s"
2152 msgstr "删除报表 {%(num)s} %(title)s"
2153 
2154-#: trac/ticket/report.py:182 trac/ticket/report.py:194
2155-#: trac/ticket/report.py:242
2156+#: trac/ticket/report.py:183 trac/ticket/report.py:195
2157+#: trac/ticket/report.py:238
2158 #, python-format
2159 msgid "Report %(num)s does not exist."
2160 msgstr "报表 %(num)s 不存在."
2161 
2162-#: trac/ticket/report.py:183 trac/ticket/report.py:195
2163-#: trac/ticket/report.py:243
2164+#: trac/ticket/report.py:184 trac/ticket/report.py:196
2165+#: trac/ticket/report.py:239
2166 msgid "Invalid Report Number"
2167 msgstr "无效报表号"
2168 
2169-#: trac/ticket/report.py:207
2170+#: trac/ticket/report.py:208
2171 msgid "Create New Report"
2172 msgstr "新建报表"
2173 
2174-#: trac/ticket/report.py:211
2175+#: trac/ticket/report.py:212
2176 #, python-format
2177 msgid "Edit Report {%(num)d} %(title)s"
2178 msgstr "编辑报表 {%(num)d} %(title)s"
2179 
2180-#: trac/ticket/report.py:225
2181+#: trac/ticket/report.py:229
2182+msgid "This is a list of available reports."
2183+msgstr "有效报表列表."
2184+
2185+#: trac/ticket/report.py:244
2186 #, python-format
2187 msgid "Report failed: %(error)s"
2188 msgstr "报表失败: %(error)s"
2189 
2190-#: trac/ticket/report.py:233
2191-msgid "This is a list of available reports."
2192-msgstr "有效报表列表."
2193-
2194-#: trac/ticket/report.py:258
2195+#: trac/ticket/report.py:259
2196 #, python-format
2197 msgid "When specified, the report number should be \"%(num)s\"."
2198 msgstr "当指定后, 报表号应是 \"%(num)s\"."
2199 
2200-#: trac/ticket/report.py:305
2201+#: trac/ticket/report.py:310
2202 #, python-format
2203 msgid "Report execution failed: %(error)s"
2204 msgstr "报表执行失败: %(error)s"
2205 
2206-#: trac/ticket/report.py:518
2207+#: trac/ticket/report.py:511
2208+#, python-format
2209+msgid "The following arguments are missing: %(args)s"
2210+msgstr "缺少如下参数：%(args)s"
2211+
2212+#: trac/ticket/report.py:530
2213 msgid "SQL Query"
2214 msgstr "SQL查询"
2215 
2216-#: trac/ticket/report.py:532
2217+#: trac/ticket/report.py:544
2218 #, python-format
2219 msgid "Report %(num)s has no SQL query."
2220 msgstr "报表 %(num)s 没有SQL查询."
2221 
2222-#: trac/ticket/report.py:562
2223+#: trac/ticket/report.py:574
2224 #, python-format
2225 msgid "Query parameter \"sort=%(sort_col)s\"  is invalid"
2226 msgstr "查询参数 \"sort=%(sort_col)s\"  无效"
2227 
2228-#: trac/ticket/report.py:605
2229-#, python-format
2230-msgid "Dynamic variable '%(name)s' not defined."
2231-msgstr "动态变量 '%(name)s' 未定义."
2232-
2233 #: trac/ticket/roadmap.py:213
2234 #, python-format
2235 msgid ""
2236@@ -1945,219 +2051,210 @@
2237 "by other groups. Please check your configuration."
2238 msgstr "'%(groupname)s' 里程碑组重用了已经被其它组使用的状态 '%(status)s'. 请检查你的配置."
2239 
2240-#: trac/ticket/roadmap.py:308 trac/ticket/roadmap.py:419
2241-#: trac/ticket/roadmap.py:549 trac/ticket/templates/roadmap.html:10
2242-#: trac/ticket/templates/roadmap.html:17
2243+#: trac/ticket/roadmap.py:308 trac/ticket/roadmap.py:422
2244+#: trac/ticket/roadmap.py:551 trac/ticket/templates/roadmap.html:11
2245+#: trac/ticket/templates/roadmap.html:16
2246 msgid "Roadmap"
2247 msgstr "路线图"
2248 
2249-#: trac/ticket/roadmap.py:350
2250+#: trac/ticket/roadmap.py:352
2251 msgid "iCalendar"
2252 msgstr "iCalendar"
2253 
2254-#: trac/ticket/roadmap.py:428 trac/ticket/roadmap.py:801
2255+#: trac/ticket/roadmap.py:431 trac/ticket/roadmap.py:818
2256 #, python-format
2257 msgid "Milestone %(name)s"
2258 msgstr "里程碑 %(name)s"
2259 
2260-#: trac/ticket/roadmap.py:447
2261+#: trac/ticket/roadmap.py:450
2262 #, python-format
2263 msgid "Ticket #%(num)s: %(summary)s"
2264-msgstr "传票 #%(num)s: %(summary)s"
2265+msgstr "任务单 #%(num)s: %(summary)s"
2266 
2267-#: trac/ticket/roadmap.py:621
2268+#: trac/ticket/roadmap.py:506
2269+msgid "Milestones reached"
2270+msgstr "里程碑达成"
2271+
2272+#: trac/ticket/roadmap.py:630
2273 #, python-format
2274 msgid "Milestone \"%(name)s\" already exists, please choose another name"
2275 msgstr "里程碑 \"%(name)s\" 已经存在, 请选择其他名称"
2276 
2277-#: trac/ticket/roadmap.py:626
2278+#: trac/ticket/roadmap.py:635
2279 msgid "You must provide a name for the milestone."
2280 msgstr "你必须为里程碑提供名称."
2281 
2282-#: trac/ticket/web_ui.py:135 trac/ticket/templates/ticket.html:17
2283+#: trac/ticket/web_ui.py:173 trac/ticket/templates/ticket.html:17
2284 msgid "New Ticket"
2285-msgstr "新建传票"
2286+msgstr "新建任务单"
2287 
2288-#: trac/ticket/web_ui.py:151
2289+#: trac/ticket/web_ui.py:189
2290 msgid "id can't be set for a new ticket request."
2291-msgstr "id不能设置给新传票请求."
2292+msgstr "id不能设置给新任务单请求."
2293 
2294-#: trac/ticket/web_ui.py:202
2295-msgid "Ticket changes"
2296-msgstr "传票变更"
2297+#: trac/ticket/web_ui.py:247
2298+msgid "Opened and closed tickets"
2299+msgstr "开启和关闭的任务单"
2300 
2301-#: trac/ticket/web_ui.py:204
2302-msgid "Ticket details"
2303-msgstr "传票详情"
2304+#: trac/ticket/web_ui.py:249
2305+msgid "Ticket updates"
2306+msgstr "任务单更新"
2307 
2308-#: trac/ticket/web_ui.py:210
2309-#, fuzzy
2310+#: trac/ticket/web_ui.py:255
2311 msgid "created"
2312-msgstr "创建"
2313+msgstr "已创建"
2314 
2315-#: trac/ticket/web_ui.py:211
2316-#, fuzzy
2317+#: trac/ticket/web_ui.py:256
2318 msgid "reopened"
2319-msgstr "打开"
2320+msgstr "已重新打开"
2321 
2322-#: trac/ticket/web_ui.py:212
2323-#, fuzzy
2324+#: trac/ticket/web_ui.py:257
2325 msgid "closed"
2326-msgstr "关闭"
2327+msgstr "已关闭"
2328 
2329-#: trac/ticket/web_ui.py:213
2330-#, fuzzy
2331+#: trac/ticket/web_ui.py:258
2332 msgid "updated"
2333-msgstr "升级"
2334+msgstr "已升级"
2335 
2336-#: trac/ticket/web_ui.py:309
2337-#, fuzzy, python-format
2338+#: trac/ticket/web_ui.py:354
2339+#, python-format
2340 msgid "Ticket %(ticketref)s (%(summary)s) %(verb)s"
2341-msgstr "传票 %(ticketref)s (%(summary)s) %(verb)s"
2342+msgstr "任务单 %(ticketref)s (%(summary)s) %(verb)s"
2343 
2344-#: trac/ticket/web_ui.py:437
2345+#: trac/ticket/web_ui.py:482
2346 #, python-format
2347 msgid "Invalid action \"%(name)s\""
2348 msgstr "无效动作: \"%(name)s\""
2349 
2350-#: trac/ticket/web_ui.py:548
2351+#: trac/ticket/web_ui.py:601
2352 msgid "Back to Query"
2353 msgstr "返回查询"
2354 
2355-#: trac/ticket/web_ui.py:628 trac/ticket/web_ui.py:778
2356+#: trac/ticket/web_ui.py:677 trac/ticket/web_ui.py:827
2357 msgid "Ticket History"
2358-msgstr "传票历史"
2359+msgstr "任务单历史"
2360 
2361-#: trac/ticket/web_ui.py:673
2362+#: trac/ticket/web_ui.py:722
2363 msgid "No differences to show"
2364 msgstr "没有差异"
2365 
2366-#: trac/ticket/web_ui.py:713 trac/ticket/web_ui.py:768
2367-#: trac/ticket/web_ui.py:776 trac/wiki/web_ui.py:355 trac/wiki/web_ui.py:361
2368-#: trac/wiki/web_ui.py:507 trac/wiki/web_ui.py:515
2369+#: trac/ticket/web_ui.py:762 trac/ticket/web_ui.py:817
2370+#: trac/ticket/web_ui.py:825 trac/wiki/web_ui.py:367 trac/wiki/web_ui.py:373
2371+#: trac/wiki/web_ui.py:520 trac/wiki/web_ui.py:534
2372 #, python-format
2373 msgid "Version %(num)s"
2374 msgstr "版本 %(num)s"
2375 
2376-#: trac/ticket/web_ui.py:716
2377+#: trac/ticket/web_ui.py:765
2378 msgid "initial"
2379 msgstr "初始"
2380 
2381-#: trac/ticket/web_ui.py:778 trac/versioncontrol/web_ui/changeset.py:342
2382-#: trac/wiki/web_ui.py:374
2383+#: trac/ticket/web_ui.py:827 trac/versioncontrol/web_ui/changeset.py:343
2384+#: trac/wiki/web_ui.py:386
2385 msgid "Change"
2386 msgstr "变更"
2387 
2388-#: trac/ticket/web_ui.py:783
2389+#: trac/ticket/web_ui.py:832
2390 msgid "Ticket Diff"
2391-msgstr "传票差异"
2392+msgstr "任务单差异"
2393 
2394-#: trac/ticket/web_ui.py:851
2395+#: trac/ticket/web_ui.py:904
2396 msgid "No permission to change ticket fields."
2397-msgstr "无权修改传票字段."
2398+msgstr "无权修改任务单字段."
2399 
2400-#: trac/ticket/web_ui.py:859
2401+#: trac/ticket/web_ui.py:912
2402 msgid "No permissions to change ticket fields."
2403-msgstr "无权修改传票字段."
2404+msgstr "无权修改任务单字段."
2405 
2406-#: trac/ticket/web_ui.py:868
2407+#: trac/ticket/web_ui.py:921
2408 msgid "No permissions to add a comment."
2409 msgstr "无权增加评论."
2410 
2411-#: trac/ticket/web_ui.py:874
2412+#: trac/ticket/web_ui.py:927
2413 msgid ""
2414 "Sorry, can not save your changes. This ticket has been modified by "
2415 "someone else since you started"
2416-msgstr "对不起, 无法保存你的修改. 该传票已经被其他人修改"
2417+msgstr "对不起, 无法保存你的修改. 该任务单已经被其他人修改"
2418 
2419-#: trac/ticket/web_ui.py:881
2420+#: trac/ticket/web_ui.py:934
2421 msgid "Tickets must contain a summary."
2422-msgstr "传票必须有概述."
2423+msgstr "任务单必须有概述."
2424 
2425-#: trac/ticket/web_ui.py:904
2426+#: trac/ticket/web_ui.py:957
2427 #, python-format
2428 msgid "Ticket description is too long (must be less than %(num)s characters)"
2429-msgstr "传票描述太长(必须少于 %(num)s 个字符)"
2430+msgstr "任务单描述太长(必须少于 %(num)s 个字符)"
2431 
2432-#: trac/ticket/web_ui.py:919
2433+#: trac/ticket/web_ui.py:964
2434+#, python-format
2435+msgid "Ticket comment is too long (must be less than %(num)s characters)"
2436+msgstr "任务单评论太长(必须少于 %(num)s 个字符)"
2437+
2438+#: trac/ticket/web_ui.py:979
2439 msgid "Invalid comment threading identifier"
2440 msgstr "无效评论线索标识"
2441 
2442-#: trac/ticket/web_ui.py:926
2443+#: trac/ticket/web_ui.py:986
2444 #, python-format
2445 msgid "The ticket field '%(field)s' is invalid: %(message)s"
2446-msgstr "传票字段 '%(field)s' 无效: %(message)s"
2447+msgstr "任务单字段 '%(field)s' 无效: %(message)s"
2448 
2449-#: trac/ticket/web_ui.py:1043
2450+#: trac/ticket/web_ui.py:1136
2451 msgid "Assign to"
2452 msgstr "指派给"
2453 
2454-#: trac/ticket/web_ui.py:1059
2455-msgid "Open"
2456-msgstr "打开"
2457-
2458-#: trac/ticket/web_ui.py:1060
2459-msgid "Closed"
2460-msgstr "关闭"
2461-
2462-#: trac/ticket/web_ui.py:1075
2463+#: trac/ticket/web_ui.py:1166
2464 msgid "Add to Cc"
2465 msgstr "增加抄送"
2466 
2467-#: trac/ticket/web_ui.py:1076
2468+#: trac/ticket/web_ui.py:1167
2469 msgid "Remove from Cc"
2470 msgstr "删除抄送"
2471 
2472-#: trac/ticket/web_ui.py:1077
2473+#: trac/ticket/web_ui.py:1168
2474 msgid "Add/Remove from Cc"
2475 msgstr "增加/删除抄送"
2476 
2477-#: trac/ticket/web_ui.py:1078
2478+#: trac/ticket/web_ui.py:1169
2479 msgid "<Author field>"
2480 msgstr "<Author field>"
2481 
2482-#: trac/ticket/web_ui.py:1098 trac/ticket/templates/query.html:89
2483+#: trac/ticket/web_ui.py:1190 trac/ticket/templates/query.html:91
2484 msgid "yes"
2485 msgstr "是"
2486 
2487-#: trac/ticket/web_ui.py:1098 trac/ticket/templates/query.html:92
2488+#: trac/ticket/web_ui.py:1190 trac/ticket/templates/query.html:94
2489 msgid "no"
2490 msgstr "否"
2491 
2492-#: trac/ticket/web_ui.py:1268 trac/versioncontrol/templates/changeset.html:130
2493+#: trac/ticket/web_ui.py:1383 trac/versioncontrol/templates/changeset.html:130
2494 msgid "modified"
2495 msgstr "已修改"
2496 
2497-#: trac/ticket/templates/milestone_delete.html:9
2498-#: trac/ticket/templates/milestone_delete.html:21
2499+#: trac/ticket/templates/milestone_delete.html:10
2500+#: trac/ticket/templates/milestone_delete.html:22
2501 msgid "Delete Milestone"
2502 msgstr "删除里程碑"
2503 
2504-#: trac/ticket/templates/milestone_delete.html:25
2505+#: trac/ticket/templates/milestone_delete.html:27
2506 msgid "Are you sure you want to delete this milestone?"
2507 msgstr "确定删除该里程碑吗?"
2508 
2509-#: trac/ticket/templates/milestone_delete.html:27
2510+#: trac/ticket/templates/milestone_delete.html:29
2511 msgid "Retarget associated tickets to milestone"
2512-msgstr "重指定关联传票到里程碑"
2513+msgstr "重新关联相关任务单到里程碑"
2514 
2515-#: trac/ticket/templates/milestone_delete.html:34
2516-#: trac/ticket/templates/milestone_view.html:91
2517+#: trac/ticket/templates/milestone_delete.html:41
2518+#: trac/ticket/templates/milestone_view.html:100
2519 msgid "Delete milestone"
2520 msgstr "删除里程碑"
2521 
2522-#: trac/ticket/templates/milestone_delete.html:39
2523-#: trac/ticket/templates/milestone_edit.html:96
2524-#: trac/ticket/templates/milestone_view.html:97
2525-#: trac/ticket/templates/roadmap.html:72
2526-msgid "TracRoadmap"
2527-msgstr "TracRoadmap"
2528-
2529-#: trac/ticket/templates/milestone_delete.html:39
2530+#: trac/ticket/templates/milestone_delete.html:45
2531 msgid ""
2532-"for help on using\n"
2533+"[1:Note:] See\n"
2534+"      [2:TracRoadmap] for help on using\n"
2535 "      the roadmap."
2536-msgstr "使用路线图的帮助."
2537+msgstr "[1:注意:] 使用路线图的帮助参见 [2:TracRoadmap]。"
2538 
2539 #: trac/ticket/templates/milestone_edit.html:11
2540 #: trac/ticket/templates/milestone_edit.html:37
2541@@ -2179,32 +2276,33 @@
2542 
2543 #: trac/ticket/templates/milestone_edit.html:71
2544 msgid "Retarget associated open tickets to milestone:"
2545-msgstr "重指定关联活动传票到里程碑"
2546+msgstr "重指定关联活动任务单到里程碑"
2547 
2548-#: trac/ticket/templates/milestone_edit.html:89
2549-#: trac/wiki/templates/wiki_edit.html:126
2550-#: trac/wiki/templates/wiki_edit.html:131
2551+#: trac/ticket/templates/milestone_edit.html:92
2552+#: trac/ticket/templates/ticket.html:403 trac/wiki/templates/wiki_edit.html:119
2553+#: trac/wiki/templates/wiki_edit.html:124
2554 msgid "Submit changes"
2555 msgstr "提交变更"
2556 
2557-#: trac/ticket/templates/milestone_edit.html:90
2558+#: trac/ticket/templates/milestone_edit.html:93
2559 msgid "Add milestone"
2560 msgstr "增加里程碑"
2561 
2562-#: trac/ticket/templates/milestone_edit.html:96
2563-#: trac/ticket/templates/milestone_view.html:97
2564-#: trac/ticket/templates/roadmap.html:72
2565+#: trac/ticket/templates/milestone_edit.html:98
2566+#: trac/ticket/templates/milestone_view.html:106
2567+#: trac/ticket/templates/roadmap.html:70
2568 msgid ""
2569-"for help on using\n"
2570+"[1:Note:] See\n"
2571+"        [2:TracRoadmap] for help on using\n"
2572 "        the roadmap."
2573-msgstr "使用路线图的帮助."
2574+msgstr "[1:注意:] 使用路线图的帮助参见 [2:TracRoadmap]。"
2575 
2576-#: trac/ticket/templates/milestone_view.html:10
2577-#: trac/ticket/templates/milestone_view.html:22
2578+#: trac/ticket/templates/milestone_view.html:11
2579+#: trac/ticket/templates/milestone_view.html:23
2580 msgid "Milestone"
2581 msgstr "里程碑"
2582 
2583-#: trac/ticket/templates/milestone_view.html:26
2584+#: trac/ticket/templates/milestone_view.html:27
2585 msgid ""
2586 "ago\n"
2587 "            ("
2588@@ -2212,141 +2310,146 @@
2589 "前\n"
2590 "            ("
2591 
2592-#: trac/ticket/templates/milestone_view.html:30
2593-#: trac/ticket/templates/roadmap.html:43
2594+#: trac/ticket/templates/milestone_view.html:31
2595+#: trac/ticket/templates/roadmap.html:42
2596 msgid "late"
2597 msgstr "延期"
2598 
2599-#: trac/ticket/templates/milestone_view.html:33
2600-#: trac/ticket/templates/roadmap.html:46
2601+#: trac/ticket/templates/milestone_view.html:34
2602+#: trac/ticket/templates/roadmap.html:45
2603 msgid "Due in"
2604 msgstr "剩余"
2605 
2606-#: trac/ticket/templates/milestone_view.html:37
2607-#: trac/ticket/templates/roadmap.html:50
2608+#: trac/ticket/templates/milestone_view.html:38
2609+#: trac/ticket/templates/roadmap.html:49
2610 msgid "No date set"
2611 msgstr "没有设置日期"
2612 
2613-#: trac/ticket/templates/milestone_view.html:47
2614-#: trac/timeline/templates/timeline.html:42
2615+#: trac/ticket/templates/milestone_view.html:48
2616+#: trac/timeline/templates/timeline.html:44
2617+#, fuzzy
2618 msgid "by"
2619-msgstr "操作者"
2620+msgstr ": "
2621 
2622-#: trac/ticket/templates/milestone_view.html:58
2623+#: trac/ticket/templates/milestone_view.html:62
2624 msgid "(none)"
2625 msgstr "(无)"
2626 
2627-#: trac/ticket/templates/milestone_view.html:87
2628+#: trac/ticket/templates/milestone_view.html:94
2629 msgid "Edit milestone"
2630 msgstr "编辑里程碑"
2631 
2632-#: trac/ticket/templates/query.html:28
2633+#: trac/ticket/templates/query.html:29
2634 #: trac/ticket/templates/query_results.html:29
2635-#, fuzzy, python-format
2636+#, python-format
2637 msgid "%(num)s match"
2638 msgid_plural "%(num)s matches"
2639-msgstr[0] ""
2640+msgstr[0] "%(num)s匹配"
2641+msgstr[1] "%(num)s匹配"
2642 
2643-#: trac/ticket/templates/query.html:37
2644+#: trac/ticket/templates/query.html:39
2645 msgid "Filters"
2646 msgstr "过滤器"
2647 
2648-#: trac/ticket/templates/query.html:38
2649+#: trac/ticket/templates/query.html:40
2650 msgid "Query filters"
2651 msgstr "查询过滤器"
2652 
2653-#: trac/ticket/templates/query.html:113
2654+#: trac/ticket/templates/query.html:124
2655 msgid "Add filter"
2656 msgstr "增加过滤器"
2657 
2658-#: trac/ticket/templates/query.html:133
2659+#: trac/ticket/templates/query.html:144
2660 msgid "Columns"
2661 msgstr "列"
2662 
2663-#: trac/ticket/templates/query.html:147
2664+#: trac/ticket/templates/query.html:158
2665 msgid "Group results by"
2666 msgstr "结果分组"
2667 
2668-#: trac/ticket/templates/query.html:157
2669+#: trac/ticket/templates/query.html:169
2670 msgid "descending"
2671 msgstr "降序"
2672 
2673-#: trac/ticket/templates/query.html:161
2674+#: trac/ticket/templates/query.html:173
2675 msgid "Show under each result:"
2676 msgstr "在每个结果下显示:"
2677 
2678-#: trac/ticket/templates/query.html:171
2679+#: trac/ticket/templates/query.html:183
2680+#: trac/ticket/templates/report_view.html:27
2681 msgid "Max items per page"
2682 msgstr "每页最多条目"
2683 
2684-#: trac/ticket/templates/query.html:214
2685+#: trac/ticket/templates/query.html:226
2686 msgid "Edit query"
2687 msgstr "编辑查询"
2688 
2689-#: trac/ticket/templates/query.html:222
2690+#: trac/ticket/templates/query.html:234
2691 msgid "Save query"
2692 msgstr "保存查询"
2693 
2694-#: trac/ticket/templates/query.html:222
2695+#: trac/ticket/templates/query.html:234
2696 #, python-format
2697 msgid "Save updated query in report {%(id)s}"
2698 msgstr "在报表 {%(id)s} 中保存更新的查询"
2699 
2700-#: trac/ticket/templates/query.html:222
2701+#: trac/ticket/templates/query.html:234
2702 msgid "Create new report from current query"
2703 msgstr "用当前查询创建新的"
2704 
2705-#: trac/ticket/templates/query.html:231
2706+#: trac/ticket/templates/query.html:243
2707 msgid "Delete query"
2708 msgstr "删除查询"
2709 
2710-#: trac/ticket/templates/query.html:238
2711-#: trac/ticket/templates/report_edit.html:36
2712-msgid "TracQuery"
2713-msgstr "TracQuery"
2714+#: trac/ticket/templates/query.html:249
2715+msgid ""
2716+"[1:Note:] See [2:TracQuery]\n"
2717+"        for help on using queries."
2718+msgstr "[1:注意：]有关使用查询的帮助参见[2:TracQuery]"
2719 
2720-#: trac/ticket/templates/query.html:238
2721-msgid "for help on using queries."
2722-msgstr "使用查询的帮助."
2723+#: trac/ticket/templates/query_results.html:44
2724+msgid "No tickets found"
2725+msgstr "没有匹配的任务单"
2726 
2727-#: trac/ticket/templates/query_results.html:53
2728-#: trac/ticket/templates/query_results.html:55
2729+#: trac/ticket/templates/query_results.html:58
2730+#: trac/ticket/templates/query_results.html:60
2731 msgid "View ticket"
2732-msgstr "查看传票"
2733+msgstr "查看任务单"
2734 
2735-#: trac/ticket/templates/query_results.html:69
2736+#: trac/ticket/templates/query_results.html:65
2737+#: trac/ticket/templates/report_view.html:183
2738+msgid "View milestone"
2739+msgstr "查看里程碑"
2740+
2741+#: trac/ticket/templates/query_results.html:76
2742 msgid "Reported by"
2743 msgstr "汇报人"
2744 
2745-#: trac/ticket/templates/query_results.html:76
2746+#: trac/ticket/templates/query_results.html:83
2747 msgid "(this ticket)"
2748-msgstr "(本传票)"
2749+msgstr "(本任务单)"
2750 
2751-#: trac/ticket/templates/query_results.html:92
2752+#: trac/ticket/templates/query_results.html:99
2753 msgid "(more results for this group on next page)"
2754 msgstr "(下页有更多结果)"
2755 
2756-#: trac/ticket/templates/report_delete.html:18
2757+#: trac/ticket/templates/report_delete.html:17
2758 msgid "Are you sure you want to delete this report?"
2759 msgstr "确定删除此报表吗?"
2760 
2761-#: trac/ticket/templates/report_delete.html:21
2762-#: trac/ticket/templates/report_view.html:39
2763+#: trac/ticket/templates/report_delete.html:22
2764+#: trac/ticket/templates/report_view.html:82
2765 msgid "Delete report"
2766 msgstr "删除报表"
2767 
2768-#: trac/ticket/templates/report_delete.html:27
2769-#: trac/ticket/templates/report_edit.html:50
2770-#: trac/ticket/templates/report_view.html:170
2771-msgid "TracReports"
2772-msgstr "TracReports"
2773+#: trac/ticket/templates/report_delete.html:26
2774+#: trac/ticket/templates/report_edit.html:48
2775+#: trac/ticket/templates/report_view.html:218
2776+msgid ""
2777+"[1:Note:]\n"
2778+"        See [2:TracReports] for help on using and creating reports."
2779+msgstr "[1:注意:] 使用和创建报表的帮助参见[2:TracReports]。"
2780 
2781-#: trac/ticket/templates/report_delete.html:27
2782-#: trac/ticket/templates/report_edit.html:50
2783-#: trac/ticket/templates/report_view.html:170
2784-msgid "for help on using and creating reports."
2785-msgstr "使用和创建报表的帮助."
2786-
2787 #: trac/ticket/templates/report_edit.html:21
2788 msgid "Report Title:"
2789 msgstr "报表标题:"
2790@@ -2355,64 +2458,58 @@
2791 msgid "Description: (you may use [1:WikiFormatting] here)"
2792 msgstr "描述: (你可用 [1:WikiFormatting] 格式)"
2793 
2794-#: trac/ticket/templates/report_edit.html:34
2795-msgid "Error:"
2796-msgstr "错误:"
2797-
2798 #: trac/ticket/templates/report_edit.html:36
2799-msgid "Query for Report: (can be either SQL or, if starting with"
2800-msgstr "用于报表的查询: (可以是 SQL 或者, 如果开始于"
2801+msgid ""
2802+"Query for Report: (can be either SQL or, if starting with [1:query:], a "
2803+"[2:TracQuery] expression)"
2804+msgstr "生成报表的查询: (可以是SQL，或者是一个以[1:query:]开头的[2:TracQuery]表达式)"
2805 
2806-#: trac/ticket/templates/report_edit.html:36
2807-msgid "query:"
2808-msgstr "查询:"
2809-
2810-#: trac/ticket/templates/report_edit.html:36
2811-msgid ", a"
2812-msgstr ", 一个"
2813-
2814-#: trac/ticket/templates/report_edit.html:36
2815-msgid "expression)"
2816-msgstr "表达式)"
2817-
2818 #: trac/ticket/templates/report_edit.html:41
2819 msgid "Save report"
2820 msgstr "保存报表"
2821 
2822-#: trac/ticket/templates/report_view.html:16
2823+#: trac/ticket/templates/report_view.html:21
2824 msgid "matches)"
2825 msgstr "匹配)"
2826 
2827-#: trac/ticket/templates/report_view.html:27
2828+#: trac/ticket/templates/report_view.html:42
2829+msgid "Arguments"
2830+msgstr "参数"
2831+
2832+#: trac/ticket/templates/report_view.html:43
2833+msgid "Report arguments"
2834+msgstr "报表参数"
2835+
2836+#: trac/ticket/templates/report_view.html:70
2837 msgid "Edit report"
2838 msgstr "编辑报表"
2839 
2840-#: trac/ticket/templates/report_view.html:33
2841+#: trac/ticket/templates/report_view.html:76
2842 msgid "Copy report"
2843 msgstr "复制报表"
2844 
2845-#: trac/ticket/templates/report_view.html:51
2846+#: trac/ticket/templates/report_view.html:94
2847 msgid "match"
2848 msgstr "匹配"
2849 
2850-#: trac/ticket/templates/report_view.html:85
2851-#: trac/ticket/templates/report_view.html:92
2852+#: trac/ticket/templates/report_view.html:128
2853+#: trac/ticket/templates/report_view.html:135
2854 msgid "View report"
2855 msgstr "查看报表"
2856 
2857-#: trac/ticket/templates/report_view.html:160
2858+#: trac/ticket/templates/report_view.html:210
2859 msgid "Create new report"
2860 msgstr "新建报表"
2861 
2862-#: trac/ticket/templates/roadmap.html:23
2863+#: trac/ticket/templates/roadmap.html:22
2864 msgid "Show already completed milestones"
2865 msgstr "显示已完成里程碑"
2866 
2867-#: trac/ticket/templates/roadmap.html:34
2868+#: trac/ticket/templates/roadmap.html:33
2869 msgid "Milestone:"
2870 msgstr "里程碑:"
2871 
2872-#: trac/ticket/templates/roadmap.html:39
2873+#: trac/ticket/templates/roadmap.html:38
2874 msgid ""
2875 "ago\n"
2876 "                ("
2877@@ -2420,163 +2517,172 @@
2878 "前\n"
2879 "                ("
2880 
2881-#: trac/ticket/templates/roadmap.html:67
2882+#: trac/ticket/templates/roadmap.html:66
2883 msgid "Add new milestone"
2884 msgstr "新建里程碑"
2885 
2886-#: trac/ticket/templates/ticket.html:57
2887+#: trac/ticket/templates/ticket.html:59
2888 #: trac/versioncontrol/templates/changeset.html:128
2889 msgid "added"
2890 msgstr "增加"
2891 
2892-#: trac/ticket/templates/ticket.html:60
2893+#: trac/ticket/templates/ticket.html:63
2894 msgid "changed from"
2895 msgstr "变更自"
2896 
2897-#: trac/ticket/templates/ticket.html:63
2898-#: trac/versioncontrol/templates/browser.html:125
2899+#: trac/ticket/templates/ticket.html:66
2900+#: trac/versioncontrol/templates/browser.html:135
2901 msgid "set to"
2902 msgstr "设置为"
2903 
2904-#: trac/ticket/templates/ticket.html:66
2905+#: trac/ticket/templates/ticket.html:70
2906 msgid "deleted"
2907 msgstr "删除"
2908 
2909-#: trac/ticket/templates/ticket.html:79
2910+#: trac/ticket/templates/ticket.html:84
2911 msgid "Ticket #"
2912-msgstr "传票 #"
2913+msgstr "任务单 #"
2914 
2915-#: trac/ticket/templates/ticket.html:83
2916+#: trac/ticket/templates/ticket.html:88
2917 msgid "Create New Ticket"
2918-msgstr "创建新传票"
2919+msgstr "创建新任务单"
2920 
2921-#: trac/ticket/templates/ticket.html:94 trac/ticket/templates/ticket.html:97
2922+#: trac/ticket/templates/ticket.html:99 trac/ticket/templates/ticket.html:102
2923 msgid "— at"
2924 msgstr "— 于"
2925 
2926-#: trac/ticket/templates/ticket.html:108
2927+#: trac/ticket/templates/ticket.html:113
2928 msgid "Preview ("
2929 msgstr "预览 ("
2930 
2931-#: trac/ticket/templates/ticket.html:108 trac/wiki/templates/wiki_edit.html:62
2932+#: trac/ticket/templates/ticket.html:113 trac/wiki/templates/wiki_edit.html:52
2933 msgid "skip"
2934 msgstr "跳过"
2935 
2936-#: trac/ticket/templates/ticket.html:113 trac/ticket/templates/ticket.html:209
2937+#: trac/ticket/templates/ticket.html:118 trac/ticket/templates/ticket.html:217
2938 msgid "in reply to:"
2939 msgstr "回复到:"
2940 
2941-#: trac/ticket/templates/ticket.html:115
2942+#: trac/ticket/templates/ticket.html:120
2943 msgid "Changed by"
2944 msgstr "修改者"
2945 
2946-#: trac/ticket/templates/ticket.html:126
2947+#: trac/ticket/templates/ticket.html:131
2948 msgid "Opened"
2949-msgstr "打开"
2950+msgstr "开启于"
2951 
2952-#: trac/ticket/templates/ticket.html:126 trac/ticket/templates/ticket.html:127
2953+#: trac/ticket/templates/ticket.html:131 trac/ticket/templates/ticket.html:132
2954 msgid "ago"
2955 msgstr "前"
2956 
2957-#: trac/ticket/templates/ticket.html:127
2958+#: trac/ticket/templates/ticket.html:131
2959+#, python-format
2960+msgid "Opened %(created)s ago"
2961+msgstr "开启于 %(created)s 前"
2962+
2963+#: trac/ticket/templates/ticket.html:132
2964 msgid "Last modified"
2965-msgstr "最新修改"
2966+msgstr "最后修改于"
2967 
2968-#: trac/ticket/templates/ticket.html:128
2969+#: trac/ticket/templates/ticket.html:132
2970+#, python-format
2971+msgid "Last modified %(modified)s ago"
2972+msgstr "最后修改于 %(modified)s 前"
2973+
2974+#: trac/ticket/templates/ticket.html:133
2975 msgid "(ticket not yet created)"
2976-msgstr "(还没有创建传票)"
2977+msgstr "(还没有创建任务单)"
2978 
2979-#: trac/ticket/templates/ticket.html:137
2980+#: trac/ticket/templates/ticket.html:142
2981 msgid "Reported by:"
2982 msgstr "汇报人:"
2983 
2984-#: trac/ticket/templates/ticket.html:139
2985+#: trac/ticket/templates/ticket.html:146
2986 msgid "Owned by:"
2987 msgstr "属主:"
2988 
2989-#: trac/ticket/templates/ticket.html:168
2990+#: trac/ticket/templates/ticket.html:176
2991 msgid "(last modified by"
2992 msgstr "(最新修改者"
2993 
2994-#: trac/ticket/templates/ticket.html:170
2995+#: trac/ticket/templates/ticket.html:178
2996 msgid "diff"
2997 msgstr "差异"
2998 
2999-#: trac/ticket/templates/ticket.html:181 trac/ticket/templates/ticket.html:223
3000+#: trac/ticket/templates/ticket.html:189 trac/ticket/templates/ticket.html:231
3001 msgid "Reply"
3002 msgstr "回复"
3003 
3004-#: trac/ticket/templates/ticket.html:181
3005+#: trac/ticket/templates/ticket.html:189
3006 msgid "Reply, quoting this description"
3007 msgstr "回复, 引用此描述"
3008 
3009-#: trac/ticket/templates/ticket.html:200
3010+#: trac/ticket/templates/ticket.html:208
3011 msgid "Change History"
3012 msgstr "变更历史"
3013 
3014-#: trac/ticket/templates/ticket.html:213
3015+#: trac/ticket/templates/ticket.html:221
3016 msgid "follow-up"
3017 msgstr "跟随"
3018 
3019-#: trac/ticket/templates/ticket.html:218
3020-msgid "Changed"
3021-msgstr "已变更"
3022+#: trac/ticket/templates/ticket.html:227
3023+#, python-format
3024+msgid "%(date)s ago by"
3025+msgstr "于%(date)s前，操作者: "
3026 
3027-#: trac/ticket/templates/ticket.html:219
3028-msgid "ago by"
3029-msgstr "前, 由"
3030-
3031-#: trac/ticket/templates/ticket.html:238
3032+#: trac/ticket/templates/ticket.html:246
3033 msgid "Add/Change #"
3034 msgstr "增加/修改 #"
3035 
3036-#: trac/ticket/templates/ticket.html:258
3037+#: trac/ticket/templates/ticket.html:262 trac/wiki/templates/wiki_edit.html:98
3038+msgid "E-mail address and user name can be saved in the"
3039+msgstr "E-mail地址和用户名可以保存在"
3040+
3041+#: trac/ticket/templates/ticket.html:269
3042 msgid ""
3043 "Comment (you may use\n"
3044 "              [1:WikiFormatting]\n"
3045 "              here):"
3046-msgstr ""
3047-"评论 (你可用\n"
3048-"              [1:WikiFormatting]\n"
3049-"              ):"
3050+msgstr "评论(你可以使用[1:WikiFormatting]): "
3051 
3052-#: trac/ticket/templates/ticket.html:271
3053+#: trac/ticket/templates/ticket.html:282
3054 msgid "Properties"
3055 msgstr "属性"
3056 
3057-#: trac/ticket/templates/ticket.html:274
3058+#: trac/ticket/templates/ticket.html:285
3059 msgid "Summary:"
3060-msgstr "概述:"
3061+msgstr "概要:"
3062 
3063-#: trac/ticket/templates/ticket.html:282
3064+#: trac/ticket/templates/ticket.html:293
3065 msgid "Reporter:"
3066 msgstr "汇报人:"
3067 
3068-#: trac/ticket/templates/ticket.html:339
3069+#: trac/ticket/templates/ticket.html:353
3070 msgid "This checkbox allows you to add or remove yourself from the CC list."
3071-msgstr ""
3072+msgstr "您可以使用此复选框将自己加入到抄送列表中或从中移除。"
3073 
3074-#: trac/ticket/templates/ticket.html:345
3075+#: trac/ticket/templates/ticket.html:359
3076 msgid "Space or comma delimited email addresses and usernames are accepted."
3077-msgstr ""
3078+msgstr "可以接受使用空格或逗号隔开的email地址或用户名。"
3079 
3080-#: trac/ticket/templates/ticket.html:377
3081+#: trac/ticket/templates/ticket.html:391
3082 msgid "I have files to attach to this ticket"
3083-msgstr "我有文件需要附加到传票"
3084+msgstr "我有文件需要附加到任务单"
3085 
3086-#: trac/ticket/templates/ticket.html:388 trac/wiki/templates/wiki_edit.html:124
3087+#: trac/ticket/templates/ticket.html:402 trac/wiki/templates/wiki_edit.html:117
3088 msgid "Preview"
3089 msgstr "预览"
3090 
3091-#: trac/ticket/templates/ticket.html:396
3092-msgid "TracTickets"
3093-msgstr "TracTickets"
3094+#: trac/ticket/templates/ticket.html:403
3095+msgid "Create ticket"
3096+msgstr "创建新任务单"
3097 
3098-#: trac/ticket/templates/ticket.html:396
3099+#: trac/ticket/templates/ticket.html:408
3100 msgid ""
3101-"for help on using\n"
3102+"[1:Note:] See\n"
3103+"        [2:TracTickets] for help on using\n"
3104 "        tickets."
3105-msgstr "关于传票的使用帮助."
3106+msgstr "[1:注意:] 使用任务单的帮助参见[2:TracTickets]"
3107 
3108 #: trac/ticket/templates/ticket_notify_email.txt:9
3109 msgid "Changes (by"
3110@@ -2584,7 +2690,7 @@
3111 
3112 #: trac/ticket/templates/ticket_notify_email.txt:15
3113 msgid "Description changed by"
3114-msgstr "变更描述"
3115+msgstr "描述变更 操作者:"
3116 
3117 #: trac/ticket/templates/ticket_notify_email.txt:28
3118 msgid ""
3119@@ -2592,41 +2698,50 @@
3120 "Ticket URL: <"
3121 msgstr ""
3122 "-- \n"
3123-"传票 URL: <"
3124+"任务单 URL: <"
3125 
3126-#: trac/timeline/web_ui.py:76 trac/timeline/templates/timeline.html:10
3127-#: trac/timeline/templates/timeline.html:16
3128+#: trac/timeline/web_ui.py:77 trac/timeline/templates/timeline.html:11
3129+#: trac/timeline/templates/timeline.html:17
3130 msgid "Timeline"
3131 msgstr "时间线"
3132 
3133-#: trac/timeline/web_ui.py:202
3134+#: trac/timeline/web_ui.py:229
3135 msgid "Previous period"
3136 msgstr "上一周期"
3137 
3138-#: trac/timeline/web_ui.py:208
3139+#: trac/timeline/web_ui.py:236
3140 msgid "Next period"
3141 msgstr "下一周期"
3142 
3143-#: trac/timeline/web_ui.py:269
3144+#: trac/timeline/web_ui.py:297
3145 #, python-format
3146 msgid "%(date)s in Timeline"
3147 msgstr "%(date)s 在时间线"
3148 
3149 #: trac/timeline/templates/timeline.html:20
3150-msgid "View changes from"
3151-msgstr "查看变更自"
3152+msgid ""
3153+"[1:View changes from [2:]] [3:]\n"
3154+"        and [4:[5:] days back][6:]\n"
3155+"        [7:done by [8:]]"
3156+msgstr ""
3157+"\n"
3158+"[1:查看[2:]] [3:]之前\n"
3159+"[4:[5:]天][6:]\n"
3160+"[7:由[8:]完成]进行的变更"
3161 
3162-#: trac/timeline/templates/timeline.html:21
3163-msgid "days back"
3164-msgstr "天前"
3165+#: trac/timeline/templates/timeline.html:37
3166+msgid "Today"
3167+msgstr "今天"
3168 
3169-#: trac/timeline/templates/timeline.html:53
3170-msgid "TracTimeline"
3171-msgstr "TracTimeline"
3172+#: trac/timeline/templates/timeline.html:37
3173+msgid "Yesterday"
3174+msgstr "昨天"
3175 
3176-#: trac/timeline/templates/timeline.html:53
3177-msgid "for information about the timeline view."
3178-msgstr "关于时间线视图的信息."
3179+#: trac/timeline/templates/timeline.html:54
3180+msgid ""
3181+"[1:Note:] See [2:TracTimeline]\n"
3182+"        for information about the timeline view."
3183+msgstr "[1:注意:] 时间线视图的相关信息参见[2:TracTimeline]。"
3184 
3185 #: trac/util/presentation.py:254
3186 #, python-format
3187@@ -2638,161 +2753,194 @@
3188 msgid "%(start)d - %(stop)d of %(total)d"
3189 msgstr "%(start)d - %(stop)d 共 %(total)d"
3190 
3191-#: trac/versioncontrol/api.py:81
3192+#: trac/versioncontrol/admin.py:42
3193 #, python-format
3194-msgid "Can't synchronize with the repository (%(error)s)"
3195-msgstr "无法与仓库同步 (%(error)s)"
3196+msgid "%(rev)s resynced."
3197+msgstr "%(rev)s已重新同步."
3198 
3199-#: trac/versioncontrol/api.py:96
3200+#: trac/versioncontrol/admin.py:45
3201+msgid "Resyncing repository history... "
3202+msgstr "重新同步版本库历史……"
3203+
3204+#: trac/versioncontrol/admin.py:58
3205 #, python-format
3206+msgid "%(num)s revision cached."
3207+msgid_plural "%(num)s revisions cached."
3208+msgstr[0] "%(num)s个修订已缓存"
3209+msgstr[1] "%(num)s个修订已缓存"
3210+
3211+#: trac/versioncontrol/admin.py:60
3212+msgid "Done."
3213+msgstr "完成。"
3214+
3215+#: trac/versioncontrol/api.py:90
3216+#, python-format
3217+msgid ""
3218+"Can't synchronize with the repository (%(error)s). Look in the Trac log "
3219+"for more information."
3220+msgstr "无法与版本库同步 (%(error)s)。更多信息请查看Trac日志。"
3221+
3222+#: trac/versioncontrol/api.py:105
3223+#, python-format
3224 msgid "Changeset %(rev)s"
3225 msgstr "变更集 %(rev)s"
3226 
3227-#: trac/versioncontrol/api.py:103
3228+#: trac/versioncontrol/api.py:112
3229 msgid "Directory"
3230 msgstr "目录"
3231 
3232-#: trac/versioncontrol/api.py:107
3233+#: trac/versioncontrol/api.py:116
3234 #, python-format
3235 msgid "at version %(rev)s"
3236 msgstr "于版本 %(rev)s"
3237 
3238-#: trac/versioncontrol/api.py:109
3239+#: trac/versioncontrol/api.py:118
3240 msgid "Path"
3241 msgstr "路径"
3242 
3243-#: trac/versioncontrol/api.py:131
3244+#: trac/versioncontrol/api.py:142
3245 #, python-format
3246+msgid "Unsupported version control system \"%(name)s\": \"%(error)s\" "
3247+msgstr "不支持的版本控制系统 \"%(name)s\": \"%(error)s\""
3248+
3249+#: trac/versioncontrol/api.py:146
3250+#, python-format
3251 msgid ""
3252-"Unsupported version control system \"%(name)s\". Check that the Python "
3253-"support libraries for \"%(name)s\" are correctly installed."
3254-msgstr "不支持的版本控制系统 \"%(name)s\". 请检查Python 支持库 \"%(name)s\" 已经正确安装."
3255+"Unsupported version control system \"%(name)s\": Can't find an "
3256+"appropriate component, maybe the corresponding plugin was not enabled? "
3257+msgstr "不支持的版本控制系统\"%(name)s\"：未能找到合适的组件，也许相关插件没有被激活？"
3258 
3259-#: trac/versioncontrol/api.py:163
3260+#: trac/versioncontrol/api.py:178
3261 #, python-format
3262 msgid "No changeset %(rev)s in the repository"
3263-msgstr "在仓库中没有变更集 %(rev)s"
3264+msgstr "在版本库中没有变更集 %(rev)s"
3265 
3266-#: trac/versioncontrol/api.py:165
3267+#: trac/versioncontrol/api.py:180
3268 msgid "No such changeset"
3269 msgstr "没有这个变更集"
3270 
3271-#: trac/versioncontrol/api.py:171
3272+#: trac/versioncontrol/api.py:186
3273 msgid "No such node"
3274 msgstr "没有这个节点"
3275 
3276-#: trac/versioncontrol/api.py:509
3277+#: trac/versioncontrol/api.py:524
3278 #, python-format
3279 msgid "Insufficient permissions to access %(path)s"
3280 msgstr "访问 %(path)s 的权限不够"
3281 
3282-#: trac/versioncontrol/api.py:514
3283+#: trac/versioncontrol/api.py:529
3284 #, python-format
3285 msgid "Insufficient permissions to access changeset %(id)s"
3286 msgstr "访问变更集 %(id)s 的权限不够"
3287 
3288-#: trac/versioncontrol/cache.py:95
3289+#: trac/versioncontrol/cache.py:102
3290 msgid ""
3291 "The 'repository_dir' has changed, a 'trac-admin resync' operation is "
3292 "needed."
3293 msgstr "'repository_dir'已经被修改, 需要执行'trac-admin resync'操作."
3294 
3295-#: trac/versioncontrol/cache.py:114
3296+#: trac/versioncontrol/cache.py:121
3297 msgid "Missing \"youngest_rev\" in cache metadata"
3298 msgstr "在缓存的元数据中没有 \"youngest_rev\""
3299 
3300-#: trac/versioncontrol/svn_fs.py:294
3301+#: trac/versioncontrol/svn_fs.py:305
3302 #, python-format
3303 msgid "Subversion >= 1.0 required: Found %(version)s"
3304 msgstr "需要Subversion >= 1.0: 发现的是 %(version)s"
3305 
3306-#: trac/versioncontrol/svn_fs.py:371
3307+#: trac/versioncontrol/svn_fs.py:387
3308 msgid "No svn:externals configured in trac.ini"
3309 msgstr "在trac.ini没有svn:externals配置"
3310 
3311-#: trac/versioncontrol/svn_fs.py:395
3312+#: trac/versioncontrol/svn_fs.py:422
3313 #, python-format
3314 msgid "%(path)s does not appear to be a Subversion repository."
3315-msgstr "%(path)s 不是Subversion仓库路径."
3316+msgstr "%(path)s 不是Subversion版本库路径."
3317 
3318-#: trac/versioncontrol/svn_fs.py:652
3319+#: trac/versioncontrol/svn_fs.py:429
3320 #, python-format
3321+msgid "Couldn't open Subversion repository %(path)s: %(svn_error)s"
3322+msgstr "不能打开Subversion版本库 %(path)s：%(svn_error)s"
3323+
3324+#: trac/versioncontrol/svn_fs.py:683
3325+#, python-format
3326 msgid ""
3327 "Diff mismatch: Base is a %(oldnode)s (%(oldpath)s in revision %(oldrev)s)"
3328 " and Target is a %(newnode)s (%(newpath)s in revision %(newrev)s)."
3329-msgstr ""
3330-"差异不匹配: 基准是 %(oldnode)s (%(oldpath)s 在修订 %(oldrev)s)中,  而目标是 %(newnode)s "
3331-"(%(newpath)s 在版本 %(newrev)s)中."
3332+msgstr "差异不匹配: 基准是 %(oldnode)s (%(oldpath)s 在修订 %(oldrev)s)中,  而目标是 %(newnode)s (%(newpath)s 在修订 %(newrev)s)中."
3333 
3334-#: trac/versioncontrol/svn_fs.py:803
3335+#: trac/versioncontrol/svn_fs.py:836
3336 #, python-format
3337-msgid "svn blame failed: %(error)s"
3338-msgstr "svn 失败报告: %(error)s"
3339+msgid "svn blame failed on %(path)s: %(error)s"
3340+msgstr "svn追溯失败 %(path)s: %(error)s"
3341 
3342-#: trac/versioncontrol/templates/browser.html:45
3343+#: trac/versioncontrol/templates/browser.html:50
3344 msgid "View revision:"
3345 msgstr "查看修订:"
3346 
3347-#: trac/versioncontrol/templates/browser.html:55
3348+#: trac/versioncontrol/templates/browser.html:60
3349 msgid "Visit:"
3350 msgstr "访问:"
3351 
3352-#: trac/versioncontrol/templates/browser.html:63
3353+#: trac/versioncontrol/templates/browser.html:68
3354 msgid "Go!"
3355 msgstr "èµ°!"
3356 
3357-#: trac/versioncontrol/templates/browser.html:63
3358+#: trac/versioncontrol/templates/browser.html:68
3359 msgid "Jump to the chosen preselected path"
3360 msgstr "跳转到预选择的路径"
3361 
3362-#: trac/versioncontrol/templates/browser.html:82
3363-#: trac/versioncontrol/templates/revisionlog.html:92
3364-#: trac/versioncontrol/web_ui/browser.py:622
3365+#: trac/versioncontrol/templates/browser.html:87
3366+#: trac/versioncontrol/templates/revisionlog.html:93
3367+#: trac/versioncontrol/web_ui/browser.py:621
3368 msgid "Rev"
3369-msgstr "修订"
3370+msgstr "Rev"
3371 
3372-#: trac/versioncontrol/templates/browser.html:84
3373-#: trac/versioncontrol/web_ui/browser.py:373 trac/wiki/web_ui.py:520
3374-#: trac/wiki/web_ui.py:544
3375+#: trac/versioncontrol/templates/browser.html:89
3376+#: trac/versioncontrol/web_ui/browser.py:372 trac/wiki/web_ui.py:539
3377+#: trac/wiki/web_ui.py:565
3378 msgid "Last Change"
3379-msgstr "最后变更"
3380+msgstr "最新变更"
3381 
3382-#: trac/versioncontrol/templates/browser.html:91
3383+#: trac/versioncontrol/templates/browser.html:96
3384 msgid "Parent Directory"
3385 msgstr "父目录"
3386 
3387-#: trac/versioncontrol/templates/browser.html:100
3388-#: trac/wiki/templates/wiki_edit.html:51 trac/wiki/templates/wiki_view.html:23
3389+#: trac/versioncontrol/templates/browser.html:102
3390+msgid "No files found"
3391+msgstr "没有找到任何文件。"
3392+
3393+#: trac/versioncontrol/templates/browser.html:110
3394+#: trac/wiki/templates/wiki_edit.html:41 trac/wiki/templates/wiki_view.html:30
3395 msgid "Revision info"
3396 msgstr "修订信息"
3397 
3398-#: trac/versioncontrol/templates/browser.html:102
3399-msgid "Revision"
3400-msgstr "修订"
3401+#: trac/versioncontrol/templates/browser.html:112
3402+#, python-format
3403+msgid ""
3404+"Revision [1:%(rev)s], %(size)s\n"
3405+"            (checked in by %(author)s, %(date)s ago)"
3406+msgstr ""
3407+"修订 [1:%(rev)s], %(size)s\n"
3408+"            (由%(author)s在%(date)s前签入)"
3409 
3410-#: trac/versioncontrol/templates/browser.html:103
3411-msgid "(checked in by"
3412-msgstr "(检入者"
3413+#: trac/versioncontrol/templates/browser.html:151
3414+msgid ""
3415+"[1:Note:] See [2:TracBrowser]\n"
3416+"        for help on using the browser."
3417+msgstr "[1:注意:] 使用源码浏览器的帮助参见 [2:TracBrowser]。"
3418 
3419-#: trac/versioncontrol/templates/browser.html:142
3420-msgid "TracBrowser"
3421-msgstr "TracBrowser"
3422-
3423-#: trac/versioncontrol/templates/browser.html:142
3424-msgid "for help on using the browser."
3425-msgstr "使用源码游览的帮助."
3426-
3427-#: trac/versioncontrol/templates/browser.html:153
3428+#: trac/versioncontrol/templates/browser.html:163
3429 msgid "View changes..."
3430-msgstr "查阅变更"
3431+msgstr "查阅变更..."
3432 
3433-#: trac/versioncontrol/templates/browser.html:153
3434+#: trac/versioncontrol/templates/browser.html:163
3435 msgid "Select paths and revs for Diff"
3436-msgstr "选择差异的路径和修订"
3437+msgstr "选择进行对比的路径和修订"
3438 
3439 #: trac/versioncontrol/templates/changeset.html:21
3440 #: trac/versioncontrol/templates/changeset.html:36
3441-#: trac/versioncontrol/web_ui/changeset.py:344
3442+#: trac/versioncontrol/web_ui/changeset.py:345
3443 msgid "Changeset"
3444 msgstr "变更集"
3445 
3446@@ -2813,7 +2961,7 @@
3447 #: trac/versioncontrol/templates/changeset.html:33
3448 #: trac/versioncontrol/templates/changeset.html:64
3449 msgid "Show entry in browser"
3450-msgstr "在源码游览中显示条目"
3451+msgstr "在源码浏览器中显示条目"
3452 
3453 #: trac/versioncontrol/templates/changeset.html:25
3454 msgid "Changes in"
3455@@ -2874,29 +3022,29 @@
3456 msgid "moved"
3457 msgstr "已移动"
3458 
3459-#: trac/versioncontrol/templates/diff_form.html:9
3460-#: trac/versioncontrol/templates/diff_form.html:20
3461+#: trac/versioncontrol/templates/diff_form.html:10
3462+#: trac/versioncontrol/templates/diff_form.html:21
3463 msgid "Prepare Diff"
3464 msgstr "准备差异"
3465 
3466-#: trac/versioncontrol/templates/diff_form.html:26
3467+#: trac/versioncontrol/templates/diff_form.html:27
3468 msgid "Select the base and the target for the diff:"
3469 msgstr "选择差异的基准和目标:"
3470 
3471-#: trac/versioncontrol/templates/diff_form.html:29
3472+#: trac/versioncontrol/templates/diff_form.html:30
3473 msgid "From:"
3474 msgstr "从:"
3475 
3476-#: trac/versioncontrol/templates/diff_form.html:33
3477-#: trac/versioncontrol/templates/diff_form.html:43
3478+#: trac/versioncontrol/templates/diff_form.html:34
3479+#: trac/versioncontrol/templates/diff_form.html:44
3480 msgid "at revision:"
3481 msgstr "在修订:"
3482 
3483-#: trac/versioncontrol/templates/diff_form.html:39
3484+#: trac/versioncontrol/templates/diff_form.html:40
3485 msgid "To:"
3486 msgstr "至:"
3487 
3488-#: trac/versioncontrol/templates/diff_form.html:49
3489+#: trac/versioncontrol/templates/diff_form.html:50
3490 msgid ""
3491 "For either path, you can start typing the path and will be\n"
3492 "              presented a list of existing directories and files to "
3493@@ -2907,101 +3055,102 @@
3494 "每个路径, 你可以开始输入路径, 然后将获得现有路径和文件的提示, 以供选择.              点击条目以选择, 或者使用上下箭头, "
3495 "然后按tab键."
3496 
3497-#: trac/versioncontrol/templates/diff_form.html:63
3498-msgid "TracChangeset"
3499-msgstr "TracChangeset"
3500+#: trac/versioncontrol/templates/diff_form.html:62
3501+msgid ""
3502+"[1:Note:] See\n"
3503+"        [2:TracChangeset]\n"
3504+"        for help on using the diff feature."
3505+msgstr "[1:注意:] 对比功能的使用帮助参见[2:TracChangeset]"
3506 
3507-#: trac/versioncontrol/templates/diff_form.html:63
3508-msgid "for help on using the diff feature."
3509-msgstr "使用差异特性的帮助."
3510-
3511 #: trac/versioncontrol/templates/dir_entries.html:17
3512 msgid "View Revision Log"
3513 msgstr "查看修订日志"
3514 
3515-#: trac/versioncontrol/templates/revisionlog.html:10
3516+#: trac/versioncontrol/templates/revisionlog.html:11
3517 msgid "(log)"
3518 msgstr "(日志)"
3519 
3520-#: trac/versioncontrol/templates/revisionlog.html:22
3521+#: trac/versioncontrol/templates/revisionlog.html:23
3522 msgid "Revision Log Mode:"
3523 msgstr "修订日志模式:"
3524 
3525-#: trac/versioncontrol/templates/revisionlog.html:26
3526+#: trac/versioncontrol/templates/revisionlog.html:27
3527 msgid "Stop on copy"
3528 msgstr "只显示到复制时的修订"
3529 
3530-#: trac/versioncontrol/templates/revisionlog.html:32
3531+#: trac/versioncontrol/templates/revisionlog.html:33
3532 msgid "Follow copies"
3533 msgstr "跟随复制"
3534 
3535-#: trac/versioncontrol/templates/revisionlog.html:38
3536+#: trac/versioncontrol/templates/revisionlog.html:39
3537 msgid "Show only adds and deletes"
3538 msgstr "只显示增加和删除"
3539 
3540-#: trac/versioncontrol/templates/revisionlog.html:43
3541+#: trac/versioncontrol/templates/revisionlog.html:44
3542 msgid "View log starting at"
3543-msgstr "查看日志起始于"
3544+msgstr "查看日志，起始修订:"
3545 
3546-#: trac/versioncontrol/templates/revisionlog.html:47
3547+#: trac/versioncontrol/templates/revisionlog.html:48
3548 msgid "and back to"
3549-msgstr "回退到"
3550+msgstr "结束修订:"
3551 
3552-#: trac/versioncontrol/templates/revisionlog.html:52
3553+#: trac/versioncontrol/templates/revisionlog.html:53
3554 msgid "Show at most"
3555 msgstr "最多显示"
3556 
3557-#: trac/versioncontrol/templates/revisionlog.html:54
3558+#: trac/versioncontrol/templates/revisionlog.html:55
3559 msgid "revisions per page."
3560 msgstr "修订/页."
3561 
3562-#: trac/versioncontrol/templates/revisionlog.html:59
3563+#: trac/versioncontrol/templates/revisionlog.html:60
3564 msgid "Show full log messages"
3565 msgstr "显示完整日志信息"
3566 
3567-#: trac/versioncontrol/templates/revisionlog.html:77
3568+#: trac/versioncontrol/templates/revisionlog.html:78
3569 msgid "Copied or renamed"
3570 msgstr "复制或更名"
3571 
3572-#: trac/versioncontrol/templates/revisionlog.html:84
3573+#: trac/versioncontrol/templates/revisionlog.html:85
3574 msgid "Diff from Old Revision to New Revision (select them below)"
3575 msgstr "显示旧修订到新修订的差异(从下面选择)"
3576 
3577-#: trac/versioncontrol/templates/revisionlog.html:93
3578+#: trac/versioncontrol/templates/revisionlog.html:94
3579 msgid "Chgset"
3580 msgstr "变更集"
3581 
3582-#: trac/versioncontrol/templates/revisionlog.html:96
3583+#: trac/versioncontrol/templates/revisionlog.html:97
3584 msgid "Log Message"
3585 msgstr "日志消息"
3586 
3587-#: trac/versioncontrol/templates/revisionlog.html:107
3588+#: trac/versioncontrol/templates/revisionlog.html:104
3589+msgid "No revisions found"
3590+msgstr "没有找到任何修订"
3591+
3592+#: trac/versioncontrol/templates/revisionlog.html:116
3593 msgid "copied from"
3594 msgstr "复制于"
3595 
3596-#: trac/versioncontrol/templates/revisionlog.html:121
3597+#: trac/versioncontrol/templates/revisionlog.html:130
3598 msgid "View log starting at this revision"
3599-msgstr "查看从这个修订之后的日志"
3600+msgstr "查看此修订之后的日志"
3601 
3602-#: trac/versioncontrol/templates/revisionlog.html:162
3603+#: trac/versioncontrol/templates/revisionlog.html:171
3604 msgid "Diff from Old Revision to New Revision (select them above)"
3605 msgstr "显示旧修订到新修订的差异(从上面选择)"
3606 
3607-#: trac/versioncontrol/templates/revisionlog.html:168
3608-msgid "TracRevisionLog"
3609-msgstr "TracRevisionLog"
3610+#: trac/versioncontrol/templates/revisionlog.html:176
3611+msgid ""
3612+"[1:Note:] See [2:TracRevisionLog]\n"
3613+"        for help on using the revision log."
3614+msgstr "[1:注意:] 使用版本日志的帮助参见[2:TracRevisionLog]。"
3615 
3616-#: trac/versioncontrol/templates/revisionlog.html:168
3617-msgid "for help on using the revision log."
3618-msgstr "使用修订日志的帮助."
3619-
3620 #: trac/versioncontrol/templates/revisionlog.txt:1
3621 msgid ""
3622 "#\n"
3623 "# ChangeLog for"
3624 msgstr ""
3625 "#\n"
3626-"# 变更集日志"
3627+"# 变更日志: "
3628 
3629 #: trac/versioncontrol/templates/revisionlog.txt:2
3630 msgid ""
3631@@ -3013,245 +3162,337 @@
3632 
3633 #: trac/versioncontrol/web_ui/browser.py:297
3634 msgid "Browse Source"
3635-msgstr "源码游览"
3636+msgstr "源码浏览"
3637 
3638-#: trac/versioncontrol/web_ui/browser.py:345
3639-#: trac/versioncontrol/web_ui/changeset.py:240
3640+#: trac/versioncontrol/web_ui/browser.py:344
3641+#: trac/versioncontrol/web_ui/changeset.py:241
3642 msgid "Invalid Changeset Number"
3643-msgstr "无效变更版本号"
3644+msgstr "无效变更集版本号"
3645 
3646-#: trac/versioncontrol/web_ui/browser.py:351
3647-#: trac/versioncontrol/web_ui/log.py:98
3648+#: trac/versioncontrol/web_ui/browser.py:350
3649+#: trac/versioncontrol/web_ui/log.py:97
3650 msgid "Parent directory"
3651 msgstr "父目录"
3652 
3653-#: trac/versioncontrol/web_ui/browser.py:377
3654+#: trac/versioncontrol/web_ui/browser.py:376
3655 msgid "Normal"
3656 msgstr "正常"
3657 
3658-#: trac/versioncontrol/web_ui/browser.py:378
3659+#: trac/versioncontrol/web_ui/browser.py:377
3660 msgid "View file without annotations"
3661-msgstr "查看文件(不包含注释)"
3662+msgstr "查看文件(不包含注解)"
3663 
3664-#: trac/versioncontrol/web_ui/browser.py:382
3665+#: trac/versioncontrol/web_ui/browser.py:381
3666 msgid "Annotate"
3667-msgstr "注释"
3668+msgstr "注解"
3669 
3670-#: trac/versioncontrol/web_ui/browser.py:383
3671+#: trac/versioncontrol/web_ui/browser.py:382
3672 msgid ""
3673 "Annotate each line with the last changed revision (this can be time "
3674 "consuming...)"
3675-msgstr "给最后的变更修订每行都加注释 (可能这将花费过多 时间...)"
3676+msgstr "给最新修订每行都加注解 (这可能是耗时操作...)"
3677 
3678-#: trac/versioncontrol/web_ui/browser.py:389
3679+#: trac/versioncontrol/web_ui/browser.py:388
3680 msgid "Revision Log"
3681 msgstr "修订日志"
3682 
3683-#: trac/versioncontrol/web_ui/browser.py:455
3684-#: trac/versioncontrol/web_ui/changeset.py:334
3685+#: trac/versioncontrol/web_ui/browser.py:454
3686+#: trac/versioncontrol/web_ui/changeset.py:335
3687 msgid "Zip Archive"
3688 msgstr "Zip归档"
3689 
3690-#: trac/versioncontrol/web_ui/browser.py:622
3691+#: trac/versioncontrol/web_ui/browser.py:621
3692 msgid "Revision in which the line changed"
3693-msgstr "该行变更时的修订"
3694+msgstr "该行发生变更的修订"
3695 
3696-#: trac/versioncontrol/web_ui/changeset.py:333
3697+#: trac/versioncontrol/web_ui/changeset.py:334
3698 msgid "Unified Diff"
3699-msgstr "统一格式差异"
3700+msgstr "统一对比"
3701 
3702-#: trac/versioncontrol/web_ui/changeset.py:348
3703+#: trac/versioncontrol/web_ui/changeset.py:349
3704 msgid "Reverse Diff"
3705-msgstr "回退差异"
3706+msgstr "反向对比"
3707 
3708-#: trac/versioncontrol/web_ui/changeset.py:379
3709+#: trac/versioncontrol/web_ui/changeset.py:380
3710 #, python-format
3711 msgid "Changeset %(id)s for %(path)s"
3712 msgstr "变更集 %(id)s 为 %(path)s"
3713 
3714-#: trac/versioncontrol/web_ui/changeset.py:382
3715-#: trac/versioncontrol/web_ui/changeset.py:404
3716-#: trac/versioncontrol/web_ui/changeset.py:422
3717+#: trac/versioncontrol/web_ui/changeset.py:383
3718+#: trac/versioncontrol/web_ui/changeset.py:405
3719+#: trac/versioncontrol/web_ui/changeset.py:423
3720 #, python-format
3721 msgid "Changeset %(id)s"
3722 msgstr "变更集 %(id)s"
3723 
3724-#: trac/versioncontrol/web_ui/changeset.py:452
3725+#: trac/versioncontrol/web_ui/changeset.py:453
3726 #, python-format
3727 msgid "Show revision %(rev)s of this file in browser"
3728 msgstr "在浏览器中显示文件的修订 %(rev)s"
3729 
3730-#: trac/versioncontrol/web_ui/changeset.py:595
3731+#: trac/versioncontrol/web_ui/changeset.py:601
3732 #, python-format
3733 msgid "Show the changeset %(id)s restricted to %(path)s"
3734 msgstr "显示变更集 %(id)s , 仅包含路径 %(path)s"
3735 
3736-#: trac/versioncontrol/web_ui/changeset.py:605
3737+#: trac/versioncontrol/web_ui/changeset.py:611
3738 #, python-format
3739 msgid "Show the %(range)s differences restricted to %(path)s"
3740 msgstr "显示差异范围 %(range)s , 仅包含路径 %(path)s"
3741 
3742-#: trac/versioncontrol/web_ui/changeset.py:784
3743+#: trac/versioncontrol/web_ui/changeset.py:795
3744 msgid "Repository checkins"
3745-msgstr "仓库检入"
3746+msgstr "版本库检入"
3747 
3748-#: trac/versioncontrol/web_ui/changeset.py:956
3749+#: trac/versioncontrol/web_ui/changeset.py:970
3750 msgid "Changesets"
3751-msgstr "变更集s"
3752+msgstr "变更集"
3753 
3754-#: trac/versioncontrol/web_ui/log.py:170
3755+#: trac/versioncontrol/web_ui/log.py:169
3756 #, python-format
3757 msgid ""
3758 "The file or directory '%(path)s' doesn't exist at revision %(rev)s or at "
3759 "any previous revision."
3760-msgstr "文件或目录 '%(path)s' 不存在 %(rev)s 及以前的修订."
3761+msgstr "文件或目录 '%(path)s' 不存在 %(rev)s 及以前的修订。"
3762 
3763-#: trac/versioncontrol/web_ui/log.py:172
3764+#: trac/versioncontrol/web_ui/log.py:171
3765 msgid "Nonexistent path"
3766 msgstr "路径不存在"
3767 
3768-#: trac/versioncontrol/web_ui/log.py:188
3769+#: trac/versioncontrol/web_ui/log.py:187
3770 #, python-format
3771 msgid "Revision Log (restarting at %(path)s, rev. %(rev)s)"
3772-msgstr "修订日志 (起始于 %(path)s, 修订. %(rev)s)"
3773+msgstr "修订日志 (起始于 %(path)s, 修订 %(rev)s)"
3774 
3775-#: trac/versioncontrol/web_ui/log.py:245
3776+#: trac/versioncontrol/web_ui/log.py:244
3777 msgid "ChangeLog"
3778 msgstr "变更日志"
3779 
3780-#: trac/versioncontrol/web_ui/log.py:247
3781+#: trac/versioncontrol/web_ui/log.py:246
3782 msgid "View Latest Revision"
3783 msgstr "查看最新修订"
3784 
3785-#: trac/versioncontrol/web_ui/log.py:251
3786+#: trac/versioncontrol/web_ui/log.py:250
3787 msgid "Older Revisions"
3788 msgstr "更早版本"
3789 
3790-#: trac/web/auth.py:89
3791+#: trac/versioncontrol/web_ui/util.py:61
3792+msgid "search"
3793+msgstr "搜索"
3794+
3795+#: trac/versioncontrol/web_ui/util.py:65
3796 #, python-format
3797+msgid ""
3798+"You can %(search)s in the repository history to see if that path existed "
3799+"but was later removed"
3800+msgstr "你可以在版本库历史中%(search)s，以判断是否路径曾经存在但后来被删除了。"
3801+
3802+#: trac/web/auth.py:88
3803+#, python-format
3804 msgid "logged in as %(user)s"
3805 msgstr "登录为 %(user)s"
3806 
3807-#: trac/web/auth.py:92
3808+#: trac/web/auth.py:91
3809 msgid "Logout"
3810-msgstr "登出"
3811+msgstr "注销"
3812 
3813-#: trac/web/auth.py:95
3814+#: trac/web/auth.py:94
3815 msgid "Login"
3816 msgstr "登录"
3817 
3818-#: trac/web/auth.py:137
3819+#: trac/web/auth.py:136
3820 #, python-format
3821 msgid "Already logged in as %(user)s."
3822 msgstr "已经登录为 %(user)s."
3823 
3824-#: trac/web/chrome.py:160 trac/web/chrome.py:168
3825+#: trac/web/chrome.py:177 trac/web/chrome.py:185
3826 #, python-format
3827 msgid "Previous %(label)s"
3828-msgstr "前 %(label)s"
3829+msgstr "前一%(label)s"
3830 
3831-#: trac/web/chrome.py:180 trac/web/chrome.py:187
3832+#: trac/web/chrome.py:197 trac/web/chrome.py:204
3833 #, python-format
3834 msgid "Next %(label)s"
3835-msgstr "后 %(label)s"
3836+msgstr "后一%(label)s"
3837 
3838-#: trac/wiki/api.py:325
3839+#: trac/web/chrome.py:794
3840+msgid "(unknown template location)"
3841+msgstr "(未知模板路径)"
3842+
3843+#: trac/web/chrome.py:795
3844+#, python-format
3845+msgid "Genshi %(error)s error while rendering template %(location)s"
3846+msgstr "Genshi在渲染模板%(location)s时，发生错误%(error)s。"
3847+
3848+#. ... not logged in, you may want to 'do so' now (link)
3849+#: trac/web/main.py:495
3850+msgid "do so"
3851+msgstr "这样做"
3852+
3853+#: trac/web/main.py:497
3854+#, python-format
3855+msgid "You are currently not logged in. You may want to %(do_so)s now."
3856+msgstr "您现在没有登录，您也许想要现在就%(do_so)s。"
3857+
3858+#: trac/wiki/admin.py:84
3859+#, python-format
3860+msgid "'%(name)s' is not a file"
3861+msgstr "'%(name)s'不是一个文件。"
3862+
3863+#: trac/wiki/admin.py:128
3864+#, python-format
3865+msgid " %(page)s imported from %(filename)s"
3866+msgstr "已从%(filename)s中导入%(page)s"
3867+
3868+#: trac/wiki/admin.py:154
3869+msgid "Title"
3870+msgstr "标题"
3871+
3872+#: trac/wiki/admin.py:154
3873+msgid "Edits"
3874+msgstr "编辑次数"
3875+
3876+#: trac/wiki/admin.py:164
3877+msgid "Deleted pages"
3878+msgstr "已删除页面 "
3879+
3880+#: trac/wiki/admin.py:182
3881+#, python-format
3882+msgid "'%(name)s' is not a directory"
3883+msgstr "'%(name)s'不是一个目录。"
3884+
3885+#: trac/wiki/api.py:317 trac/wiki/templates/wiki_view.html:53
3886 msgid "no permission to view this wiki page"
3887-msgstr "无权查看此维基页面"
3888+msgstr "无权查看此Wiki页面"
3889 
3890-#: trac/wiki/formatter.py:133
3891+#: trac/wiki/formatter.py:140
3892 #, python-format
3893 msgid "HTML parsing error: %(message)s"
3894 msgstr "HTML处理错误: %(message)s"
3895 
3896-#: trac/wiki/intertrac.py:51
3897+#: trac/wiki/formatter.py:144
3898+msgid "Error: Forbidden character sequence \"--\" in htmlcomment wiki code block"
3899+msgstr "错误: htmlcomment wiki代码块中存在非法字符序列 \"--\" "
3900+
3901+#: trac/wiki/intertrac.py:50
3902 #, python-format
3903 msgid "Can't view %(link)s:"
3904 msgstr "无法查看 %(link)s:"
3905 
3906-#: trac/wiki/macros.py:467
3907+#: trac/wiki/macros.py:478
3908 #, python-format
3909 msgid "Error: Can't get description for macro %(name)s"
3910 msgstr "错误: 无法得到宏 %(name)s 的描述"
3911 
3912-#: trac/wiki/macros.py:550
3913+#: trac/wiki/macros.py:561
3914 msgid "Table of Contents"
3915 msgstr "内容索引"
3916 
3917-#: trac/wiki/model.py:146
3918+#: trac/wiki/model.py:147
3919 msgid "Page not modified"
3920 msgstr "未修改的页面"
3921 
3922-#: trac/wiki/web_ui.py:85 trac/wiki/web_ui.py:596
3923+#: trac/wiki/web_ui.py:89 trac/wiki/web_ui.py:616
3924 msgid "Wiki"
3925-msgstr "维基"
3926+msgstr "Wiki"
3927 
3928-#: trac/wiki/web_ui.py:87
3929+#: trac/wiki/web_ui.py:91
3930 msgid "Help/Guide"
3931 msgstr "帮助/指南"
3932 
3933-#: trac/wiki/web_ui.py:122
3934+#: trac/wiki/web_ui.py:126
3935 #, python-format
3936 msgid "No version \"%(num)s\" for Wiki page \"%(name)s\""
3937-msgstr "无版本 \"%(num)s\" , 维基页面 \"%(name)s\""
3938+msgstr "无版本 \"%(num)s\" , Wiki页面 \"%(name)s\""
3939 
3940-#: trac/wiki/web_ui.py:181
3941+#: trac/wiki/web_ui.py:183
3942 #, python-format
3943+msgid "The wiki page is too long (must be less than %(num)s characters)"
3944+msgstr "任务单描述太长(必须少于 %(num)s 个字符)"
3945+
3946+#: trac/wiki/web_ui.py:193
3947+#, python-format
3948 msgid "The Wiki page field '%(field)s' is invalid: %(message)s"
3949-msgstr "维基页面字段 '%(field)s' 无效: %(message)s"
3950+msgstr "Wiki页面字段 '%(field)s' 无效: %(message)s"
3951 
3952-#: trac/wiki/web_ui.py:185
3953+#: trac/wiki/web_ui.py:197
3954 #, python-format
3955 msgid "Invalid Wiki page: %(message)s"
3956-msgstr "无效的维基页面: %(message)s"
3957+msgstr "无效的Wiki页面: %(message)s"
3958 
3959-#: trac/wiki/web_ui.py:271
3960+#. wiki page
3961+#: trac/wiki/web_ui.py:224
3962+msgid "currently edited"
3963+msgstr "正在编辑"
3964+
3965+#: trac/wiki/web_ui.py:283
3966 msgid "Page not modified, showing latest version."
3967-msgstr ""
3968+msgstr "页面未修改，显示最新版本"
3969 
3970-#: trac/wiki/web_ui.py:303
3971+#: trac/wiki/web_ui.py:315
3972 #, python-format
3973 msgid "Version %(num)s of page \"%(name)s\" does not exist"
3974 msgstr "版本 %(num)s 不存在, 页面 \"%(name)s\" "
3975 
3976-#: trac/wiki/web_ui.py:357
3977+#: trac/wiki/web_ui.py:369
3978 msgid "Page history"
3979 msgstr "页面历史"
3980 
3981-#: trac/wiki/web_ui.py:374
3982+#: trac/wiki/web_ui.py:386
3983 msgid "Wiki History"
3984-msgstr "维基历史"
3985+msgstr "Wiki历史"
3986 
3987-#: trac/wiki/web_ui.py:439
3988+#: trac/wiki/web_ui.py:451
3989 #, python-format
3990 msgid "Page %(name)s does not exist"
3991 msgstr "页面 %(name)s 不存在"
3992 
3993-#: trac/wiki/web_ui.py:476
3994+#: trac/wiki/web_ui.py:489
3995 #, python-format
3996 msgid "Page %(name)s not found"
3997 msgstr "没有找到页面 %(name)s"
3998 
3999-#: trac/wiki/web_ui.py:510 trac/wiki/web_ui.py:519
4000+#: trac/wiki/web_ui.py:525
4001+msgid "View latest version"
4002+msgstr "查看最新版本"
4003+
4004+#: trac/wiki/web_ui.py:529
4005+msgid "View parent page"
4006+msgstr "查看父页面"
4007+
4008+#: trac/wiki/web_ui.py:538
4009 msgid "View Latest Version"
4010 msgstr "查看最新版本"
4011 
4012-#: trac/wiki/web_ui.py:539
4013+#: trac/wiki/web_ui.py:544
4014+msgid "Up"
4015+msgstr "向上"
4016+
4017+#: trac/wiki/web_ui.py:560
4018 msgid "Start Page"
4019 msgstr "起始页"
4020 
4021-#: trac/wiki/web_ui.py:540
4022+#: trac/wiki/web_ui.py:561
4023 msgid "Index"
4024 msgstr "索引"
4025 
4026-#: trac/wiki/web_ui.py:542
4027+#: trac/wiki/web_ui.py:563
4028 msgid "History"
4029 msgstr "历史"
4030 
4031-#: trac/wiki/web_ui.py:552
4032+#: trac/wiki/web_ui.py:573
4033 msgid "Wiki changes"
4034-msgstr "维基变更"
4035+msgstr "Wiki变更"
4036 
4037+#. wiki page
4038+#: trac/wiki/web_ui.py:602
4039+msgid " edited"
4040+msgstr "已编辑"
4041+
4042+#: trac/wiki/web_ui.py:602
4043+msgid " created"
4044+msgstr "已创建"
4045+
4046 #: trac/wiki/templates/wiki_delete.html:22
4047 msgid "Delete"
4048 msgstr "删除"
4049@@ -3272,13 +3513,13 @@
4050 msgid "This is the only version the page, so the page will be removed completely!"
4051 msgstr "这是此页面的唯一版本, 因此该页面将彻底删除!"
4052 
4053-#: trac/wiki/templates/wiki_diff.html:16
4054+#: trac/wiki/templates/wiki_diff.html:17
4055 #, python-format
4056 msgid "Delete version %(old_version)d to version %(version)d"
4057-msgstr ""
4058+msgstr "删除版本%(old_version)d到版本%(version)d"
4059 
4060-#: trac/wiki/templates/wiki_diff.html:17
4061-#, fuzzy, python-format
4062+#: trac/wiki/templates/wiki_diff.html:18
4063+#, python-format
4064 msgid "Delete version %(version)d"
4065 msgstr "删除版本 %(version)d"
4066 
4067@@ -3290,114 +3531,119 @@
4068 msgid "Someone else has modified that page since you started your edits."
4069 msgstr "已有其他人修改了该页面."
4070 
4071-#: trac/wiki/templates/wiki_edit.html:31 trac/wiki/templates/wiki_edit.html:41
4072+#: trac/wiki/templates/wiki_edit.html:31
4073 msgid "If you save right away, you risk to revert those changes"
4074 msgstr "如果你现在保存, 可能将那些修改覆盖"
4075 
4076-#: trac/wiki/templates/wiki_edit.html:31 trac/wiki/templates/wiki_edit.html:41
4077+#: trac/wiki/templates/wiki_edit.html:31
4078 msgid "(highlighted below as deletions)."
4079 msgstr "(删除部分在下面高亮显示)."
4080 
4081-#: trac/wiki/templates/wiki_edit.html:33 trac/wiki/templates/wiki_edit.html:42
4082+#: trac/wiki/templates/wiki_edit.html:33
4083 msgid ""
4084 "Please review all those changes and manually merge them with your\n"
4085 "        own changes."
4086 msgstr "请检查所有修改, 并手工合并到你的修改中."
4087 
4088-#: trac/wiki/templates/wiki_edit.html:34 trac/wiki/templates/wiki_edit.html:44
4089+#: trac/wiki/templates/wiki_edit.html:34
4090 msgid "If you're unsure about what you're doing, please press"
4091 msgstr "如果你对所做的不确定, 请按"
4092 
4093-#: trac/wiki/templates/wiki_edit.html:35 trac/wiki/templates/wiki_edit.html:45
4094+#: trac/wiki/templates/wiki_edit.html:35
4095 msgid ""
4096 "(losing your changes) and start editing the latest version of the page\n"
4097 "        again."
4098 msgstr "(失去你的修改) 然后重新开始编辑页面的最先版本."
4099 
4100-#: trac/wiki/templates/wiki_edit.html:39
4101-#, fuzzy
4102-msgid "Someone else modified that page since you started your edits."
4103-msgstr "已有其他人修改了该页面."
4104-
4105-#: trac/wiki/templates/wiki_edit.html:53
4106+#: trac/wiki/templates/wiki_edit.html:43
4107 msgid "Change information for future version"
4108 msgstr "改变未来版本的信息"
4109 
4110-#: trac/wiki/templates/wiki_edit.html:54 trac/wiki/templates/wiki_view.html:26
4111+#: trac/wiki/templates/wiki_edit.html:44 trac/wiki/templates/wiki_view.html:33
4112 msgid "(modified by"
4113 msgstr "(修改者"
4114 
4115-#: trac/wiki/templates/wiki_edit.html:72
4116+#: trac/wiki/templates/wiki_edit.html:62
4117 msgid ""
4118 "Sorry, this page has been modified by somebody else since you started\n"
4119 "            editing. Your changes cannot be saved."
4120 msgstr "对不起, 该页面已经被其他人修改. 你不能保存所做的修改."
4121 
4122-#: trac/wiki/templates/wiki_edit.html:85
4123+#: trac/wiki/templates/wiki_edit.html:75
4124 msgid "Adjust edit area height:"
4125 msgstr "调整编辑框高度:"
4126 
4127-#: trac/wiki/templates/wiki_edit.html:97
4128+#: trac/wiki/templates/wiki_edit.html:87
4129 msgid ""
4130 "[1:Note:] See [2:WikiFormatting] and\n"
4131 "          [3:TracWiki] for help on editing wiki content."
4132 msgstr ""
4133 "[1:注释:] 查看 [2:WikiFormatting] 和\n"
4134-"          [3:TracWiki] 以获得编辑维基内容的帮助."
4135+"          [3:TracWiki] 以获得编辑Wiki内容的帮助."
4136 
4137-#: trac/wiki/templates/wiki_edit.html:102
4138+#: trac/wiki/templates/wiki_edit.html:92
4139 msgid "Change information"
4140 msgstr "变更信息"
4141 
4142-#: trac/wiki/templates/wiki_edit.html:110
4143+#: trac/wiki/templates/wiki_edit.html:103
4144 msgid "Comment about this change (optional):"
4145 msgstr "评论此次修改(可选):"
4146 
4147-#: trac/wiki/templates/wiki_edit.html:117
4148+#: trac/wiki/templates/wiki_edit.html:110
4149 msgid "Page is read-only"
4150 msgstr "页面只读"
4151 
4152-#: trac/wiki/templates/wiki_edit.html:125
4153+#: trac/wiki/templates/wiki_edit.html:118
4154 msgid "Merge changes"
4155 msgstr "合并变更"
4156 
4157-#: trac/wiki/templates/wiki_edit.html:129
4158+#: trac/wiki/templates/wiki_edit.html:122
4159 msgid "Preview Page"
4160 msgstr "页面预览"
4161 
4162-#: trac/wiki/templates/wiki_edit.html:130
4163+#: trac/wiki/templates/wiki_edit.html:123
4164 msgid "Review Changes"
4165 msgstr "预览变更"
4166 
4167-#: trac/wiki/templates/wiki_view.html:39
4168+#: trac/wiki/templates/wiki_view.html:47
4169 msgid "Describe"
4170 msgstr "描述"
4171 
4172-#: trac/wiki/templates/wiki_view.html:40
4173+#: trac/wiki/templates/wiki_view.html:47
4174 msgid "here."
4175 msgstr "æ­¤."
4176 
4177-#: trac/wiki/templates/wiki_view.html:57
4178+#: trac/wiki/templates/wiki_view.html:49
4179+msgid "Alternatively, you can also create the page higher in the hierarchy:"
4180+msgstr "此外，您也可以创建目录层次更高的页面。"
4181+
4182+#: trac/wiki/templates/wiki_view.html:74
4183 msgid "Edit this page"
4184 msgstr "编辑此页面"
4185 
4186-#: trac/wiki/templates/wiki_view.html:60
4187+#: trac/wiki/templates/wiki_view.html:77
4188 msgid "Create this page"
4189 msgstr "创建此页面"
4190 
4191-#: trac/wiki/templates/wiki_view.html:62
4192+#: trac/wiki/templates/wiki_view.html:79
4193 msgid "Using the template:"
4194 msgstr "使用模板:"
4195 
4196-#: trac/wiki/templates/wiki_view.html:65
4197+#: trac/wiki/templates/wiki_view.html:82
4198 msgid "(blank page)"
4199 msgstr "(空白页面)"
4200 
4201-#: trac/wiki/templates/wiki_view.html:84
4202+#: trac/wiki/templates/wiki_view.html:101
4203 msgid "Delete this version"
4204 msgstr "删除此版本"
4205 
4206-#: trac/wiki/templates/wiki_view.html:86
4207+#: trac/wiki/templates/wiki_view.html:103
4208 msgid "Delete page"
4209 msgstr "删除页面 "
4210 
4211+#~ msgid "Changed"
4212+#~ msgstr "已变更"
4213+
4214+#~ msgid "ago by"
4215+#~ msgstr "前, 由"
4216+