Edgewall Software

Ticket #5472: zh_CN-lang-r8179.patch

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

Updated zh_CN translations for r8179

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