Edgewall Software

Ticket #5472: zh_CN-lang-r8983.patch

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

zh_CN Translation Patch for r8983

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