Edgewall Software

Ticket #5472: zh_CN-lang-r8267.patch

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

Update d zh_CN translation for r8267

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