Index: messages.po =================================================================== --- messages.po (版本 8970) +++ messages.po (工作副本) @@ -8,167 +8,183 @@ "Project-Id-Version: Trac 0.12\n" "Report-Msgid-Bugs-To: trac-dev@googlegroups.com\n" "POT-Creation-Date: 2007-06-23 15:38+0200\n" -"PO-Revision-Date: 2009-06-15 09:51+0800\n" -"Last-Translator: Zeng Jie \n" +"PO-Revision-Date: 2009-12-23 15:33+0800\n" +"Last-Translator: Hong Shuning \n" "Language-Team: zh_CN \n" "Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.2\n" +"Generated-By: Babel 0.9.4\n" -#: trac/about.py:43 trac/templates/about.html:9 trac/templates/about.html:28 +#: tracopt/mimeview/php.py:97 +msgid "" +"You appear to be using the PHP CGI binary. Trac requires the CLI version " +"for syntax highlighting." +msgstr "你使用的是PHP CGI的二进制版本, Trac需要使用CLI版本以提供语法高亮." + +#: trac/about.py:44 trac/templates/about.html:9 trac/templates/about.html:28 msgid "About Trac" msgstr "关于Trac" -#: trac/attachment.py:149 +#: trac/attachment.py:148 #, python-format msgid "Attachment '%(title)s' does not exist." msgstr "附件 '%(title)s' 不存在." -#: trac/attachment.py:150 +#: trac/attachment.py:149 msgid "Invalid Attachment" msgstr "无效附件" -#: trac/attachment.py:192 +#: trac/attachment.py:191 msgid "Could not delete attachment" msgstr "不能删除附件" -#: trac/attachment.py:298 +#: trac/attachment.py:297 #, python-format msgid "Attachment '%(filename)s' not found" msgstr "没有找到文件名为 '%(filename)s' 的附件" -#: trac/attachment.py:372 +#: trac/attachment.py:371 msgid "Bad request" msgstr "错误请求" -#: trac/attachment.py:389 +#: trac/attachment.py:388 #, python-format msgid "Back to %(parent)s" msgstr "返回 %(parent)s" -#: trac/attachment.py:481 +#: trac/attachment.py:480 msgid " attached to " msgstr "附加到" -#: trac/attachment.py:542 +#: trac/attachment.py:541 #, python-format msgid "Attachment '%(id)s' in %(parent)s" msgstr "在 %(parent)s 中的附件 '%(id)s'" -#: trac/attachment.py:545 +#: trac/attachment.py:544 #, python-format msgid "Attachments of %(parent)s" msgstr "在 %(parent)s 中的附件" -#: trac/attachment.py:558 trac/attachment.py:581 trac/admin/web_ui.py:428 -#: trac/admin/web_ui.py:431 trac/admin/web_ui.py:435 +#: trac/attachment.py:557 trac/attachment.py:580 trac/admin/web_ui.py:455 +#: trac/admin/web_ui.py:458 trac/admin/web_ui.py:462 msgid "No file uploaded" msgstr "没有文件被上传" -#: trac/attachment.py:566 +#: trac/attachment.py:565 msgid "Can't upload empty file" msgstr "不能上传空文件" -#: trac/attachment.py:571 +#: trac/attachment.py:570 #, python-format msgid "Maximum attachment size: %(num)s bytes" msgstr "附件的最大尺寸为: %(num)s 字节" -#: trac/attachment.py:572 +#: trac/attachment.py:571 msgid "Upload failed" msgstr "上传失败" -#: trac/attachment.py:593 +#: trac/attachment.py:592 #, python-format msgid "Attachment field %(field)s is invalid: %(message)s" msgstr "附件字段 %(field)s 无效: %(message)s" -#: trac/attachment.py:597 +#: trac/attachment.py:596 #, python-format msgid "Invalid attachment: %(message)s" msgstr "无效附件: %(message)s" -#: trac/attachment.py:634 +#: trac/attachment.py:607 #, python-format +msgid "" +"You don't have permission to replace the attachment %(name)s. You can " +"only replace your own attachments. Replacing other's attachments requires" +" ATTACHMENT_DELETE permission." +msgstr "" +"你没有替换附件 %(name)s 的权限。你只能替换你自己的附件，\"\n" +"\"替换别人的附件需要 ATTACHMENT_DELETE权限" + +#: trac/attachment.py:639 +#, python-format msgid "%(attachment)s (delete)" msgstr "%(attachment)s (删除)" -#: trac/attachment.py:696 trac/versioncontrol/web_ui/browser.py:510 -#: trac/wiki/web_ui.py:70 +#: trac/attachment.py:700 trac/versioncontrol/web_ui/browser.py:525 +#: trac/wiki/web_ui.py:69 msgid "Plain Text" msgstr "纯文本" -#: trac/attachment.py:702 trac/versioncontrol/web_ui/browser.py:515 +#: trac/attachment.py:706 trac/versioncontrol/web_ui/browser.py:530 msgid "Original Format" msgstr "原始格式" -#: trac/attachment.py:744 trac/attachment.py:750 trac/templates/macros.html:164 -#: trac/templates/macros.html:165 trac/ticket/templates/ticket.html:58 -#: trac/ticket/templates/ticket.html:59 +#: trac/attachment.py:748 trac/attachment.py:754 trac/templates/macros.html:154 +#: trac/templates/macros.html:155 trac/ticket/templates/ticket.html:82 +#: trac/ticket/templates/ticket.html:83 msgid "Download" msgstr "下载" -#: trac/attachment.py:844 +#: trac/attachment.py:848 #, python-format msgid "Invalid resource identifier '%(id)s'" msgstr "资源标示符'%(id)s'无效" -#: trac/attachment.py:880 trac/admin/templates/admin_components.html:80 +#: trac/attachment.py:884 trac/admin/templates/admin_components.html:80 #: trac/admin/templates/admin_enums.html:47 #: trac/admin/templates/admin_milestones.html:103 #: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:68 -#: trac/templates/error.html:166 trac/ticket/admin.py:201 -#: trac/ticket/admin.py:390 trac/ticket/admin.py:547 +#: trac/templates/error.html:166 trac/ticket/admin.py:209 +#: trac/ticket/admin.py:400 trac/ticket/admin.py:559 msgid "Name" msgstr "名称" -#: trac/attachment.py:880 +#: trac/attachment.py:884 msgid "Size" msgstr "大小" -#: trac/attachment.py:880 trac/templates/history_view.html:28 -#: trac/versioncontrol/templates/revisionlog.html:96 +#: trac/attachment.py:884 trac/templates/history_view.html:29 +#: trac/versioncontrol/templates/revisionlog.html:98 msgid "Author" msgstr "作者" -#: trac/attachment.py:880 trac/templates/history_view.html:27 -#: trac/versioncontrol/templates/revisionlog.html:95 +#: trac/attachment.py:884 trac/templates/history_view.html:28 +#: trac/versioncontrol/templates/revisionlog.html:97 msgid "Date" msgstr "日期" -#: trac/attachment.py:881 trac/templates/attachment.html:86 -#: trac/ticket/api.py:214 trac/ticket/templates/ticket.html:173 +#: trac/attachment.py:885 trac/templates/attachment.html:89 +#: trac/ticket/api.py:287 trac/ticket/templates/ticket.html:201 msgid "Description" msgstr "描述" -#: trac/attachment.py:906 trac/wiki/admin.py:74 +#: trac/attachment.py:910 trac/wiki/admin.py:101 #, python-format msgid "File '%(name)s' exists" msgstr "文件 '%(name)s' 已经存在." -#: trac/config.py:331 +#: trac/config.py:384 #, python-format msgid "[%(section)s] %(entry)s: expected integer, got %(value)s" msgstr "[%(section)s] %(entry)s: 期望是整数, 却得到 %(value)s" -#: trac/env.py:506 +#: trac/env.py:521 msgid "Database newer than Trac version" msgstr "数据库的版本比Trac使用的版本新" -#: trac/env.py:518 +#: trac/env.py:535 #, python-format msgid "No upgrade module for version %(num)i (%(version)s.py)" msgstr "版本%(num)i 没有升级模块 (%(version)s.py)" -#: trac/env.py:563 +#: trac/env.py:580 msgid "" "Missing environment variable \"TRAC_ENV\". Trac requires this variable to" " point to a valid Trac environment." msgstr "没有环境变量\"TRAC_ENV\". Trac要求使用该变量以指向一个有效的Trac环境." -#: trac/env.py:595 +#: trac/env.py:612 #, python-format msgid "" "The Trac Environment needs to be upgraded.\n" @@ -179,116 +195,116 @@ "\n" "请执行\"trac-admin %(path)s upgrade\"" -#: trac/env.py:629 +#: trac/env.py:646 msgid "Copying resources from:" -msgstr "Copying resources from:" +msgstr "正在复制资源自：" -#: trac/env.py:645 +#: trac/env.py:662 msgid "Creating scripts." -msgstr "Creating scripts." +msgstr "正在创建脚本。" -#: trac/env.py:662 +#: trac/env.py:677 #, python-format msgid "hotcopy can't overwrite existing '%(dest)s'" msgstr "热备无法覆盖已存在的 '%(dest)s'" -#: trac/env.py:672 +#: trac/env.py:687 #, python-format msgid "Hotcopying %(src)s to %(dst)s ..." -msgstr "Hotcopying %(src)s to %(dst)s ..." +msgstr "正在将 %(src)s 热备至 %(dst)s ..." -#: trac/env.py:687 +#: trac/env.py:702 msgid "The following errors happened while copying the environment:" -msgstr "The following errors happened while copying the environment:" +msgstr "当复制环境时发生以下错误：" -#: trac/env.py:698 +#: trac/env.py:713 msgid "Hotcopy done." msgstr "热备结束。" -#: trac/env.py:703 trac/admin/api.py:126 +#: trac/env.py:718 trac/admin/api.py:125 msgid "Invalid arguments" msgstr "无效参数" -#: trac/env.py:706 +#: trac/env.py:721 msgid "Database is up to date, no upgrade necessary." -msgstr "Database is up to date, no upgrade necessary." +msgstr "数据库是最新的，无需升级。" -#: trac/env.py:714 +#: trac/env.py:729 #, python-format msgid "" "Backup failed with '%(msg)s'.\n" "Use '--no-backup' to upgrade without doing a backup." msgstr "" -"Backup failed with '%(msg)s'.\n" -"Use '--no-backup' to upgrade without doing a backup." +"备份失败：'%(msg)s'.\n" +"使用 '--no-backup' 执行不做备份的升级。" -#: trac/env.py:719 +#: trac/env.py:734 msgid "Upgrade done." -msgstr "Upgrade done." +msgstr "升级完成。" #: trac/notification.py:155 msgid "TLS enabled but server does not support TLS" msgstr "启用了TLS, 但是服务器并不支持TLS" -#: trac/notification.py:304 +#: trac/notification.py:303 #, python-format msgid "Invalid email encoding setting: %s" msgstr "无效的email编码设置: %s" -#: trac/notification.py:330 +#: trac/notification.py:329 msgid "Header length is too short" msgstr "Header长度过短" -#: trac/perm.py:49 +#: trac/perm.py:48 #, python-format msgid "%(perm)s privileges are required to perform this operation on %(resource)s" msgstr "对 %(resource)s 执行的操作需要 %(perm)s 权限" -#: trac/perm.py:51 +#: trac/perm.py:50 #, python-format msgid "%(perm)s privileges are required to perform this operation" msgstr "执行该操作需要 %(perm)s 权限" -#: trac/perm.py:54 +#: trac/perm.py:55 msgid "Insufficient privileges to perform this operation." msgstr "没有足够的权限执行该操作." -#: trac/perm.py:320 +#: trac/perm.py:319 #, python-format msgid "%(name)s is not a valid action." msgstr "%(name)s 是无效动作." -#: trac/perm.py:616 +#: trac/perm.py:615 msgid "User" msgstr "用户" -#: trac/perm.py:616 trac/admin/templates/admin_perms.html:69 -#: trac/ticket/templates/ticket.html:379 +#: trac/perm.py:615 trac/admin/templates/admin_perms.html:69 +#: trac/ticket/templates/ticket.html:439 msgid "Action" msgstr "动作" -#: trac/perm.py:618 +#: trac/perm.py:617 msgid "Available actions:" msgstr "可选动作: " -#: trac/perm.py:631 +#: trac/perm.py:630 msgid "Group names must be in lower case and actions in upper case" msgstr "组名必须小写，而动作名必须大写" -#: trac/resource.py:329 +#: trac/resource.py:328 #, python-format msgid " at version %(version)s" msgstr "于版本 %(version)s" -#: trac/admin/api.py:130 +#: trac/admin/api.py:129 msgid "Command not found" msgstr "命令无法找到" -#: trac/admin/console.py:81 trac/ticket/templates/report_edit.html:34 +#: trac/admin/console.py:110 trac/ticket/templates/report_edit.html:34 msgid "Error:" msgstr "错误:" -#: trac/admin/console.py:99 +#: trac/admin/console.py:128 #, python-format msgid "" "Welcome to trac-admin %(version)s\n" @@ -304,38 +320,38 @@ "\n" "输入 '?' 或 'help' 获取命令帮助" -#: trac/admin/console.py:131 +#: trac/admin/console.py:160 msgid "Failed to open environment." msgstr "打开环境失败。" -#: trac/admin/console.py:198 +#: trac/admin/console.py:229 msgid "Completion error:" msgstr "自动完成错误:" -#: trac/admin/console.py:249 +#: trac/admin/console.py:280 #, python-format msgid "No documentation found for '%(cmd)s'" msgstr "没有找到 '%(cmd)s' 的文档" -#: trac/admin/console.py:251 +#: trac/admin/console.py:282 #, python-format msgid "trac-admin - The Trac Administration Console %(version)s" msgstr "trac-admin - Trac管理控制台 %(version)s" -#: trac/admin/console.py:255 +#: trac/admin/console.py:286 msgid "Usage: trac-admin [command [subcommand] [option ...]]\n" msgstr "用法: trac-admin [command [subcommand] [option ...]]\n" -#: trac/admin/console.py:258 +#: trac/admin/console.py:289 msgid "Invoking trac-admin without command starts interactive mode.\n" msgstr "不带命令调用trac-admin将启动交互模式。" -#: trac/admin/console.py:296 +#: trac/admin/console.py:329 #, python-format msgid "Creating a new Trac environment at %(envname)s" msgstr "在%(envname)s处创建一个新的Trac环境" -#: trac/admin/console.py:298 +#: trac/admin/console.py:331 msgid "" "\n" "Trac will first ask a few questions about your environment \n" @@ -349,12 +365,12 @@ "请输入您项目的名称。\n" "此名称将在页面标题和描述中使用。" -#: trac/admin/console.py:306 +#: trac/admin/console.py:339 #, python-format msgid "Project Name [%(default)s]> " msgstr "项目名称 [%(default)s]> " -#: trac/admin/console.py:308 +#: trac/admin/console.py:341 msgid "" " \n" " Please specify the connection string for the database to use.\n" @@ -368,12 +384,12 @@ "使用一个已存在的PostgreSQL数据库也是可行的\n" "(具体的连接字符串语法请查看Trac文档)。" -#: trac/admin/console.py:316 +#: trac/admin/console.py:349 #, python-format msgid "Database connection string [%(default)s]> " msgstr "数据库连接字符串 [%(default)s]> " -#: trac/admin/console.py:318 +#: trac/admin/console.py:351 msgid "" " \n" " Please specify the type of version control system,\n" @@ -389,12 +405,12 @@ "请在此选择缺省值，并在下一个问题中不要\n" "指定版本库目录。" -#: trac/admin/console.py:327 +#: trac/admin/console.py:360 #, python-format msgid "Repository type [%(default)s]> " msgstr "版本库类型 [%(default)s]> " -#: trac/admin/console.py:329 +#: trac/admin/console.py:362 msgid "" "\n" " Please specify the absolute path to the version control\n" @@ -405,28 +421,28 @@ "表明在无版本库模式下使用Trac。\n" "您也可以在以后再指定版本库位置。" -#: trac/admin/console.py:334 +#: trac/admin/console.py:367 msgid "Path to repository [/path/to/repos]> " msgstr "版本库路径 [/path/to/repos]> " -#: trac/admin/console.py:341 +#: trac/admin/console.py:374 #, python-format msgid "Initenv for '%(env)s' failed." msgstr "对'%(env)s' 执行 initenv 失败。" -#: trac/admin/console.py:370 +#: trac/admin/console.py:403 msgid "Creating and Initializing Project" msgstr "创建和初始化项目" -#: trac/admin/console.py:389 +#: trac/admin/console.py:422 msgid " Installing default wiki pages" msgstr " 安装缺省Wiki页" -#: trac/admin/console.py:400 +#: trac/admin/console.py:433 msgid " Indexing repository" msgstr " 建立版本库索引" -#: trac/admin/console.py:403 +#: trac/admin/console.py:436 msgid "" "\n" "---------------------------------------------------------------------\n" @@ -451,7 +467,7 @@ "您的trac.ini文件以及[trac] repository_type\n" "和repository_path 设置以启用Trac版本库浏览器。" -#: trac/admin/console.py:447 +#: trac/admin/console.py:480 #, python-format msgid "" "\n" @@ -501,35 +517,35 @@ "\n" "恭喜您！\n" -#: trac/admin/console.py:507 +#: trac/admin/console.py:540 #, python-format msgid "non-ascii environment path '%(path)s' not supported." msgstr "不支持非ASCII环境路径 '%(path)s'。" -#: trac/admin/web_ui.py:67 +#: trac/admin/web_ui.py:81 msgid "Admin" msgstr "管理" -#: trac/admin/web_ui.py:68 trac/admin/templates/admin.html:16 +#: trac/admin/web_ui.py:82 trac/admin/templates/admin.html:16 msgid "Administration" msgstr "管理" -#: trac/admin/web_ui.py:84 +#: trac/admin/web_ui.py:98 msgid "No administration panels available" msgstr "没有可用的管理面板" -#: trac/admin/web_ui.py:106 trac/admin/web_ui.py:110 +#: trac/admin/web_ui.py:124 trac/admin/web_ui.py:128 msgid "Unknown administration panel" msgstr "未知管理面板" -#: trac/admin/web_ui.py:183 trac/ticket/admin.py:58 trac/ticket/admin.py:83 -#: trac/ticket/admin.py:267 trac/ticket/admin.py:447 trac/ticket/admin.py:598 -#: trac/ticket/admin.py:683 trac/ticket/report.py:172 -#: trac/ticket/roadmap.py:674 trac/wiki/web_ui.py:290 +#: trac/admin/web_ui.py:201 trac/ticket/admin.py:65 trac/ticket/admin.py:90 +#: trac/ticket/admin.py:275 trac/ticket/admin.py:457 trac/ticket/admin.py:609 +#: trac/ticket/admin.py:697 trac/ticket/report.py:177 +#: trac/ticket/roadmap.py:685 trac/wiki/web_ui.py:289 msgid "Your changes have been saved." msgstr "您的修改已保存" -#: trac/admin/web_ui.py:186 trac/ticket/admin.py:61 +#: trac/admin/web_ui.py:204 trac/ticket/admin.py:68 msgid "" "Error writing to trac.ini, make sure it is writable by the web server. " "Your changes have not been saved." @@ -537,114 +553,114 @@ "写入trac.ini错误，请确保它能被Web服务器写入。\n" "您的修改没有保存。" -#: trac/admin/web_ui.py:199 trac/admin/web_ui.py:226 trac/admin/web_ui.py:314 -#: trac/admin/web_ui.py:404 trac/prefs/web_ui.py:88 +#: trac/admin/web_ui.py:217 trac/admin/web_ui.py:245 trac/admin/web_ui.py:333 +#: trac/admin/web_ui.py:431 trac/prefs/web_ui.py:86 #: trac/prefs/templates/prefs_general.html:9 msgid "General" msgstr "一般" -#: trac/admin/web_ui.py:199 trac/admin/templates/admin_basics.html:13 +#: trac/admin/web_ui.py:217 trac/admin/templates/admin_basics.html:13 msgid "Basic Settings" msgstr "基础设置" -#: trac/admin/web_ui.py:226 trac/admin/templates/admin_logging.html:10 +#: trac/admin/web_ui.py:245 trac/admin/templates/admin_logging.html:10 #: trac/admin/templates/admin_logging.html:22 msgid "Logging" msgstr "日志" -#: trac/admin/web_ui.py:235 trac/ticket/templates/milestone_delete.html:31 -#: trac/ticket/templates/milestone_edit.html:73 +#: trac/admin/web_ui.py:254 trac/ticket/templates/milestone_delete.html:31 +#: trac/ticket/templates/milestone_edit.html:72 msgid "None" msgstr "无" -#: trac/admin/web_ui.py:236 +#: trac/admin/web_ui.py:255 msgid "Console" msgstr "控制台" -#: trac/admin/web_ui.py:238 trac/templates/attachment.html:28 -#: trac/templates/attachment.html:89 trac/versioncontrol/api.py:114 +#: trac/admin/web_ui.py:257 trac/templates/attachment.html:29 +#: trac/versioncontrol/api.py:111 msgid "File" msgstr "文件" -#: trac/admin/web_ui.py:240 +#: trac/admin/web_ui.py:259 msgid "Syslog" -msgstr "Syslog" +msgstr "系统日志" -#: trac/admin/web_ui.py:242 +#: trac/admin/web_ui.py:261 msgid "Windows event log" msgstr "Windows事件日志" -#: trac/admin/web_ui.py:255 +#: trac/admin/web_ui.py:274 #, python-format msgid "Unknown log type %(type)s" msgstr "未知日志类型 %(type)s" -#: trac/admin/web_ui.py:256 +#: trac/admin/web_ui.py:275 msgid "Invalid log type" msgstr "无效日志类型" -#: trac/admin/web_ui.py:270 +#: trac/admin/web_ui.py:289 #, python-format msgid "Unknown log level %(level)s" msgstr "未知日志级别 %(level)s" -#: trac/admin/web_ui.py:271 +#: trac/admin/web_ui.py:290 msgid "Invalid log level" msgstr "无效日志级别" -#: trac/admin/web_ui.py:284 +#: trac/admin/web_ui.py:303 msgid "You must specify a log file" msgstr "必须指定一个日志文件" -#: trac/admin/web_ui.py:285 +#: trac/admin/web_ui.py:304 msgid "Missing field" msgstr "缺少字段" -#: trac/admin/web_ui.py:314 trac/admin/templates/admin_perms.html:9 +#: trac/admin/web_ui.py:333 trac/admin/templates/admin_perms.html:9 msgid "Permissions" msgstr "权限" -#: trac/admin/web_ui.py:328 +#: trac/admin/web_ui.py:347 msgid "All upper-cased tokens are reserved for permission names" msgstr "全部大写的标记已保留为权限名称" -#: trac/admin/web_ui.py:335 +#: trac/admin/web_ui.py:354 msgid "Unknown action" msgstr "未知动作" -#: trac/admin/web_ui.py:339 +#: trac/admin/web_ui.py:358 #, python-format msgid "The user %(subject)s has been granted the permission %(action)s." msgstr "用户 %(subject)s 已分配权限 %(action)s。" -#: trac/admin/web_ui.py:344 +#: trac/admin/web_ui.py:363 #, python-format msgid "The permission %(action)s was already granted to %(subject)s." msgstr "权限 \"%(action)s\" 已分配给 \"%(subject)s\"" -#: trac/admin/web_ui.py:360 +#: trac/admin/web_ui.py:379 #, python-format msgid "The user %(subject)s has been added to the group %(group)s." msgstr "\"%(subject)s\" 已增加到用户组 \"%(group)s\"" -#: trac/admin/web_ui.py:365 +#: trac/admin/web_ui.py:384 #, python-format msgid "The user %(subject)s was already added to the group %(group)s." msgstr "\"%(subject)s\" 已增加到用户组 \"%(group)s\"" -#: trac/admin/web_ui.py:378 +#: trac/admin/web_ui.py:397 msgid "The selected permissions have been revoked." msgstr "所选权限已收回。" -#: trac/admin/web_ui.py:404 trac/admin/templates/admin_plugins.html:9 +#: trac/admin/web_ui.py:431 trac/admin/templates/admin_plugins.html:9 msgid "Plugins" msgstr "插件s" -#: trac/admin/web_ui.py:438 +#: trac/admin/web_ui.py:465 msgid "Uploaded file is not a Python source file or egg" msgstr "上传的文件不是Python源文件或者egg包" -#: trac/admin/web_ui.py:443 +#: trac/admin/web_ui.py:470 #, python-format msgid "Plugin %(name)s already installed" msgstr "插件 %(name)s 已安装" @@ -678,7 +694,7 @@ msgstr "URL:" #: trac/admin/templates/admin_basics.html:29 -#: trac/ticket/templates/ticket.html:302 +#: trac/ticket/templates/ticket.html:362 msgid "Description:" msgstr "描述:" @@ -687,12 +703,12 @@ #: trac/admin/templates/admin_enums.html:69 #: trac/admin/templates/admin_logging.html:54 #: trac/admin/templates/admin_milestones.html:128 -#: trac/admin/templates/admin_plugins.html:103 +#: trac/admin/templates/admin_plugins.html:164 #: trac/admin/templates/admin_versions.html:94 msgid "Apply changes" msgstr "应用修改" -#: trac/admin/templates/admin_components.html:10 +#: trac/admin/templates/admin_components.html:10 trac/ticket/admin.py:76 msgid "Components" msgstr "组件" @@ -722,13 +738,15 @@ #: trac/admin/templates/admin_enums.html:23 #: trac/admin/templates/admin_milestones.html:67 #: trac/admin/templates/admin_versions.html:45 -#: trac/templates/attachment.html:57 trac/templates/attachment.html:70 +#: trac/templates/attachment.html:60 trac/templates/attachment.html:73 #: trac/ticket/templates/milestone_delete.html:40 -#: trac/ticket/templates/milestone_edit.html:94 +#: trac/ticket/templates/milestone_edit.html:93 #: trac/ticket/templates/report_delete.html:21 #: trac/ticket/templates/report_edit.html:42 +#: trac/ticket/templates/ticket.html:108 #: trac/wiki/templates/wiki_delete.html:36 -#: trac/wiki/templates/wiki_edit.html:35 trac/wiki/templates/wiki_edit.html:126 +#: trac/wiki/templates/wiki_edit.html:80 +#: trac/wiki/templates/wiki_edit_form.html:77 msgid "Cancel" msgstr "取消" @@ -753,7 +771,8 @@ msgid "Add" msgstr "增加" -#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:201 +#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:209 +#: trac/ticket/api.py:281 trac/ticket/web_ui.py:1309 msgid "Owner" msgstr "属主" @@ -799,6 +818,7 @@ msgstr "管理" #: trac/admin/templates/admin_enums.html:18 +#: trac/ticket/templates/ticket.html:134 msgid "Modify" msgstr "修改" @@ -829,7 +849,8 @@ " [1:log] directory of the project environment ([2:%(dir)s])." msgstr "如果指定了相对路径，日志文件将被存储在项目环境([2:%(dir)s])的 [1:log]目录。" -#: trac/admin/templates/admin_milestones.html:10 trac/ticket/roadmap.py:839 +#: trac/admin/templates/admin_milestones.html:10 trac/ticket/admin.py:241 +#: trac/ticket/roadmap.py:853 msgid "Milestones" msgstr "里程碑" @@ -843,7 +864,7 @@ #: trac/admin/templates/admin_milestones.html:25 #: trac/admin/templates/admin_milestones.html:84 -#: trac/ticket/templates/milestone_edit.html:51 +#: trac/ticket/templates/milestone_edit.html:50 msgid "Due:" msgstr "逾期日:" @@ -852,19 +873,19 @@ #: trac/admin/templates/admin_milestones.html:88 #: trac/admin/templates/admin_versions.html:30 #: trac/admin/templates/admin_versions.html:63 -#: trac/ticket/templates/milestone_edit.html:54 -#: trac/ticket/templates/milestone_edit.html:66 +#: trac/ticket/templates/milestone_edit.html:53 +#: trac/ticket/templates/milestone_edit.html:65 msgid "Format:" msgstr "格式:" #: trac/admin/templates/admin_milestones.html:35 -#: trac/ticket/templates/milestone_edit.html:59 +#: trac/ticket/templates/milestone_edit.html:58 msgid "Completed:" msgstr "完成日:" #: trac/admin/templates/admin_milestones.html:57 #: trac/admin/templates/admin_versions.html:35 -#: trac/ticket/templates/milestone_edit.html:85 +#: trac/ticket/templates/milestone_edit.html:84 msgid "Description (you may use [1:WikiFormatting] here):" msgstr "描述 (此处可用 [1:WikiFormatting] 格式):" @@ -872,13 +893,13 @@ msgid "Add Milestone:" msgstr "增加里程碑:" -#: trac/admin/templates/admin_milestones.html:103 trac/ticket/admin.py:390 +#: trac/admin/templates/admin_milestones.html:103 trac/ticket/admin.py:400 msgid "Due" msgstr "预期" -#: trac/admin/templates/admin_milestones.html:103 trac/ticket/admin.py:390 +#: trac/admin/templates/admin_milestones.html:103 trac/ticket/admin.py:400 #: trac/ticket/templates/milestone_view.html:26 -#: trac/ticket/templates/roadmap.html:37 +#: trac/ticket/templates/roadmap.html:38 msgid "Completed" msgstr "完成" @@ -932,7 +953,7 @@ msgid "Note that" msgstr "注意" -#: trac/admin/templates/admin_perms.html:92 trac/ticket/templates/query.html:62 +#: trac/admin/templates/admin_perms.html:92 trac/ticket/templates/query.html:74 msgid "or" msgstr "或" @@ -946,19 +967,19 @@ " as that is reserved for permission names." msgstr "名不能全部大写，因为这是权限名称的保留格式。" -#: trac/admin/templates/admin_plugins.html:17 +#: trac/admin/templates/admin_plugins.html:41 msgid "Manage Plugins" msgstr "管理插件" -#: trac/admin/templates/admin_plugins.html:21 +#: trac/admin/templates/admin_plugins.html:45 msgid "Install Plugin:" msgstr "安装插件:" -#: trac/admin/templates/admin_plugins.html:23 +#: trac/admin/templates/admin_plugins.html:47 msgid "File:" msgstr "文件:" -#: trac/admin/templates/admin_plugins.html:28 +#: trac/admin/templates/admin_plugins.html:52 msgid "" "The web server does not have sufficient permissions to store files in\n" " the environment plugins directory." @@ -966,36 +987,55 @@ "web服务器没有足够的权限把文件保存在\n" " 运行环境的插件目录中." -#: trac/admin/templates/admin_plugins.html:32 +#: trac/admin/templates/admin_plugins.html:56 msgid "Upload a plugin packaged as Python egg." msgstr "上传一个Python egg包形式的插件." -#: trac/admin/templates/admin_plugins.html:37 +#: trac/admin/templates/admin_plugins.html:61 msgid "Install" msgstr "安装" -#: trac/admin/templates/admin_plugins.html:60 trac/templates/diff_view.html:43 -#: trac/versioncontrol/templates/changeset.html:97 +#: trac/admin/templates/admin_plugins.html:84 trac/templates/diff_view.html:46 +#: trac/versioncontrol/templates/changeset.html:102 msgid "Author:" msgstr "作者:" -#: trac/admin/templates/admin_plugins.html:69 +#: trac/admin/templates/admin_plugins.html:93 msgid "Home page:" msgstr "首页:" -#: trac/admin/templates/admin_plugins.html:76 +#: trac/admin/templates/admin_plugins.html:100 msgid "License:" msgstr "授权:" -#: trac/admin/templates/admin_plugins.html:83 +#: trac/admin/templates/admin_plugins.html:110 +#, fuzzy +msgid "Show all descriptions" +msgstr "显示所有描述" + +#: trac/admin/templates/admin_plugins.html:112 +#, fuzzy +msgid "Hide all descriptions" +msgstr "隐藏所有描述" + +#: trac/admin/templates/admin_plugins.html:114 trac/ticket/admin.py:76 +#: trac/ticket/api.py:294 msgid "Component" msgstr "组件" -#: trac/admin/templates/admin_plugins.html:83 +#: trac/admin/templates/admin_plugins.html:117 msgid "Enabled" msgstr "启用" -#: trac/admin/templates/admin_versions.html:10 +#: trac/admin/templates/admin_plugins.html:126 +msgid "Toggle the module description" +msgstr "切换模块描述" + +#: trac/admin/templates/admin_plugins.html:142 +msgid "Toggle the component description" +msgstr "切换组建描述" + +#: trac/admin/templates/admin_versions.html:10 trac/ticket/admin.py:440 msgid "Versions" msgstr "版本" @@ -1023,106 +1063,115 @@ msgid "Released" msgstr "发布" -#: trac/db/api.py:131 +#: trac/db/api.py:132 #, python-format msgid "Unsupported database type \"%(scheme)s\"" msgstr "不支持的数据库 \"%(scheme)s\"" -#: trac/db/api.py:156 -msgid "Database connection string must start with scheme:/" +#: trac/db/api.py:160 +#, fuzzy, python-format +msgid "" +"Unknown scheme \"%(scheme)s\"; database connection string must start with" +" {scheme}:/" msgstr "数据库链接字符串必须始于scheme:/" +#: trac/db/mysql_backend.py:75 +msgid "Cannot load Python bindings for MySQL" +msgstr "无法加载 Python 的 MySQL 访问模块" + #: trac/db/pool.py:122 #, python-format msgid "Unable to get database connection within %(time)d seconds" -msgstr "无法在%(time)d 秒内获得数据库连接" +msgstr "无法在 %(time)d 秒内获得数据库连接" -#: trac/db/sqlite_backend.py:133 +#: trac/db/postgres_backend.py:68 +msgid "Cannot load Python bindings for PostgreSQL" +msgstr "无法加载 Python 的 PostgreSQL 访问模块" + +#: trac/db/sqlite_backend.py:149 +msgid "Cannot load Python bindings for SQLite" +msgstr "无法加载 Python 的 SQLite 访问模块" + +#: trac/db/sqlite_backend.py:153 +msgid "Need at least PySqlite 2.0.7 or higher" +msgstr "至少需要 PySqlite 2.0.7 或以上版本" + +#: trac/db/sqlite_backend.py:168 #, python-format msgid "Database already exists at %(path)s" msgstr "数据库已经存在于 %(path)s" -#: trac/db/sqlite_backend.py:173 +#: trac/db/sqlite_backend.py:210 #, python-format msgid "Database \"%(path)s\" not found." msgstr "数据库 \"%(path)s\" 未找到." -#: trac/db/sqlite_backend.py:182 -#, python-format +#: trac/db/sqlite_backend.py:218 +#, fuzzy, python-format msgid "" -"The user %(user)s requires read _and_ write permission to the database " +"The user %(user)s requires read _and_ write permissions to the database " "file %(path)s and the directory it is located in." msgstr "用户 %(user)s 需要数据库文件 %(path)s 即其所在目录的读/写权限." -#: trac/mimeview/api.py:644 trac/mimeview/api.py:654 +#: trac/mimeview/api.py:662 trac/mimeview/api.py:672 #, python-format msgid "No available MIME conversions from %(old)s to %(new)s" msgstr "没有有效的MIME将 %(old)s 转换为 %(new)s" -#: trac/mimeview/api.py:756 +#: trac/mimeview/api.py:780 #, python-format msgid "HTML preview using %(renderer)s failed (%(err)s)" msgstr "使用%(renderer)s进行HTML预览失败 (%(err)s)" -#: trac/mimeview/patch.py:55 +#: trac/mimeview/patch.py:53 msgid "Invalid unified diff content" msgstr "无效的unified diff内容" -#: trac/mimeview/patch.py:165 +#: trac/mimeview/patch.py:163 #, python-format msgid "new file %(new)s" msgstr "新文件 %(new)s" -#: trac/mimeview/patch.py:169 +#: trac/mimeview/patch.py:167 #, python-format msgid "deleted file %(deleted)s" msgstr "已删除文件%(deleted)s" -#: trac/mimeview/patch.py:241 +#: trac/mimeview/patch.py:239 msgid "this hunk was shorter than expected" msgstr "此块比预期的短" -#: trac/mimeview/php.py:98 -msgid "" -"You appear to be using the PHP CGI binary. Trac requires the CLI version " -"for syntax highlighting." -msgstr "你使用的是PHP CGI的二进制版本, Trac需要使用CLI版本以提供语法高亮." +#: trac/mimeview/pygments.py:121 trac/prefs/templates/prefs_pygments.html:9 +msgid "Syntax Highlighting" +msgstr "语法高亮" -#: trac/mimeview/rst.py:60 -msgid "Docutils not found" -msgstr "无法找到Docutils" - -#: trac/mimeview/rst.py:62 -#, python-format -msgid "Docutils version >= %(version)s required, %(found)s found" -msgstr "需要Docutils版本 >= %(version)s, 现有版本为%(found)s" - -#: trac/prefs/web_ui.py:53 trac/prefs/templates/prefs.html:16 -#: trac/ticket/templates/ticket.html:263 trac/wiki/templates/wiki_edit.html:99 +#: trac/prefs/web_ui.py:52 trac/prefs/templates/prefs.html:16 +#: trac/ticket/templates/ticket.html:473 +#: trac/wiki/templates/wiki_edit_form.html:50 msgid "Preferences" msgstr "个人设置" -#: trac/prefs/web_ui.py:76 +#: trac/prefs/web_ui.py:75 msgid "Unknown preference panel" msgstr "未知选项面板" -#: trac/prefs/web_ui.py:89 trac/prefs/templates/prefs_datetime.html:10 +#: trac/prefs/web_ui.py:87 trac/prefs/templates/prefs_datetime.html:10 msgid "Date & Time" msgstr "日期和时间" -#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_keybindings.html:10 +#: trac/prefs/web_ui.py:88 trac/prefs/templates/prefs_keybindings.html:10 msgid "Keyboard Shortcuts" msgstr "键盘快捷方式" -#: trac/prefs/web_ui.py:92 trac/prefs/templates/prefs_language.html:9 +#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_language.html:9 msgid "Language" msgstr "语言" -#: trac/prefs/web_ui.py:94 trac/prefs/templates/prefs_advanced.html:9 +#: trac/prefs/web_ui.py:92 trac/prefs/templates/prefs_advanced.html:9 msgid "Advanced" msgstr "高级" -#: trac/prefs/web_ui.py:146 +#: trac/prefs/web_ui.py:143 msgid "Your preferences have been saved." msgstr "您的个人设置已保存。" @@ -1296,55 +1345,48 @@ " language negotiation feature to select the appropriate language." msgstr "“缺省语言”选项使用浏览器的语言协商功能选择合适的语言。" -#: trac/prefs/templates/prefs_pygments.html:9 -msgid "Pygments Theme" -msgstr "Pygments主题" - #: trac/prefs/templates/prefs_pygments.html:36 +#, fuzzy msgid "" "The Pygments syntax highlighter can be used with\n" -" different coloring themes." +" different coloring styles." msgstr "Pygments语法高亮可以使用不同的颜色主题." #: trac/prefs/templates/prefs_pygments.html:38 -msgid "Theme:" -msgstr "主题:" +msgid "Style:" +msgstr "主题：" #: trac/prefs/templates/prefs_pygments.html:43 msgid "Preview:" msgstr "预览:" -#: trac/search/web_ui.py:64 trac/search/templates/search.html:11 +#: trac/search/web_ui.py:63 trac/search/templates/search.html:11 #: trac/search/templates/search.html:24 trac/search/templates/search.html:29 #: trac/templates/theme.html:28 msgid "Search" msgstr "搜索" -#: trac/search/web_ui.py:108 +#: trac/search/web_ui.py:153 #, python-format +msgid "Browse repository path %(path)s" +msgstr "浏览版本库路径 %(path)s" + +#: trac/search/web_ui.py:193 +#, python-format msgid "Search query too short. Query must be at least %(num)s characters long." msgstr "搜索查询太短. 查询必须至少包含 %(num)s 字符." -#: trac/search/web_ui.py:110 -msgid "Search Error" -msgstr "搜索错误" - -#: trac/search/web_ui.py:145 trac/ticket/query.py:682 trac/ticket/report.py:324 +#: trac/search/web_ui.py:231 trac/ticket/query.py:759 trac/ticket/report.py:353 msgid "Next Page" msgstr "下一页" -#: trac/search/web_ui.py:151 trac/ticket/query.py:687 trac/ticket/report.py:328 +#: trac/search/web_ui.py:237 trac/ticket/query.py:764 trac/ticket/report.py:356 msgid "Previous Page" msgstr "上一页" -#: trac/search/web_ui.py:193 -#, python-format -msgid "Browse repository path %(path)s" -msgstr "浏览版本库路径 %(path)s" - #: trac/search/templates/search.html:11 trac/search/templates/search.html:41 -#: trac/ticket/templates/query_results.html:21 -#: trac/ticket/templates/report_view.html:87 +#: trac/ticket/templates/query_results.html:22 +#: trac/ticket/templates/report_view.html:86 msgid "Results" msgstr "结果" @@ -1357,7 +1399,7 @@ msgstr "操作者:" #: trac/search/templates/search.html:66 -#: trac/ticket/templates/report_view.html:216 +#: trac/ticket/templates/report_view.html:199 msgid "No matches found." msgstr "没有匹配的结果." @@ -1433,72 +1475,71 @@ msgid "Value" msgstr "值" -#: trac/templates/attachment.html:10 +#: trac/templates/attachment.html:11 msgid "Attachment" msgstr "附件" -#: trac/templates/attachment.html:25 +#: trac/templates/attachment.html:26 msgid "Add Attachment to" msgstr "增加附件到" -#: trac/templates/attachment.html:28 +#: trac/templates/attachment.html:29 msgid "(size limit" msgstr "(大小限制" -#: trac/templates/attachment.html:33 +#: trac/templates/attachment.html:34 msgid "Attachment Info" msgstr "附件信息" -#: trac/templates/attachment.html:36 trac/ticket/templates/ticket.html:254 -#: trac/wiki/templates/wiki_edit.html:95 +#: trac/templates/attachment.html:37 trac/ticket/templates/ticket.html:464 +#: trac/wiki/templates/wiki_edit_form.html:46 msgid "Your email or username:" msgstr "您的email或用户名:" -#: trac/templates/attachment.html:42 +#: trac/templates/attachment.html:43 msgid "Description of the file (optional):" msgstr "文件描述(可选):" -#: trac/templates/attachment.html:47 +#: trac/templates/attachment.html:49 msgid "Replace existing attachment of the same name" msgstr "替换已有同名附件" -#: trac/templates/attachment.html:56 +#: trac/templates/attachment.html:59 msgid "Add attachment" msgstr "追加附件" -#: trac/templates/attachment.html:64 +#: trac/templates/attachment.html:67 msgid "Are you sure you want to delete this attachment?" msgstr "确定删除该附件?" -#: trac/templates/attachment.html:64 trac/wiki/templates/wiki_delete.html:32 +#: trac/templates/attachment.html:67 trac/wiki/templates/wiki_delete.html:32 msgid "This is an irreversible operation." msgstr "该操作是不可逆的." -#: trac/templates/attachment.html:71 trac/templates/attachment.html:111 +#: trac/templates/attachment.html:74 trac/templates/attachment.html:114 msgid "Delete attachment" msgstr "删除附件" -#: trac/templates/attachment.html:80 +#: trac/templates/attachment.html:83 msgid "Attach another file" msgstr "附加另一个文件" -#: trac/templates/attachment.html:90 -msgid "(added by" -msgstr "(添加者" +#: trac/templates/attachment.html:92 +#, fuzzy, python-format +msgid "" +"File %(file)s, %(size)s\n" +" (added by %(author)s, %(date)s ago)" +msgstr "" +"文件 %(file)s, %(size)s\n" +" (由%(author)s在%(date)s前添加)" -#: trac/templates/attachment.html:91 trac/templates/diff_view.html:40 -#: trac/versioncontrol/templates/changeset.html:96 -#: trac/wiki/templates/wiki_view.html:33 -msgid "ago)" -msgstr "前)" - #: trac/templates/diff_div.html:58 -#: trac/versioncontrol/templates/browser.html:134 +#: trac/versioncontrol/templates/browser.html:138 msgid "Property" msgstr "属性" -#: trac/templates/diff_div.html:69 trac/ticket/templates/ticket.html:64 -#: trac/versioncontrol/templates/changeset.html:32 +#: trac/templates/diff_div.html:69 trac/ticket/templates/ticket.html:88 +#: trac/versioncontrol/templates/changeset.html:37 msgid "to" msgstr "至" @@ -1506,84 +1547,89 @@ msgid "Differences" msgstr "差异" -#: trac/templates/diff_view.html:17 +#: trac/templates/diff_view.html:18 msgid "Changes" msgstr "变更" -#: trac/templates/diff_view.html:18 trac/templates/diff_view.html:21 -#: trac/ticket/templates/query.html:104 +#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:22 +#: trac/ticket/templates/query.html:116 msgid "between" msgstr "之间" -#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:25 -#: trac/templates/history_view.html:26 trac/ticket/templates/ticket.html:103 -#: trac/wiki/web_ui.py:549 trac/wiki/templates/wiki_view.html:32 +#: trac/templates/diff_view.html:20 trac/templates/diff_view.html:26 +#: trac/templates/history_view.html:27 trac/ticket/admin.py:440 +#: trac/ticket/api.py:295 trac/ticket/templates/ticket.html:148 +#: trac/ticket/templates/ticket.html:276 msgid "Version" msgstr "版本" -#: trac/templates/diff_view.html:19 trac/templates/diff_view.html:22 -#: trac/ticket/templates/query.html:106 +#: trac/templates/diff_view.html:20 trac/templates/diff_view.html:23 +#: trac/ticket/templates/query.html:118 msgid "and" msgstr "和" -#: trac/templates/diff_view.html:22 trac/ticket/web_ui.py:765 -#: trac/ticket/templates/ticket.html:100 +#: trac/templates/diff_view.html:23 trac/ticket/web_ui.py:787 +#: trac/ticket/web_ui.py:922 trac/ticket/templates/ticket.html:145 msgid "Initial Version" msgstr "初始版本" -#: trac/templates/diff_view.html:24 -#: trac/versioncontrol/templates/changeset.html:71 +#: trac/templates/diff_view.html:25 +#: trac/versioncontrol/templates/changeset.html:76 msgid "from" msgstr "从" -#: trac/templates/diff_view.html:25 +#: trac/templates/diff_view.html:26 msgid "of" msgstr "的" -#: trac/templates/diff_view.html:37 -#: trac/versioncontrol/templates/changeset.html:94 +#: trac/templates/diff_view.html:39 +#: trac/versioncontrol/templates/changeset.html:99 msgid "Timestamp:" msgstr "时间戳:" -#: trac/templates/diff_view.html:39 trac/templates/diff_view.html:45 -#: trac/templates/diff_view.html:51 +#: trac/templates/diff_view.html:41 trac/templates/diff_view.html:48 +#: trac/templates/diff_view.html:54 msgid "(multiple changes)" msgstr "(多次变更)" -#: trac/templates/diff_view.html:47 +#: trac/templates/diff_view.html:43 +msgid "ago)" +msgstr "前)" + +#: trac/templates/diff_view.html:50 msgid "(IP:" msgstr "(IP:" -#: trac/templates/diff_view.html:49 +#: trac/templates/diff_view.html:52 msgid "Comment:" msgstr "评论:" -#: trac/templates/diff_view.html:57 -#: trac/versioncontrol/templates/changeset.html:151 -#: trac/versioncontrol/templates/revisionlog.html:71 +#: trac/templates/diff_view.html:60 +#: trac/versioncontrol/templates/changeset.html:156 +#: trac/versioncontrol/templates/revisionlog.html:72 msgid "Legend:" msgstr "图例:" -#: trac/templates/diff_view.html:59 -#: trac/versioncontrol/templates/changeset.html:153 +#: trac/templates/diff_view.html:62 +#: trac/versioncontrol/templates/changeset.html:158 msgid "Unmodified" msgstr "未修改" -#: trac/templates/diff_view.html:60 -#: trac/versioncontrol/templates/changeset.html:154 -#: trac/versioncontrol/templates/revisionlog.html:73 +#: trac/templates/diff_view.html:63 +#: trac/versioncontrol/templates/changeset.html:159 +#: trac/versioncontrol/templates/revisionlog.html:74 msgid "Added" msgstr "已增加" -#: trac/templates/diff_view.html:61 -#: trac/versioncontrol/templates/changeset.html:155 -#: trac/versioncontrol/templates/revisionlog.html:75 +#: trac/templates/diff_view.html:64 +#: trac/versioncontrol/templates/changeset.html:160 +#: trac/versioncontrol/templates/revisionlog.html:76 msgid "Removed" msgstr "删除" -#: trac/templates/diff_view.html:62 trac/ticket/api.py:250 -#: trac/versioncontrol/templates/changeset.html:157 -#: trac/versioncontrol/templates/revisionlog.html:77 trac/wiki/admin.py:155 +#: trac/templates/diff_view.html:65 trac/ticket/api.py:323 +#: trac/versioncontrol/templates/changeset.html:162 +#: trac/versioncontrol/templates/revisionlog.html:78 trac/wiki/admin.py:196 msgid "Modified" msgstr "修改" @@ -1644,11 +1690,12 @@ msgstr "Trac检测到一个内部错误:" #: trac/templates/error.html:106 +#, fuzzy msgid "" -"There was an internal error in Trac. \n" -" It is recommended that you notify your local \n" +"There was an internal error in Trac.\n" +" It is recommended that you notify your local\n" " [1:\n" -" Trac administrator] with the information needed to \n" +" Trac administrator] with the information needed to\n" " reproduce the issue." msgstr "Trac发生了内部错误。建议您向本地[1:Trac 管理员]提供重现问题所需要的信息。" @@ -1691,37 +1738,7 @@ " 应考虑向Trac开发团队报告这个问题。" #: trac/templates/error.html:131 -msgid "Before you do that, though, please first try" -msgstr "在此之前，请首先尝试" - -#: trac/templates/error.html:132 -msgid "searching" -msgstr "搜索" - -#: trac/templates/error.html:132 -msgid "for similar issues" -msgstr "类似问题" - -#: trac/templates/error.html:133 msgid "" -", as it is quite likely that this problem\n" -" has been reported before. For questions about " -"installation\n" -" and configuration of Trac, please try the" -msgstr "" -"，因为很可能这个问题以前已经报告过了。\n" -"有关Trac安装和配置的问题，请尝试" - -#: trac/templates/error.html:136 -msgid "mailing list" -msgstr "邮件列表" - -#: trac/templates/error.html:136 -msgid "instead of filing a ticket." -msgstr "而不是填写任务单" - -#: trac/templates/error.html:131 -msgid "" "Before you do that, though, please first try\n" " [1:[2:searching]\n" " for similar issues], as it is quite likely that this " @@ -1804,26 +1821,31 @@ msgid "Change History for" msgstr "变更历史" -#: trac/templates/history_view.html:20 trac/templates/history_view.html:51 +#: trac/templates/history_view.html:21 trac/templates/history_view.html:52 #: trac/versioncontrol/templates/diff_form.html:58 -#: trac/versioncontrol/templates/revisionlog.html:85 -#: trac/versioncontrol/templates/revisionlog.html:171 +#: trac/versioncontrol/templates/revisionlog.html:87 +#: trac/versioncontrol/templates/revisionlog.html:180 msgid "View changes" msgstr "查阅变更" -#: trac/templates/history_view.html:22 +#: trac/templates/history_view.html:23 msgid "Change history" msgstr "变更历史" -#: trac/templates/history_view.html:29 +#: trac/templates/history_view.html:30 #: trac/ticket/templates/ticket_notify_email.txt:21 msgid "Comment" msgstr "评论" -#: trac/templates/history_view.html:41 +#: trac/templates/history_view.html:42 msgid "View this version" msgstr "查看该版本" +#: trac/templates/history_view.html:45 +#, python-format +msgid "IP-Address: %(ipnr)s" +msgstr "IP地址： %(ipnr)s" + #: trac/templates/index.html:8 trac/templates/index.html:12 msgid "Available Projects" msgstr "有效项目" @@ -1832,128 +1854,148 @@ msgid "Error" msgstr "错误" -#: trac/templates/layout.html:42 +#: trac/templates/layout.html:49 msgid "Download in other formats:" msgstr "用其他格式下载:" -#: trac/templates/macros.html:40 +#: trac/templates/macros.html:29 msgid "anonymous" msgstr "匿名" -#: trac/templates/macros.html:73 trac/templates/macros.html:74 +#: trac/templates/macros.html:37 +#, fuzzy +msgid "Go to root directory" +msgstr "转到根目录" + +#: trac/templates/macros.html:37 +#, python-format +msgid "View %(folder)s" +msgstr "查看 %(folder)s" + +#: trac/templates/macros.html:62 trac/templates/macros.html:63 msgid "Previous" msgstr "上一个" -#: trac/templates/macros.html:83 trac/templates/macros.html:84 +#: trac/templates/macros.html:72 trac/templates/macros.html:73 msgid "Next" msgstr "下一个" -#: trac/templates/macros.html:94 +#: trac/templates/macros.html:83 msgid "View differences" msgstr "查看差异" -#: trac/templates/macros.html:97 +#: trac/templates/macros.html:86 msgid "inline" msgstr "内嵌" -#: trac/templates/macros.html:99 +#: trac/templates/macros.html:88 msgid "side by side" msgstr "并排" -#: trac/templates/macros.html:101 +#: trac/templates/macros.html:90 msgid "Show" msgstr "显示" -#: trac/templates/macros.html:104 +#: trac/templates/macros.html:93 msgid "lines around each change" msgstr "每次变更行数" -#: trac/templates/macros.html:107 +#: trac/templates/macros.html:96 msgid "Ignore:" msgstr "忽略:" -#: trac/templates/macros.html:111 +#: trac/templates/macros.html:100 msgid "Blank lines" msgstr "空行" -#: trac/templates/macros.html:116 +#: trac/templates/macros.html:105 msgid "Case changes" msgstr "大小写变化" -#: trac/templates/macros.html:121 +#: trac/templates/macros.html:110 msgid "White space changes" msgstr "空字符变化" -#: trac/templates/macros.html:125 trac/ticket/templates/milestone_view.html:54 -#: trac/ticket/templates/query.html:191 +#: trac/templates/macros.html:114 trac/ticket/templates/milestone_view.html:59 +#: trac/ticket/templates/query.html:210 #: trac/ticket/templates/report_view.html:33 #: trac/ticket/templates/roadmap.html:25 #: trac/timeline/templates/timeline.html:32 -#: trac/versioncontrol/templates/revisionlog.html:65 +#: trac/versioncontrol/templates/revisionlog.html:66 msgid "Update" msgstr "更新结果" -#: trac/templates/macros.html:138 +#: trac/templates/macros.html:127 msgid "(The file is empty)" msgstr "(文件为空)" -#: trac/templates/macros.html:141 +#: trac/templates/macros.html:130 msgid "HTML preview not available" msgstr "HTML预览功能不可用" -#: trac/templates/macros.html:143 +#: trac/templates/macros.html:132 msgid "since the file size exceeds" msgstr "由于文件大小超过" -#: trac/templates/macros.html:144 +#: trac/templates/macros.html:133 msgid "bytes." -msgstr "字节." +msgstr "字节。" -#: trac/templates/macros.html:146 +#: trac/templates/macros.html:135 msgid "since no preview renderer could handle it." -msgstr "由于没有合适的渲染器来处理." +msgstr "由于没有合适的渲染器来处理。" -#: trac/templates/macros.html:149 +#: trac/templates/macros.html:138 msgid "Try" msgstr "尝试" -#: trac/templates/macros.html:150 +#: trac/templates/macros.html:139 msgid "downloading" msgstr "下载" -#: trac/templates/macros.html:150 +#: trac/templates/macros.html:139 msgid "the file instead." -msgstr "文件代替." +msgstr "文件代替。" -#: trac/templates/macros.html:163 +#: trac/templates/macros.html:153 msgid "View attachment" msgstr "查看附件" -#: trac/templates/macros.html:166 +#: trac/templates/macros.html:156 msgid ") - added by" msgstr ") - 添加者" -#: trac/templates/macros.html:167 trac/ticket/templates/query_results.html:77 +#: trac/templates/macros.html:157 msgid "ago." -msgstr "前." +msgstr "前。" -#: trac/templates/macros.html:172 trac/templates/macros.html:183 +#: trac/templates/macros.html:163 trac/templates/macros.html:174 +#: trac/ticket/templates/ticket.html:487 msgid "Attachments" msgstr "附件" -#: trac/templates/macros.html:208 +#: trac/templates/macros.html:199 msgid "Attach file" msgstr "附加文件" -#: trac/templates/macros.html:236 trac/templates/macros.html:237 -#: trac/templates/macros.html:245 -msgid "s:" -msgstr "s:" +#: trac/templates/macros.html:214 +#, fuzzy, python-format +msgid "%(num)s of %(total)s %(unit)s %(title)s" +msgid_plural "%(num)s of %(total)s %(units)s %(title)s" +msgstr[0] "" -#: trac/templates/macros.html:245 -msgid "Total" -msgstr "总计" +#: trac/templates/macros.html:227 +#, fuzzy, python-format +msgid "%(title)s %(unit)s:" +msgid_plural "%(title)s %(units)s:" +msgstr[0] "" +#: trac/templates/macros.html:237 +#, fuzzy, python-format +msgid "Total %(unit)s:" +msgid_plural "Total %(units)s:" +msgstr[0] "" + #: trac/templates/theme.html:26 msgid "Search:" msgstr "搜索:" @@ -1966,93 +2008,128 @@ msgid "Warning:" msgstr "警告:" -#: trac/ticket/admin.py:105 +#: trac/ticket/admin.py:36 +msgid "(Undefined)" +msgstr "（未定义的）" + +#: trac/ticket/admin.py:47 +#, fuzzy +msgid "Ticket System" +msgstr "任务单系统" + +#: trac/ticket/admin.py:112 #, python-format msgid "The component \"%(name)s\" has been added." msgstr "组件 '%(name)s' 已添加。" -#: trac/ticket/admin.py:109 +#: trac/ticket/admin.py:117 trac/ticket/model.py:664 trac/ticket/model.py:686 +#, fuzzy +msgid "Invalid component name." +msgstr "无效的组件名称。" + +#: trac/ticket/admin.py:118 #, python-format msgid "Component %(name)s already exists." msgstr "组件 %(name)s 已经存在." -#: trac/ticket/admin.py:116 +#: trac/ticket/admin.py:125 msgid "No component selected" msgstr "没有选择组件" -#: trac/ticket/admin.py:124 +#: trac/ticket/admin.py:133 msgid "The selected components have been removed." msgstr "选定组件已删除。" -#: trac/ticket/admin.py:262 trac/ticket/roadmap.py:651 +#: trac/ticket/admin.py:241 trac/ticket/api.py:293 +#: trac/ticket/templates/milestone_view.html:11 +#: trac/ticket/templates/milestone_view.html:22 +msgid "Milestone" +msgstr "里程碑" + +#: trac/ticket/admin.py:270 trac/ticket/roadmap.py:662 msgid "Completion date may not be in the future" msgstr "完成日期不能是未来的日期" -#: trac/ticket/admin.py:264 +#: trac/ticket/admin.py:272 msgid "Invalid Completion Date" msgstr "无效完成日期" -#: trac/ticket/admin.py:291 +#: trac/ticket/admin.py:299 #, python-format msgid "The milestone \"%(name)s\" has been added." msgstr "里程碑 \"%(name)s\" 已添加。" -#: trac/ticket/admin.py:295 +#: trac/ticket/admin.py:304 trac/ticket/model.py:804 trac/ticket/model.py:829 +#, fuzzy +msgid "Invalid milestone name." +msgstr "无效的里程碑名称。" + +#: trac/ticket/admin.py:305 #, python-format msgid "Milestone %(name)s already exists." msgstr "里程碑 %(name)s 已经存在." -#: trac/ticket/admin.py:303 +#: trac/ticket/admin.py:313 msgid "No milestone selected" msgstr "没有选择里程碑" -#: trac/ticket/admin.py:311 +#: trac/ticket/admin.py:321 msgid "The selected milestones have been removed." msgstr "选定里程碑已删除。" -#: trac/ticket/admin.py:470 +#: trac/ticket/admin.py:480 #, python-format msgid "The version \"%(name)s\" has been added." msgstr "版本 '%(name)s' 已添加。" -#: trac/ticket/admin.py:474 +#: trac/ticket/admin.py:485 trac/ticket/model.py:941 trac/ticket/model.py:963 +#, fuzzy +msgid "Invalid version name." +msgstr "无效的版本名称。" + +#: trac/ticket/admin.py:486 #, python-format msgid "Version %(name)s already exists." msgstr "版本 %(name)s 已经存在." -#: trac/ticket/admin.py:481 +#: trac/ticket/admin.py:493 msgid "No version selected" msgstr "没有选择版本" -#: trac/ticket/admin.py:489 +#: trac/ticket/admin.py:501 msgid "The selected versions have been removed." msgstr "选定版本已删除。" -#: trac/ticket/admin.py:547 +#: trac/ticket/admin.py:559 msgid "Time" msgstr "时间" -#: trac/ticket/admin.py:618 +#: trac/ticket/admin.py:629 #, python-format msgid "The %(field)s \"%(name)s\" has been added." msgstr "%(field)s \"%(name)s\" 已添加。" -#: trac/ticket/admin.py:623 +#: trac/ticket/admin.py:635 trac/ticket/model.py:523 trac/ticket/model.py:550 #, python-format +msgid "Invalid %(type)s name." +msgstr "无效的%(type)s名称。" + +#: trac/ticket/admin.py:637 +#, python-format msgid "%(type)s %(name)s already exists" msgstr "%(type)s %(name)s 已经存在" -#: trac/ticket/admin.py:629 +#: trac/ticket/admin.py:643 #, python-format msgid "No %s selected" msgstr "没有 %s 被选择" -#: trac/ticket/admin.py:639 +#: trac/ticket/admin.py:653 #, python-format msgid "The selected %(fields)s have been removed." msgstr "选定%(fields)s已删除。" -#: trac/ticket/admin.py:660 +#: trac/ticket/admin.py:674 msgid "" "Error writing to trac.ini, make sure it is writable by the web server. " "The default value has not been saved." @@ -2060,70 +2137,135 @@ "写入trac.ini错误，请确保它可被Web服务器写入。\n" "缺省值没有被保存。" -#: trac/ticket/admin.py:672 +#: trac/ticket/admin.py:686 msgid "Order numbers must be unique" msgstr "序号必须唯一" -#: trac/ticket/admin.py:734 +#: trac/ticket/admin.py:748 msgid "Possible Values" msgstr "可取值" -#: trac/ticket/admin.py:756 +#: trac/ticket/admin.py:770 #, python-format msgid "Invalid up/down value: %(value)s" msgstr "无效的 up/down 值: %(value)s" -#: trac/ticket/admin.py:822 +#: trac/ticket/admin.py:790 trac/ticket/api.py:292 +#, fuzzy +msgid "Priority" +msgstr "优先级" + +#: trac/ticket/admin.py:790 +#, fuzzy +msgid "Priorities" +msgstr "优先级" + +#: trac/ticket/admin.py:796 trac/ticket/api.py:297 +msgid "Resolution" +msgstr "处理结果" + +#: trac/ticket/admin.py:796 +#, fuzzy +msgid "Resolutions" +msgstr "处理结果" + +#: trac/ticket/admin.py:802 trac/ticket/api.py:296 +msgid "Severity" +msgstr "严重性" + +#: trac/ticket/admin.py:802 +#, fuzzy +msgid "Severities" +msgstr "严重性" + +#: trac/ticket/admin.py:808 +#, fuzzy +msgid "Ticket Type" +msgstr "任务单类型" + +#: trac/ticket/admin.py:808 +#, fuzzy +msgid "Ticket Types" +msgstr "任务单类型" + +#: trac/ticket/admin.py:836 msgid " must be a number" msgstr " 必须是一个数" -#: trac/ticket/admin.py:827 +#: trac/ticket/admin.py:841 #, python-format msgid "Ticket %(num)s and all associated data removed." msgstr "任务单 %(num)s 和所有相关数据均已被删除。" -#: trac/ticket/api.py:248 +#: trac/ticket/api.py:275 +#, fuzzy +msgid "Summary" +msgstr "概述:" + +#: trac/ticket/api.py:277 +#, fuzzy +msgid "Reporter" +msgstr "报告人:" + +#: trac/ticket/api.py:290 +#, fuzzy +msgid "Type" +msgstr "类型:" + +#: trac/ticket/api.py:291 +msgid "Status" +msgstr "状态" + +#: trac/ticket/api.py:316 +msgid "Keywords" +msgstr "关键词" + +#: trac/ticket/api.py:317 +msgid "Cc" +msgstr "抄送" + +#: trac/ticket/api.py:321 msgid "Created" msgstr "创建" -#: trac/ticket/api.py:405 +#: trac/ticket/api.py:481 #, python-format msgid "Comment %(cnum)s for Ticket #%(id)s" -msgstr "评论 %(cnum)s 任务单 #%(id)s" +msgstr "任务单 #%(id)s 的评论 %(cnum)s" -#: trac/ticket/api.py:426 +#: trac/ticket/api.py:502 #, python-format msgid "Ticket #%(shortname)s" msgstr "任务单 #%(shortname)s" -#: trac/ticket/default_workflow.py:222 +#: trac/ticket/default_workflow.py:225 msgid "Current state no longer exists" msgstr "当前状态己不存在" -#: trac/ticket/default_workflow.py:224 +#: trac/ticket/default_workflow.py:227 msgid "The ticket will be disowned" msgstr "任务单将将脱离属主" -#: trac/ticket/default_workflow.py:243 trac/ticket/default_workflow.py:257 +#: trac/ticket/default_workflow.py:246 trac/ticket/default_workflow.py:260 #, python-format msgid "The owner will change from %(current_owner)s" msgstr "属主将由%(current_owner)s变更" -#: trac/ticket/default_workflow.py:248 +#: trac/ticket/default_workflow.py:251 #, python-format msgid "The owner will change from %(current_owner)s to %(selected_owner)s" msgstr "属主将由%(current_owner)s变更为%(selected_owner)s" -#: trac/ticket/default_workflow.py:253 +#: trac/ticket/default_workflow.py:256 msgid "to " msgstr "到" -#: trac/ticket/default_workflow.py:261 +#: trac/ticket/default_workflow.py:264 #, python-format msgid "The owner will change from %(current_owner)s to %(authname)s" msgstr "属主将由%(current_owner)s变更为%(authname)s" -#: trac/ticket/default_workflow.py:272 +#: trac/ticket/default_workflow.py:274 msgid "" "Your workflow attempts to set a resolution but none is defined " "(configuration issue, please contact your Trac admin)." @@ -2131,420 +2273,534 @@ "您的工作流试图设置处理结果，但一个也没有定义\n" "(配置问题，请联系您的Trac管理员)。" -#: trac/ticket/default_workflow.py:277 +#: trac/ticket/default_workflow.py:279 #, python-format msgid "The resolution will be set to %(name)s" msgstr "处理结果将设置为 %(name)s" -#: trac/ticket/default_workflow.py:287 +#: trac/ticket/default_workflow.py:289 msgid "The resolution will be set" msgstr "处理结果将设置为" -#: trac/ticket/default_workflow.py:293 +#: trac/ticket/default_workflow.py:295 #, python-format msgid "Next status will be '%(name)s'" msgstr "下一个状态将是 '%(name)s'" -#: trac/ticket/model.py:140 +#: trac/ticket/model.py:107 +#, fuzzy, python-format +msgid "Ticket %(id)s does not exist." +msgstr "任务单 %(id)s 不存在." + +#: trac/ticket/model.py:108 +#, fuzzy +msgid "Invalid ticket number" +msgstr "无效的任务单编号" + +#: trac/ticket/model.py:144 msgid "Multi-values fields not supported yet" msgstr "尚不支持多值字段" -#: trac/ticket/model.py:392 +#: trac/ticket/model.py:482 #, python-format msgid "%(type)s %(name)s does not exist." msgstr "%(type)s %(name)s 不存在." -#: trac/ticket/model.py:540 +#: trac/ticket/model.py:631 #, python-format msgid "Component %(name)s does not exist." msgstr "组件 '%(name)s' 不存在." -#: trac/ticket/model.py:773 +#: trac/ticket/model.py:749 +#, fuzzy, python-format +msgid "Milestone %(name)s does not exist." +msgstr "里程碑 '%(name)s' 不存在." + +#: trac/ticket/model.py:750 +#, fuzzy +msgid "Invalid milestone name" +msgstr "无效的里程碑名称" + +#: trac/ticket/model.py:887 msgid "Open (by due date)" msgstr "开启(有期限)" -#: trac/ticket/model.py:774 +#: trac/ticket/model.py:888 msgid "Open (no due date)" msgstr "开启(无期限)" -#: trac/ticket/model.py:777 +#: trac/ticket/model.py:891 msgid "Closed" msgstr "关闭" -#: trac/ticket/model.py:793 +#: trac/ticket/model.py:908 #, python-format msgid "Version %(name)s does not exist." msgstr "版本 '%(name)s' 不存在." -#: trac/ticket/query.py:76 +#: trac/ticket/query.py:53 +msgid "Invalid query constraint value" +msgstr "无效的查询条件" + +#: trac/ticket/query.py:87 #, python-format msgid "Query page %(page)s is invalid." msgstr "查询页面 %(page)s 无效" -#: trac/ticket/query.py:91 +#: trac/ticket/query.py:102 #, python-format msgid "Query max %(max)s is invalid." msgstr "Query max %(max)s 无效" -#: trac/ticket/query.py:130 +#: trac/ticket/query.py:158 msgid "Query filter requires field and constraints separated by a \"=\"" msgstr "查询过滤器要求使用\"=\"分隔字段和约束" -#: trac/ticket/query.py:143 +#: trac/ticket/query.py:171 msgid "Query filter requires field name" msgstr "查询过滤器需要字段名" -#: trac/ticket/query.py:273 +#: trac/ticket/query.py:304 #, python-format msgid "Page %(page)s is beyond the number of pages in the query" msgstr "页面 %(page)s 已超出查询结果页数" -#: trac/ticket/query.py:609 trac/ticket/web_ui.py:601 -msgid "Ticket" -msgstr "任务单" +#: trac/ticket/query.py:558 +#, fuzzy, python-format +msgid "Invalid ticket id list: %(value)s" +msgstr "无效的任务单ID列表： %(value)s" -#: trac/ticket/query.py:627 trac/ticket/query.py:635 +#: trac/ticket/query.py:657 trac/ticket/query.py:665 msgid "contains" msgstr "包含" -#: trac/ticket/query.py:628 trac/ticket/query.py:636 +#: trac/ticket/query.py:658 trac/ticket/query.py:666 msgid "doesn't contain" msgstr "不包含" -#: trac/ticket/query.py:629 +#: trac/ticket/query.py:659 msgid "begins with" msgstr "起始于" -#: trac/ticket/query.py:630 +#: trac/ticket/query.py:660 msgid "ends with" msgstr "结束于" -#: trac/ticket/query.py:631 trac/ticket/query.py:639 +#: trac/ticket/query.py:661 trac/ticket/query.py:669 trac/ticket/query.py:673 msgid "is" msgstr "是" -#: trac/ticket/query.py:632 trac/ticket/query.py:640 +#: trac/ticket/query.py:662 trac/ticket/query.py:670 trac/ticket/query.py:674 msgid "is not" msgstr "不是" -#: trac/ticket/query.py:695 trac/ticket/report.py:335 +#: trac/ticket/query.py:704 trac/ticket/query.py:710 +msgid "Ticket" +msgstr "任务单" + +#: trac/ticket/query.py:772 trac/ticket/report.py:362 #, python-format msgid "Page %(num)d" msgstr "第 %(num)d 页" -#: trac/ticket/query.py:744 trac/ticket/report.py:526 trac/ticket/web_ui.py:151 -#: trac/timeline/web_ui.py:216 trac/versioncontrol/web_ui/log.py:240 +#: trac/ticket/query.py:821 trac/ticket/report.py:522 trac/ticket/web_ui.py:129 +#: trac/timeline/web_ui.py:214 trac/versioncontrol/web_ui/log.py:283 msgid "RSS Feed" msgstr "RSS Feed" -#: trac/ticket/query.py:746 trac/ticket/report.py:529 trac/ticket/web_ui.py:147 +#: trac/ticket/query.py:823 trac/ticket/report.py:524 trac/ticket/web_ui.py:125 msgid "Comma-delimited Text" msgstr "逗号分割文本" -#: trac/ticket/query.py:748 trac/ticket/report.py:531 trac/ticket/web_ui.py:149 +#: trac/ticket/query.py:825 trac/ticket/report.py:526 trac/ticket/web_ui.py:127 msgid "Tab-delimited Text" msgstr "Tab分割文本" -#: trac/ticket/query.py:770 trac/ticket/report.py:63 +#: trac/ticket/query.py:847 trac/ticket/report.py:64 msgid "View Tickets" msgstr "查看任务单" -#: trac/ticket/query.py:948 trac/ticket/query.py:959 trac/ticket/report.py:121 +#: trac/ticket/query.py:1054 trac/ticket/query.py:1065 +#: trac/ticket/report.py:126 msgid "Custom Query" msgstr "定制查询" -#: trac/ticket/query.py:958 trac/ticket/report.py:111 trac/ticket/report.py:112 -#: trac/ticket/report.py:114 trac/ticket/report.py:229 +#: trac/ticket/query.py:1064 trac/ticket/report.py:116 +#: trac/ticket/report.py:117 trac/ticket/report.py:119 +#: trac/ticket/templates/report_list.html:10 +#: trac/ticket/templates/report_list.html:15 msgid "Available Reports" msgstr "可用的报表" -#: trac/ticket/query.py:1046 +#: trac/ticket/query.py:1147 #, python-format msgid "[Error: %(error)s]" msgstr "[Error: %(error)s]" -#: trac/ticket/query.py:1144 +#: trac/ticket/query.py:1281 msgid "No results" msgstr "没有结果" -#: trac/ticket/query.py:1162 +#: trac/ticket/query.py:1299 #, python-format msgid "%(groupvalue)s %(groupname)s tickets matching %(query)s" msgstr "%(groupvalue)s %(groupname)s 任务单匹配 %(query)s" -#: trac/ticket/query.py:1184 +#: trac/ticket/query.py:1321 #, python-format msgid "%(groupvalue)s %(groupname)s tickets:" msgstr "%(groupvalue)s %(groupname)s 任务单：" -#: trac/ticket/report.py:145 +#: trac/ticket/report.py:150 msgid "The report has been created." msgstr "报表已创建。" -#: trac/ticket/report.py:157 +#: trac/ticket/report.py:162 #, python-format msgid "The report {%(id)d} has been deleted." msgstr "报表 {%(id)d} 已删除。" -#: trac/ticket/report.py:181 +#: trac/ticket/report.py:186 #, python-format msgid "Delete Report {%(num)s} %(title)s" msgstr "删除报表 {%(num)s} %(title)s" -#: trac/ticket/report.py:186 trac/ticket/report.py:198 -#: trac/ticket/report.py:241 +#: trac/ticket/report.py:191 trac/ticket/report.py:203 +#: trac/ticket/report.py:253 #, python-format msgid "Report %(num)s does not exist." msgstr "报表 %(num)s 不存在." -#: trac/ticket/report.py:187 trac/ticket/report.py:199 -#: trac/ticket/report.py:242 +#: trac/ticket/report.py:192 trac/ticket/report.py:204 +#: trac/ticket/report.py:254 msgid "Invalid Report Number" msgstr "无效报表号" -#: trac/ticket/report.py:211 +#: trac/ticket/report.py:216 msgid "Create New Report" msgstr "新建报表" -#: trac/ticket/report.py:215 +#: trac/ticket/report.py:220 #, python-format msgid "Edit Report {%(num)d} %(title)s" msgstr "编辑报表 {%(num)d} %(title)s" -#: trac/ticket/report.py:232 -msgid "This is a list of available reports." -msgstr "有效报表列表." - -#: trac/ticket/report.py:247 +#: trac/ticket/report.py:259 #, python-format msgid "Report failed: %(error)s" msgstr "报表失败: %(error)s" -#: trac/ticket/report.py:262 +#: trac/ticket/report.py:274 #, python-format msgid "When specified, the report number should be \"%(num)s\"." msgstr "当指定后, 报表号应是 \"%(num)s\"." -#: trac/ticket/report.py:313 +#: trac/ticket/report.py:325 #, python-format msgid "Report execution failed: %(error)s" msgstr "报表执行失败: %(error)s" -#: trac/ticket/report.py:514 +#: trac/ticket/report.py:530 +msgid "SQL Query" +msgstr "SQL查询" + +#: trac/ticket/report.py:554 #, python-format msgid "The following arguments are missing: %(args)s" msgstr "缺少如下参数：%(args)s" -#: trac/ticket/report.py:533 -msgid "SQL Query" -msgstr "SQL查询" - -#: trac/ticket/report.py:547 +#: trac/ticket/report.py:568 #, python-format msgid "Report %(num)s has no SQL query." msgstr "报表 %(num)s 没有SQL查询." -#: trac/ticket/report.py:577 +#: trac/ticket/report.py:598 #, python-format msgid "Query parameter \"sort=%(sort_col)s\" is invalid" msgstr "查询参数 \"sort=%(sort_col)s\" 无效" -#: trac/ticket/roadmap.py:215 +#: trac/ticket/roadmap.py:208 +#, fuzzy +msgid "ticket status" +msgstr "任务单状态" + +#: trac/ticket/roadmap.py:208 +#, fuzzy +msgid "ticket" +msgstr "任务单" + +#: trac/ticket/roadmap.py:208 +#, fuzzy +msgid "tickets" +msgstr "任务单" + +#: trac/ticket/roadmap.py:218 #, python-format msgid "" "'%(group1)s' and '%(group2)s' milestone groups both are declared to be " "\"catch-all\" groups. Please check your configuration." msgstr "'%(group1)s' 和 '%(group2)s' 里程碑组都声明为\"catch-all\" 组. 请检查您的配置." -#: trac/ticket/roadmap.py:231 +#: trac/ticket/roadmap.py:234 #, python-format msgid "" "'%(groupname)s' milestone group reused status '%(status)s' already taken " "by other groups. Please check your configuration." msgstr "'%(groupname)s' 里程碑组重用了已经被其它组使用的状态 '%(status)s'. 请检查您的配置." -#: trac/ticket/roadmap.py:310 trac/ticket/roadmap.py:424 -#: trac/ticket/roadmap.py:559 trac/ticket/templates/roadmap.html:11 +#: trac/ticket/roadmap.py:317 trac/ticket/roadmap.py:433 +#: trac/ticket/roadmap.py:568 trac/ticket/templates/roadmap.html:11 #: trac/ticket/templates/roadmap.html:16 msgid "Roadmap" msgstr "路线图" -#: trac/ticket/roadmap.py:354 +#: trac/ticket/roadmap.py:361 msgid "iCalendar" msgstr "iCalendar" -#: trac/ticket/roadmap.py:433 trac/ticket/roadmap.py:829 +#: trac/ticket/roadmap.py:442 trac/ticket/roadmap.py:843 #, python-format msgid "Milestone %(name)s" msgstr "里程碑 %(name)s" -#: trac/ticket/roadmap.py:452 +#: trac/ticket/roadmap.py:461 #, python-format msgid "Ticket #%(num)s: %(summary)s" msgstr "任务单 #%(num)s: %(summary)s" -#: trac/ticket/roadmap.py:514 +#: trac/ticket/roadmap.py:523 msgid "Milestones reached" msgstr "里程碑达成" -#: trac/ticket/roadmap.py:602 +#: trac/ticket/roadmap.py:611 #, python-format msgid "The milestone \"%(name)s\" has been deleted." msgstr "里程碑 %(name)s 已删除。" -#: trac/ticket/roadmap.py:640 -#, python-format -msgid "Milestone \"%(name)s\" already exists, please choose another name" +#: trac/ticket/roadmap.py:651 +#, fuzzy, python-format +msgid "Milestone \"%(name)s\" already exists, please choose another name." msgstr "里程碑 \"%(name)s\" 已经存在, 请选择其他名称" -#: trac/ticket/roadmap.py:645 +#: trac/ticket/roadmap.py:654 msgid "You must provide a name for the milestone." msgstr "您必须为里程碑提供名称." -#: trac/ticket/web_ui.py:173 trac/ticket/templates/ticket.html:17 +#: trac/ticket/web_ui.py:151 trac/ticket/templates/ticket.html:18 msgid "New Ticket" msgstr "新建任务单" -#: trac/ticket/web_ui.py:189 +#: trac/ticket/web_ui.py:167 msgid "id can't be set for a new ticket request." msgstr "id不能设置给新任务单请求." -#: trac/ticket/web_ui.py:247 +#: trac/ticket/web_ui.py:225 msgid "Opened and closed tickets" msgstr "开启和关闭的任务单" -#: trac/ticket/web_ui.py:249 +#: trac/ticket/web_ui.py:227 msgid "Ticket updates" msgstr "任务单更新" -#: trac/ticket/web_ui.py:255 +#: trac/ticket/web_ui.py:233 msgid "created" msgstr "已创建" -#: trac/ticket/web_ui.py:256 +#: trac/ticket/web_ui.py:234 msgid "reopened" msgstr "已重新打开" -#: trac/ticket/web_ui.py:257 +#: trac/ticket/web_ui.py:235 msgid "closed" msgstr "已关闭" -#: trac/ticket/web_ui.py:258 +#: trac/ticket/web_ui.py:236 msgid "updated" msgstr "已升级" -#: trac/ticket/web_ui.py:354 +#: trac/ticket/web_ui.py:256 +#, fuzzy, python-format +msgid "%(labels)s changed" +msgid_plural "%(labels)s changed" +msgstr[0] "%(labels)s 已变更" + +#: trac/ticket/web_ui.py:336 #, python-format msgid "Ticket %(ticketref)s (%(summary)s) %(verb)s" msgstr "任务单 %(ticketref)s (%(summary)s) %(verb)s" -#: trac/ticket/web_ui.py:482 +#: trac/ticket/web_ui.py:490 #, python-format msgid "Invalid action \"%(name)s\"" msgstr "无效动作: \"%(name)s\"" -#: trac/ticket/web_ui.py:601 +#: trac/ticket/web_ui.py:618 +#, fuzzy +msgid "Previous Ticket" +msgstr "上一个任务单" + +#: trac/ticket/web_ui.py:618 +#, fuzzy +msgid "Next Ticket" +msgstr "下一个任务单" + +#: trac/ticket/web_ui.py:619 msgid "Back to Query" msgstr "返回查询" -#: trac/ticket/web_ui.py:677 trac/ticket/web_ui.py:827 +#: trac/ticket/web_ui.py:695 trac/ticket/web_ui.py:843 +#: trac/ticket/web_ui.py:851 msgid "Ticket History" msgstr "任务单历史" -#: trac/ticket/web_ui.py:722 +#: trac/ticket/web_ui.py:699 trac/ticket/web_ui.py:898 +#, python-format +msgid "Back to Ticket #%(num)s" +msgstr "回到任务单 #%(num)s" + +#: trac/ticket/web_ui.py:741 msgid "No differences to show" msgstr "没有差异" -#: trac/ticket/web_ui.py:762 trac/ticket/web_ui.py:817 -#: trac/ticket/web_ui.py:825 trac/wiki/web_ui.py:378 trac/wiki/web_ui.py:384 -#: trac/wiki/web_ui.py:531 trac/wiki/web_ui.py:545 +#: trac/ticket/web_ui.py:784 trac/ticket/web_ui.py:840 +#: trac/ticket/web_ui.py:848 trac/ticket/web_ui.py:919 +#: trac/ticket/web_ui.py:956 trac/ticket/web_ui.py:963 trac/wiki/web_ui.py:375 +#: trac/wiki/web_ui.py:381 trac/wiki/web_ui.py:569 trac/wiki/web_ui.py:583 #, python-format msgid "Version %(num)s" msgstr "版本 %(num)s" -#: trac/ticket/web_ui.py:765 +#: trac/ticket/web_ui.py:787 trac/ticket/web_ui.py:922 msgid "initial" msgstr "初始" -#: trac/ticket/web_ui.py:827 trac/versioncontrol/web_ui/changeset.py:344 -#: trac/wiki/web_ui.py:397 -msgid "Change" -msgstr "变更" +#: trac/ticket/web_ui.py:850 trac/ticket/web_ui.py:965 +#: trac/versioncontrol/web_ui/changeset.py:341 trac/wiki/web_ui.py:394 +#, fuzzy +msgid "Previous Change" +msgstr "上一个更改" -#: trac/ticket/web_ui.py:832 +#: trac/ticket/web_ui.py:850 trac/ticket/web_ui.py:965 +#: trac/versioncontrol/web_ui/changeset.py:341 trac/wiki/web_ui.py:394 +#, fuzzy +msgid "Next Change" +msgstr "下一个更改" + +#: trac/ticket/web_ui.py:856 msgid "Ticket Diff" msgstr "任务单差异" -#: trac/ticket/web_ui.py:904 +#: trac/ticket/web_ui.py:890 trac/ticket/web_ui.py:959 +#: trac/ticket/web_ui.py:966 +#, fuzzy +msgid "Ticket Comment History" +msgstr "任务单评论历史" + +#: trac/ticket/web_ui.py:892 trac/ticket/web_ui.py:916 +#: trac/ticket/web_ui.py:973 +#, fuzzy, python-format +msgid "Ticket #%(num)s, comment %(cnum)d" +msgstr "任务单 #%(num)s, 注释 %(cnum)d" + +#: trac/ticket/web_ui.py:971 +#, fuzzy +msgid "Ticket Comment Diff" +msgstr "任务单评论差异" + +#: trac/ticket/web_ui.py:1057 +#, fuzzy +msgid "No permission to edit description." +msgstr "无权修改描述。" + +#: trac/ticket/web_ui.py:1060 msgid "No permission to change ticket fields." msgstr "无权修改任务单字段." -#: trac/ticket/web_ui.py:912 -msgid "No permissions to change ticket fields." -msgstr "无权修改任务单字段." - -#: trac/ticket/web_ui.py:921 +#: trac/ticket/web_ui.py:1076 msgid "No permissions to add a comment." msgstr "无权增加评论." -#: trac/ticket/web_ui.py:927 +#: trac/ticket/web_ui.py:1082 msgid "" "Sorry, can not save your changes. This ticket has been modified by " "someone else since you started" msgstr "对不起, 无法保存您的修改. 该任务单已经被其他人修改" -#: trac/ticket/web_ui.py:934 +#: trac/ticket/web_ui.py:1089 msgid "Tickets must contain a summary." msgstr "任务单必须有概述." -#: trac/ticket/web_ui.py:957 +#: trac/ticket/web_ui.py:1112 #, python-format msgid "Ticket description is too long (must be less than %(num)s characters)" msgstr "任务单描述太长(必须少于 %(num)s 个字符)" -#: trac/ticket/web_ui.py:964 +#: trac/ticket/web_ui.py:1119 #, python-format msgid "Ticket comment is too long (must be less than %(num)s characters)" msgstr "任务单评论太长(必须少于 %(num)s 个字符)" -#: trac/ticket/web_ui.py:979 +#: trac/ticket/web_ui.py:1134 msgid "Invalid comment threading identifier" msgstr "无效评论线索标识" -#: trac/ticket/web_ui.py:986 +#: trac/ticket/web_ui.py:1141 #, python-format msgid "The ticket field '%(field)s' is invalid: %(message)s" msgstr "任务单字段 '%(field)s' 无效: %(message)s" -#: trac/ticket/web_ui.py:1136 -msgid "Assign to" -msgstr "指派给" +#: trac/ticket/web_ui.py:1160 +#, python-format +msgid "" +"The ticket has been created, but an error occurred while sending " +"notifications: %(message)s" +msgstr "该任务单已创建，但在发送邮件通知时发生错误： %(message)s" -#: trac/ticket/web_ui.py:1166 +#: trac/ticket/web_ui.py:1170 +#, python-format +msgid "" +"Your ticket %(ticketref)s has been created, but you don't have permission" +" to view it." +msgstr "你的任务单 %(ticketref)s 已经创建，但你没有权限查看它。" + +#. TRANSLATOR: The 'change' has been saved... (link) +#: trac/ticket/web_ui.py:1201 +#, fuzzy +msgid "change" +msgstr "变更" + +#: trac/ticket/web_ui.py:1207 +#, python-format +msgid "" +"The %(change)s has been saved, but an error occurred while sending " +"notifications: %(message)s" +msgstr "%(change)s已保存，但在发送邮件通知时发生错误： %(message)s" + +#: trac/ticket/web_ui.py:1339 msgid "Add to Cc" msgstr "增加抄送" -#: trac/ticket/web_ui.py:1167 +#: trac/ticket/web_ui.py:1340 msgid "Remove from Cc" msgstr "删除抄送" -#: trac/ticket/web_ui.py:1168 +#: trac/ticket/web_ui.py:1341 msgid "Add/Remove from Cc" msgstr "增加/删除抄送" -#: trac/ticket/web_ui.py:1169 +#: trac/ticket/web_ui.py:1342 msgid "" msgstr "" -#: trac/ticket/web_ui.py:1190 trac/ticket/templates/query.html:91 +#: trac/ticket/web_ui.py:1363 trac/ticket/templates/query.html:103 msgid "yes" msgstr "是" -#: trac/ticket/web_ui.py:1190 trac/ticket/templates/query.html:94 +#: trac/ticket/web_ui.py:1363 trac/ticket/templates/query.html:106 msgid "no" msgstr "否" -#: trac/ticket/web_ui.py:1383 trac/versioncontrol/templates/changeset.html:130 +#: trac/ticket/web_ui.py:1554 trac/versioncontrol/templates/changeset.html:135 msgid "modified" msgstr "已修改" @@ -2562,7 +2818,7 @@ msgstr "重新关联相关任务单到里程碑" #: trac/ticket/templates/milestone_delete.html:41 -#: trac/ticket/templates/milestone_view.html:100 +#: trac/ticket/templates/milestone_view.html:105 msgid "Delete milestone" msgstr "删除里程碑" @@ -2574,178 +2830,186 @@ msgstr "[1:注意:] 使用路线图的帮助参见 [2:TracRoadmap]。" #: trac/ticket/templates/milestone_edit.html:11 -#: trac/ticket/templates/milestone_edit.html:37 +#: trac/ticket/templates/milestone_edit.html:36 msgid "Edit Milestone" msgstr "编辑里程碑" #: trac/ticket/templates/milestone_edit.html:12 -#: trac/ticket/templates/milestone_edit.html:38 +#: trac/ticket/templates/milestone_edit.html:37 msgid "New Milestone" msgstr "新建里程碑" -#: trac/ticket/templates/milestone_edit.html:45 +#: trac/ticket/templates/milestone_edit.html:44 msgid "Name of the milestone:" msgstr "里程碑名称:" -#: trac/ticket/templates/milestone_edit.html:50 +#: trac/ticket/templates/milestone_edit.html:49 msgid "Schedule" msgstr "时间表" -#: trac/ticket/templates/milestone_edit.html:71 +#: trac/ticket/templates/milestone_edit.html:70 msgid "Retarget associated open tickets to milestone:" msgstr "重指定关联活动任务单到里程碑" -#: trac/ticket/templates/milestone_edit.html:92 -#: trac/ticket/templates/ticket.html:403 trac/wiki/templates/wiki_edit.html:119 -#: trac/wiki/templates/wiki_edit.html:124 +#: trac/ticket/templates/milestone_edit.html:91 +#: trac/ticket/templates/ticket.html:107 trac/ticket/templates/ticket.html:497 +#: trac/wiki/templates/wiki_edit_form.html:70 +#: trac/wiki/templates/wiki_edit_form.html:75 msgid "Submit changes" msgstr "提交变更" -#: trac/ticket/templates/milestone_edit.html:93 +#: trac/ticket/templates/milestone_edit.html:92 msgid "Add milestone" msgstr "增加里程碑" -#: trac/ticket/templates/milestone_edit.html:98 -#: trac/ticket/templates/milestone_view.html:106 -#: trac/ticket/templates/roadmap.html:70 +#: trac/ticket/templates/milestone_edit.html:97 +#: trac/ticket/templates/milestone_view.html:111 +#: trac/ticket/templates/roadmap.html:76 msgid "" "[1:Note:] See\n" " [2:TracRoadmap] for help on using\n" " the roadmap." msgstr "[1:注意:] 使用路线图的帮助参见 [2:TracRoadmap]。" -#: trac/ticket/templates/milestone_view.html:11 -#: trac/ticket/templates/milestone_view.html:23 -msgid "Milestone" -msgstr "里程碑" - #: trac/ticket/templates/milestone_view.html:27 +#, fuzzy msgid "" "ago\n" -" (" +" (" msgstr "" "前\n" -" (" +" (" -#: trac/ticket/templates/milestone_view.html:31 -#: trac/ticket/templates/roadmap.html:42 +#: trac/ticket/templates/milestone_view.html:33 +#: trac/ticket/templates/roadmap.html:45 msgid "late" msgstr "延期" -#: trac/ticket/templates/milestone_view.html:34 -#: trac/ticket/templates/roadmap.html:45 +#: trac/ticket/templates/milestone_view.html:38 +#: trac/ticket/templates/roadmap.html:50 msgid "Due in" msgstr "剩余" -#: trac/ticket/templates/milestone_view.html:38 -#: trac/ticket/templates/roadmap.html:49 +#: trac/ticket/templates/milestone_view.html:43 +#: trac/ticket/templates/roadmap.html:55 msgid "No date set" msgstr "没有设置日期" -#: trac/ticket/templates/milestone_view.html:48 +#: trac/ticket/templates/milestone_view.html:53 #: trac/timeline/templates/timeline.html:44 msgid "by" -msgstr ": " +msgstr "按: " -#: trac/ticket/templates/milestone_view.html:62 +#: trac/ticket/templates/milestone_view.html:67 msgid "(none)" msgstr "(无)" -#: trac/ticket/templates/milestone_view.html:94 +#: trac/ticket/templates/milestone_view.html:99 msgid "Edit milestone" msgstr "编辑里程碑" #: trac/ticket/templates/query.html:29 -#: trac/ticket/templates/query_results.html:29 -#, python-format +#: trac/ticket/templates/query_results.html:30 +#: trac/ticket/templates/report_view.html:94 +#, fuzzy, python-format msgid "%(num)s match" msgid_plural "%(num)s matches" msgstr[0] "%(num)s匹配" -msgstr[1] "%(num)s匹配" -#: trac/ticket/templates/query.html:39 +#: trac/ticket/templates/query.html:38 msgid "Filters" msgstr "过滤器" -#: trac/ticket/templates/query.html:40 +#: trac/ticket/templates/query.html:39 msgid "Query filters" msgstr "查询过滤器" -#: trac/ticket/templates/query.html:124 -msgid "Add filter" -msgstr "增加过滤器" +#: trac/ticket/templates/query.html:45 trac/ticket/templates/query.html:142 +#, fuzzy +msgid "Or" +msgstr "或" -#: trac/ticket/templates/query.html:144 +#: trac/ticket/templates/query.html:128 +#, fuzzy +msgid "And" +msgstr "和" + +#: trac/ticket/templates/query.html:163 msgid "Columns" msgstr "列" -#: trac/ticket/templates/query.html:158 +#: trac/ticket/templates/query.html:177 msgid "Group results by" msgstr "结果分组" -#: trac/ticket/templates/query.html:169 +#: trac/ticket/templates/query.html:188 msgid "descending" msgstr "降序" -#: trac/ticket/templates/query.html:173 +#: trac/ticket/templates/query.html:192 msgid "Show under each result:" msgstr "在每个结果下显示:" -#: trac/ticket/templates/query.html:183 +#: trac/ticket/templates/query.html:202 #: trac/ticket/templates/report_view.html:27 msgid "Max items per page" msgstr "每页最多条目" -#: trac/ticket/templates/query.html:226 +#: trac/ticket/templates/query.html:245 msgid "Edit query" msgstr "编辑查询" -#: trac/ticket/templates/query.html:234 +#: trac/ticket/templates/query.html:253 msgid "Save query" msgstr "保存查询" -#: trac/ticket/templates/query.html:234 +#: trac/ticket/templates/query.html:253 #, python-format msgid "Save updated query in report {%(id)s}" msgstr "在报表 {%(id)s} 中保存更新的查询" -#: trac/ticket/templates/query.html:234 +#: trac/ticket/templates/query.html:253 msgid "Create new report from current query" msgstr "用当前查询创建新的" -#: trac/ticket/templates/query.html:243 +#: trac/ticket/templates/query.html:261 msgid "Delete query" msgstr "删除查询" -#: trac/ticket/templates/query.html:249 +#: trac/ticket/templates/query.html:267 msgid "" "[1:Note:] See [2:TracQuery]\n" " for help on using queries." msgstr "[1:注意：]有关使用查询的帮助参见[2:TracQuery]" -#: trac/ticket/templates/query_results.html:44 +#: trac/ticket/templates/query_results.html:45 msgid "No tickets found" msgstr "没有匹配的任务单" -#: trac/ticket/templates/query_results.html:58 -#: trac/ticket/templates/query_results.html:60 +#: trac/ticket/templates/query_results.html:59 +#: trac/ticket/templates/query_results.html:61 msgid "View ticket" msgstr "查看任务单" -#: trac/ticket/templates/query_results.html:65 -#: trac/ticket/templates/report_view.html:183 +#: trac/ticket/templates/query_results.html:66 +#: trac/ticket/templates/report_view.html:176 msgid "View milestone" msgstr "查看里程碑" -#: trac/ticket/templates/query_results.html:76 -msgid "Reported by" -msgstr "汇报人" +#: trac/ticket/templates/query_results.html:77 +#, python-format +msgid "" +"Reported by [1:%(author)s],\n" +" %(date)s ago." +msgstr "" +"由 [1:%(author)s] 报告,\n" +" %(date)s前。" -#: trac/ticket/templates/query_results.html:83 +#: trac/ticket/templates/query_results.html:84 msgid "(this ticket)" msgstr "(本任务单)" -#: trac/ticket/templates/query_results.html:99 +#: trac/ticket/templates/query_results.html:100 msgid "(more results for this group on next page)" msgstr "(下页有更多结果)" @@ -2754,13 +3018,15 @@ msgstr "确定删除此报表吗?" #: trac/ticket/templates/report_delete.html:22 +#: trac/ticket/templates/report_list.html:36 #: trac/ticket/templates/report_view.html:82 msgid "Delete report" msgstr "删除报表" #: trac/ticket/templates/report_delete.html:26 -#: trac/ticket/templates/report_edit.html:48 -#: trac/ticket/templates/report_view.html:218 +#: trac/ticket/templates/report_edit.html:47 +#: trac/ticket/templates/report_list.html:54 +#: trac/ticket/templates/report_view.html:201 msgid "" "[1:Note:]\n" " See [2:TracReports] for help on using and creating reports." @@ -2784,9 +3050,61 @@ msgid "Save report" msgstr "保存报表" +#: trac/ticket/templates/report_list.html:18 +msgid "This is a list of available reports." +msgstr "有效报表列表." + +#: trac/ticket/templates/report_list.html:25 +#, fuzzy +msgid "Report" +msgstr "报表" + +#: trac/ticket/templates/report_list.html:26 trac/wiki/admin.py:196 +msgid "Title" +msgstr "标题" + +#: trac/ticket/templates/report_list.html:27 +#: trac/wiki/templates/wiki_edit.html:68 +#, fuzzy +msgid "Actions" +msgstr "动作" + +#: trac/ticket/templates/report_list.html:32 +#: trac/ticket/templates/report_list.html:33 +#: trac/ticket/templates/report_view.html:129 +msgid "View report" +msgstr "查看报表" + +#: trac/ticket/templates/report_list.html:34 +#: trac/ticket/templates/report_view.html:70 +msgid "Edit report" +msgstr "编辑报表" + +#: trac/ticket/templates/report_list.html:35 +#: trac/ticket/templates/ticket.html:269 trac/wiki/templates/wiki_edit.html:124 +#, fuzzy +msgid "Edit" +msgstr "编辑" + +#: trac/ticket/templates/report_list.html:37 +#: trac/wiki/templates/wiki_delete.html:22 +msgid "Delete" +msgstr "删除" + +#: trac/ticket/templates/report_list.html:40 +#, fuzzy +msgid "No reports available." +msgstr "没有可用的报表。" + +#: trac/ticket/templates/report_list.html:49 +msgid "Create new report" +msgstr "新建报表" + #: trac/ticket/templates/report_view.html:21 -msgid "matches)" -msgstr "匹配)" +#, fuzzy, python-format +msgid "%(num)d match" +msgid_plural "%(num)d matches" +msgstr[0] "%(num)s匹配" #: trac/ticket/templates/report_view.html:42 msgid "Arguments" @@ -2796,27 +3114,15 @@ msgid "Report arguments" msgstr "报表参数" -#: trac/ticket/templates/report_view.html:70 -msgid "Edit report" -msgstr "编辑报表" - #: trac/ticket/templates/report_view.html:76 msgid "Copy report" msgstr "复制报表" #: trac/ticket/templates/report_view.html:94 -msgid "match" -msgstr "匹配" +#, fuzzy +msgid "No matches" +msgstr "没有匹配结果" -#: trac/ticket/templates/report_view.html:128 -#: trac/ticket/templates/report_view.html:135 -msgid "View report" -msgstr "查看报表" - -#: trac/ticket/templates/report_view.html:210 -msgid "Create new report" -msgstr "新建报表" - #: trac/ticket/templates/roadmap.html:22 msgid "Show already completed milestones" msgstr "显示已完成里程碑" @@ -2825,175 +3131,233 @@ msgid "Milestone:" msgstr "里程碑:" -#: trac/ticket/templates/roadmap.html:38 +#: trac/ticket/templates/roadmap.html:39 +#, fuzzy msgid "" "ago\n" -" (" +" (" msgstr "" "前\n" " (" -#: trac/ticket/templates/roadmap.html:66 +#: trac/ticket/templates/roadmap.html:72 msgid "Add new milestone" msgstr "新建里程碑" -#: trac/ticket/templates/ticket.html:59 -#: trac/versioncontrol/templates/changeset.html:128 +#: trac/ticket/templates/ticket.html:83 +#: trac/versioncontrol/templates/changeset.html:133 msgid "added" msgstr "增加" -#: trac/ticket/templates/ticket.html:63 +#: trac/ticket/templates/ticket.html:87 msgid "changed from" msgstr "变更自" -#: trac/ticket/templates/ticket.html:66 -#: trac/versioncontrol/templates/browser.html:135 +#: trac/ticket/templates/ticket.html:90 +#: trac/versioncontrol/templates/browser.html:139 msgid "set to" msgstr "设置为" -#: trac/ticket/templates/ticket.html:70 +#: trac/ticket/templates/ticket.html:94 msgid "deleted" msgstr "删除" -#: trac/ticket/templates/ticket.html:84 +#: trac/ticket/templates/ticket.html:106 trac/ticket/templates/ticket.html:496 +#: trac/wiki/templates/wiki_edit.html:70 trac/wiki/templates/wiki_edit.html:128 +#: trac/wiki/templates/wiki_edit_form.html:39 +#: trac/wiki/templates/wiki_edit_form.html:68 +msgid "Preview" +msgstr "预览" + +#: trac/ticket/templates/ticket.html:108 +msgid "Cancel comment edit" +msgstr "放弃编辑评论" + +#: trac/ticket/templates/ticket.html:134 +msgid "Go to the ticket editor" +msgstr "转到任务单编辑器" + +#: trac/ticket/templates/ticket.html:138 msgid "Ticket #" msgstr "任务单 #" -#: trac/ticket/templates/ticket.html:88 -msgid "Create New Ticket" -msgstr "创建新任务单" - -#: trac/ticket/templates/ticket.html:99 trac/ticket/templates/ticket.html:102 +#: trac/ticket/templates/ticket.html:144 trac/ticket/templates/ticket.html:147 msgid "— at" msgstr "— 于" -#: trac/ticket/templates/ticket.html:113 -msgid "Preview (" -msgstr "预览 (" +#: trac/ticket/templates/ticket.html:152 +msgid "Create New Ticket" +msgstr "创建新任务单" -#: trac/ticket/templates/ticket.html:113 trac/wiki/templates/wiki_edit.html:52 -msgid "skip" -msgstr "跳过" - -#: trac/ticket/templates/ticket.html:118 trac/ticket/templates/ticket.html:217 -msgid "in reply to:" -msgstr "回复到:" - -#: trac/ticket/templates/ticket.html:120 -msgid "Changed by" -msgstr "修改者" - -#: trac/ticket/templates/ticket.html:131 -msgid "Opened" -msgstr "开启于" - -#: trac/ticket/templates/ticket.html:131 trac/ticket/templates/ticket.html:132 -msgid "ago" -msgstr "前" - -#: trac/ticket/templates/ticket.html:131 +#: trac/ticket/templates/ticket.html:160 #, python-format msgid "Opened %(created)s ago" msgstr "开启于 %(created)s 前" -#: trac/ticket/templates/ticket.html:132 -msgid "Last modified" -msgstr "最后修改于" - -#: trac/ticket/templates/ticket.html:132 +#: trac/ticket/templates/ticket.html:161 #, python-format msgid "Last modified %(modified)s ago" msgstr "最后修改于 %(modified)s 前" -#: trac/ticket/templates/ticket.html:133 +#: trac/ticket/templates/ticket.html:162 msgid "(ticket not yet created)" msgstr "(还没有创建任务单)" -#: trac/ticket/templates/ticket.html:142 +#: trac/ticket/templates/ticket.html:170 msgid "Reported by:" msgstr "汇报人:" -#: trac/ticket/templates/ticket.html:146 +#: trac/ticket/templates/ticket.html:174 msgid "Owned by:" msgstr "属主:" -#: trac/ticket/templates/ticket.html:176 +#: trac/ticket/templates/ticket.html:203 msgid "(last modified by" msgstr "(最新修改者" -#: trac/ticket/templates/ticket.html:178 +#: trac/ticket/templates/ticket.html:205 trac/ticket/templates/ticket.html:291 msgid "diff" msgstr "差异" -#: trac/ticket/templates/ticket.html:189 trac/ticket/templates/ticket.html:231 +#: trac/ticket/templates/ticket.html:214 trac/ticket/templates/ticket.html:263 msgid "Reply" msgstr "回复" -#: trac/ticket/templates/ticket.html:189 +#: trac/ticket/templates/ticket.html:214 msgid "Reply, quoting this description" msgstr "回复, 引用此描述" -#: trac/ticket/templates/ticket.html:208 +#: trac/ticket/templates/ticket.html:232 msgid "Change History" msgstr "变更历史" -#: trac/ticket/templates/ticket.html:221 +#: trac/ticket/templates/ticket.html:247 trac/ticket/templates/ticket.html:324 +msgid "in reply to:" +msgstr "回复到:" + +#: trac/ticket/templates/ticket.html:251 msgid "follow-up" msgstr "跟随" -#: trac/ticket/templates/ticket.html:227 -#, python-format -msgid "%(date)s ago by" -msgstr "于%(date)s前，操作者: " +#: trac/ticket/templates/ticket.html:257 +#, fuzzy +msgid "Changed" +msgstr "变更" -#: trac/ticket/templates/ticket.html:246 -msgid "Add/Change #" -msgstr "增加/修改 #" +#: trac/ticket/templates/ticket.html:257 +#, fuzzy +msgid "ago by" +msgstr "前" -#: trac/ticket/templates/ticket.html:262 trac/wiki/templates/wiki_edit.html:98 -msgid "E-mail address and user name can be saved in the" -msgstr "E-mail地址和用户名可以保存在" +#: trac/ticket/templates/ticket.html:277 +#, fuzzy +msgid ", edited" +msgstr "已编辑" -#: trac/ticket/templates/ticket.html:269 +#: trac/ticket/templates/ticket.html:277 trac/ticket/templates/ticket.html:281 +#, fuzzy msgid "" -"Comment (you may use\n" +"ago\n" +" by" +msgstr "" +"前\n" +" (" + +#: trac/ticket/templates/ticket.html:280 +#, fuzzy +msgid "Last edited" +msgstr "上次编辑" + +#: trac/ticket/templates/ticket.html:285 +#: trac/versioncontrol/templates/changeset.html:92 +msgid "previous" +msgstr "上一个" + +#: trac/ticket/templates/ticket.html:288 +#, fuzzy +msgid "next" +msgstr "下一个" + +#: trac/ticket/templates/ticket.html:307 +msgid "View ticket fields and description" +msgstr "" + +#: trac/ticket/templates/ticket.html:307 +#, fuzzy +msgid "View" +msgstr "预览" + +#: trac/ticket/templates/ticket.html:310 +#, fuzzy +msgid "Add a comment" +msgstr "添加评论" + +#: trac/ticket/templates/ticket.html:314 +#, fuzzy +msgid "" +"You may use\n" " [1:WikiFormatting]\n" -" here):" -msgstr "评论(您可以使用[1:WikiFormatting]): " +" here." +msgstr "" +"您可以在此处\n" +"\"\n" +"\" 使用\n" +"\"\n" +"\" [1:WikiFormatting]。" -#: trac/ticket/templates/ticket.html:282 +#: trac/ticket/templates/ticket.html:326 +msgid "Changed by" +msgstr "修改者" + +#: trac/ticket/templates/ticket.html:334 +#, fuzzy +msgid "Modify Ticket" +msgstr "修改任务单" + +#: trac/ticket/templates/ticket.html:340 +#, fuzzy +msgid "Change Properties" +msgstr "改变属性" + +#: trac/ticket/templates/ticket.html:341 msgid "Properties" msgstr "属性" -#: trac/ticket/templates/ticket.html:285 +#: trac/ticket/templates/ticket.html:345 msgid "Summary:" -msgstr "概要:" +msgstr "概述:" -#: trac/ticket/templates/ticket.html:293 +#: trac/ticket/templates/ticket.html:353 msgid "Reporter:" -msgstr "汇报人:" +msgstr "报告人:" -#: trac/ticket/templates/ticket.html:353 +#: trac/ticket/templates/ticket.html:413 msgid "This checkbox allows you to add or remove yourself from the CC list." msgstr "您可以使用此复选框将自己加入到抄送列表中或从中移除。" -#: trac/ticket/templates/ticket.html:359 +#: trac/ticket/templates/ticket.html:419 msgid "Space or comma delimited email addresses and usernames are accepted." msgstr "可以接受使用空格或逗号隔开的email地址或用户名。" -#: trac/ticket/templates/ticket.html:391 +#: trac/ticket/templates/ticket.html:472 +#: trac/wiki/templates/wiki_edit_form.html:49 +msgid "E-mail address and user name can be saved in the" +msgstr "E-mail地址和用户名可以保存在" + +#: trac/ticket/templates/ticket.html:481 msgid "I have files to attach to this ticket" msgstr "我有文件需要附加到任务单" -#: trac/ticket/templates/ticket.html:402 trac/wiki/templates/wiki_edit.html:117 -msgid "Preview" -msgstr "预览" +#: trac/ticket/templates/ticket.html:487 +#, fuzzy +msgid "Go to the list of attachments" +msgstr "转到附件列表" -#: trac/ticket/templates/ticket.html:403 +#: trac/ticket/templates/ticket.html:497 msgid "Create ticket" msgstr "创建新任务单" -#: trac/ticket/templates/ticket.html:408 +#: trac/ticket/templates/ticket.html:502 msgid "" "[1:Note:] See\n" " [2:TracTickets] for help on using\n" @@ -3016,28 +3380,47 @@ "-- \n" "任务单 URL: <" -#: trac/timeline/web_ui.py:77 trac/timeline/templates/timeline.html:11 +#: trac/timeline/web_ui.py:75 trac/timeline/templates/timeline.html:11 #: trac/timeline/templates/timeline.html:17 msgid "Timeline" msgstr "时间线" -#: trac/timeline/web_ui.py:229 -msgid "Previous period" +#: trac/timeline/web_ui.py:227 trac/timeline/web_ui.py:235 +#, fuzzy +msgid "Previous Period" msgstr "上一周期" -#: trac/timeline/web_ui.py:236 -msgid "Next period" +#: trac/timeline/web_ui.py:234 trac/timeline/web_ui.py:235 +#, fuzzy +msgid "Next Period" msgstr "下一周期" -#: trac/timeline/web_ui.py:237 -msgid "Period" -msgstr "周期" - -#: trac/timeline/web_ui.py:297 +#: trac/timeline/web_ui.py:295 #, python-format msgid "%(date)s in Timeline" msgstr "时间线中的%(date)s" +#. TRANSLATOR: other_events +#: trac/timeline/web_ui.py:343 +msgid "other kind of events" +msgstr "其他类型事件" + +#: trac/timeline/web_ui.py:348 +#, python-format +msgid "Event provider %(name)s failed for filters %(kinds)s: " +msgstr "" + +#: trac/timeline/web_ui.py:354 +#, python-format +msgid "" +"\n" +" You may want to see the %(other_events)s from the Timeline " +"or \n" +" notify your Trac administrator about the error (detailed\n" +" informations were written to the log).\n" +" " +msgstr "" + #: trac/timeline/templates/timeline.html:20 msgid "" "[1:View changes from [2:]] [3:]\n" @@ -3063,6 +3446,48 @@ " for information about the timeline view." msgstr "[1:注意:] 时间线视图的相关信息参见[2:TracTimeline]。" +#: trac/util/datefmt.py:68 +#, fuzzy, python-format +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d 年" + +#: trac/util/datefmt.py:69 +#, fuzzy, python-format +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d 个月" + +#: trac/util/datefmt.py:70 +#, fuzzy, python-format +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d 周" + +#: trac/util/datefmt.py:71 +#, fuzzy, python-format +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d 天" + +#: trac/util/datefmt.py:72 +#, fuzzy, python-format +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d 小时" + +#: trac/util/datefmt.py:73 +#, fuzzy, python-format +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d 分" + +#: trac/util/datefmt.py:92 +#, fuzzy, python-format +msgid "%(num)i second" +msgid_plural "%(num)i seconds" +msgstr[0] "%(num)i 秒" + #: trac/util/presentation.py:254 #, python-format msgid "%(last)d of %(total)d" @@ -3083,106 +3508,101 @@ msgstr "重新同步版本库历史..." #: trac/versioncontrol/admin.py:58 -#, python-format +#, fuzzy, python-format msgid "%(num)s revision cached." msgid_plural "%(num)s revisions cached." msgstr[0] "%(num)s个修订已缓存" -msgstr[1] "%(num)s个修订已缓存" #: trac/versioncontrol/admin.py:60 msgid "Done." msgstr "完成。" -#: trac/versioncontrol/api.py:90 +#: trac/versioncontrol/api.py:87 #, python-format msgid "" "Can't synchronize with the repository (%(error)s). Look in the Trac log " "for more information." msgstr "无法与版本库同步 (%(error)s)。更多信息请查看Trac日志。" -#: trac/versioncontrol/api.py:105 +#: trac/versioncontrol/api.py:102 #, python-format msgid "Changeset %(rev)s" msgstr "变更集 %(rev)s" -#: trac/versioncontrol/api.py:112 +#: trac/versioncontrol/api.py:109 msgid "Directory" msgstr "目录" -#: trac/versioncontrol/api.py:116 +#: trac/versioncontrol/api.py:113 #, python-format msgid "at version %(rev)s" -msgstr "于版本 %(rev)s" +msgstr "于修订 %(rev)s" -#: trac/versioncontrol/api.py:118 +#: trac/versioncontrol/api.py:115 msgid "Path" msgstr "路径" -#: trac/versioncontrol/api.py:142 +#: trac/versioncontrol/api.py:139 #, python-format msgid "Unsupported version control system \"%(name)s\": \"%(error)s\" " msgstr "不支持的版本控制系统 \"%(name)s\": \"%(error)s\"" -#: trac/versioncontrol/api.py:146 +#: trac/versioncontrol/api.py:143 #, python-format msgid "" "Unsupported version control system \"%(name)s\": Can't find an " "appropriate component, maybe the corresponding plugin was not enabled? " msgstr "不支持的版本控制系统\"%(name)s\"：未能找到合适的组件，也许相关插件没有被激活？" -#: trac/versioncontrol/api.py:178 +#: trac/versioncontrol/api.py:175 #, python-format msgid "No changeset %(rev)s in the repository" msgstr "在版本库中没有变更集 %(rev)s" -#: trac/versioncontrol/api.py:180 +#: trac/versioncontrol/api.py:177 msgid "No such changeset" msgstr "没有这个变更集" -#: trac/versioncontrol/api.py:186 +#: trac/versioncontrol/api.py:183 msgid "No such node" msgstr "没有这个节点" -#: trac/versioncontrol/api.py:524 +#: trac/versioncontrol/api.py:523 #, python-format msgid "Insufficient permissions to access %(path)s" msgstr "访问 %(path)s 的权限不够" -#: trac/versioncontrol/api.py:529 +#: trac/versioncontrol/api.py:528 #, python-format msgid "Insufficient permissions to access changeset %(id)s" msgstr "访问变更集 %(id)s 的权限不够" -#: trac/versioncontrol/cache.py:102 +#: trac/versioncontrol/cache.py:104 msgid "" "The 'repository_dir' has changed, a 'trac-admin resync' operation is " "needed." msgstr "'repository_dir'已经被修改, 需要执行'trac-admin resync'操作." -#: trac/versioncontrol/cache.py:121 +#: trac/versioncontrol/cache.py:123 msgid "Missing \"youngest_rev\" in cache metadata" msgstr "在缓存的元数据中没有 \"youngest_rev\"" -#: trac/versioncontrol/svn_fs.py:305 +#: trac/versioncontrol/svn_fs.py:301 #, python-format msgid "Subversion >= 1.0 required: Found %(version)s" msgstr "需要Subversion >= 1.0: 发现的是 %(version)s" -#: trac/versioncontrol/svn_fs.py:387 -msgid "No svn:externals configured in trac.ini" -msgstr "在trac.ini没有svn:externals配置" - -#: trac/versioncontrol/svn_fs.py:422 +#: trac/versioncontrol/svn_fs.py:325 #, python-format msgid "%(path)s does not appear to be a Subversion repository." msgstr "%(path)s 不是Subversion版本库路径." -#: trac/versioncontrol/svn_fs.py:429 +#: trac/versioncontrol/svn_fs.py:332 #, python-format msgid "Couldn't open Subversion repository %(path)s: %(svn_error)s" msgstr "不能打开Subversion版本库 %(path)s：%(svn_error)s" -#: trac/versioncontrol/svn_fs.py:685 +#: trac/versioncontrol/svn_fs.py:603 #, python-format msgid "" "Diff mismatch: Base is a %(oldnode)s (%(oldpath)s in revision %(oldrev)s)" @@ -3191,53 +3611,124 @@ "差异不匹配: 基准是 %(oldnode)s (%(oldpath)s 在修订 %(oldrev)s)中, 而目标是 %(newnode)s " "(%(newpath)s 在修订 %(newrev)s)中." -#: trac/versioncontrol/svn_fs.py:838 +#: trac/versioncontrol/svn_fs.py:757 #, python-format msgid "svn blame failed on %(path)s: %(error)s" msgstr "svn追溯失败 %(path)s: %(error)s" -#: trac/versioncontrol/templates/browser.html:50 +#: trac/versioncontrol/svn_prop.py:111 +msgid "No svn:externals configured in trac.ini" +msgstr "在trac.ini没有svn:externals配置" + +#: trac/versioncontrol/svn_prop.py:148 +#, fuzzy +msgid "merged" +msgstr "已合并" + +#: trac/versioncontrol/svn_prop.py:148 +#, fuzzy +msgid "blocked" +msgstr "已阻止" + +#: trac/versioncontrol/svn_prop.py:190 +msgid "eligible" +msgstr "合格的" + +#: trac/versioncontrol/svn_prop.py:204 +msgid "(toggle deleted branches)" +msgstr "（切换显示已删除的分支）" + +#: trac/versioncontrol/svn_prop.py:231 +msgid "View merge source" +msgstr "显示合并源" + +#: trac/versioncontrol/svn_prop.py:241 +#, fuzzy +msgid "No revisions" +msgstr "没有这个修订" + +#: trac/versioncontrol/svn_prop.py:276 +#, fuzzy +msgid "merged: " +msgstr "已合并：" + +#: trac/versioncontrol/svn_prop.py:276 +msgid "blocked: " +msgstr "已阻止：" + +#: trac/versioncontrol/svn_prop.py:277 +msgid "reverse-merged: " +msgstr "反向合并：" + +#: trac/versioncontrol/svn_prop.py:277 +msgid "un-blocked: " +msgstr "未阻止：" + +#: trac/versioncontrol/svn_prop.py:288 +#, fuzzy +msgid " (added)" +msgstr " (已添加)" + +#: trac/versioncontrol/svn_prop.py:316 +#: trac/versioncontrol/templates/changeset.html:134 +msgid "removed" +msgstr "已删除" + +#: trac/versioncontrol/svn_prop.py:319 +msgid " (with no actual effect on merging)" +msgstr " （并非真的进行合并）" + +#: trac/versioncontrol/svn_prop.py:320 +#, python-format +msgid "Property %(prop)s changed" +msgstr "属性 %(prop)s 已改变" + +#: trac/versioncontrol/templates/browser.html:54 +msgid "Hint: clear the field to view latest revision" +msgstr "提示：清除该字段可以查看最新的修订" + +#: trac/versioncontrol/templates/browser.html:54 msgid "View revision:" msgstr "查看修订:" -#: trac/versioncontrol/templates/browser.html:60 +#: trac/versioncontrol/templates/browser.html:64 msgid "Visit:" msgstr "访问:" -#: trac/versioncontrol/templates/browser.html:68 +#: trac/versioncontrol/templates/browser.html:72 msgid "Go!" msgstr "走!" -#: trac/versioncontrol/templates/browser.html:68 +#: trac/versioncontrol/templates/browser.html:72 msgid "Jump to the chosen preselected path" msgstr "跳转到预选择的路径" -#: trac/versioncontrol/templates/browser.html:87 -#: trac/versioncontrol/templates/revisionlog.html:93 -#: trac/versioncontrol/web_ui/browser.py:621 +#: trac/versioncontrol/templates/browser.html:91 +#: trac/versioncontrol/templates/revisionlog.html:95 +#: trac/versioncontrol/web_ui/browser.py:644 msgid "Rev" msgstr "Rev" -#: trac/versioncontrol/templates/browser.html:89 -#: trac/versioncontrol/web_ui/browser.py:372 trac/wiki/web_ui.py:550 -#: trac/wiki/web_ui.py:576 +#: trac/versioncontrol/templates/browser.html:93 +#: trac/versioncontrol/web_ui/browser.py:387 trac/wiki/web_ui.py:589 +#: trac/wiki/web_ui.py:616 msgid "Last Change" msgstr "最新变更" -#: trac/versioncontrol/templates/browser.html:96 +#: trac/versioncontrol/templates/browser.html:100 msgid "Parent Directory" msgstr "父目录" -#: trac/versioncontrol/templates/browser.html:102 +#: trac/versioncontrol/templates/browser.html:106 msgid "No files found" msgstr "没有找到任何文件。" -#: trac/versioncontrol/templates/browser.html:110 -#: trac/wiki/templates/wiki_edit.html:41 trac/wiki/templates/wiki_view.html:30 +#: trac/versioncontrol/templates/browser.html:114 +#: trac/wiki/templates/wiki_edit.html:112 trac/wiki/templates/wiki_view.html:37 msgid "Revision info" msgstr "修订信息" -#: trac/versioncontrol/templates/browser.html:112 +#: trac/versioncontrol/templates/browser.html:116 #, python-format msgid "" "Revision [1:%(rev)s], %(size)s\n" @@ -3246,101 +3737,113 @@ "修订 [1:%(rev)s], %(size)s\n" " (由%(author)s在%(date)s前签入)" -#: trac/versioncontrol/templates/browser.html:151 +#: trac/versioncontrol/templates/browser.html:155 msgid "" "[1:Note:] See [2:TracBrowser]\n" " for help on using the browser." msgstr "[1:注意:] 使用源码浏览器的帮助参见 [2:TracBrowser]。" -#: trac/versioncontrol/templates/browser.html:163 +#: trac/versioncontrol/templates/browser.html:167 msgid "View changes..." msgstr "查阅变更..." -#: trac/versioncontrol/templates/browser.html:163 +#: trac/versioncontrol/templates/browser.html:167 msgid "Select paths and revs for Diff" msgstr "选择进行对比的路径和修订" -#: trac/versioncontrol/templates/changeset.html:21 -#: trac/versioncontrol/templates/changeset.html:36 -#: trac/versioncontrol/web_ui/changeset.py:346 +#: trac/versioncontrol/templates/changeset.html:26 +#: trac/versioncontrol/templates/changeset.html:41 msgid "Changeset" msgstr "变更集" -#: trac/versioncontrol/templates/changeset.html:22 -#: trac/versioncontrol/templates/changeset.html:32 -#: trac/versioncontrol/templates/changeset.html:34 -#: trac/versioncontrol/templates/changeset.html:36 +#: trac/versioncontrol/templates/changeset.html:27 +#: trac/versioncontrol/templates/changeset.html:37 +#: trac/versioncontrol/templates/changeset.html:39 +#: trac/versioncontrol/templates/changeset.html:41 msgid "Show full changeset" msgstr "显示全部变更集" -#: trac/versioncontrol/templates/changeset.html:22 +#: trac/versioncontrol/templates/changeset.html:27 msgid "for" msgstr "对于" -#: trac/versioncontrol/templates/changeset.html:23 -#: trac/versioncontrol/templates/changeset.html:26 +#: trac/versioncontrol/templates/changeset.html:28 #: trac/versioncontrol/templates/changeset.html:31 -#: trac/versioncontrol/templates/changeset.html:33 -#: trac/versioncontrol/templates/changeset.html:64 +#: trac/versioncontrol/templates/changeset.html:36 +#: trac/versioncontrol/templates/changeset.html:38 +#: trac/versioncontrol/templates/changeset.html:69 msgid "Show entry in browser" msgstr "在源码浏览器中显示条目" -#: trac/versioncontrol/templates/changeset.html:25 +#: trac/versioncontrol/templates/changeset.html:30 msgid "Changes in" msgstr "变更于" -#: trac/versioncontrol/templates/changeset.html:27 +#: trac/versioncontrol/templates/changeset.html:32 msgid "Show revision log" msgstr "显示修订日志" -#: trac/versioncontrol/templates/changeset.html:30 +#: trac/versioncontrol/templates/changeset.html:35 msgid "Changes from" msgstr "变更自" -#: trac/versioncontrol/templates/changeset.html:31 -#: trac/versioncontrol/templates/changeset.html:33 +#: trac/versioncontrol/templates/changeset.html:36 +#: trac/versioncontrol/templates/changeset.html:38 msgid "at" msgstr "于" -#: trac/versioncontrol/templates/changeset.html:32 -#: trac/versioncontrol/templates/changeset.html:34 +#: trac/versioncontrol/templates/changeset.html:37 +#: trac/versioncontrol/templates/changeset.html:39 msgid "r" msgstr "r" -#: trac/versioncontrol/templates/changeset.html:77 -#: trac/versioncontrol/templates/changeset.html:80 +#: trac/versioncontrol/templates/changeset.html:82 +#: trac/versioncontrol/templates/changeset.html:85 msgid "Show differences" msgstr "显示差异" -#: trac/versioncontrol/templates/changeset.html:77 +#: trac/versioncontrol/templates/changeset.html:82 msgid "view diffs" msgstr "查看差异" -#: trac/versioncontrol/templates/changeset.html:87 +#: trac/versioncontrol/templates/changeset.html:85 +#, fuzzy, python-format +msgid "%(num)d diff" +msgid_plural "%(num)d diffs" +msgstr[0] "%(num)d个差异" + +#: trac/versioncontrol/templates/changeset.html:88 +#, fuzzy, python-format +msgid "%(num)d prop" +msgid_plural "%(num)d props" +msgstr[0] "%(num)d个属性" + +#: trac/versioncontrol/templates/changeset.html:92 msgid "Show previous version in browser" msgstr "在浏览器中显示上一个版本" -#: trac/versioncontrol/templates/changeset.html:87 -msgid "previous" -msgstr "上一个" +#: trac/versioncontrol/templates/changeset.html:100 +msgid "less than one hour" +msgstr "少于一小时" -#: trac/versioncontrol/templates/changeset.html:109 +#: trac/versioncontrol/templates/changeset.html:100 +#, python-format +msgid "%(date)s (%(duration)s ago)" +msgstr "%(date)s （%(duration)s 前）" + +#: trac/versioncontrol/templates/changeset.html:114 msgid "Message:" msgstr "消息:" -#: trac/versioncontrol/templates/changeset.html:121 +#: trac/versioncontrol/templates/changeset.html:126 msgid "Location:" msgstr "位置:" -#: trac/versioncontrol/templates/changeset.html:129 -msgid "removed" -msgstr "已删除" - -#: trac/versioncontrol/templates/changeset.html:131 +#: trac/versioncontrol/templates/changeset.html:136 msgid "copied" msgstr "已复制" -#: trac/versioncontrol/templates/changeset.html:132 +#: trac/versioncontrol/templates/changeset.html:137 msgid "moved" msgstr "已移动" @@ -3392,75 +3895,84 @@ msgid "(log)" msgstr "(日志)" -#: trac/versioncontrol/templates/revisionlog.html:23 +#: trac/versioncontrol/templates/revisionlog.html:24 msgid "Revision Log Mode:" msgstr "修订日志模式:" -#: trac/versioncontrol/templates/revisionlog.html:27 +#: trac/versioncontrol/templates/revisionlog.html:28 msgid "Stop on copy" msgstr "只显示到复制时的修订" -#: trac/versioncontrol/templates/revisionlog.html:33 +#: trac/versioncontrol/templates/revisionlog.html:34 msgid "Follow copies" msgstr "跟随复制" -#: trac/versioncontrol/templates/revisionlog.html:39 +#: trac/versioncontrol/templates/revisionlog.html:40 msgid "Show only adds and deletes" msgstr "只显示增加和删除" -#: trac/versioncontrol/templates/revisionlog.html:44 +#: trac/versioncontrol/templates/revisionlog.html:45 msgid "View log starting at" msgstr "查看日志，起始修订:" -#: trac/versioncontrol/templates/revisionlog.html:48 +#: trac/versioncontrol/templates/revisionlog.html:49 msgid "and back to" msgstr "结束修订:" -#: trac/versioncontrol/templates/revisionlog.html:53 +#: trac/versioncontrol/templates/revisionlog.html:54 msgid "Show at most" msgstr "最多显示" -#: trac/versioncontrol/templates/revisionlog.html:55 +#: trac/versioncontrol/templates/revisionlog.html:56 msgid "revisions per page." msgstr "修订/页." -#: trac/versioncontrol/templates/revisionlog.html:60 +#: trac/versioncontrol/templates/revisionlog.html:61 msgid "Show full log messages" msgstr "显示完整日志信息" -#: trac/versioncontrol/templates/revisionlog.html:78 +#: trac/versioncontrol/templates/revisionlog.html:79 msgid "Copied or renamed" msgstr "复制或更名" -#: trac/versioncontrol/templates/revisionlog.html:85 +#: trac/versioncontrol/templates/revisionlog.html:87 msgid "Diff from Old Revision to New Revision (select them below)" msgstr "显示旧修订到新修订的差异(从下面选择)" -#: trac/versioncontrol/templates/revisionlog.html:94 +#: trac/versioncontrol/templates/revisionlog.html:93 +msgid "Old / New" +msgstr "" + +#: trac/versioncontrol/templates/revisionlog.html:93 +#, fuzzy +msgid "Diff" +msgstr "差异" + +#: trac/versioncontrol/templates/revisionlog.html:96 msgid "Chgset" msgstr "变更集" -#: trac/versioncontrol/templates/revisionlog.html:97 +#: trac/versioncontrol/templates/revisionlog.html:99 msgid "Log Message" msgstr "日志消息" -#: trac/versioncontrol/templates/revisionlog.html:104 +#: trac/versioncontrol/templates/revisionlog.html:106 msgid "No revisions found" msgstr "没有找到任何修订" -#: trac/versioncontrol/templates/revisionlog.html:116 +#: trac/versioncontrol/templates/revisionlog.html:120 msgid "copied from" msgstr "复制于" -#: trac/versioncontrol/templates/revisionlog.html:130 +#: trac/versioncontrol/templates/revisionlog.html:134 msgid "View log starting at this revision" msgstr "查看此修订之后的日志" -#: trac/versioncontrol/templates/revisionlog.html:171 +#: trac/versioncontrol/templates/revisionlog.html:180 msgid "Diff from Old Revision to New Revision (select them above)" msgstr "显示旧修订到新修订的差异(从上面选择)" -#: trac/versioncontrol/templates/revisionlog.html:176 +#: trac/versioncontrol/templates/revisionlog.html:185 msgid "" "[1:Note:] See [2:TracRevisionLog]\n" " for help on using the revision log." @@ -3482,208 +3994,230 @@ "# \n" "# 由Trac生成" -#: trac/versioncontrol/web_ui/browser.py:297 +#: trac/versioncontrol/web_ui/browser.py:293 msgid "Browse Source" msgstr "源码浏览" -#: trac/versioncontrol/web_ui/browser.py:344 -#: trac/versioncontrol/web_ui/changeset.py:242 +#: trac/versioncontrol/web_ui/browser.py:340 +#: trac/versioncontrol/web_ui/changeset.py:239 msgid "Invalid Changeset Number" msgstr "无效变更集版本号" -#: trac/versioncontrol/web_ui/browser.py:350 -#: trac/versioncontrol/web_ui/log.py:97 +#: trac/versioncontrol/web_ui/browser.py:372 +#: trac/versioncontrol/web_ui/browser.py:380 +#, fuzzy, python-format +msgid "Revision %(num)s" +msgstr "修订 %(num)s" + +#: trac/versioncontrol/web_ui/browser.py:381 +#, fuzzy +msgid "Previous Revision" +msgstr "上一修订" + +#: trac/versioncontrol/web_ui/browser.py:381 +#, fuzzy +msgid "Next Revision" +msgstr "下一修订" + +#: trac/versioncontrol/web_ui/browser.py:382 +#, fuzzy +msgid "Latest Revision" +msgstr "最新修订" + +#: trac/versioncontrol/web_ui/browser.py:386 +#: trac/versioncontrol/web_ui/log.py:279 msgid "Parent directory" msgstr "父目录" -#: trac/versioncontrol/web_ui/browser.py:376 +#: trac/versioncontrol/web_ui/browser.py:391 msgid "Normal" msgstr "正常" -#: trac/versioncontrol/web_ui/browser.py:377 +#: trac/versioncontrol/web_ui/browser.py:392 msgid "View file without annotations" msgstr "查看文件(不包含注解)" -#: trac/versioncontrol/web_ui/browser.py:381 +#: trac/versioncontrol/web_ui/browser.py:396 msgid "Annotate" msgstr "注解" -#: trac/versioncontrol/web_ui/browser.py:382 +#: trac/versioncontrol/web_ui/browser.py:397 msgid "" "Annotate each line with the last changed revision (this can be time " "consuming...)" msgstr "给最新修订每行都加注解 (这可能是耗时操作...)" -#: trac/versioncontrol/web_ui/browser.py:388 +#: trac/versioncontrol/web_ui/browser.py:403 msgid "Revision Log" msgstr "修订日志" -#: trac/versioncontrol/web_ui/browser.py:454 -#: trac/versioncontrol/web_ui/changeset.py:336 +#: trac/versioncontrol/web_ui/browser.py:469 +#: trac/versioncontrol/web_ui/changeset.py:333 msgid "Zip Archive" msgstr "Zip归档" -#: trac/versioncontrol/web_ui/browser.py:621 +#: trac/versioncontrol/web_ui/browser.py:644 msgid "Revision in which the line changed" msgstr "该行发生变更的修订" -#: trac/versioncontrol/web_ui/changeset.py:335 +#: trac/versioncontrol/web_ui/changeset.py:332 msgid "Unified Diff" msgstr "统一对比" -#: trac/versioncontrol/web_ui/changeset.py:350 +#: trac/versioncontrol/web_ui/changeset.py:343 +#, fuzzy +msgid "Previous Changeset" +msgstr "上一变更集" + +#: trac/versioncontrol/web_ui/changeset.py:343 +#, fuzzy +msgid "Next Changeset" +msgstr "下一变更集" + +#: trac/versioncontrol/web_ui/changeset.py:347 msgid "Reverse Diff" msgstr "反向对比" -#: trac/versioncontrol/web_ui/changeset.py:381 +#: trac/versioncontrol/web_ui/changeset.py:378 #, python-format msgid "Changeset %(id)s for %(path)s" msgstr "变更集 %(id)s 为 %(path)s" -#: trac/versioncontrol/web_ui/changeset.py:384 -#: trac/versioncontrol/web_ui/changeset.py:406 -#: trac/versioncontrol/web_ui/changeset.py:424 +#: trac/versioncontrol/web_ui/changeset.py:381 +#: trac/versioncontrol/web_ui/changeset.py:403 +#: trac/versioncontrol/web_ui/changeset.py:421 #, python-format msgid "Changeset %(id)s" msgstr "变更集 %(id)s" -#: trac/versioncontrol/web_ui/changeset.py:454 +#: trac/versioncontrol/web_ui/changeset.py:451 #, python-format msgid "Show revision %(rev)s of this file in browser" msgstr "在浏览器中显示文件的修订 %(rev)s" -#: trac/versioncontrol/web_ui/changeset.py:602 +#: trac/versioncontrol/web_ui/changeset.py:598 #, python-format msgid "Show the changeset %(id)s restricted to %(path)s" msgstr "显示变更集 %(id)s , 仅包含路径 %(path)s" -#: trac/versioncontrol/web_ui/changeset.py:612 +#: trac/versioncontrol/web_ui/changeset.py:608 #, python-format msgid "Show the %(range)s differences restricted to %(path)s" msgstr "显示差异范围 %(range)s , 仅包含路径 %(path)s" -#: trac/versioncontrol/web_ui/changeset.py:803 +#: trac/versioncontrol/web_ui/changeset.py:804 msgid "Repository checkins" msgstr "版本库检入" -#: trac/versioncontrol/web_ui/changeset.py:978 +#: trac/versioncontrol/web_ui/changeset.py:979 msgid "Changesets" msgstr "变更集" -#: trac/versioncontrol/web_ui/log.py:169 +#: trac/versioncontrol/web_ui/log.py:178 #, python-format msgid "" "The file or directory '%(path)s' doesn't exist at revision %(rev)s or at " "any previous revision." msgstr "文件或目录 '%(path)s' 不存在 %(rev)s 及以前的修订。" -#: trac/versioncontrol/web_ui/log.py:171 +#: trac/versioncontrol/web_ui/log.py:180 msgid "Nonexistent path" msgstr "路径不存在" -#: trac/versioncontrol/web_ui/log.py:187 +#: trac/versioncontrol/web_ui/log.py:207 #, python-format msgid "Revision Log (restarting at %(path)s, rev. %(rev)s)" msgstr "修订日志 (起始于 %(path)s, 修订 %(rev)s)" -#: trac/versioncontrol/web_ui/log.py:244 +#: trac/versioncontrol/web_ui/log.py:287 msgid "ChangeLog" msgstr "变更日志" -#: trac/versioncontrol/web_ui/log.py:246 +#: trac/versioncontrol/web_ui/log.py:289 msgid "View Latest Revision" msgstr "查看最新修订" -#: trac/versioncontrol/web_ui/log.py:250 +#: trac/versioncontrol/web_ui/log.py:293 msgid "Older Revisions" msgstr "更早版本" -#: trac/versioncontrol/web_ui/util.py:61 +#: trac/versioncontrol/web_ui/util.py:57 msgid "search" msgstr "搜索" -#: trac/versioncontrol/web_ui/util.py:65 +#: trac/versioncontrol/web_ui/util.py:61 #, python-format msgid "" "You can %(search)s in the repository history to see if that path existed " "but was later removed" msgstr "您可以在版本库历史中%(search)s，以判断是否路径曾经存在但后来被删除了。" -#: trac/web/auth.py:88 +#: trac/web/auth.py:98 #, python-format msgid "logged in as %(user)s" msgstr "登录为 %(user)s" -#: trac/web/auth.py:91 +#: trac/web/auth.py:101 msgid "Logout" msgstr "注销" -#: trac/web/auth.py:94 +#: trac/web/auth.py:104 msgid "Login" msgstr "登录" -#: trac/web/auth.py:136 +#: trac/web/auth.py:146 #, python-format msgid "Already logged in as %(user)s." msgstr "已经登录为 %(user)s." -#: trac/web/chrome.py:178 trac/web/chrome.py:186 +#: trac/web/chrome.py:576 #, python-format -msgid "Previous %(label)s" -msgstr "上一%(label)s" +msgid "Error with navigation contributor \"%(name)s\"" +msgstr "" -#: trac/web/chrome.py:198 trac/web/chrome.py:205 -#, python-format -msgid "Next %(label)s" -msgstr "下一%(label)s" - -#: trac/web/chrome.py:814 +#: trac/web/chrome.py:866 msgid "(unknown template location)" msgstr "(未知模板路径)" -#: trac/web/chrome.py:815 +#: trac/web/chrome.py:867 #, python-format msgid "Genshi %(error)s error while rendering template %(location)s" msgstr "Genshi在渲染模板%(location)s时，发生错误%(error)s。" -#. ... not logged in, you may want to 'do so' now (link) -#: trac/web/main.py:493 +#. TRANSLATOR: ... not logged in, you may want to 'do so' now (link) +#: trac/web/main.py:523 msgid "do so" msgstr "这样做" -#: trac/web/main.py:495 +#: trac/web/main.py:525 #, python-format msgid "You are currently not logged in. You may want to %(do_so)s now." msgstr "您现在没有登录，您也许想要现在就%(do_so)s。" -#: trac/wiki/admin.py:84 +#: trac/wiki/admin.py:113 #, python-format msgid "'%(name)s' is not a file" msgstr "'%(name)s'不是一个文件。" -#: trac/wiki/admin.py:129 +#: trac/wiki/admin.py:164 trac/wiki/admin.py:247 #, python-format msgid " %(page)s imported from %(filename)s" msgstr "已从%(filename)s中导入%(page)s" -#: trac/wiki/admin.py:155 -msgid "Title" -msgstr "标题" - -#: trac/wiki/admin.py:155 +#: trac/wiki/admin.py:196 msgid "Edits" msgstr "编辑次数" -#: trac/wiki/admin.py:165 +#: trac/wiki/admin.py:206 msgid "Deleted pages" msgstr "已删除页面 " -#: trac/wiki/admin.py:183 +#: trac/wiki/admin.py:226 #, python-format msgid "'%(name)s' is not a directory" msgstr "'%(name)s'不是一个目录。" -#: trac/wiki/api.py:301 trac/wiki/templates/wiki_view.html:53 +#: trac/wiki/api.py:301 msgid "no permission to view this wiki page" msgstr "无权查看此Wiki页面" @@ -3701,28 +4235,28 @@ msgid "Can't view %(link)s:" msgstr "无法查看 %(link)s:" -#: trac/wiki/macros.py:478 +#: trac/wiki/macros.py:501 #, python-format msgid "Error: Can't get description for macro %(name)s" msgstr "错误: 无法得到宏 %(name)s 的描述" -#: trac/wiki/macros.py:561 +#: trac/wiki/macros.py:595 msgid "Table of Contents" msgstr "内容索引" -#: trac/wiki/model.py:149 +#: trac/wiki/model.py:150 msgid "Page not modified" msgstr "未修改的页面" -#: trac/wiki/web_ui.py:89 trac/wiki/web_ui.py:627 +#: trac/wiki/web_ui.py:88 trac/wiki/web_ui.py:667 msgid "Wiki" msgstr "Wiki" -#: trac/wiki/web_ui.py:91 +#: trac/wiki/web_ui.py:90 msgid "Help/Guide" msgstr "帮助/指南" -#: trac/wiki/web_ui.py:126 +#: trac/wiki/web_ui.py:125 #, python-format msgid "No version \"%(num)s\" for Wiki page \"%(name)s\"" msgstr "无版本 \"%(num)s\" , Wiki页面 \"%(name)s\"" @@ -3742,7 +4276,7 @@ msgid "Invalid Wiki page: %(message)s" msgstr "无效的Wiki页面: %(message)s" -#. wiki page +#. TRANSLATOR: wiki page #: trac/wiki/web_ui.py:224 msgid "currently edited" msgstr "正在编辑" @@ -3762,78 +4296,84 @@ msgid "The version %(version)d of the page %(name)s has been deleted." msgstr "页面 %(name)s 版本 %(version)d 已删除。" -#: trac/wiki/web_ui.py:294 +#: trac/wiki/web_ui.py:293 msgid "Page not modified, showing latest version." msgstr "页面未修改，显示最新版本" -#: trac/wiki/web_ui.py:326 +#: trac/wiki/web_ui.py:325 #, python-format msgid "Version %(num)s of page \"%(name)s\" does not exist" msgstr "版本 %(num)s 不存在, 页面 \"%(name)s\" " -#: trac/wiki/web_ui.py:380 +#: trac/wiki/web_ui.py:377 msgid "Page history" msgstr "页面历史" -#: trac/wiki/web_ui.py:397 +#: trac/wiki/web_ui.py:395 msgid "Wiki History" msgstr "Wiki历史" -#: trac/wiki/web_ui.py:462 +#: trac/wiki/web_ui.py:481 #, python-format msgid "Page %(name)s does not exist" msgstr "页面 %(name)s 不存在" -#: trac/wiki/web_ui.py:500 +#: trac/wiki/web_ui.py:522 #, python-format msgid "Page %(name)s not found" msgstr "没有找到页面 %(name)s" -#: trac/wiki/web_ui.py:536 +#: trac/wiki/web_ui.py:574 msgid "View latest version" msgstr "查看最新版本" -#: trac/wiki/web_ui.py:540 +#: trac/wiki/web_ui.py:578 msgid "View parent page" msgstr "查看父页面" -#: trac/wiki/web_ui.py:549 +#: trac/wiki/web_ui.py:587 +#, fuzzy +msgid "Previous Version" +msgstr "上一版本" + +#: trac/wiki/web_ui.py:587 +#, fuzzy +msgid "Next Version" +msgstr "下一版本" + +#: trac/wiki/web_ui.py:588 msgid "View Latest Version" msgstr "查看最新版本" -#: trac/wiki/web_ui.py:555 +#: trac/wiki/web_ui.py:594 msgid "Up" msgstr "向上" -#: trac/wiki/web_ui.py:571 +#: trac/wiki/web_ui.py:611 msgid "Start Page" msgstr "起始页" -#: trac/wiki/web_ui.py:572 +#: trac/wiki/web_ui.py:612 msgid "Index" msgstr "索引" -#: trac/wiki/web_ui.py:574 +#: trac/wiki/web_ui.py:614 msgid "History" msgstr "历史" -#: trac/wiki/web_ui.py:584 +#: trac/wiki/web_ui.py:624 msgid "Wiki changes" msgstr "Wiki变更" -#. wiki page -#: trac/wiki/web_ui.py:613 +#. TRANSLATOR: wiki page +#: trac/wiki/web_ui.py:653 msgid " edited" msgstr "已编辑" -#: trac/wiki/web_ui.py:613 +#: trac/wiki/web_ui.py:653 msgid " created" msgstr "已创建" -#: trac/wiki/templates/wiki_delete.html:22 -msgid "Delete" -msgstr "删除" - #: trac/wiki/templates/wiki_delete.html:26 msgid "Are you sure you want to" msgstr "您确认" @@ -3860,121 +4400,193 @@ msgid "Delete version %(version)d" msgstr "删除版本 %(version)d" -#: trac/wiki/templates/wiki_edit.html:28 +#: trac/wiki/templates/wiki_edit.html:67 +msgid "Go to Save, Preview, Review or Cancel buttons" +msgstr "" + +#: trac/wiki/templates/wiki_edit.html:69 +#, fuzzy +msgid "See the diffs" +msgstr "查看差异" + +#: trac/wiki/templates/wiki_edit.html:69 +#: trac/wiki/templates/wiki_edit_form.html:38 +#, fuzzy +msgid "Review" +msgstr "检查" + +#: trac/wiki/templates/wiki_edit.html:70 +msgid "See the preview" +msgstr "查看预览" + +#: trac/wiki/templates/wiki_edit.html:73 msgid "Editing" msgstr "编辑" -#: trac/wiki/templates/wiki_edit.html:30 +#: trac/wiki/templates/wiki_edit.html:75 msgid "Someone else has modified that page since you started your edits." msgstr "已有其他人修改了该页面." -#: trac/wiki/templates/wiki_edit.html:31 +#: trac/wiki/templates/wiki_edit.html:76 msgid "If you save right away, you risk to revert those changes" msgstr "如果您现在保存, 可能将那些修改覆盖" -#: trac/wiki/templates/wiki_edit.html:31 +#: trac/wiki/templates/wiki_edit.html:76 msgid "(highlighted below as deletions)." msgstr "(删除部分在下面高亮显示)." -#: trac/wiki/templates/wiki_edit.html:33 +#: trac/wiki/templates/wiki_edit.html:78 msgid "" "Please review all those changes and manually merge them with your\n" " own changes." msgstr "请检查所有修改, 并手工合并到您的修改中." -#: trac/wiki/templates/wiki_edit.html:34 +#: trac/wiki/templates/wiki_edit.html:79 msgid "If you're unsure about what you're doing, please press" msgstr "如果您对所做的不确定, 请按" -#: trac/wiki/templates/wiki_edit.html:35 +#: trac/wiki/templates/wiki_edit.html:80 msgid "" "(losing your changes) and start editing the latest version of the page\n" " again." msgstr "(失去您的修改) 然后重新开始编辑页面的最先版本." -#: trac/wiki/templates/wiki_edit.html:43 +#: trac/wiki/templates/wiki_edit.html:114 msgid "Change information for future version" msgstr "改变未来版本的信息" -#: trac/wiki/templates/wiki_edit.html:44 trac/wiki/templates/wiki_view.html:33 +#: trac/wiki/templates/wiki_edit.html:115 msgid "(modified by" msgstr "(修改者" -#: trac/wiki/templates/wiki_edit.html:62 +#: trac/wiki/templates/wiki_edit.html:124 +msgid "Go to the editor" +msgstr "转向编辑器" + +#: trac/wiki/templates/wiki_edit.html:127 +#: trac/wiki/templates/wiki_edit_form.html:74 +msgid "Review Changes" +msgstr "预览变更" + +#: trac/wiki/templates/wiki_edit.html:129 +#, fuzzy +msgid "No changes" +msgstr "没有变更" + +#: trac/wiki/templates/wiki_edit.html:142 msgid "" "Sorry, this page has been modified by somebody else since you started\n" " editing. Your changes cannot be saved." msgstr "对不起, 该页面已经被其他人修改. 您不能保存所做的修改." -#: trac/wiki/templates/wiki_edit.html:75 +#: trac/wiki/templates/wiki_edit_form.html:16 msgid "Adjust edit area height:" msgstr "调整编辑框高度:" -#: trac/wiki/templates/wiki_edit.html:87 +#: trac/wiki/templates/wiki_edit_form.html:24 +msgid "Selecting and pressing 'Preview' enters a two-column [edit|preview] mode" +msgstr "" + +#: trac/wiki/templates/wiki_edit_form.html:24 +msgid "Edit side-by-side" +msgstr "" + +#: trac/wiki/templates/wiki_edit_form.html:32 +#, fuzzy msgid "" "[1:Note:] See [2:WikiFormatting] and\n" -" [3:TracWiki] for help on editing wiki content." +" [3:TracWiki] for help on editing wiki content." msgstr "" "[1:注释:] 查看 [2:WikiFormatting] 和\n" " [3:TracWiki] 以获得编辑Wiki内容的帮助." -#: trac/wiki/templates/wiki_edit.html:92 +#: trac/wiki/templates/wiki_edit_form.html:38 +#, fuzzy +msgid "See the start of the diffs" +msgstr "选择差异的基准和目标:" + +#: trac/wiki/templates/wiki_edit_form.html:39 +msgid "See the start of the preview" +msgstr "" + +#: trac/wiki/templates/wiki_edit_form.html:43 msgid "Change information" msgstr "变更信息" -#: trac/wiki/templates/wiki_edit.html:103 +#: trac/wiki/templates/wiki_edit_form.html:54 msgid "Comment about this change (optional):" msgstr "评论此次修改(可选):" -#: trac/wiki/templates/wiki_edit.html:110 +#: trac/wiki/templates/wiki_edit_form.html:61 msgid "Page is read-only" msgstr "页面只读" -#: trac/wiki/templates/wiki_edit.html:118 +#: trac/wiki/templates/wiki_edit_form.html:69 msgid "Merge changes" msgstr "合并变更" -#: trac/wiki/templates/wiki_edit.html:122 +#: trac/wiki/templates/wiki_edit_form.html:73 msgid "Preview Page" msgstr "页面预览" -#: trac/wiki/templates/wiki_edit.html:123 -msgid "Review Changes" -msgstr "预览变更" +#: trac/wiki/templates/wiki_view.html:28 +msgid "View WikiStart" +msgstr "" -#: trac/wiki/templates/wiki_view.html:47 -msgid "Describe" -msgstr "请在这里描述" +#: trac/wiki/templates/wiki_view.html:28 +#, fuzzy +msgid "wiki:" +msgstr "wiki" -#: trac/wiki/templates/wiki_view.html:47 -msgid "here." -msgstr "。" +#: trac/wiki/templates/wiki_view.html:39 +#, fuzzy, python-format +msgid "Version %(version)s (modified by %(author)s, %(date)s ago)" +msgstr "版本 %(version)s (由 %(author)s 于 %(date)s 前修改)" -#: trac/wiki/templates/wiki_view.html:49 -msgid "Alternatively, you can also create the page higher in the hierarchy:" +#: trac/wiki/templates/wiki_view.html:52 +#, python-format +msgid "Last modified by %(author)s on %(datetime)s (%(reldate)s ago)" +msgstr "由 %(author)s 于 %(datetime)s (%(reldate)s 前) 最后一次修改" + +#: trac/wiki/templates/wiki_view.html:57 +#, fuzzy +msgid "The page" +msgstr "此页面" + +#: trac/wiki/templates/wiki_view.html:57 +msgid "does not exist. You can create it here." +msgstr "不存在。你可以在此创建它。" + +#: trac/wiki/templates/wiki_view.html:59 +#, fuzzy +msgid "You could also create the same page higher in the hierarchy:" msgstr "此外，您也可以创建目录层次更高的页面:" -#: trac/wiki/templates/wiki_view.html:74 +#: trac/wiki/templates/wiki_view.html:80 msgid "Edit this page" msgstr "编辑此页面" -#: trac/wiki/templates/wiki_view.html:77 +#: trac/wiki/templates/wiki_view.html:83 msgid "Create this page" msgstr "创建此页面" -#: trac/wiki/templates/wiki_view.html:79 +#: trac/wiki/templates/wiki_view.html:85 msgid "Using the template:" msgstr "使用模板:" -#: trac/wiki/templates/wiki_view.html:82 +#: trac/wiki/templates/wiki_view.html:88 msgid "(blank page)" msgstr "(空白页面)" -#: trac/wiki/templates/wiki_view.html:101 +#: trac/wiki/templates/wiki_view.html:107 msgid "Delete this version" msgstr "删除此版本" -#: trac/wiki/templates/wiki_view.html:103 +#: trac/wiki/templates/wiki_view.html:109 msgid "Delete page" msgstr "删除页面 " +#: trac/wiki/templates/wiki_view.html:118 +msgid "The following pages have a name similar to this page, and may be related:" +msgstr "以下页面与此页面名字相似，可能会有关联：" +