Edgewall Software

Ticket #5472: zh_CN-lang-r9640.patch

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