comparison i18n/zh_CN.po @ 9804:fe0fb1cca911

i18n-zh: updated Chinese translation
author Dongsheng Song <dongsheng.song@gmail.com>
date Mon, 09 Nov 2009 20:39:58 +0100
parents af64aa112aa3
children c5c969e9eefb
comparison
equal deleted inserted replaced
9803:a0bf760c0dae 9804:fe0fb1cca911
2 # Chinese (simplified) translation for Mercurial 2 # Chinese (simplified) translation for Mercurial
3 # This file is distributed under the same license as Mercurial 3 # This file is distributed under the same license as Mercurial
4 # 4 #
5 # Copyright (C) 2009 the Mercurial team 5 # Copyright (C) 2009 the Mercurial team
6 # Dongsheng Song <dongsheng.song@gmail.com>, 2009 6 # Dongsheng Song <dongsheng.song@gmail.com>, 2009
7 #
8 # $Id: zh_CN.po 1313 2009-06-24 02:08:02Z songdongsheng@live.cn $
9 # 7 #
10 # Update with pot file: 8 # Update with pot file:
11 # msgmerge --update zh_CN.po hg.pot 9 # msgmerge --update zh_CN.po hg.pot
12 # msgfmt --statistics -c zh_CN.po 10 # msgfmt --statistics -c zh_CN.po
13 # 11 #
48 # 46 #
49 msgid "" 47 msgid ""
50 msgstr "" 48 msgstr ""
51 "Project-Id-Version: Mercurial 1.3\n" 49 "Project-Id-Version: Mercurial 1.3\n"
52 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" 50 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
53 "POT-Creation-Date: 2009-10-25 12:38+0100\n" 51 "POT-Creation-Date: 2009-10-19 11:47+0800\n"
54 "PO-Revision-Date: 2009-10-25 12:49+0100\n" 52 "PO-Revision-Date: 2009-03-31 20:38+0200\n"
55 "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" 53 "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
56 "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" 54 "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n"
57 "MIME-Version: 1.0\n" 55 "MIME-Version: 1.0\n"
58 "Content-Type: text/plain; charset=UTF-8\n" 56 "Content-Type: text/plain; charset=UTF-8\n"
59 "Content-Transfer-Encoding: 8bit\n" 57 "Content-Transfer-Encoding: 8bit\n"
69 msgstr "选项" 67 msgstr "选项"
70 68
71 msgid "COMMANDS" 69 msgid "COMMANDS"
72 msgstr "命令" 70 msgstr "命令"
73 71
72 msgid ""
73 " options:\n"
74 "\n"
75 msgstr ""
76 " 选项:\n"
77 "\n"
78
79 #, python-format
80 msgid ""
81 " aliases: %s\n"
82 "\n"
83 msgstr ""
84 " 别名: %s\n"
85 "\n"
86
87 msgid ""
88 "hooks for controlling repository access\n"
89 "\n"
90 "This hook makes it possible to allow or deny write access to portions\n"
91 "of a repository when receiving incoming changesets.\n"
92 "\n"
93 "The authorization is matched based on the local user name on the\n"
94 "system where the hook runs, and not the committer of the original\n"
95 "changeset (since the latter is merely informative).\n"
96 "\n"
97 "The acl hook is best used along with a restricted shell like hgsh,\n"
98 "preventing authenticating users from doing anything other than\n"
99 "pushing or pulling. The hook is not safe to use if users have\n"
100 "interactive shell access, as they can then disable the hook.\n"
101 "Nor is it safe if remote users share an account, because then there\n"
102 "is no way to distinguish them.\n"
103 "\n"
104 "To use this hook, configure the acl extension in your hgrc like this::\n"
105 "\n"
106 " [extensions]\n"
107 " hgext.acl =\n"
108 "\n"
109 " [hooks]\n"
110 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
111 "\n"
112 " [acl]\n"
113 " # Check whether the source of incoming changes is in this list\n"
114 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
115 " sources = serve\n"
116 "\n"
117 "The allow and deny sections take a subtree pattern as key (with a glob\n"
118 "syntax by default), and a comma separated list of users as the\n"
119 "corresponding value. The deny list is checked before the allow list\n"
120 "is. ::\n"
121 "\n"
122 " [acl.allow]\n"
123 " # If acl.allow is not present, all users are allowed by default.\n"
124 " # An empty acl.allow section means no users allowed.\n"
125 " docs/** = doc_writer\n"
126 " .hgtags = release_engineer\n"
127 "\n"
128 " [acl.deny]\n"
129 " # If acl.deny is not present, no users are refused by default.\n"
130 " # An empty acl.deny section means all users allowed.\n"
131 " glob pattern = user4, user5\n"
132 " ** = user6\n"
133 msgstr ""
134
135 #, python-format
136 msgid "acl: %s not enabled\n"
137 msgstr "acl: 未启用 %s\n"
138
139 #, python-format
140 msgid "acl: %s enabled, %d entries for user %s\n"
141 msgstr "acl: 已启用 %s, %d 项,用户 %s\n"
142
143 #, python-format
144 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
145 msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集"
146
147 #, python-format
148 msgid "acl: changes have source \"%s\" - skipping\n"
149 msgstr "acl: 改变源 \"%s\" - 跳过\n"
150
151 #, python-format
152 msgid "acl: user %s denied on %s\n"
153 msgstr "acl: 用户 %s 被拒绝访问 %s\n"
154
155 #, python-format
156 msgid "acl: access denied for changeset %s"
157 msgstr "acl: 拒绝访问修改集 %s"
158
159 #, python-format
160 msgid "acl: user %s not allowed on %s\n"
161 msgstr "acl: 用户 %s 被拒绝访问 %s\n"
162
163 #, python-format
164 msgid "acl: allowing changeset %s\n"
165 msgstr "acl: 允许修改集 %s\n"
166
167 msgid ""
168 "track a line of development with movable markers\n"
169 "\n"
170 "Bookmarks are local movable markers to changesets. Every bookmark\n"
171 "points to a changeset identified by its hash. If you commit a\n"
172 "changeset that is based on a changeset that has a bookmark on it, the\n"
173 "bookmark shifts to the new changeset.\n"
174 "\n"
175 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
176 "merge, hg update).\n"
177 "\n"
178 "By default, when several bookmarks point to the same changeset, they\n"
179 "will all move forward together. It is possible to obtain a more\n"
180 "git-like experience by adding the following configuration option to\n"
181 "your .hgrc::\n"
182 "\n"
183 " [bookmarks]\n"
184 " track.current = True\n"
185 "\n"
186 "This will cause Mercurial to track the bookmark that you are currently\n"
187 "using, and only update it. This is similar to git's approach to\n"
188 "branching.\n"
189 msgstr ""
190
191 msgid ""
192 "track a line of development with movable markers\n"
193 "\n"
194 " Bookmarks are pointers to certain commits that move when\n"
195 " committing. Bookmarks are local. They can be renamed, copied and\n"
196 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
197 " 'hg update' to merge and update respectively to a given bookmark.\n"
198 "\n"
199 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
200 " directory's parent revision with the given name. If you specify\n"
201 " a revision using -r REV (where REV may be an existing bookmark),\n"
202 " the bookmark is assigned to that revision.\n"
203 " "
204 msgstr ""
205
206 msgid "a bookmark of this name does not exist"
207 msgstr ""
208
209 msgid "a bookmark of the same name already exists"
210 msgstr ""
211
212 msgid "new bookmark name required"
213 msgstr ""
214
215 msgid "bookmark name required"
216 msgstr ""
217
218 msgid "bookmark name cannot contain newlines"
219 msgstr ""
220
221 msgid "a bookmark cannot have the name of an existing branch"
222 msgstr ""
223
224 msgid "force"
225 msgstr "强制"
226
227 msgid "revision"
228 msgstr "版本"
229
230 msgid "delete a given bookmark"
231 msgstr "删除指定书签"
232
233 msgid "rename a given bookmark"
234 msgstr "改名指定书签"
235
236 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
237 msgstr ""
238
239 msgid ""
240 "hooks for integrating with the Bugzilla bug tracker\n"
241 "\n"
242 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
243 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
244 "bug status.\n"
245 "\n"
246 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
247 "installations using MySQL are supported.\n"
248 "\n"
249 "The hook relies on a Bugzilla script to send bug change notification\n"
250 "emails. That script changes between Bugzilla versions; the\n"
251 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
252 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
253 "be run by Mercurial as the user pushing the change; you will need to\n"
254 "ensure the Bugzilla install file permissions are set appropriately.\n"
255 "\n"
256 "The extension is configured through three different configuration\n"
257 "sections. These keys are recognized in the [bugzilla] section:\n"
258 "\n"
259 "host\n"
260 " Hostname of the MySQL server holding the Bugzilla database.\n"
261 "\n"
262 "db\n"
263 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
264 "\n"
265 "user\n"
266 " Username to use to access MySQL server. Default 'bugs'.\n"
267 "\n"
268 "password\n"
269 " Password to use to access MySQL server.\n"
270 "\n"
271 "timeout\n"
272 " Database connection timeout (seconds). Default 5.\n"
273 "\n"
274 "version\n"
275 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
276 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
277 " to 2.18.\n"
278 "\n"
279 "bzuser\n"
280 " Fallback Bugzilla user name to record comments with, if changeset\n"
281 " committer cannot be found as a Bugzilla user.\n"
282 "\n"
283 "bzdir\n"
284 " Bugzilla install directory. Used by default notify. Default\n"
285 " '/var/www/html/bugzilla'.\n"
286 "\n"
287 "notify\n"
288 " The command to run to get Bugzilla to send bug change notification\n"
289 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
290 " and 'user' (committer bugzilla email). Default depends on version;\n"
291 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
292 " %(id)s %(user)s\".\n"
293 "\n"
294 "regexp\n"
295 " Regular expression to match bug IDs in changeset commit message.\n"
296 " Must contain one \"()\" group. The default expression matches 'Bug\n"
297 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
298 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
299 "\n"
300 "style\n"
301 " The style file to use when formatting comments.\n"
302 "\n"
303 "template\n"
304 " Template to use when formatting comments. Overrides style if\n"
305 " specified. In addition to the usual Mercurial keywords, the\n"
306 " extension specifies::\n"
307 "\n"
308 " {bug} The Bugzilla bug ID.\n"
309 " {root} The full pathname of the Mercurial repository.\n"
310 " {webroot} Stripped pathname of the Mercurial repository.\n"
311 " {hgweb} Base URL for browsing Mercurial repositories.\n"
312 "\n"
313 " Default 'changeset {node|short} in repo {root} refers '\n"
314 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
315 "\n"
316 "strip\n"
317 " The number of slashes to strip from the front of {root} to produce\n"
318 " {webroot}. Default 0.\n"
319 "\n"
320 "usermap\n"
321 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
322 " mappings. If specified, the file should contain one mapping per\n"
323 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
324 "\n"
325 "The [usermap] section is used to specify mappings of Mercurial\n"
326 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
327 "\"committer\"=\"Bugzilla user\"\n"
328 "\n"
329 "Finally, the [web] section supports one entry:\n"
330 "\n"
331 "baseurl\n"
332 " Base URL for browsing Mercurial repositories. Reference from\n"
333 " templates as {hgweb}.\n"
334 "\n"
335 "Activating the extension::\n"
336 "\n"
337 " [extensions]\n"
338 " hgext.bugzilla =\n"
339 "\n"
340 " [hooks]\n"
341 " # run bugzilla hook on every change pulled or pushed in here\n"
342 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
343 "\n"
344 "Example configuration:\n"
345 "\n"
346 "This example configuration is for a collection of Mercurial\n"
347 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
348 "installation in /opt/bugzilla-3.2. ::\n"
349 "\n"
350 " [bugzilla]\n"
351 " host=localhost\n"
352 " password=XYZZY\n"
353 " version=3.0\n"
354 " bzuser=unknown@domain.com\n"
355 " bzdir=/opt/bugzilla-3.2\n"
356 " template=Changeset {node|short} in {root|basename}.\n"
357 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
358 " {desc}\\n\n"
359 " strip=5\n"
360 "\n"
361 " [web]\n"
362 " baseurl=http://dev.domain.com/hg\n"
363 "\n"
364 " [usermap]\n"
365 " user@emaildomain.com=user.name@bugzilladomain.com\n"
366 "\n"
367 "Commits add a comment to the Bugzilla bug record of the form::\n"
368 "\n"
369 " Changeset 3b16791d6642 in repository-name.\n"
370 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
371 "\n"
372 " Changeset commit comment. Bug 1234.\n"
373 msgstr ""
374
375 #, python-format
376 msgid "connecting to %s:%s as %s, password %s\n"
377 msgstr "连接到 %s:%s as %s,密码 %s\n"
378
379 #, python-format
380 msgid "query: %s %s\n"
381 msgstr "查询: %s %s\n"
382
383 #, python-format
384 msgid "failed query: %s %s\n"
385 msgstr "查询失败: %s %s\n"
386
387 msgid "unknown database schema"
388 msgstr "未知的数据库方案"
389
390 #, python-format
391 msgid "bug %d already knows about changeset %s\n"
392 msgstr ""
393
394 msgid "telling bugzilla to send mail:\n"
395 msgstr ""
396
397 #, python-format
398 msgid " bug %s\n"
399 msgstr ""
400
401 #, python-format
402 msgid "running notify command %s\n"
403 msgstr ""
404
405 #, python-format
406 msgid "bugzilla notify command %s"
407 msgstr ""
408
409 msgid "done\n"
410 msgstr "完成\n"
411
412 #, python-format
413 msgid "looking up user %s\n"
414 msgstr ""
415
416 #, python-format
417 msgid "cannot find bugzilla user id for %s"
418 msgstr ""
419
420 #, python-format
421 msgid "cannot find bugzilla user id for %s or %s"
422 msgstr ""
423
424 #, python-format
425 msgid "bugzilla version %s not supported"
426 msgstr ""
427
428 msgid ""
429 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
430 "details:\n"
431 "\t{desc|tabindent}"
432 msgstr ""
433
434 #, python-format
435 msgid "python mysql support not available: %s"
436 msgstr ""
437
438 #, python-format
439 msgid "hook type %s does not pass a changeset id"
440 msgstr ""
441
442 #, python-format
443 msgid "database error: %s"
444 msgstr ""
445
446 msgid "command to display child changesets"
447 msgstr "列出子修改集的命令"
448
74 #, fuzzy 449 #, fuzzy
75 msgid "" 450 msgid ""
76 " options:\n" 451 "show the children of the given or working directory revision\n"
77 "\n" 452 "\n"
78 msgstr " 选项:\n" 453 " Print the children of the working directory's revisions. If a\n"
79 454 " revision is given via -r/--rev, the children of that revision will\n"
80 #, python-format 455 " be printed. If a file argument is given, revision in which the\n"
81 msgid "" 456 " file was last changed (after the working directory revision or the\n"
82 " aliases: %s\n" 457 " argument to --rev if given) is printed.\n"
83 "\n" 458 " "
84 msgstr "" 459 msgstr ""
85 " 别名: %s\n" 460 "显示工作目录或指定版本的父亲\n"
86 "\n" 461 "\n"
87 462 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
88 msgid "" 463 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
89 "Some commands allow the user to specify a date, e.g.:\n" 464 " 版本,或 '--rev' 指定的版本)。\n"
90 "\n" 465 " "
91 "- backout, commit, import, tag: Specify the commit date.\n" 466
92 "- log, revert, update: Select revision(s) by date.\n" 467 msgid "show children of the specified revision"
93 "\n" 468 msgstr "显示指定版本的子孙"
94 "Many date formats are valid. Here are some examples::\n" 469
95 "\n" 470 msgid "hg children [-r REV] [FILE]"
96 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" 471 msgstr ""
97 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" 472
98 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" 473 msgid "command to display statistics about repository history"
99 " \"Dec 6\" (midnight)\n" 474 msgstr ""
100 " \"13:18\" (today assumed)\n" 475
101 " \"3:39\" (3:39AM assumed)\n" 476 #, python-format
102 " \"3:39pm\" (15:39)\n" 477 msgid "Revision %d is a merge, ignoring...\n"
103 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n" 478 msgstr ""
104 " \"2006-12-6 13:18\"\n" 479
105 " \"2006-12-6\"\n" 480 #, python-format
106 " \"12-6\"\n" 481 msgid "generating stats: %d%%"
107 " \"12/6\"\n" 482 msgstr ""
108 " \"12/6/6\" (Dec 6 2006)\n" 483
109 "\n" 484 msgid ""
110 "Lastly, there is Mercurial's internal format::\n" 485 "histogram of changes to the repository\n"
111 "\n" 486 "\n"
112 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" 487 " This command will display a histogram representing the number\n"
113 "\n" 488 " of changed lines or revisions, grouped according to the given\n"
114 "This is the internal representation format for dates. unixtime is the\n" 489 " template. The default template will group changes by author.\n"
115 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" 490 " The --dateformat option may be used to group the results by\n"
116 "the offset of the local timezone, in seconds west of UTC (negative if\n" 491 " date instead.\n"
117 "the timezone is east of UTC).\n" 492 "\n"
118 "\n" 493 " Statistics are based on the number of changed lines, or\n"
119 "The log command also accepts date ranges::\n" 494 " alternatively the number of matching revisions if the\n"
120 "\n" 495 " --changesets option is specified.\n"
121 " \"<{datetime}\" - at or before a given date/time\n" 496 "\n"
122 " \">{datetime}\" - on or after a given date/time\n" 497 " Examples::\n"
123 " \"{datetime} to {datetime}\" - a date range, inclusive\n" 498 "\n"
124 " \"-{days}\" - within a given number of days of today\n" 499 " # display count of changed lines for every committer\n"
500 " hg churn -t '{author|email}'\n"
501 "\n"
502 " # display daily activity graph\n"
503 " hg churn -f '%H' -s -c\n"
504 "\n"
505 " # display activity of developers by month\n"
506 " hg churn -f '%Y-%m' -s -c\n"
507 "\n"
508 " # display count of lines changed in every year\n"
509 " hg churn -f '%Y' -s\n"
510 "\n"
511 " It is possible to map alternate email addresses to a main address\n"
512 " by providing a file using the following format::\n"
513 "\n"
514 " <alias email> <actual email>\n"
515 "\n"
516 " Such a file may be specified with the --aliases option, otherwise\n"
517 " a .hgchurn file will be looked for in the working directory root.\n"
518 " "
519 msgstr ""
520
521 #, python-format
522 msgid "assuming %i character terminal\n"
523 msgstr ""
524
525 msgid "count rate for the specified revision or range"
125 msgstr "" 526 msgstr ""
126 527
127 #, fuzzy 528 #, fuzzy
128 msgid "" 529 msgid "count rate for revisions matching date spec"
129 "Mercurial's default format for showing changes between two versions of\n" 530 msgstr "显示匹配日期的版本"
130 "a file is compatible with the unified format of GNU diff, which can be\n" 531
131 "used by GNU patch and many other standard tools.\n" 532 msgid "template to group changesets"
132 "\n" 533 msgstr ""
133 "While this standard format is often enough, it does not encode the\n" 534
134 "following information:\n" 535 msgid "strftime-compatible format for grouping by date"
135 "\n" 536 msgstr ""
136 "- executable status and other permission bits\n" 537
137 "- copy or rename information\n" 538 msgid "count rate by number of changesets"
138 "- changes in binary files\n" 539 msgstr ""
139 "- creation or deletion of empty files\n" 540
140 "\n" 541 msgid "sort by key (default: sort by count)"
141 "Mercurial also supports the extended diff format from the git VCS\n" 542 msgstr ""
142 "which addresses these limitations. The git diff format is not produced\n" 543
143 "by default because a few widespread tools still do not understand this\n" 544 msgid "file with email aliases"
144 "format.\n" 545 msgstr ""
145 "\n" 546
146 "This means that when generating diffs from a Mercurial repository\n" 547 msgid "show progress"
147 "(e.g. with \"hg export\"), you should be careful about things like file\n" 548 msgstr ""
148 "copies and renames or other things mentioned above, because when\n" 549
149 "applying a standard diff to a different repository, this extra\n" 550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
150 "information is lost. Mercurial's internal operations (like push and\n" 551 msgstr ""
151 "pull) are not affected by this, because they use an internal binary\n" 552
152 "format for communicating changes.\n" 553 msgid ""
153 "\n" 554 "colorize output from some commands\n"
154 "To make Mercurial produce the git extended diff format, use the --git\n" 555 "\n"
155 "option available for many commands, or set 'git = True' in the [diff]\n" 556 "This extension modifies the status command to add color to its output\n"
156 "section of your hgrc. You do not need to set this option when\n" 557 "to reflect file status, the qseries command to add color to reflect\n"
157 "importing diffs in this format or using them in the mq extension.\n" 558 "patch status (applied, unapplied, missing), and to diff-related\n"
158 msgstr "" 559 "commands to highlight additions, removals, diff headers, and trailing\n"
159 "\n" 560 "whitespace.\n"
160 " 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容,可用于\n" 561 "\n"
161 " GNU patch 和许多标准工具。\n" 562 "Other effects in addition to color, like bold and underlined text, are\n"
162 "\n" 563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
163 " 虽然标准格式在大多数情况下都能满足要求,但是它不包含下述信息:\n" 564 "function (aka ANSI escape codes). This module also provides the\n"
164 "\n" 565 "render_text function, which can be used to add effects to any text.\n"
165 " - 可执行状态和其它权限位\n" 566 "\n"
166 " - 复制或改名信息\n" 567 "Default effects may be overridden from the .hgrc file::\n"
167 " - 二进制文件的修改\n" 568 "\n"
168 " - 创建或删除空文件\n" 569 " [color]\n"
169 "\n" 570 " status.modified = blue bold underline red_background\n"
170 " 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n" 571 " status.added = green bold\n"
171 " 此格式,所以它不是默认格式。\n" 572 " status.removed = red bold blue_background\n"
172 "\n" 573 " status.deleted = cyan bold underline\n"
173 " 这意味着当从水银版本库(例如 \"hg export\")产生差异时,在其它版本库应用" 574 " status.unknown = magenta bold underline\n"
174 "标\n" 575 " status.ignored = black bold\n"
175 " 准差异时,会丢失文件复制或改名等额外信息,所以你要小心处理。水银的内部\n" 576 "\n"
176 " 操作(例如 push 和 pull)在传达改变时,使用内部的二进制格式,所以不受影\n" 577 " # 'none' turns off all effects\n"
177 " 响。\n" 578 " status.clean = none\n"
178 "\n" 579 " status.copied = none\n"
179 " 要让水银产生 git 扩展差异格式,可以对许多命令使用选项 '--git',或者在\n" 580 "\n"
180 " 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时,\n" 581 " qseries.applied = blue bold underline\n"
181 " 或在 mq 扩展中使用时,不需要设置此选项。\n" 582 " qseries.unapplied = black bold\n"
182 " " 583 " qseries.missing = red bold\n"
183 584 "\n"
184 msgid "" 585 " diff.diffline = bold\n"
586 " diff.extended = cyan bold\n"
587 " diff.file_a = red bold\n"
588 " diff.file_b = green bold\n"
589 " diff.hunk = magenta\n"
590 " diff.deleted = red\n"
591 " diff.inserted = green\n"
592 " diff.changed = white\n"
593 " diff.trailingwhitespace = bold red_background\n"
594 msgstr ""
595
596 msgid "when to colorize (always, auto, or never)"
597 msgstr ""
598
599 msgid "don't colorize output"
600 msgstr ""
601
602 #, python-format
603 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
604 msgstr ""
605
606 msgid "import revisions from foreign VCS repositories into Mercurial"
607 msgstr ""
608
609 msgid ""
610 "convert a foreign SCM repository to a Mercurial one.\n"
611 "\n"
612 " Accepted source formats [identifiers]:\n"
613 "\n"
614 " - Mercurial [hg]\n"
615 " - CVS [cvs]\n"
616 " - Darcs [darcs]\n"
617 " - git [git]\n"
618 " - Subversion [svn]\n"
619 " - Monotone [mtn]\n"
620 " - GNU Arch [gnuarch]\n"
621 " - Bazaar [bzr]\n"
622 " - Perforce [p4]\n"
623 "\n"
624 " Accepted destination formats [identifiers]:\n"
625 "\n"
626 " - Mercurial [hg]\n"
627 " - Subversion [svn] (history on branches is not preserved)\n"
628 "\n"
629 " If no revision is given, all revisions will be converted.\n"
630 " Otherwise, convert will only import up to the named revision\n"
631 " (given in a format understood by the source).\n"
632 "\n"
633 " If no destination directory name is specified, it defaults to the\n"
634 " basename of the source with '-hg' appended. If the destination\n"
635 " repository doesn't exist, it will be created.\n"
636 "\n"
637 " By default, all sources except Mercurial will use --branchsort.\n"
638 " Mercurial uses --sourcesort to preserve original revision numbers\n"
639 " order. Sort modes have the following effects:\n"
640 "\n"
641 " --branchsort convert from parent to child revision when possible,\n"
642 " which means branches are usually converted one after\n"
643 " the other. It generates more compact repositories.\n"
644 "\n"
645 " --datesort sort revisions by date. Converted repositories have\n"
646 " good-looking changelogs but are often an order of\n"
647 " magnitude larger than the same ones generated by\n"
648 " --branchsort.\n"
649 "\n"
650 " --sourcesort try to preserve source revisions order, only\n"
651 " supported by Mercurial sources.\n"
652 "\n"
653 " If <REVMAP> isn't given, it will be put in a default location\n"
654 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
655 " that maps each source commit ID to the destination ID for that\n"
656 " revision, like so::\n"
657 "\n"
658 " <source ID> <destination ID>\n"
659 "\n"
660 " If the file doesn't exist, it's automatically created. It's\n"
661 " updated on each commit copied, so convert-repo can be interrupted\n"
662 " and can be run repeatedly to copy new commits.\n"
663 "\n"
664 " The [username mapping] file is a simple text file that maps each\n"
665 " source commit author to a destination commit author. It is handy\n"
666 " for source SCMs that use unix logins to identify authors (eg:\n"
667 " CVS). One line per author mapping and the line format is:\n"
668 " srcauthor=whatever string you want\n"
669 "\n"
670 " The filemap is a file that allows filtering and remapping of files\n"
671 " and directories. Comment lines start with '#'. Each line can\n"
672 " contain one of the following directives::\n"
673 "\n"
674 " include path/to/file\n"
675 "\n"
676 " exclude path/to/file\n"
677 "\n"
678 " rename from/file to/file\n"
679 "\n"
680 " The 'include' directive causes a file, or all files under a\n"
681 " directory, to be included in the destination repository, and the\n"
682 " exclusion of all other files and directories not explicitly\n"
683 " included. The 'exclude' directive causes files or directories to\n"
684 " be omitted. The 'rename' directive renames a file or directory. To\n"
685 " rename from a subdirectory into the root of the repository, use\n"
686 " '.' as the path to rename to.\n"
687 "\n"
688 " The splicemap is a file that allows insertion of synthetic\n"
689 " history, letting you specify the parents of a revision. This is\n"
690 " useful if you want to e.g. give a Subversion merge two parents, or\n"
691 " graft two disconnected series of history together. Each entry\n"
692 " contains a key, followed by a space, followed by one or two\n"
693 " comma-separated values. The key is the revision ID in the source\n"
694 " revision control system whose parents should be modified (same\n"
695 " format as a key in .hg/shamap). The values are the revision IDs\n"
696 " (in either the source or destination revision control system) that\n"
697 " should be used as the new parents for that node.\n"
698 "\n"
699 " The branchmap is a file that allows you to rename a branch when it is\n"
700 " being brought in from whatever external repository. When used in\n"
701 " conjunction with a splicemap, it allows for a powerful combination\n"
702 " to help fix even the most badly mismanaged repositories and turn them\n"
703 " into nicely structured Mercurial repositories. The branchmap contains\n"
704 " lines of the form \"original_branch_name new_branch_name\".\n"
705 " \"original_branch_name\" is the name of the branch in the source\n"
706 " repository, and \"new_branch_name\" is the name of the branch is the\n"
707 " destination repository. This can be used to (for instance) move code\n"
708 " in one repository from \"default\" to a named branch.\n"
709 "\n"
710 " Mercurial Source\n"
711 " ----------------\n"
712 "\n"
713 " --config convert.hg.ignoreerrors=False (boolean)\n"
714 " ignore integrity errors when reading. Use it to fix Mercurial\n"
715 " repositories with missing revlogs, by converting from and to\n"
716 " Mercurial.\n"
717 " --config convert.hg.saverev=False (boolean)\n"
718 " store original revision ID in changeset (forces target IDs to\n"
719 " change)\n"
720 " --config convert.hg.startrev=0 (hg revision identifier)\n"
721 " convert start revision and its descendants\n"
722 "\n"
723 " CVS Source\n"
724 " ----------\n"
725 "\n"
726 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
727 " to indicate the starting point of what will be converted. Direct\n"
728 " access to the repository files is not needed, unless of course the\n"
729 " repository is :local:. The conversion uses the top level directory\n"
730 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
731 " commands to find files to convert. This means that unless a\n"
732 " filemap is given, all files under the starting directory will be\n"
733 " converted, and that any directory reorganization in the CVS\n"
734 " sandbox is ignored.\n"
735 "\n"
736 " Because CVS does not have changesets, it is necessary to collect\n"
737 " individual commits to CVS and merge them into changesets. CVS\n"
738 " source uses its internal changeset merging code by default but can\n"
739 " be configured to call the external 'cvsps' program by setting::\n"
740 "\n"
741 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
742 "\n"
743 " This option is deprecated and will be removed in Mercurial 1.4.\n"
744 "\n"
745 " The options shown are the defaults.\n"
746 "\n"
747 " Internal cvsps is selected by setting ::\n"
748 "\n"
749 " --config convert.cvsps=builtin\n"
750 "\n"
751 " and has a few more configurable options:\n"
752 "\n"
753 " --config convert.cvsps.cache=True (boolean)\n"
754 " Set to False to disable remote log caching, for testing and\n"
755 " debugging purposes.\n"
756 " --config convert.cvsps.fuzz=60 (integer)\n"
757 " Specify the maximum time (in seconds) that is allowed between\n"
758 " commits with identical user and log message in a single\n"
759 " changeset. When very large files were checked in as part of a\n"
760 " changeset then the default may not be long enough.\n"
761 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
762 " Specify a regular expression to which commit log messages are\n"
763 " matched. If a match occurs, then the conversion process will\n"
764 " insert a dummy revision merging the branch on which this log\n"
765 " message occurs to the branch indicated in the regex.\n"
766 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
767 " Specify a regular expression to which commit log messages are\n"
768 " matched. If a match occurs, then the conversion process will\n"
769 " add the most recent revision on the branch indicated in the\n"
770 " regex as the second parent of the changeset.\n"
771 "\n"
772 " The hgext/convert/cvsps wrapper script allows the builtin\n"
773 " changeset merging code to be run without doing a conversion. Its\n"
774 " parameters and output are similar to that of cvsps 2.1.\n"
775 "\n"
776 " Subversion Source\n"
777 " -----------------\n"
778 "\n"
779 " Subversion source detects classical trunk/branches/tags layouts.\n"
780 " By default, the supplied \"svn://repo/path/\" source URL is\n"
781 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
782 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
783 " its subdirectories are listed as possible branches. If\n"
784 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
785 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
786 " can be overridden with following options. Set them to paths\n"
787 " relative to the source URL, or leave them blank to disable auto\n"
788 " detection.\n"
789 "\n"
790 " --config convert.svn.branches=branches (directory name)\n"
791 " specify the directory containing branches\n"
792 " --config convert.svn.tags=tags (directory name)\n"
793 " specify the directory containing tags\n"
794 " --config convert.svn.trunk=trunk (directory name)\n"
795 " specify the name of the trunk branch\n"
796 "\n"
797 " Source history can be retrieved starting at a specific revision,\n"
798 " instead of being integrally converted. Only single branch\n"
799 " conversions are supported.\n"
800 "\n"
801 " --config convert.svn.startrev=0 (svn revision number)\n"
802 " specify start Subversion revision.\n"
803 "\n"
804 " Perforce Source\n"
805 " ---------------\n"
806 "\n"
807 " The Perforce (P4) importer can be given a p4 depot path or a\n"
808 " client specification as source. It will convert all files in the\n"
809 " source to a flat Mercurial repository, ignoring labels, branches\n"
810 " and integrations. Note that when a depot path is given you then\n"
811 " usually should specify a target directory, because otherwise the\n"
812 " target may be named ...-hg.\n"
813 "\n"
814 " It is possible to limit the amount of source history to be\n"
815 " converted by specifying an initial Perforce revision.\n"
816 "\n"
817 " --config convert.p4.startrev=0 (perforce changelist number)\n"
818 " specify initial Perforce revision.\n"
819 "\n"
820 " Mercurial Destination\n"
821 " ---------------------\n"
822 "\n"
823 " --config convert.hg.clonebranches=False (boolean)\n"
824 " dispatch source branches in separate clones.\n"
825 " --config convert.hg.tagsbranch=default (branch name)\n"
826 " tag revisions branch name\n"
827 " --config convert.hg.usebranchnames=True (boolean)\n"
828 " preserve branch names\n"
829 "\n"
830 " "
831 msgstr ""
832
833 msgid ""
834 "create changeset information from CVS\n"
835 "\n"
836 " This command is intended as a debugging tool for the CVS to\n"
837 " Mercurial converter, and can be used as a direct replacement for\n"
838 " cvsps.\n"
839 "\n"
840 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
841 " named directory) in the CVS repository, and converts the log to a\n"
842 " series of changesets based on matching commit log entries and\n"
843 " dates."
844 msgstr ""
845
846 msgid "username mapping filename"
847 msgstr ""
848
849 msgid "destination repository type"
850 msgstr ""
851
852 msgid "remap file names using contents of file"
853 msgstr ""
854
855 msgid "import up to target revision REV"
856 msgstr ""
857
858 msgid "source repository type"
859 msgstr ""
860
861 msgid "splice synthesized history into place"
862 msgstr ""
863
864 msgid "change branch names while converting"
865 msgstr ""
866
867 msgid "try to sort changesets by branches"
868 msgstr ""
869
870 msgid "try to sort changesets by date"
871 msgstr ""
872
873 msgid "preserve source changesets order"
874 msgstr ""
875
876 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
877 msgstr ""
878
879 msgid "only return changes on specified branches"
880 msgstr ""
881
882 msgid "prefix to remove from file names"
883 msgstr ""
884
885 msgid "only return changes after or between specified tags"
886 msgstr ""
887
888 msgid "update cvs log cache"
889 msgstr ""
890
891 msgid "create new cvs log cache"
892 msgstr ""
893
894 msgid "set commit time fuzz in seconds"
895 msgstr ""
896
897 msgid "specify cvsroot"
898 msgstr ""
899
900 msgid "show parent changesets"
901 msgstr ""
902
903 msgid "show current changeset in ancestor branches"
904 msgstr ""
905
906 msgid "ignored for compatibility"
907 msgstr ""
908
909 msgid "hg debugcvsps [OPTION]... [PATH]..."
910 msgstr ""
911
912 msgid ""
913 "warning: lightweight checkouts may cause conversion failures, try with a "
914 "regular branch instead.\n"
915 msgstr ""
916
917 msgid "bzr source type could not be determined\n"
918 msgstr ""
919
920 #, python-format
921 msgid "%s is not a valid revision in current branch"
922 msgstr ""
923
924 #, python-format
925 msgid "%s is not available in %s anymore"
926 msgstr ""
927
928 #, python-format
929 msgid "%s.%s symlink has no target"
930 msgstr ""
931
932 #, python-format
933 msgid "cannot find required \"%s\" tool"
934 msgstr ""
935
936 #, python-format
937 msgid "running: %s\n"
938 msgstr ""
939
940 #, python-format
941 msgid "%s error:\n"
942 msgstr ""
943
944 #, python-format
945 msgid "syntax error in %s(%d): key/value pair expected"
946 msgstr ""
947
948 #, python-format
949 msgid "could not open map file %r: %s"
950 msgstr ""
951
952 #, python-format
953 msgid "%s: missing or unsupported repository"
954 msgstr ""
955
956 #, python-format
957 msgid "convert: %s\n"
958 msgstr ""
959
960 #, python-format
961 msgid "%s: unknown repository type"
962 msgstr ""
963
964 #, python-format
965 msgid "unknown sort mode: %s"
966 msgstr "未知排序方式: %s"
967
968 #, python-format
969 msgid "cycle detected between %s and %s"
970 msgstr ""
971
972 msgid "not all revisions were sorted"
973 msgstr ""
974
975 #, python-format
976 msgid "Writing author map file %s\n"
977 msgstr ""
978
979 #, python-format
980 msgid "Ignoring bad line in author map file %s: %s\n"
981 msgstr ""
982
983 #, python-format
984 msgid "mapping author %s to %s\n"
985 msgstr ""
986
987 #, python-format
988 msgid "overriding mapping for author %s, was %s, will be %s\n"
989 msgstr ""
990
991 #, python-format
992 msgid "spliced in %s as parents of %s\n"
993 msgstr ""
994
995 msgid "scanning source...\n"
996 msgstr ""
997
998 msgid "sorting...\n"
999 msgstr ""
1000
1001 msgid "converting...\n"
1002 msgstr ""
1003
1004 #, python-format
1005 msgid "source: %s\n"
1006 msgstr ""
1007
1008 #, python-format
1009 msgid "assuming destination %s\n"
1010 msgstr ""
1011
1012 msgid "more than one sort mode specified"
1013 msgstr ""
1014
1015 msgid "--sourcesort is not supported by this data source"
1016 msgstr ""
1017
1018 msgid ""
1019 "warning: support for external cvsps is deprecated and will be removed in "
1020 "Mercurial 1.4\n"
1021 msgstr ""
1022
1023 #, python-format
1024 msgid "revision %s is not a patchset number or date"
1025 msgstr ""
1026
1027 msgid "using builtin cvsps\n"
1028 msgstr ""
1029
1030 #, python-format
1031 msgid "connecting to %s\n"
1032 msgstr ""
1033
1034 msgid "CVS pserver authentication failed"
1035 msgstr ""
1036
1037 #, python-format
1038 msgid ""
1039 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1040 msgstr ""
1041
1042 #, python-format
1043 msgid "%d bytes missing from remote file"
1044 msgstr ""
1045
1046 #, python-format
1047 msgid "cvs server: %s\n"
1048 msgstr ""
1049
1050 #, python-format
1051 msgid "unknown CVS response: %s"
1052 msgstr ""
1053
1054 msgid "collecting CVS rlog\n"
1055 msgstr ""
1056
1057 #, python-format
1058 msgid "reading cvs log cache %s\n"
1059 msgstr ""
1060
1061 #, python-format
1062 msgid "cache has %d log entries\n"
1063 msgstr ""
1064
1065 #, python-format
1066 msgid "error reading cache: %r\n"
1067 msgstr ""
1068
1069 #, python-format
1070 msgid "running %s\n"
1071 msgstr ""
1072
1073 #, python-format
1074 msgid "prefix=%r directory=%r root=%r\n"
1075 msgstr ""
1076
1077 msgid "RCS file must be followed by working file"
1078 msgstr ""
1079
1080 msgid "must have at least some revisions"
1081 msgstr ""
1082
1083 msgid "expected revision number"
1084 msgstr ""
1085
1086 msgid "revision must be followed by date line"
1087 msgstr ""
1088
1089 #, python-format
1090 msgid "found synthetic revision in %s: %r\n"
1091 msgstr "%s 有伪造版本: %r\n"
1092
1093 #, python-format
1094 msgid "writing cvs log cache %s\n"
1095 msgstr ""
1096
1097 #, python-format
1098 msgid "%d log entries\n"
1099 msgstr ""
1100
1101 msgid "creating changesets\n"
1102 msgstr ""
1103
1104 msgid "synthetic changeset cannot have multiple parents"
1105 msgstr ""
1106
1107 #, python-format
1108 msgid ""
1109 "warning: CVS commit message references non-existent branch %r:\n"
1110 "%s\n"
1111 msgstr ""
1112
1113 #, python-format
1114 msgid "%d changeset entries\n"
1115 msgstr ""
1116
1117 #, python-format
1118 msgid "darcs version 2.1 or newer needed (found %r)"
1119 msgstr ""
1120
1121 msgid "Python ElementTree module is not available"
1122 msgstr ""
1123
1124 #, python-format
1125 msgid "cleaning up %s\n"
1126 msgstr ""
1127
1128 msgid "internal calling inconsistency"
1129 msgstr ""
1130
1131 msgid "errors in filemap"
1132 msgstr ""
1133
1134 #, python-format
1135 msgid "%s:%d: %r already in %s list\n"
1136 msgstr ""
1137
1138 #, python-format
1139 msgid "%s:%d: unknown directive %r\n"
1140 msgstr ""
1141
1142 msgid "source repository doesn't support --filemap"
1143 msgstr ""
1144
1145 #, python-format
1146 msgid "%s does not look like a GNU Arch repo"
1147 msgstr ""
1148
1149 msgid "cannot find a GNU Arch tool"
1150 msgstr ""
1151
1152 #, python-format
1153 msgid "analyzing tree version %s...\n"
1154 msgstr ""
1155
1156 #, python-format
1157 msgid ""
1158 "tree analysis stopped because it points to an unregistered archive %s...\n"
1159 msgstr ""
1160
1161 #, python-format
1162 msgid "applying revision %s...\n"
1163 msgstr ""
1164
1165 #, python-format
1166 msgid "computing changeset between %s and %s...\n"
1167 msgstr ""
1168
1169 #, python-format
1170 msgid "obtaining revision %s...\n"
1171 msgstr ""
1172
1173 #, python-format
1174 msgid "analyzing revision %s...\n"
1175 msgstr ""
1176
1177 #, python-format
1178 msgid "could not parse cat-log of %s"
1179 msgstr ""
1180
1181 #, python-format
1182 msgid "%s is not a local Mercurial repo"
1183 msgstr "%s 不是本地的水银版本库"
1184
1185 #, python-format
1186 msgid "initializing destination %s repository\n"
1187 msgstr "初始化目标版本库 %s\n"
1188
1189 msgid "run hg sink pre-conversion action\n"
1190 msgstr "执行动作 hg sink pre-conversion\n"
1191
1192 msgid "run hg sink post-conversion action\n"
1193 msgstr "执行动作 hg sink post-conversion action\n"
1194
1195 #, python-format
1196 msgid "pulling from %s into %s\n"
1197 msgstr "自 %s 拉到 %s\n"
1198
1199 msgid "filtering out empty revision\n"
1200 msgstr ""
1201
1202 msgid "updating tags\n"
1203 msgstr "正在更新标签\n"
1204
1205 #, python-format
1206 msgid "%s is not a valid start revision"
1207 msgstr "%s 不是有效的开始版本"
1208
1209 #, python-format
1210 msgid "ignoring: %s\n"
1211 msgstr "忽略: %s\n"
1212
1213 msgid "run hg source pre-conversion action\n"
1214 msgstr "执行动作 hg source pre-conversion\n"
1215
1216 msgid "run hg source post-conversion action\n"
1217 msgstr "执行动作 hg source post-conversion\n"
1218
1219 #, python-format
1220 msgid "%s does not look like a monotone repo"
1221 msgstr "%s 不像是单纯的 monotone 版本库"
1222
1223 #, python-format
1224 msgid "copying file in renamed directory from '%s' to '%s'"
1225 msgstr "从已改名的目录 '%s' 复制文件到 '%s'"
1226
1227 msgid "reading p4 views\n"
1228 msgstr ""
1229
1230 msgid "collecting p4 changelists\n"
1231 msgstr "正在搜索 p4 修改集\n"
1232
1233 msgid "Subversion python bindings could not be loaded"
1234 msgstr "不能加载 svn 的 python 绑定"
1235
1236 #, python-format
1237 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1238 msgstr "发现 svn 的 python 绑定版本 %d.%d,需要 1.4 或更新的版本"
1239
1240 msgid "Subversion python bindings are too old, 1.4 or later required"
1241 msgstr "svn 的 python 绑定太旧,需要 1.4 或更新的版本"
1242
1243 #, python-format
1244 msgid "svn: revision %s is not an integer"
1245 msgstr "svn: 版本 %s 不是整数"
1246
1247 #, python-format
1248 msgid "svn: start revision %s is not an integer"
1249 msgstr "svn: 开始版本 %s 不是整数"
1250
1251 #, python-format
1252 msgid "no revision found in module %s"
1253 msgstr "没有在模块 %s 中发现版本"
1254
1255 #, python-format
1256 msgid "expected %s to be at %r, but not found"
1257 msgstr "期望 %s 位于 %r,但是没有发现"
1258
1259 #, python-format
1260 msgid "found %s at %r\n"
1261 msgstr "发现 %s 位于 %r\n"
1262
1263 #, python-format
1264 msgid "ignoring empty branch %s\n"
1265 msgstr "忽略空的分支 %s\n"
1266
1267 #, python-format
1268 msgid "found branch %s at %d\n"
1269 msgstr "发现分支 %s 位于 %d\n"
1270
1271 msgid "svn: start revision is not supported with more than one branch"
1272 msgstr "svn: 在给出多于一个分支时不支持开始版本"
1273
1274 #, python-format
1275 msgid "svn: no revision found after start revision %d"
1276 msgstr "svn: 在开始版本 %d 之后没有版本"
1277
1278 #, python-format
1279 msgid "no tags found at revision %d\n"
1280 msgstr "在版本 %d 没有发现标签\n"
1281
1282 #, python-format
1283 msgid "ignoring foreign branch %r\n"
1284 msgstr "忽略外部分支 %r\n"
1285
1286 #, python-format
1287 msgid "%s not found up to revision %d"
1288 msgstr "没有发现 %s,一直到版本 %d"
1289
1290 #, python-format
1291 msgid "branch renamed from %s to %s at %d\n"
1292 msgstr "分支从 %s 改名为 %s,在 %d\n"
1293
1294 #, python-format
1295 msgid "reparent to %s\n"
1296 msgstr ""
1297
1298 #, python-format
1299 msgid "copied to %s from %s@%s\n"
1300 msgstr "复制到 %s,自 %s@%s\n"
1301
1302 #, python-format
1303 msgid "gone from %s\n"
1304 msgstr "离开 %s\n"
1305
1306 #, python-format
1307 msgid "entry %s\n"
1308 msgstr "入口 %s\n"
1309
1310 #, python-format
1311 msgid "unknown path in revision %d: %s\n"
1312 msgstr "版本 %d 有未知路径: %s\n"
1313
1314 #, python-format
1315 msgid "mark %s came from %s:%d\n"
1316 msgstr "标记 %s 来自 %s:%d\n"
1317
1318 #, python-format
1319 msgid "parsing revision %d (%d changes)\n"
1320 msgstr "解析版本 %d (%d 个改变)\n"
1321
1322 #, python-format
1323 msgid "found parent of branch %s at %d: %s\n"
1324 msgstr "发现分支 %s 的父亲,在 %d: %s\n"
1325
1326 msgid "no copyfrom path, don't know what to do.\n"
1327 msgstr "没有 copyfrom 路径,不知道该怎么办。\n"
1328
1329 #, python-format
1330 msgid "fetching revision log for \"%s\" from %d to %d\n"
1331 msgstr "为 \"%s\" 获取版本日志,自 %d 到 %d\n"
1332
1333 #, python-format
1334 msgid "revision %d has no entries\n"
1335 msgstr "版本 %d 没有入口\n"
1336
1337 #, python-format
1338 msgid "svn: branch has no revision %s"
1339 msgstr "svn: 分支没有版本 %s"
1340
1341 #, python-format
1342 msgid "%r is not under %r, ignoring\n"
1343 msgstr "%r 不在 %r 之下,忽略之\n"
1344
1345 #, python-format
1346 msgid "initializing svn repo %r\n"
1347 msgstr "初始化 svn 版本库 %r\n"
1348
1349 #, python-format
1350 msgid "initializing svn wc %r\n"
1351 msgstr "初始化 svn 工作副本 %r\n"
1352
1353 msgid "unexpected svn output:\n"
1354 msgstr "意外的 svn 输出:\n"
1355
1356 msgid "unable to cope with svn output"
1357 msgstr "不能处理 svn 的输出"
1358
1359 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1360 msgstr ""
1361
1362 msgid ""
1363 "command to allow external programs to compare revisions\n"
1364 "\n"
1365 "The extdiff Mercurial extension allows you to use external programs\n"
1366 "to compare revisions, or revision with working directory. The external\n"
1367 "diff programs are called with a configurable set of options and two\n"
1368 "non-option arguments: paths to directories containing snapshots of\n"
1369 "files to compare.\n"
1370 "\n"
1371 "The extdiff extension also allows to configure new diff commands, so\n"
1372 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
1373 "\n"
1374 " [extdiff]\n"
1375 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1376 " cdiff = gdiff -Nprc5\n"
1377 " ## or the old way:\n"
1378 " #cmd.cdiff = gdiff\n"
1379 " #opts.cdiff = -Nprc5\n"
1380 "\n"
1381 " # add new command called vdiff, runs kdiff3\n"
1382 " vdiff = kdiff3\n"
1383 "\n"
1384 " # add new command called meld, runs meld (no need to name twice)\n"
1385 " meld =\n"
1386 "\n"
1387 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1388 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1389 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1390 " # your .vimrc\n"
1391 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1392 "\n"
1393 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1394 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1395 "files, so running the external diff program will actually be pretty\n"
1396 "fast (at least faster than having to compare the entire tree).\n"
1397 msgstr ""
1398
1399 #, python-format
1400 msgid "making snapshot of %d files from rev %s\n"
1401 msgstr ""
1402
1403 #, python-format
1404 msgid "making snapshot of %d files from working directory\n"
1405 msgstr ""
1406
1407 msgid "cannot specify --rev and --change at the same time"
1408 msgstr "不能同时指定 '--rev' 和 '--change'"
1409
1410 #, python-format
1411 msgid "running %r in %s\n"
1412 msgstr ""
1413
1414 #, python-format
1415 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1416 msgstr ""
1417
1418 msgid "cleaning up temp directory\n"
1419 msgstr ""
1420
1421 msgid ""
1422 "use external program to diff repository (or selected files)\n"
1423 "\n"
1424 " Show differences between revisions for the specified files, using\n"
1425 " an external program. The default program used is diff, with\n"
1426 " default options \"-Npru\".\n"
1427 "\n"
1428 " To select a different program, use the -p/--program option. The\n"
1429 " program will be passed the names of two directories to compare. To\n"
1430 " pass additional options to the program, use -o/--option. These\n"
1431 " will be passed before the names of the directories to compare.\n"
1432 "\n"
1433 " When two revision arguments are given, then changes are shown\n"
1434 " between those revisions. If only one revision is specified then\n"
1435 " that revision is compared to the working directory, and, when no\n"
1436 " revisions are specified, the working directory files are compared\n"
1437 " to its parent."
1438 msgstr ""
1439
1440 msgid "comparison program to run"
1441 msgstr ""
1442
1443 msgid "pass option to comparison program"
1444 msgstr ""
1445
1446 msgid "change made by revision"
1447 msgstr "此版本的修改"
1448
1449 msgid "hg extdiff [OPT]... [FILE]..."
1450 msgstr ""
1451
1452 #, python-format
1453 msgid ""
1454 "use %(path)s to diff repository (or selected files)\n"
1455 "\n"
1456 " Show differences between revisions for the specified files, using the\n"
1457 " %(path)s program.\n"
1458 "\n"
1459 " When two revision arguments are given, then changes are shown between\n"
1460 " those revisions. If only one revision is specified then that revision is\n"
1461 " compared to the working directory, and, when no revisions are specified,\n"
1462 " the working directory files are compared to its parent."
1463 msgstr ""
1464
1465 #, python-format
1466 msgid "hg %s [OPTION]... [FILE]..."
1467 msgstr ""
1468
1469 msgid "pull, update and merge in one command"
1470 msgstr ""
1471
1472 msgid ""
1473 "pull changes from a remote repository, merge new changes if needed.\n"
1474 "\n"
1475 " This finds all changes from the repository at the specified path\n"
1476 " or URL and adds them to the local repository.\n"
1477 "\n"
1478 " If the pulled changes add a new branch head, the head is\n"
1479 " automatically merged, and the result of the merge is committed.\n"
1480 " Otherwise, the working directory is updated to include the new\n"
1481 " changes.\n"
1482 "\n"
1483 " When a merge occurs, the newly pulled changes are assumed to be\n"
1484 " \"authoritative\". The head of the new changes is used as the first\n"
1485 " parent, with local changes as the second. To switch the merge\n"
1486 " order, use --switch-parent.\n"
1487 "\n"
1488 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1489 " "
1490 msgstr ""
1491
1492 msgid ""
1493 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1494 msgstr ""
1495
1496 msgid "outstanding uncommitted merge"
1497 msgstr ""
1498
1499 msgid "outstanding uncommitted changes"
1500 msgstr ""
1501
1502 msgid "working directory is missing some files"
1503 msgstr ""
1504
1505 msgid ""
1506 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1507 msgstr ""
1508
1509 #, python-format
1510 msgid "pulling from %s\n"
1511 msgstr "正在拉自 %s\n"
1512
1513 msgid ""
1514 "Other repository doesn't support revision lookup, so a rev cannot be "
1515 "specified."
1516 msgstr ""
1517
1518 #, python-format
1519 msgid ""
1520 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1521 "\" to merge them)\n"
1522 msgstr ""
1523
1524 #, python-format
1525 msgid "updating to %d:%s\n"
1526 msgstr ""
1527
1528 #, python-format
1529 msgid "merging with %d:%s\n"
1530 msgstr ""
1531
1532 #, python-format
1533 msgid "new changeset %d:%s merges remote changes with local\n"
1534 msgstr "新修改集 '%d:%s' 将远程修改与本地合并\n"
1535
1536 msgid "a specific revision you would like to pull"
1537 msgstr "指定取得的版本"
1538
1539 msgid "edit commit message"
1540 msgstr "编辑提交日志"
1541
1542 msgid "edit commit message (DEPRECATED)"
1543 msgstr "编辑提交日志(不赞成)"
1544
1545 msgid "switch parents when merging"
1546 msgstr "当合并时切换父亲"
1547
1548 msgid "hg fetch [SOURCE]"
1549 msgstr "hg fetch [SOURCE]"
1550
1551 msgid "commands to sign and verify changesets"
1552 msgstr "签署和校验修改集的命令"
1553
1554 msgid "error while verifying signature"
1555 msgstr ""
1556
1557 #, python-format
1558 msgid "%s Bad signature from \"%s\"\n"
1559 msgstr ""
1560
1561 #, python-format
1562 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1563 msgstr ""
1564
1565 #, python-format
1566 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1567 msgstr ""
1568
1569 msgid "list signed changesets"
1570 msgstr ""
1571
1572 #, python-format
1573 msgid "%s:%d node does not exist\n"
1574 msgstr ""
1575
1576 msgid "verify all the signatures there may be for a particular revision"
1577 msgstr ""
1578
1579 #, python-format
1580 msgid "No valid signature for %s\n"
1581 msgstr ""
1582
1583 msgid ""
1584 "add a signature for the current or given revision\n"
1585 "\n"
1586 " If no revision is given, the parent of the working directory is used,\n"
1587 " or tip if no revision is checked out.\n"
1588 "\n"
1589 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1590 " "
1591 msgstr ""
1592
1593 msgid "uncommitted merge - please provide a specific revision"
1594 msgstr ""
1595
1596 msgid "Error while signing"
1597 msgstr ""
1598
1599 msgid ""
1600 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1601 "force)"
1602 msgstr ""
1603
1604 msgid "unknown signature version"
1605 msgstr ""
1606
1607 msgid "make the signature local"
1608 msgstr ""
1609
1610 msgid "sign even if the sigfile is modified"
1611 msgstr ""
1612
1613 msgid "do not commit the sigfile after signing"
1614 msgstr ""
1615
1616 msgid "the key id to sign with"
1617 msgstr ""
1618
1619 msgid "commit message"
1620 msgstr ""
1621
1622 msgid "hg sign [OPTION]... [REVISION]..."
1623 msgstr ""
1624
1625 msgid "hg sigcheck REVISION"
1626 msgstr ""
1627
1628 msgid "hg sigs"
1629 msgstr ""
1630
1631 msgid ""
1632 "command to view revision graphs from a shell\n"
1633 "\n"
1634 "This extension adds a --graph option to the incoming, outgoing and log\n"
1635 "commands. When this options is given, an ASCII representation of the\n"
1636 "revision graph is also shown.\n"
1637 msgstr ""
1638
1639 #, python-format
1640 msgid "--graph option is incompatible with --%s"
1641 msgstr ""
1642
1643 msgid ""
1644 "show revision history alongside an ASCII revision graph\n"
1645 "\n"
1646 " Print a revision history alongside a revision graph drawn with\n"
1647 " ASCII characters.\n"
1648 "\n"
1649 " Nodes printed as an @ character are parents of the working\n"
1650 " directory.\n"
1651 " "
1652 msgstr ""
1653
1654 #, python-format
1655 msgid "comparing with %s\n"
1656 msgstr ""
1657
1658 msgid "no changes found\n"
1659 msgstr "没有发现修改\n"
1660
1661 msgid "show the revision DAG"
1662 msgstr "显示版本分支图"
1663
1664 msgid "limit number of changes displayed"
1665 msgstr "限制显示的修改集数量"
1666
1667 msgid "show patch"
1668 msgstr "显示补丁"
1669
1670 msgid "show the specified revision or range"
1671 msgstr ""
1672
1673 msgid "hg glog [OPTION]... [FILE]"
1674 msgstr ""
1675
1676 msgid ""
1677 "hooks for integrating with the CIA.vc notification service\n"
1678 "\n"
1679 "This is meant to be run as a changegroup or incoming hook. To\n"
1680 "configure it, set the following options in your hgrc::\n"
1681 "\n"
1682 " [cia]\n"
1683 " # your registered CIA user name\n"
1684 " user = foo\n"
1685 " # the name of the project in CIA\n"
1686 " project = foo\n"
1687 " # the module (subproject) (optional)\n"
1688 " #module = foo\n"
1689 " # Append a diffstat to the log message (optional)\n"
1690 " #diffstat = False\n"
1691 " # Template to use for log messages (optional)\n"
1692 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1693 " # Style to use (optional)\n"
1694 " #style = foo\n"
1695 " # The URL of the CIA notification service (optional)\n"
1696 " # You can use mailto: URLs to send by email, eg\n"
1697 " # mailto:cia@cia.vc\n"
1698 " # Make sure to set email.from if you do this.\n"
1699 " #url = http://cia.vc/\n"
1700 " # print message instead of sending it (optional)\n"
1701 " #test = False\n"
1702 "\n"
1703 " [hooks]\n"
1704 " # one of these:\n"
1705 " changegroup.cia = python:hgcia.hook\n"
1706 " #incoming.cia = python:hgcia.hook\n"
1707 "\n"
1708 " [web]\n"
1709 " # If you want hyperlinks (optional)\n"
1710 " baseurl = http://server/path/to/repo\n"
1711 msgstr ""
1712
1713 #, python-format
1714 msgid "hgcia: sending update to %s\n"
1715 msgstr ""
1716
1717 msgid "email.from must be defined when sending by email"
1718 msgstr ""
1719
1720 msgid "cia: no user specified"
1721 msgstr ""
1722
1723 msgid "cia: no project specified"
1724 msgstr ""
1725
1726 msgid ""
1727 "browse the repository in a graphical way\n"
1728 "\n"
1729 "The hgk extension allows browsing the history of a repository in a\n"
1730 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1731 "distributed with Mercurial.)\n"
1732 "\n"
1733 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1734 "querying of information, and an extension to Mercurial named hgk.py,\n"
1735 "which provides hooks for hgk to get information. hgk can be found in\n"
1736 "the contrib directory, and the extension is shipped in the hgext\n"
1737 "repository, and needs to be enabled.\n"
1738 "\n"
1739 "The hg view command will launch the hgk Tcl script. For this command\n"
1740 "to work, hgk must be in your search path. Alternately, you can specify\n"
1741 "the path to hgk in your .hgrc file::\n"
1742 "\n"
1743 " [hgk]\n"
1744 " path=/location/of/hgk\n"
1745 "\n"
1746 "hgk can make use of the extdiff extension to visualize revisions.\n"
1747 "Assuming you had already configured extdiff vdiff command, just add::\n"
1748 "\n"
1749 " [hgk]\n"
1750 " vdiff=vdiff\n"
1751 "\n"
1752 "Revisions context menu will now display additional entries to fire\n"
1753 "vdiff on hovered and selected revisions.\n"
1754 msgstr ""
1755
1756 msgid "diff trees from two commits"
1757 msgstr ""
1758
1759 msgid "output common ancestor information"
1760 msgstr ""
1761
1762 msgid "cat a specific revision"
1763 msgstr ""
1764
1765 msgid "cat-file: type or revision not supplied\n"
1766 msgstr ""
1767
1768 msgid "aborting hg cat-file only understands commits\n"
1769 msgstr ""
1770
1771 msgid "parse given revisions"
1772 msgstr ""
1773
1774 msgid "print revisions"
1775 msgstr ""
1776
1777 msgid "print extension options"
1778 msgstr ""
1779
1780 msgid "start interactive history viewer"
1781 msgstr ""
1782
1783 msgid "hg view [-l LIMIT] [REVRANGE]"
1784 msgstr ""
1785
1786 msgid "generate patch"
1787 msgstr ""
1788
1789 msgid "recursive"
1790 msgstr ""
1791
1792 msgid "pretty"
1793 msgstr ""
1794
1795 msgid "stdin"
1796 msgstr ""
1797
1798 msgid "detect copies"
1799 msgstr ""
1800
1801 msgid "search"
1802 msgstr ""
1803
1804 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1805 msgstr ""
1806
1807 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1808 msgstr ""
1809
1810 msgid "hg debug-config"
1811 msgstr ""
1812
1813 msgid "hg debug-merge-base REV REV"
1814 msgstr ""
1815
1816 msgid "ignored"
1817 msgstr ""
1818
1819 msgid "hg debug-rev-parse REV"
1820 msgstr ""
1821
1822 msgid "header"
1823 msgstr ""
1824
1825 msgid "topo-order"
1826 msgstr ""
1827
1828 msgid "parents"
1829 msgstr ""
1830
1831 msgid "max-count"
1832 msgstr ""
1833
1834 msgid "hg debug-rev-list [OPTION]... REV..."
1835 msgstr ""
1836
1837 msgid ""
1838 "syntax highlighting for hgweb (requires Pygments)\n"
1839 "\n"
1840 "It depends on the Pygments syntax highlighting library:\n"
1841 "http://pygments.org/\n"
1842 "\n"
1843 "There is a single configuration option::\n"
1844 "\n"
1845 " [web]\n"
1846 " pygments_style = <style>\n"
1847 "\n"
1848 "The default is 'colorful'.\n"
1849 msgstr ""
1850
1851 msgid "accelerate status report using Linux's inotify service"
1852 msgstr ""
1853
1854 msgid "start an inotify server for this repository"
1855 msgstr "为此版本库启动服务 'inotify'"
1856
1857 msgid ""
1858 "debugging information for inotify extension\n"
1859 "\n"
1860 " Prints the list of directories being watched by the inotify server.\n"
1861 " "
1862 msgstr ""
1863
1864 msgid "directories being watched:\n"
1865 msgstr ""
1866
1867 msgid "run server in background"
1868 msgstr "在后台运行服务"
1869
1870 msgid "used internally by daemon mode"
1871 msgstr "在后台服务模式内部使用"
1872
1873 msgid "minutes to sit idle before exiting"
1874 msgstr "空闲几分钟后退出"
1875
1876 msgid "name of file to write process ID to"
1877 msgstr "写入进程标识符的文件名称"
1878
1879 msgid "hg inserve [OPTION]..."
1880 msgstr ""
1881
1882 msgid "(found dead inotify server socket; removing it)\n"
1883 msgstr ""
1884
1885 msgid "(starting inotify server)\n"
1886 msgstr ""
1887
1888 #, python-format
1889 msgid "could not start inotify server: %s\n"
1890 msgstr ""
1891
1892 #, python-format
1893 msgid "could not talk to new inotify server: %s\n"
1894 msgstr ""
1895
1896 msgid "(inotify server not running)\n"
1897 msgstr ""
1898
1899 #, python-format
1900 msgid "failed to contact inotify server: %s\n"
1901 msgstr ""
1902
1903 msgid "received empty answer from inotify server"
1904 msgstr ""
1905
1906 #, python-format
1907 msgid "(inotify: received response from incompatible server version %d)\n"
1908 msgstr ""
1909
1910 #, python-format
1911 msgid "(inotify: received '%s' response when expecting '%s')\n"
1912 msgstr ""
1913
1914 msgid "this system does not seem to support inotify"
1915 msgstr ""
1916
1917 #, python-format
1918 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1919 msgstr ""
1920
1921 msgid "*** this limit is too low to watch every directory in this repository\n"
1922 msgstr ""
1923
1924 msgid "*** counting directories: "
1925 msgstr ""
1926
1927 #, python-format
1928 msgid "found %d\n"
1929 msgstr ""
1930
1931 #, python-format
1932 msgid "*** to raise the limit from %d to %d (run as root):\n"
1933 msgstr ""
1934
1935 #, python-format
1936 msgid "*** echo %d > %s\n"
1937 msgstr ""
1938
1939 #, python-format
1940 msgid "cannot watch %s until inotify watch limit is raised"
1941 msgstr ""
1942
1943 #, python-format
1944 msgid "inotify service not available: %s"
1945 msgstr ""
1946
1947 #, python-format
1948 msgid "watching %r\n"
1949 msgstr ""
1950
1951 #, python-format
1952 msgid "watching directories under %r\n"
1953 msgstr ""
1954
1955 #, python-format
1956 msgid "status: %r %s -> %s\n"
1957 msgstr ""
1958
1959 #, python-format
1960 msgid "%s dirstate reload\n"
1961 msgstr ""
1962
1963 #, python-format
1964 msgid "%s end dirstate reload\n"
1965 msgstr ""
1966
1967 msgid "rescanning due to .hgignore change\n"
1968 msgstr ""
1969
1970 #, python-format
1971 msgid "%s event: created %s\n"
1972 msgstr ""
1973
1974 #, python-format
1975 msgid "%s event: deleted %s\n"
1976 msgstr ""
1977
1978 #, python-format
1979 msgid "%s event: modified %s\n"
1980 msgstr ""
1981
1982 #, python-format
1983 msgid "filesystem containing %s was unmounted\n"
1984 msgstr ""
1985
1986 #, python-format
1987 msgid "%s readable: %d bytes\n"
1988 msgstr ""
1989
1990 #, python-format
1991 msgid "%s below threshold - unhooking\n"
1992 msgstr ""
1993
1994 #, python-format
1995 msgid "%s reading %d events\n"
1996 msgstr ""
1997
1998 #, python-format
1999 msgid "%s hooking back up with %d bytes readable\n"
2000 msgstr ""
2001
2002 #, python-format
2003 msgid "could not start server: %s"
2004 msgstr ""
2005
2006 #, python-format
2007 msgid "answering query for %r\n"
2008 msgstr ""
2009
2010 #, python-format
2011 msgid "received query from incompatible client version %d\n"
2012 msgstr ""
2013
2014 #, python-format
2015 msgid "unrecognized query type: %s\n"
2016 msgstr ""
2017
2018 msgid "finished setup\n"
2019 msgstr ""
2020
2021 msgid ""
2022 "expand expressions into changelog and summaries\n"
2023 "\n"
2024 "This extension allows the use of a special syntax in summaries, which\n"
2025 "will be automatically expanded into links or any other arbitrary\n"
2026 "expression, much like InterWiki does.\n"
2027 "\n"
2028 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2029 "in your hgrc::\n"
2030 "\n"
2031 " [interhg]\n"
2032 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2033 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2034 "i\n"
2035 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2036 msgstr ""
2037
2038 #, python-format
2039 msgid "interhg: invalid pattern for %s: %s\n"
2040 msgstr ""
2041
2042 #, python-format
2043 msgid "interhg: invalid regexp for %s: %s\n"
2044 msgstr ""
2045
2046 msgid ""
2047 "expand keywords in tracked files\n"
2048 "\n"
2049 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2050 "tracked text files selected by your configuration.\n"
2051 "\n"
2052 "Keywords are only expanded in local repositories and not stored in the\n"
2053 "change history. The mechanism can be regarded as a convenience for the\n"
2054 "current user or for archive distribution.\n"
2055 "\n"
2056 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2057 "hgrc files.\n"
2058 "\n"
2059 "Example::\n"
2060 "\n"
2061 " [keyword]\n"
2062 " # expand keywords in every python file except those matching \"x*\"\n"
2063 " **.py =\n"
2064 " x* = ignore\n"
2065 "\n"
2066 "NOTE: the more specific you are in your filename patterns the less you\n"
2067 "lose speed in huge repositories.\n"
2068 "\n"
2069 "For [keywordmaps] template mapping and expansion demonstration and\n"
2070 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2071 "available templates and filters.\n"
2072 "\n"
2073 "An additional date template filter {date|utcdate} is provided. It\n"
2074 "returns a date like \"2006/09/18 15:13:13\".\n"
2075 "\n"
2076 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2077 "replaced with customized keywords and templates. Again, run \"hg\n"
2078 "kwdemo\" to control the results of your config changes.\n"
2079 "\n"
2080 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2081 "the risk of inadvertently storing expanded keywords in the change\n"
2082 "history.\n"
2083 "\n"
2084 "To force expansion after enabling it, or a configuration change, run\n"
2085 "\"hg kwexpand\".\n"
2086 "\n"
2087 "Also, when committing with the record extension or using mq's qrecord,\n"
2088 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2089 "the files in question to update keyword expansions after all changes\n"
2090 "have been checked in.\n"
2091 "\n"
2092 "Expansions spanning more than one line and incremental expansions,\n"
2093 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2094 "{desc}\" expands to the first line of the changeset description.\n"
2095 msgstr ""
2096
2097 #, python-format
2098 msgid "overwriting %s expanding keywords\n"
2099 msgstr ""
2100
2101 #, python-format
2102 msgid "overwriting %s shrinking keywords\n"
2103 msgstr ""
2104
2105 msgid "[keyword] patterns cannot match"
2106 msgstr ""
2107
2108 msgid "no [keyword] patterns configured"
2109 msgstr ""
2110
2111 msgid ""
2112 "print [keywordmaps] configuration and an expansion example\n"
2113 "\n"
2114 " Show current, custom, or default keyword template maps and their\n"
2115 " expansions.\n"
2116 "\n"
2117 " Extend the current configuration by specifying maps as arguments\n"
2118 " and using -f/--rcfile to source an external hgrc file.\n"
2119 "\n"
2120 " Use -d/--default to disable current configuration.\n"
2121 "\n"
2122 " See \"hg help templates\" for information on templates and filters.\n"
2123 " "
2124 msgstr ""
2125
2126 #, python-format
2127 msgid "creating temporary repository at %s\n"
2128 msgstr "正在创建临时版本库 %s\n"
2129
2130 msgid ""
2131 "\n"
2132 "\tconfiguration using custom keyword template maps\n"
2133 msgstr ""
2134
2135 msgid "\textending current template maps\n"
2136 msgstr ""
2137
2138 msgid "\toverriding default template maps\n"
2139 msgstr ""
2140
2141 msgid ""
2142 "\n"
2143 "\tconfiguration using default keyword template maps\n"
2144 msgstr ""
2145
2146 msgid "\tdisabling current template maps\n"
2147 msgstr "\t禁用当前模版映射\n"
2148
2149 msgid ""
2150 "\n"
2151 "\tconfiguration using current keyword template maps\n"
2152 msgstr ""
2153
2154 #, python-format
2155 msgid ""
2156 "\n"
2157 "keywords written to %s:\n"
2158 msgstr ""
2159
2160 msgid "unhooked all commit hooks\n"
2161 msgstr ""
2162
2163 msgid ""
2164 "\n"
2165 "\tkeywords expanded\n"
2166 msgstr ""
2167
2168 #, python-format
2169 msgid ""
2170 "\n"
2171 "removing temporary repository %s\n"
2172 msgstr ""
2173 "\n"
2174 "正在删除临时版本库 %s\n"
2175
2176 msgid ""
2177 "expand keywords in the working directory\n"
2178 "\n"
2179 " Run after (re)enabling keyword expansion.\n"
2180 "\n"
2181 " kwexpand refuses to run if given files contain local changes.\n"
2182 " "
2183 msgstr ""
2184
2185 msgid ""
2186 "show files configured for keyword expansion\n"
2187 "\n"
2188 " List which files in the working directory are matched by the\n"
2189 " [keyword] configuration patterns.\n"
2190 "\n"
2191 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2192 " execution by including only files that are actual candidates for\n"
2193 " expansion.\n"
2194 "\n"
2195 " See \"hg help keyword\" on how to construct patterns both for\n"
2196 " inclusion and exclusion of files.\n"
2197 "\n"
2198 " Use -u/--untracked to list untracked files as well.\n"
2199 "\n"
2200 " With -a/--all and -v/--verbose the codes used to show the status\n"
2201 " of files are::\n"
2202 "\n"
2203 " K = keyword expansion candidate\n"
2204 " k = keyword expansion candidate (untracked)\n"
2205 " I = ignored\n"
2206 " i = ignored (untracked)\n"
2207 " "
2208 msgstr ""
2209
2210 msgid ""
2211 "revert expanded keywords in the working directory\n"
2212 "\n"
2213 " Run before changing/disabling active keywords or if you experience\n"
2214 " problems with \"hg import\" or \"hg merge\".\n"
2215 "\n"
2216 " kwshrink refuses to run if given files contain local changes.\n"
2217 " "
2218 msgstr ""
2219
2220 msgid "show default keyword template maps"
2221 msgstr ""
2222
2223 msgid "read maps from rcfile"
2224 msgstr ""
2225
2226 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2227 msgstr ""
2228
2229 msgid "hg kwexpand [OPTION]... [FILE]..."
2230 msgstr ""
2231
2232 msgid "show keyword status flags of all files"
2233 msgstr ""
2234
2235 msgid "show files excluded from expansion"
2236 msgstr ""
2237
2238 msgid "additionally show untracked files"
2239 msgstr ""
2240
2241 msgid "hg kwfiles [OPTION]... [FILE]..."
2242 msgstr ""
2243
2244 msgid "hg kwshrink [OPTION]... [FILE]..."
2245 msgstr ""
2246
2247 msgid ""
2248 "manage a stack of patches\n"
2249 "\n"
2250 "This extension lets you work with a stack of patches in a Mercurial\n"
2251 "repository. It manages two stacks of patches - all known patches, and\n"
2252 "applied patches (subset of known patches).\n"
2253 "\n"
2254 "Known patches are represented as patch files in the .hg/patches\n"
2255 "directory. Applied patches are both patch files and changesets.\n"
2256 "\n"
2257 "Common tasks (use \"hg help command\" for more details)::\n"
2258 "\n"
2259 " prepare repository to work with patches qinit\n"
2260 " create new patch qnew\n"
2261 " import existing patch qimport\n"
2262 "\n"
2263 " print patch series qseries\n"
2264 " print applied patches qapplied\n"
2265 "\n"
2266 " add known patch to applied stack qpush\n"
2267 " remove patch from applied stack qpop\n"
2268 " refresh contents of top applied patch qrefresh\n"
2269 msgstr ""
2270
2271 #, python-format
2272 msgid "%s appears more than once in %s"
2273 msgstr ""
2274
2275 msgid "guard cannot be an empty string"
2276 msgstr ""
2277
2278 #, python-format
2279 msgid "guard %r starts with invalid character: %r"
2280 msgstr ""
2281
2282 #, python-format
2283 msgid "invalid character in guard %r: %r"
2284 msgstr ""
2285
2286 #, python-format
2287 msgid "active guards: %s\n"
2288 msgstr ""
2289
2290 #, python-format
2291 msgid "guard %r too short"
2292 msgstr ""
2293
2294 #, python-format
2295 msgid "guard %r starts with invalid char"
2296 msgstr ""
2297
2298 #, python-format
2299 msgid "allowing %s - no guards in effect\n"
2300 msgstr ""
2301
2302 #, python-format
2303 msgid "allowing %s - no matching negative guards\n"
2304 msgstr ""
2305
2306 #, python-format
2307 msgid "allowing %s - guarded by %r\n"
2308 msgstr ""
2309
2310 #, python-format
2311 msgid "skipping %s - guarded by %r\n"
2312 msgstr ""
2313
2314 #, python-format
2315 msgid "skipping %s - no matching guards\n"
2316 msgstr ""
2317
2318 #, python-format
2319 msgid "error removing undo: %s\n"
2320 msgstr ""
2321
2322 #, python-format
2323 msgid "apply failed for patch %s"
2324 msgstr ""
2325
2326 #, python-format
2327 msgid "patch didn't work out, merging %s\n"
2328 msgstr ""
2329
2330 #, python-format
2331 msgid "update returned %d"
2332 msgstr ""
2333
2334 msgid "repo commit failed"
2335 msgstr ""
2336
2337 #, python-format
2338 msgid "unable to read %s"
2339 msgstr ""
2340
2341 #, python-format
2342 msgid "patch %s does not exist\n"
2343 msgstr ""
2344
2345 #, python-format
2346 msgid "patch %s is not applied\n"
2347 msgstr ""
2348
2349 msgid "patch failed, unable to continue (try -v)\n"
2350 msgstr ""
2351
2352 #, python-format
2353 msgid "applying %s\n"
2354 msgstr ""
2355
2356 #, python-format
2357 msgid "unable to read %s\n"
2358 msgstr "读取 %s 失败\n"
2359
2360 #, python-format
2361 msgid "imported patch %s\n"
2362 msgstr ""
2363
2364 #, python-format
2365 msgid ""
2366 "\n"
2367 "imported patch %s"
2368 msgstr ""
2369
2370 #, python-format
2371 msgid "patch %s is empty\n"
2372 msgstr ""
2373
2374 msgid "patch failed, rejects left in working dir\n"
2375 msgstr ""
2376
2377 msgid "fuzz found when applying patch, stopping\n"
2378 msgstr ""
2379
2380 #, python-format
2381 msgid "revision %d is not managed"
2382 msgstr ""
2383
2384 #, python-format
2385 msgid "cannot delete revision %d above applied patches"
2386 msgstr ""
2387
2388 #, python-format
2389 msgid "patch %s finalized without changeset message\n"
2390 msgstr ""
2391
2392 msgid "qdelete requires at least one revision or patch name"
2393 msgstr ""
2394
2395 #, python-format
2396 msgid "cannot delete applied patch %s"
2397 msgstr ""
2398
2399 #, python-format
2400 msgid "patch %s not in series file"
2401 msgstr ""
2402
2403 msgid "no patches applied"
2404 msgstr ""
2405
2406 msgid "working directory revision is not qtip"
2407 msgstr ""
2408
2409 msgid "local changes found, refresh first"
2410 msgstr ""
2411
2412 msgid "local changes found"
2413 msgstr ""
2414
2415 #, python-format
2416 msgid "\"%s\" cannot be used as the name of a patch"
2417 msgstr ""
2418
2419 #, python-format
2420 msgid "patch \"%s\" already exists"
2421 msgstr ""
2422
2423 #, python-format
2424 msgid "error unlinking %s\n"
2425 msgstr ""
2426
2427 #, python-format
2428 msgid "patch name \"%s\" is ambiguous:\n"
2429 msgstr ""
2430
2431 #, python-format
2432 msgid "patch %s not in series"
2433 msgstr ""
2434
2435 msgid "(working directory not at a head)\n"
2436 msgstr ""
2437
2438 msgid "no patches in series\n"
2439 msgstr ""
2440
2441 #, python-format
2442 msgid "cannot push to a previous patch: %s"
2443 msgstr ""
2444
2445 #, python-format
2446 msgid "qpush: %s is already at the top\n"
2447 msgstr ""
2448
2449 #, python-format
2450 msgid "guarded by %r"
2451 msgstr ""
2452
2453 msgid "no matching guards"
2454 msgstr ""
2455
2456 #, python-format
2457 msgid "cannot push '%s' - %s\n"
2458 msgstr ""
2459
2460 msgid "all patches are currently applied\n"
2461 msgstr ""
2462
2463 msgid "patch series already fully applied\n"
2464 msgstr ""
2465
2466 msgid "cleaning up working directory..."
2467 msgstr ""
2468
2469 #, python-format
2470 msgid "errors during apply, please fix and refresh %s\n"
2471 msgstr ""
2472
2473 #, python-format
2474 msgid "now at: %s\n"
2475 msgstr ""
2476
2477 #, python-format
2478 msgid "patch %s is not applied"
2479 msgstr ""
2480
2481 msgid "no patches applied\n"
2482 msgstr ""
2483
2484 #, python-format
2485 msgid "qpop: %s is already at the top\n"
2486 msgstr ""
2487
2488 msgid "qpop: forcing dirstate update\n"
2489 msgstr ""
2490
2491 #, python-format
2492 msgid "trying to pop unknown node %s"
2493 msgstr ""
2494
2495 msgid "popping would remove a revision not managed by this patch queue"
2496 msgstr ""
2497
2498 msgid "deletions found between repo revs"
2499 msgstr ""
2500
2501 #, python-format
2502 msgid "popping %s\n"
2503 msgstr ""
2504
2505 msgid "patch queue now empty\n"
2506 msgstr ""
2507
2508 msgid "cannot refresh a revision with children"
2509 msgstr ""
2510
2511 msgid ""
2512 "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
2513 msgstr ""
2514
2515 msgid "patch queue directory already exists"
2516 msgstr ""
2517
2518 #, python-format
2519 msgid "patch %s is not in series file"
2520 msgstr ""
2521
2522 msgid "No saved patch data found\n"
2523 msgstr ""
2524
2525 #, python-format
2526 msgid "restoring status: %s\n"
2527 msgstr ""
2528
2529 msgid "save entry has children, leaving it alone\n"
2530 msgstr ""
2531
2532 #, python-format
2533 msgid "removing save entry %s\n"
2534 msgstr ""
2535
2536 #, python-format
2537 msgid "saved queue repository parents: %s %s\n"
2538 msgstr ""
2539
2540 msgid "queue directory updating\n"
2541 msgstr ""
2542
2543 msgid "Unable to load queue repository\n"
2544 msgstr ""
2545
2546 msgid "save: no patches applied, exiting\n"
2547 msgstr ""
2548
2549 msgid "status is already saved\n"
2550 msgstr ""
2551
2552 msgid "hg patches saved state"
2553 msgstr ""
2554
2555 msgid "repo commit failed\n"
2556 msgstr ""
2557
2558 #, python-format
2559 msgid "patch %s is already in the series file"
2560 msgstr ""
2561
2562 msgid "option \"-r\" not valid when importing files"
2563 msgstr ""
2564
2565 msgid "option \"-n\" not valid when importing multiple patches"
2566 msgstr ""
2567
2568 #, python-format
2569 msgid "revision %d is the root of more than one branch"
2570 msgstr ""
2571
2572 #, python-format
2573 msgid "revision %d is already managed"
2574 msgstr ""
2575
2576 #, python-format
2577 msgid "revision %d is not the parent of the queue"
2578 msgstr ""
2579
2580 #, python-format
2581 msgid "revision %d has unmanaged children"
2582 msgstr ""
2583
2584 #, python-format
2585 msgid "cannot import merge revision %d"
2586 msgstr ""
2587
2588 #, python-format
2589 msgid "revision %d is not the parent of %d"
2590 msgstr ""
2591
2592 msgid "-e is incompatible with import from -"
2593 msgstr ""
2594
2595 #, python-format
2596 msgid "patch %s does not exist"
2597 msgstr ""
2598
2599 msgid "need --name to import a patch from -"
2600 msgstr ""
2601
2602 #, python-format
2603 msgid "adding %s to series file\n"
2604 msgstr ""
2605
2606 msgid ""
2607 "remove patches from queue\n"
2608 "\n"
2609 " The patches must not be applied, and at least one patch is required. "
2610 "With\n"
2611 " -k/--keep, the patch files are preserved in the patch directory.\n"
2612 "\n"
2613 " To stop managing a patch and move it into permanent history,\n"
2614 " use the qfinish command."
2615 msgstr ""
2616
2617 msgid "print the patches already applied"
2618 msgstr ""
2619
2620 msgid "only one patch applied\n"
2621 msgstr ""
2622
2623 msgid "print the patches not yet applied"
2624 msgstr ""
2625
2626 msgid "all patches applied\n"
2627 msgstr ""
2628
2629 #, fuzzy
2630 msgid ""
2631 "import a patch\n"
2632 "\n"
2633 " The patch is inserted into the series after the last applied\n"
2634 " patch. If no patches have been applied, qimport prepends the patch\n"
2635 " to the series.\n"
2636 "\n"
2637 " The patch will have the same name as its source file unless you\n"
2638 " give it a new one with -n/--name.\n"
2639 "\n"
2640 " You can register an existing patch inside the patch directory with\n"
2641 " the -e/--existing flag.\n"
2642 "\n"
2643 " With -f/--force, an existing patch of the same name will be\n"
2644 " overwritten.\n"
2645 "\n"
2646 " An existing changeset may be placed under mq control with -r/--rev\n"
2647 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2648 " With -g/--git, patches imported with --rev will use the git diff\n"
2649 " format. See the diffs help topic for information on why this is\n"
2650 " important for preserving rename/copy information and permission\n"
2651 " changes.\n"
2652 "\n"
2653 " To import a patch from standard input, pass - as the patch file.\n"
2654 " When importing from standard input, a patch name must be specified\n"
2655 " using the --name flag.\n"
2656 " "
2657 msgstr ""
2658 "导入补丁\n"
2659 "\n"
2660 " 此补丁插入到最近一次应用的补丁序列中。\n"
2661 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2662 "\n"
2663 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2664 "\n"
2665 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
2666 "\n"
2667 " 使用 '--force' 会覆盖已有的补丁。\n"
2668 "\n"
2669 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2670 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2671 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2672 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2673 " "
2674
2675 #, fuzzy
2676 msgid ""
2677 "init a new queue repository\n"
2678 "\n"
2679 " The queue repository is unversioned by default. If\n"
2680 " -c/--create-repo is specified, qinit will create a separate nested\n"
2681 " repository for patches (qinit -c may also be run later to convert\n"
2682 " an unversioned patch repository into a versioned one). You can use\n"
2683 " qcommit to commit changes to this queue repository."
2684 msgstr ""
2685 "初始化队列仓库\n"
2686 "\n"
2687 " 默认队列仓库不受版本控制。如果指定了 '-c',那么 qinit 会为补丁创建一个\n"
2688 " 单独的嵌套版本库(也可以稍后运行 'qinit -c' 来将不受版本控制的补丁仓库\n"
2689 " 转换成受版本控制)。你可以使用 'qcommit' 提交改变到此队列版本库。"
2690
2691 msgid ""
2692 "clone main and patch repository at same time\n"
2693 "\n"
2694 " If source is local, destination will have no patches applied. If\n"
2695 " source is remote, this command can not check if patches are\n"
2696 " applied in source, so cannot guarantee that patches are not\n"
2697 " applied in destination. If you clone remote repository, be sure\n"
2698 " before that it has no patches applied.\n"
2699 "\n"
2700 " Source patch repository is looked for in <src>/.hg/patches by\n"
2701 " default. Use -p <url> to change.\n"
2702 "\n"
2703 " The patch directory must be a nested Mercurial repository, as\n"
2704 " would be created by qinit -c.\n"
2705 " "
2706 msgstr ""
2707
2708 msgid "versioned patch repository not found (see qinit -c)"
2709 msgstr ""
2710
2711 #, fuzzy
2712 msgid "cloning main repository\n"
2713 msgstr "初始化目标版本库 %s\n"
2714
2715 msgid "cloning patch repository\n"
2716 msgstr ""
2717
2718 #, fuzzy
2719 msgid "stripping applied patches from destination repository\n"
2720 msgstr "初始化目标版本库 %s\n"
2721
2722 #, fuzzy
2723 msgid "updating destination repository\n"
2724 msgstr "初始化目标版本库 %s\n"
2725
2726 msgid "commit changes in the queue repository"
2727 msgstr ""
2728
2729 msgid "print the entire series file"
2730 msgstr ""
2731
2732 msgid "print the name of the current patch"
2733 msgstr ""
2734
2735 msgid "print the name of the next patch"
2736 msgstr ""
2737
2738 msgid "print the name of the previous patch"
2739 msgstr ""
2740
2741 msgid ""
2742 "create a new patch\n"
2743 "\n"
2744 " qnew creates a new patch on top of the currently-applied patch (if\n"
2745 " any). It will refuse to run if there are any outstanding changes\n"
2746 " unless -f/--force is specified, in which case the patch will be\n"
2747 " initialized with them. You may also use -I/--include,\n"
2748 " -X/--exclude, and/or a list of files after the patch name to add\n"
2749 " only changes to matching files to the new patch, leaving the rest\n"
2750 " as uncommitted modifications.\n"
2751 "\n"
2752 " -u/--user and -d/--date can be used to set the (given) user and\n"
2753 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2754 " to current user and date to current date.\n"
2755 "\n"
2756 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2757 " well as the commit message. If none is specified, the header is\n"
2758 " empty and the commit message is '[mq]: PATCH'.\n"
2759 "\n"
2760 " Use the -g/--git option to keep the patch in the git extended diff\n"
2761 " format. Read the diffs help topic for more information on why this\n"
2762 " is important for preserving permission changes and copy/rename\n"
2763 " information.\n"
2764 " "
2765 msgstr ""
2766
2767 #, fuzzy
2768 msgid ""
2769 "update the current patch\n"
2770 "\n"
2771 " If any file patterns are provided, the refreshed patch will\n"
2772 " contain only the modifications that match those patterns; the\n"
2773 " remaining modifications will remain in the working directory.\n"
2774 "\n"
2775 " If -s/--short is specified, files currently included in the patch\n"
2776 " will be refreshed just like matched files and remain in the patch.\n"
2777 "\n"
2778 " hg add/remove/copy/rename work as usual, though you might want to\n"
2779 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2780 " and renames. See the diffs help topic for more information on the\n"
2781 " git diff format.\n"
2782 " "
2783 msgstr ""
2784 "更新当前补丁\n"
2785 "\n"
2786 " 如果提供了文件匹配模式,更新后的补丁只包含匹配这些模式的修改,其它\n"
2787 " 的修改仍旧在工作目录中。\n"
2788 "\n"
2789 " 如果指定了 '--short',只更新已经在补丁中的文件,与文件匹配模式类似。\n"
2790 "\n"
2791 " 'hg add/remove/copy/rename' 如常工作,你可能想使用 git 格式补丁(使\n"
2792 " 用选项 '--git' 或在配置文件的 [diff] 区中设置 git=1)以跟踪复制和改\n"
2793 " 名。请参见差异帮助主题,以了解关于 git 差异格式的更多信息。\n"
2794 " "
2795
2796 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2797 msgstr ""
2798
2799 #, fuzzy
2800 msgid ""
2801 "diff of the current patch and subsequent modifications\n"
2802 "\n"
2803 " Shows a diff which includes the current patch as well as any\n"
2804 " changes which have been made in the working directory since the\n"
2805 " last refresh (thus showing what the current patch would become\n"
2806 " after a qrefresh).\n"
2807 "\n"
2808 " Use 'hg diff' if you only want to see the changes made since the\n"
2809 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2810 " by the current patch without including changes made since the\n"
2811 " qrefresh.\n"
2812 " "
2813 msgstr ""
2814 "显式当前的补丁和后续的修改\n"
2815 "\n"
2816 " 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n"
2817 " 显示当前的补丁)。\n"
2818 "\n"
2819 " 如果你只想看到最近一次刷新之后的修改请使用 'hg diff',如果你只想看到当\n"
2820 " 前的补丁请使用 'hg export qtip'。\n"
2821 " "
2822
2823 msgid ""
2824 "fold the named patches into the current patch\n"
2825 "\n"
2826 " Patches must not yet be applied. Each patch will be successively\n"
2827 " applied to the current patch in the order given. If all the\n"
2828 " patches apply successfully, the current patch will be refreshed\n"
2829 " with the new cumulative patch, and the folded patches will be\n"
2830 " deleted. With -k/--keep, the folded patch files will not be\n"
2831 " removed afterwards.\n"
2832 "\n"
2833 " The header for each folded patch will be concatenated with the\n"
2834 " current patch header, separated by a line of '* * *'."
2835 msgstr ""
2836
2837 msgid "qfold requires at least one patch name"
2838 msgstr ""
2839
2840 msgid "No patches applied"
2841 msgstr ""
2842
2843 #, python-format
2844 msgid "Skipping already folded patch %s"
2845 msgstr ""
2846
2847 #, python-format
2848 msgid "qfold cannot fold already applied patch %s"
2849 msgstr ""
2850
2851 #, python-format
2852 msgid "Error folding patch %s"
2853 msgstr ""
2854
2855 msgid "push or pop patches until named patch is at top of stack"
2856 msgstr ""
2857
2858 msgid ""
2859 "set or print guards for a patch\n"
2860 "\n"
2861 " Guards control whether a patch can be pushed. A patch with no\n"
2862 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2863 " pushed only if the qselect command has activated it. A patch with\n"
2864 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2865 " has activated it.\n"
2866 "\n"
2867 " With no arguments, print the currently active guards.\n"
2868 " With arguments, set guards for the named patch.\n"
2869 " NOTE: Specifying negative guards now requires '--'.\n"
2870 "\n"
2871 " To set guards on another patch:\n"
2872 " hg qguard -- other.patch +2.6.17 -stable\n"
2873 " "
2874 msgstr ""
2875
2876 msgid "cannot mix -l/--list with options or arguments"
2877 msgstr ""
2878
2879 msgid "no patch to work with"
2880 msgstr ""
2881
2882 #, python-format
2883 msgid "no patch named %s"
2884 msgstr ""
2885
2886 msgid "print the header of the topmost or specified patch"
2887 msgstr ""
2888
2889 #, fuzzy
2890 msgid ""
2891 "push the next patch onto the stack\n"
2892 "\n"
2893 " When -f/--force is applied, all local changes in patched files\n"
2894 " will be lost.\n"
2895 " "
2896 msgstr ""
2897 "将下个补丁压入堆栈\n"
2898 "\n"
2899 " 当指定 '--force' 时,所有在补丁文件中的本地修改都会丢失。\n"
2900 " "
2901
2902 msgid "no saved queues found, please use -n\n"
2903 msgstr ""
2904
2905 #, python-format
2906 msgid "merging with queue at: %s\n"
2907 msgstr ""
2908
2909 #, fuzzy
2910 msgid ""
2911 "pop the current patch off the stack\n"
2912 "\n"
2913 " By default, pops off the top of the patch stack. If given a patch\n"
2914 " name, keeps popping off patches until the named patch is at the\n"
2915 " top of the stack.\n"
2916 " "
2917 msgstr ""
2918 "将当前补丁弹出堆栈\n"
2919 "\n"
2920 " 默认将补丁堆栈的顶部弹出。如果指定了补丁名称,那么就会一直弹出,直到此\n"
2921 " 补丁位于堆栈顶部。\n"
2922 " "
2923
2924 #, python-format
2925 msgid "using patch queue: %s\n"
2926 msgstr ""
2927
2928 msgid ""
2929 "rename a patch\n"
2930 "\n"
2931 " With one argument, renames the current patch to PATCH1.\n"
2932 " With two arguments, renames PATCH1 to PATCH2."
2933 msgstr ""
2934
2935 #, python-format
2936 msgid "%s already exists"
2937 msgstr ""
2938
2939 #, python-format
2940 msgid "A patch named %s already exists in the series file"
2941 msgstr ""
2942
2943 msgid "restore the queue state saved by a revision"
2944 msgstr ""
2945
2946 msgid "save current queue state"
2947 msgstr ""
2948
2949 #, python-format
2950 msgid "destination %s exists and is not a directory"
2951 msgstr ""
2952
2953 #, python-format
2954 msgid "destination %s exists, use -f to force"
2955 msgstr ""
2956
2957 #, python-format
2958 msgid "copy %s to %s\n"
2959 msgstr ""
2960
2961 #, fuzzy
2962 msgid ""
2963 "strip a revision and all its descendants from the repository\n"
2964 "\n"
2965 " If one of the working directory's parent revisions is stripped, the\n"
2966 " working directory will be updated to the parent of the stripped\n"
2967 " revision.\n"
2968 " "
2969 msgstr ""
2970 "从版本库删除一个版本以及它的子孙\n"
2971 "\n"
2972 " 如果有工作目录的父版本被删除,那么此目录会被更新到已删除版本的父版本。\n"
2973 " "
2974
2975 msgid ""
2976 "set or print guarded patches to push\n"
2977 "\n"
2978 " Use the qguard command to set or print guards on patch, then use\n"
2979 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2980 " it has no guards or any positive guards match the currently\n"
2981 " selected guard, but will not be pushed if any negative guards\n"
2982 " match the current guard. For example:\n"
2983 "\n"
2984 " qguard foo.patch -stable (negative guard)\n"
2985 " qguard bar.patch +stable (positive guard)\n"
2986 " qselect stable\n"
2987 "\n"
2988 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2989 " it has a negative match) but push bar.patch (because it has a\n"
2990 " positive match).\n"
2991 "\n"
2992 " With no arguments, prints the currently active guards.\n"
2993 " With one argument, sets the active guard.\n"
2994 "\n"
2995 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2996 " When no guards are active, patches with positive guards are\n"
2997 " skipped and patches with negative guards are pushed.\n"
2998 "\n"
2999 " qselect can change the guards on applied patches. It does not pop\n"
3000 " guarded patches by default. Use --pop to pop back to the last\n"
3001 " applied patch that is not guarded. Use --reapply (which implies\n"
3002 " --pop) to push back to the current patch afterwards, but skip\n"
3003 " guarded patches.\n"
3004 "\n"
3005 " Use -s/--series to print a list of all guards in the series file\n"
3006 " (no other arguments needed). Use -v for more information."
3007 msgstr ""
3008
3009 msgid "guards deactivated\n"
3010 msgstr ""
3011
3012 #, python-format
3013 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3014 msgstr ""
3015
3016 #, python-format
3017 msgid "number of guarded, applied patches has changed from %d to %d\n"
3018 msgstr ""
3019
3020 msgid "guards in series file:\n"
3021 msgstr ""
3022
3023 msgid "no guards in series file\n"
3024 msgstr ""
3025
3026 msgid "active guards:\n"
3027 msgstr ""
3028
3029 msgid "no active guards\n"
3030 msgstr ""
3031
3032 msgid "popping guarded patches\n"
3033 msgstr ""
3034
3035 msgid "reapplying unguarded patches\n"
3036 msgstr ""
3037
3038 msgid ""
3039 "move applied patches into repository history\n"
3040 "\n"
3041 " Finishes the specified revisions (corresponding to applied\n"
3042 " patches) by moving them out of mq control into regular repository\n"
3043 " history.\n"
3044 "\n"
3045 " Accepts a revision range or the -a/--applied option. If --applied\n"
3046 " is specified, all applied mq revisions are removed from mq\n"
3047 " control. Otherwise, the given revisions must be at the base of the\n"
3048 " stack of applied patches.\n"
3049 "\n"
3050 " This can be especially useful if your changes have been applied to\n"
3051 " an upstream repository, or if you are about to push your changes\n"
3052 " to upstream.\n"
3053 " "
3054 msgstr ""
3055
3056 msgid "no revisions specified"
3057 msgstr ""
3058
3059 msgid "cannot commit over an applied mq patch"
3060 msgstr ""
3061
3062 msgid "source has mq patches applied"
3063 msgstr ""
3064
3065 #, python-format
3066 msgid "mq status file refers to unknown node %s\n"
3067 msgstr ""
3068
3069 #, python-format
3070 msgid "Tag %s overrides mq patch of the same name\n"
3071 msgstr ""
3072
3073 msgid "cannot import over an applied patch"
3074 msgstr ""
3075
3076 msgid "print first line of patch header"
3077 msgstr ""
3078
3079 #, fuzzy
3080 msgid "show only the last patch"
3081 msgstr "只显示已增加文件的状态"
3082
3083 msgid "hg qapplied [-1] [-s] [PATCH]"
3084 msgstr ""
3085
3086 msgid "use pull protocol to copy metadata"
3087 msgstr "数用协议 'pull' 来复制元数据"
3088
3089 msgid "do not update the new working directories"
3090 msgstr ""
3091
3092 msgid "use uncompressed transfer (fast over LAN)"
3093 msgstr "使用不压缩的传输(在局域网更快)"
3094
3095 #, fuzzy
3096 msgid "location of source patch repository"
3097 msgstr "为此版本库启动服务 'inotify'"
3098
3099 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3100 msgstr ""
3101
3102 msgid "hg qcommit [OPTION]... [FILE]..."
3103 msgstr ""
3104
3105 msgid "hg qdiff [OPTION]... [FILE]..."
3106 msgstr ""
3107
3108 msgid "keep patch file"
3109 msgstr ""
3110
3111 msgid "stop managing a revision (DEPRECATED)"
3112 msgstr ""
3113
3114 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3115 msgstr ""
3116
3117 msgid "edit patch header"
3118 msgstr ""
3119
3120 msgid "keep folded patch files"
3121 msgstr ""
3122
3123 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3124 msgstr ""
3125
3126 msgid "overwrite any local changes"
3127 msgstr ""
3128
3129 msgid "hg qgoto [OPTION]... PATCH"
3130 msgstr ""
3131
3132 msgid "list all patches and guards"
3133 msgstr ""
3134
3135 msgid "drop all guards"
3136 msgstr ""
3137
3138 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3139 msgstr ""
3140
3141 msgid "hg qheader [PATCH]"
3142 msgstr ""
3143
3144 #, fuzzy
3145 msgid "import file in patch directory"
3146 msgstr "从补丁目录导入文件"
3147
3148 #, fuzzy
3149 msgid "name of patch file"
3150 msgstr "补丁文件名称"
3151
3152 msgid "overwrite existing files"
3153 msgstr "覆盖已有文件"
3154
3155 msgid "place existing revisions under mq control"
3156 msgstr "将现有的版本置于 mq 控制下"
3157
3158 msgid "use git extended diff format"
3159 msgstr "使用 git 扩展差异格式"
3160
3161 msgid "qpush after importing"
3162 msgstr ""
3163
3164 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3165 msgstr ""
3166
3167 msgid "create queue repository"
3168 msgstr "创建队列版本库"
3169
3170 msgid "hg qinit [-c]"
3171 msgstr ""
3172
3173 msgid "import uncommitted changes into patch"
3174 msgstr ""
3175
3176 msgid "add \"From: <current user>\" to patch"
3177 msgstr ""
3178
3179 msgid "add \"From: <given user>\" to patch"
3180 msgstr ""
3181
3182 msgid "add \"Date: <current date>\" to patch"
3183 msgstr ""
3184
3185 msgid "add \"Date: <given date>\" to patch"
3186 msgstr ""
3187
3188 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3189 msgstr ""
3190
3191 msgid "hg qnext [-s]"
3192 msgstr ""
3193
3194 msgid "hg qprev [-s]"
3195 msgstr ""
3196
3197 msgid "pop all patches"
3198 msgstr "弹出全部补丁"
3199
3200 msgid "queue name to pop"
3201 msgstr "操作的队列名称"
3202
3203 msgid "forget any local changes"
3204 msgstr "丢弃本地修改"
3205
3206 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3207 msgstr ""
3208
3209 msgid "apply if the patch has rejects"
3210 msgstr "强制应用补丁"
3211
3212 msgid "list patch name in commit text"
3213 msgstr "在提交日志中列出补丁名称"
3214
3215 msgid "apply all patches"
3216 msgstr "应用所有补丁"
3217
3218 msgid "merge from another queue"
3219 msgstr "从其它队列合并"
3220
3221 msgid "merge queue name"
3222 msgstr "合并队列的名称"
3223
3224 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3225 msgstr ""
3226
3227 msgid "refresh only files already in the patch and specified files"
3228 msgstr "仅当文件已经在补丁或指定文件中时才更新"
3229
3230 msgid "add/update author field in patch with current user"
3231 msgstr ""
3232
3233 msgid "add/update author field in patch with given user"
3234 msgstr ""
3235
3236 #, fuzzy
3237 msgid "add/update date field in patch with current date"
3238 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3239
3240 #, fuzzy
3241 msgid "add/update date field in patch with given date"
3242 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3243
3244 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3245 msgstr ""
3246
3247 msgid "hg qrename PATCH1 [PATCH2]"
3248 msgstr ""
3249
3250 msgid "delete save entry"
3251 msgstr ""
3252
3253 #, fuzzy
3254 msgid "update queue working directory"
3255 msgstr "正在更新工作目录\n"
3256
3257 msgid "hg qrestore [-d] [-u] REV"
3258 msgstr ""
3259
3260 msgid "copy patch directory"
3261 msgstr ""
3262
3263 msgid "copy directory name"
3264 msgstr ""
3265
3266 msgid "clear queue status file"
3267 msgstr ""
3268
3269 msgid "force copy"
3270 msgstr ""
3271
3272 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3273 msgstr ""
3274
3275 msgid "disable all guards"
3276 msgstr ""
3277
3278 msgid "list all guards in series file"
3279 msgstr ""
3280
3281 msgid "pop to before first guarded applied patch"
3282 msgstr ""
3283
3284 msgid "pop, then reapply patches"
3285 msgstr ""
3286
3287 msgid "hg qselect [OPTION]... [GUARD]..."
3288 msgstr ""
3289
3290 msgid "print patches not in series"
3291 msgstr ""
3292
3293 msgid "hg qseries [-ms]"
3294 msgstr ""
3295
3296 msgid "force removal with local changes"
3297 msgstr "强制删除,纵然有本地修改"
3298
3299 msgid "bundle unrelated changesets"
3300 msgstr "打包不相关的修改集"
3301
3302 msgid "no backups"
3303 msgstr "不备份"
3304
3305 msgid "hg strip [-f] [-b] [-n] REV"
3306 msgstr ""
3307
3308 msgid "hg qtop [-s]"
3309 msgstr ""
3310
3311 #, fuzzy
3312 msgid "show only the first patch"
3313 msgstr "只显示已增加文件的状态"
3314
3315 msgid "hg qunapplied [-1] [-s] [PATCH]"
3316 msgstr ""
3317
3318 msgid "finish all applied changesets"
3319 msgstr ""
3320
3321 msgid "hg qfinish [-a] [REV]..."
3322 msgstr ""
3323
3324 msgid ""
3325 "hooks for sending email notifications at commit/push time\n"
3326 "\n"
3327 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3328 "print messages to stdout, for testing and configuring.\n"
3329 "\n"
3330 "To use, configure the notify extension and enable it in hgrc like\n"
3331 "this::\n"
3332 "\n"
3333 " [extensions]\n"
3334 " hgext.notify =\n"
3335 "\n"
3336 " [hooks]\n"
3337 " # one email for each incoming changeset\n"
3338 " incoming.notify = python:hgext.notify.hook\n"
3339 " # batch emails when many changesets incoming at one time\n"
3340 " changegroup.notify = python:hgext.notify.hook\n"
3341 "\n"
3342 " [notify]\n"
3343 " # config items go here\n"
3344 "\n"
3345 "Required configuration items::\n"
3346 "\n"
3347 " config = /path/to/file # file containing subscriptions\n"
3348 "\n"
3349 "Optional configuration items::\n"
3350 "\n"
3351 " test = True # print messages to stdout for testing\n"
3352 " strip = 3 # number of slashes to strip for url paths\n"
3353 " domain = example.com # domain to use if committer missing domain\n"
3354 " style = ... # style file to use when formatting email\n"
3355 " template = ... # template to use when formatting email\n"
3356 " incoming = ... # template to use when run as incoming hook\n"
3357 " changegroup = ... # template when run as changegroup hook\n"
3358 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3359 " maxsubject = 67 # truncate subject line longer than this\n"
3360 " diffstat = True # add a diffstat before the diff content\n"
3361 " sources = serve # notify if source of incoming changes in this list\n"
3362 " # (serve == ssh or http, push, pull, bundle)\n"
3363 " [email]\n"
3364 " from = user@host.com # email address to send as if none given\n"
3365 " [web]\n"
3366 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3367 "\n"
3368 "The notify config file has same format as a regular hgrc file. It has\n"
3369 "two sections so you can express subscriptions in whatever way is\n"
3370 "handier for you.\n"
3371 "\n"
3372 "::\n"
3373 "\n"
3374 " [usersubs]\n"
3375 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3376 " user@host = pattern\n"
3377 "\n"
3378 " [reposubs]\n"
3379 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3380 " pattern = user@host\n"
3381 "\n"
3382 "Glob patterns are matched against path to repository root.\n"
3383 "\n"
3384 "If you like, you can put notify config file in repository that users\n"
3385 "can push changes to, they can manage their own subscriptions.\n"
3386 msgstr ""
3387
3388 #, python-format
3389 msgid "%s: %d new changesets"
3390 msgstr ""
3391
3392 #, python-format
3393 msgid "notify: sending %d subscribers %d changes\n"
3394 msgstr ""
3395
3396 #, python-format
3397 msgid ""
3398 "\n"
3399 "diffs (truncated from %d to %d lines):\n"
3400 "\n"
3401 msgstr ""
3402
3403 #, python-format
3404 msgid ""
3405 "\n"
3406 "diffs (%d lines):\n"
3407 "\n"
3408 msgstr ""
3409
3410 #, python-format
3411 msgid "notify: no subscribers to repository %s\n"
3412 msgstr ""
3413
3414 #, python-format
3415 msgid "notify: changes have source \"%s\" - skipping\n"
3416 msgstr ""
3417
3418 msgid ""
3419 "browse command output with an external pager\n"
3420 "\n"
3421 "To set the pager that should be used, set the application variable::\n"
3422 "\n"
3423 " [pager]\n"
3424 " pager = LESS='FSRX' less\n"
3425 "\n"
3426 "If no pager is set, the pager extensions uses the environment variable\n"
3427 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3428 "\n"
3429 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3430 "setting::\n"
3431 "\n"
3432 " [pager]\n"
3433 " quiet = True\n"
3434 "\n"
3435 "You can disable the pager for certain commands by adding them to the\n"
3436 "pager.ignore list::\n"
3437 "\n"
3438 " [pager]\n"
3439 " ignore = version, help, update\n"
3440 "\n"
3441 "You can also enable the pager only for certain commands using\n"
3442 "pager.attend::\n"
3443 "\n"
3444 " [pager]\n"
3445 " attend = log\n"
3446 "\n"
3447 "If pager.attend is present, pager.ignore will be ignored.\n"
3448 "\n"
3449 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3450 "specify them in the global .hgrc\n"
3451 msgstr ""
3452
3453 msgid ""
3454 "interpret suffixes to refer to ancestor revisions\n"
3455 "\n"
3456 "This extension allows you to use git-style suffixes to refer to the\n"
3457 "ancestors of a specific revision.\n"
3458 "\n"
3459 "For example, if you can refer to a revision as \"foo\", then::\n"
3460 "\n"
3461 " foo^N = Nth parent of foo\n"
3462 " foo^0 = foo\n"
3463 " foo^1 = first parent of foo\n"
3464 " foo^2 = second parent of foo\n"
3465 " foo^ = foo^1\n"
3466 "\n"
3467 " foo~N = Nth first grandparent of foo\n"
3468 " foo~0 = foo\n"
3469 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3470 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3471 msgstr ""
3472
3473 msgid ""
3474 "command to send changesets as (a series of) patch emails\n"
3475 "\n"
3476 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3477 "describes the series as a whole.\n"
3478 "\n"
3479 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3480 "first line of the changeset description as the subject text. The\n"
3481 "message contains two or three body parts:\n"
3482 "\n"
3483 "- The changeset description.\n"
3484 "- [Optional] The result of running diffstat on the patch.\n"
3485 "- The patch itself, as generated by \"hg export\".\n"
3486 "\n"
3487 "Each message refers to the first in the series using the In-Reply-To\n"
3488 "and References headers, so they will show up as a sequence in threaded\n"
3489 "mail and news readers, and in mail archives.\n"
3490 "\n"
3491 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3492 "with a diffstat summary and the changeset summary, so you can be sure\n"
3493 "you are sending the right changes.\n"
3494 "\n"
3495 "To configure other defaults, add a section like this to your hgrc\n"
3496 "file::\n"
3497 "\n"
3498 " [email]\n"
3499 " from = My Name <my@email>\n"
3500 " to = recipient1, recipient2, ...\n"
3501 " cc = cc1, cc2, ...\n"
3502 " bcc = bcc1, bcc2, ...\n"
3503 "\n"
3504 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3505 "as a patchbomb.\n"
3506 "\n"
3507 "To avoid sending patches prematurely, it is a good idea to first run\n"
3508 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3509 "prompted for an email recipient address, a subject and an introductory\n"
3510 "message describing the patches of your patchbomb. Then when all is\n"
3511 "done, patchbomb messages are displayed. If the PAGER environment\n"
3512 "variable is set, your pager will be fired up once for each patchbomb\n"
3513 "message, so you can verify everything is alright.\n"
3514 "\n"
3515 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3516 "patchbomb message in a pager or sending the messages directly, it will\n"
3517 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3518 "can be previewed with any mail user agent which supports UNIX mbox\n"
3519 "files, e.g. with mutt::\n"
3520 "\n"
3521 " % mutt -R -f mbox\n"
3522 "\n"
3523 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3524 "(a utility that is commonly installed as part of the procmail\n"
3525 "package), to send each message out::\n"
3526 "\n"
3527 " % formail -s sendmail -bm -t < mbox\n"
3528 "\n"
3529 "That should be all. Now your patchbomb is on its way out.\n"
3530 "\n"
3531 "You can also either configure the method option in the email section\n"
3532 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3533 "that the patchbomb extension can automatically send patchbombs\n"
3534 "directly from the commandline. See the [email] and [smtp] sections in\n"
3535 "hgrc(5) for details.\n"
3536 msgstr ""
3537
3538 msgid "Please enter a valid value.\n"
3539 msgstr ""
3540
3541 msgid "does the diffstat above look okay? "
3542 msgstr ""
3543
3544 msgid "diffstat rejected"
3545 msgstr ""
3546
3547 msgid ""
3548 "send changesets by email\n"
3549 "\n"
3550 " By default, diffs are sent in the format generated by hg export,\n"
3551 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3552 " introduction, which describes the series as a whole.\n"
3553 "\n"
3554 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3555 " the first line of the changeset description as the subject text.\n"
3556 " The message contains two or three parts. First, the changeset\n"
3557 " description. Next, (optionally) if the diffstat program is\n"
3558 " installed and -d/--diffstat is used, the result of running\n"
3559 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3560 " \"hg export\".\n"
3561 "\n"
3562 " By default the patch is included as text in the email body for\n"
3563 " easy reviewing. Using the -a/--attach option will instead create\n"
3564 " an attachment for the patch. With -i/--inline an inline attachment\n"
3565 " will be created.\n"
3566 "\n"
3567 " With -o/--outgoing, emails will be generated for patches not found\n"
3568 " in the destination repository (or only those which are ancestors\n"
3569 " of the specified revisions if any are provided)\n"
3570 "\n"
3571 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3572 " single email containing a binary Mercurial bundle as an attachment\n"
3573 " will be sent.\n"
3574 "\n"
3575 " Examples::\n"
3576 "\n"
3577 " hg email -r 3000 # send patch 3000 only\n"
3578 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3579 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3580 " hg email 3000 # send patch 3000 (deprecated)\n"
3581 "\n"
3582 " hg email -o # send all patches not in default\n"
3583 " hg email -o DEST # send all patches not in DEST\n"
3584 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3585 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3586 "\n"
3587 " hg email -b # send bundle of all patches not in default\n"
3588 " hg email -b DEST # send bundle of all patches not in DEST\n"
3589 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3590 "default\n"
3591 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in "
3592 "DEST\n"
3593 "\n"
3594 " Before using this command, you will need to enable email in your\n"
3595 " hgrc. See the [email] section in hgrc(5) for details.\n"
3596 " "
3597 msgstr ""
3598
3599 msgid "specify at least one changeset with -r or -o"
3600 msgstr ""
3601
3602 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3603 msgstr ""
3604
3605 msgid "too many destinations"
3606 msgstr ""
3607
3608 msgid "use only one form to specify the revision"
3609 msgstr ""
3610
3611 msgid ""
3612 "\n"
3613 "Write the introductory message for the patch series.\n"
3614 "\n"
3615 msgstr ""
3616
3617 #, python-format
3618 msgid ""
3619 "This patch series consists of %d patches.\n"
3620 "\n"
3621 msgstr ""
3622
3623 msgid "Final summary:\n"
3624 msgstr ""
3625
3626 msgid "Displaying "
3627 msgstr ""
3628
3629 msgid "Writing "
3630 msgstr ""
3631
3632 msgid "Sending "
3633 msgstr ""
3634
3635 msgid "send patches as attachments"
3636 msgstr ""
3637
3638 msgid "send patches as inline attachments"
3639 msgstr ""
3640
3641 msgid "email addresses of blind carbon copy recipients"
3642 msgstr ""
3643
3644 msgid "email addresses of copy recipients"
3645 msgstr ""
3646
3647 msgid "add diffstat output to messages"
3648 msgstr ""
3649
3650 msgid "use the given date as the sending date"
3651 msgstr ""
3652
3653 msgid "use the given file as the series description"
3654 msgstr ""
3655
3656 msgid "email address of sender"
3657 msgstr ""
3658
3659 msgid "print messages that would be sent"
3660 msgstr ""
3661
3662 msgid "write messages to mbox file instead of sending them"
3663 msgstr ""
3664
3665 msgid "subject of first message (intro or single patch)"
3666 msgstr ""
3667
3668 msgid "message identifier to reply to"
3669 msgstr ""
3670
3671 msgid "flags to add in subject prefixes"
3672 msgstr ""
3673
3674 msgid "email addresses of recipients"
3675 msgstr ""
3676
3677 msgid "omit hg patch header"
3678 msgstr ""
3679
3680 msgid "send changes not found in the target repository"
3681 msgstr ""
3682
3683 msgid "send changes not in target as a binary bundle"
3684 msgstr ""
3685
3686 msgid "name of the bundle attachment file"
3687 msgstr ""
3688
3689 msgid "a revision to send"
3690 msgstr ""
3691
3692 #, fuzzy
3693 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3694 msgstr "纵然远程版本库是无关的也要执行"
3695
3696 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3697 msgstr ""
3698
3699 msgid "send an introduction email for a single patch"
3700 msgstr ""
3701
3702 msgid "hg email [OPTION]... [DEST]..."
3703 msgstr ""
3704
3705 msgid "command to delete untracked files from the working directory"
3706 msgstr ""
3707
3708 msgid ""
3709 "removes files not tracked by Mercurial\n"
3710 "\n"
3711 " Delete files not known to Mercurial. This is useful to test local\n"
3712 " and uncommitted changes in an otherwise-clean source tree.\n"
3713 "\n"
3714 " This means that purge will delete:\n"
3715 "\n"
3716 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3717 " - Empty directories: in fact Mercurial ignores directories unless\n"
3718 " they contain files under source control management\n"
3719 "\n"
3720 " But it will leave untouched:\n"
3721 "\n"
3722 " - Modified and unmodified tracked files\n"
3723 " - Ignored files (unless --all is specified)\n"
3724 " - New files added to the repository (with \"hg add\")\n"
3725 "\n"
3726 " If directories are given on the command line, only files in these\n"
3727 " directories are considered.\n"
3728 "\n"
3729 " Be careful with purge, as you could irreversibly delete some files\n"
3730 " you forgot to add to the repository. If you only want to print the\n"
3731 " list of files that this program would delete, use the --print\n"
3732 " option.\n"
3733 " "
3734 msgstr ""
3735
3736 #, python-format
3737 msgid "%s cannot be removed"
3738 msgstr ""
3739
3740 #, python-format
3741 msgid "warning: %s\n"
3742 msgstr ""
3743
3744 #, python-format
3745 msgid "Removing file %s\n"
3746 msgstr "正在删除文件 %s\n"
3747
3748 #, python-format
3749 msgid "Removing directory %s\n"
3750 msgstr "正在删除目录 %s\n"
3751
3752 msgid "abort if an error occurs"
3753 msgstr ""
3754
3755 msgid "purge ignored files too"
3756 msgstr ""
3757
3758 msgid "print filenames instead of deleting them"
3759 msgstr ""
3760
3761 #, fuzzy
3762 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3763 msgstr "在文件名称结尾增加 NUL,用于 xargs"
3764
3765 msgid "hg purge [OPTION]... [DIR]..."
3766 msgstr ""
3767
3768 msgid ""
3769 "command to move sets of revisions to a different ancestor\n"
3770 "\n"
3771 "This extension lets you rebase changesets in an existing Mercurial\n"
3772 "repository.\n"
3773 "\n"
3774 "For more information:\n"
3775 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
3776 msgstr ""
3777
3778 msgid "first revision, do not change ancestor\n"
3779 msgstr ""
3780
3781 msgid ""
3782 "move changeset (and descendants) to a different branch\n"
3783 "\n"
3784 " Rebase uses repeated merging to graft changesets from one part of\n"
3785 " history onto another. This can be useful for linearizing local\n"
3786 " changes relative to a master development tree.\n"
3787 "\n"
3788 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3789 " continued with --continue/-c or aborted with --abort/-a.\n"
3790 " "
3791 msgstr ""
3792
3793 msgid "cannot use both abort and continue"
3794 msgstr ""
3795
3796 msgid "cannot use collapse with continue or abort"
3797 msgstr ""
3798
3799 msgid "abort and continue do not allow specifying revisions"
3800 msgstr ""
3801
3802 msgid "cannot specify both a revision and a base"
3803 msgstr ""
3804
3805 msgid "nothing to rebase\n"
3806 msgstr ""
3807
3808 msgid "cannot use both keepbranches and extrafn"
3809 msgstr ""
3810
3811 msgid "rebase merging completed\n"
3812 msgstr ""
3813
3814 msgid "warning: new changesets detected on source branch, not stripping\n"
3815 msgstr ""
3816
3817 msgid "rebase completed\n"
3818 msgstr ""
3819
3820 #, python-format
3821 msgid "%d revisions have been skipped\n"
3822 msgstr ""
3823
3824 msgid " set parents\n"
3825 msgstr ""
3826
3827 #, python-format
3828 msgid "rebasing %d:%s\n"
3829 msgstr ""
3830
3831 #, python-format
3832 msgid " future parents are %d and %d\n"
3833 msgstr ""
3834
3835 #, python-format
3836 msgid " update to %d:%s\n"
3837 msgstr ""
3838
3839 msgid " already in target\n"
3840 msgstr ""
3841
3842 #, python-format
3843 msgid " merge against %d:%s\n"
3844 msgstr ""
3845
3846 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3847 msgstr ""
3848
3849 msgid "resuming interrupted rebase\n"
3850 msgstr ""
3851
3852 #, python-format
3853 msgid "no changes, revision %d skipped\n"
3854 msgstr ""
3855
3856 #, python-format
3857 msgid "next revision set to %s\n"
3858 msgstr ""
3859
3860 #, python-format
3861 msgid "cannot use revision %d as base, result would have 3 parents"
3862 msgstr ""
3863
3864 #, python-format
3865 msgid "revision %d is an mq patch (%s), finalize it.\n"
3866 msgstr ""
3867
3868 #, python-format
3869 msgid "import mq patch %d (%s)\n"
3870 msgstr ""
3871
3872 msgid "rebase status stored\n"
3873 msgstr ""
3874
3875 msgid "rebase status resumed\n"
3876 msgstr ""
3877
3878 msgid "no rebase in progress"
3879 msgstr ""
3880
3881 msgid "warning: new changesets detected on target branch, not stripping\n"
3882 msgstr ""
3883
3884 msgid "rebase aborted\n"
3885 msgstr ""
3886
3887 msgid "cannot rebase onto an applied mq patch"
3888 msgstr ""
3889
3890 msgid "cannot rebase an ancestor"
3891 msgstr ""
3892
3893 msgid "cannot rebase a descendant"
3894 msgstr ""
3895
3896 msgid "already working on current\n"
3897 msgstr ""
3898
3899 msgid "already working on the current branch\n"
3900 msgstr ""
3901
3902 #, python-format
3903 msgid "rebase onto %d starting from %d\n"
3904 msgstr ""
3905
3906 msgid "unable to collapse, there is more than one external parent"
3907 msgstr ""
3908
3909 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3910 msgstr ""
3911
3912 msgid "rebase working directory to branch head"
3913 msgstr ""
3914
3915 msgid "rebase from a given revision"
3916 msgstr ""
3917
3918 msgid "rebase from the base of a given revision"
3919 msgstr ""
3920
3921 msgid "rebase onto a given revision"
3922 msgstr ""
3923
3924 msgid "collapse the rebased revisions"
3925 msgstr ""
3926
3927 msgid "keep original revisions"
3928 msgstr ""
3929
3930 msgid "keep original branches"
3931 msgstr ""
3932
3933 msgid "continue an interrupted rebase"
3934 msgstr ""
3935
3936 msgid "abort an interrupted rebase"
3937 msgstr ""
3938
3939 msgid ""
3940 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | "
3941 "[-c] | [-a]"
3942 msgstr ""
3943
3944 msgid "commands to interactively select changes for commit/qrefresh"
3945 msgstr ""
3946
3947 msgid "this modifies a binary file (all or nothing)\n"
3948 msgstr ""
3949
3950 msgid "this is a binary file\n"
3951 msgstr ""
3952
3953 #, python-format
3954 msgid "%d hunks, %d lines changed\n"
3955 msgstr ""
3956
3957 msgid "[Ynsfdaq?]"
3958 msgstr ""
3959
3960 msgid "&Yes, record this change"
3961 msgstr ""
3962
3963 msgid "&No, skip this change"
3964 msgstr ""
3965
3966 msgid "&Skip remaining changes to this file"
3967 msgstr ""
3968
3969 msgid "Record remaining changes to this &file"
3970 msgstr ""
3971
3972 msgid "&Done, skip remaining changes and files"
3973 msgstr ""
3974
3975 #, fuzzy
3976 msgid "Record &all changes to all remaining files"
3977 msgstr "将丢失的文件视为删除"
3978
3979 #, fuzzy
3980 msgid "&Quit, recording no changes"
3981 msgstr "正在搜索修改\n"
3982
3983 msgid "&?"
3984 msgstr ""
3985
3986 msgid "y - record this change"
3987 msgstr ""
3988
3989 msgid "user quit"
3990 msgstr "用户退出"
3991
3992 #, python-format
3993 msgid "examine changes to %s?"
3994 msgstr ""
3995
3996 msgid " and "
3997 msgstr ""
3998
3999 msgid "y"
4000 msgstr ""
4001
4002 #, python-format
4003 msgid "record this change to %r?"
4004 msgstr ""
4005
4006 #, fuzzy, python-format
4007 msgid "record change %d/%d to %r?"
4008 msgstr "不需要改变 %s\n"
4009
4010 msgid ""
4011 "interactively select changes to commit\n"
4012 "\n"
4013 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4014 " will be candidates for recording.\n"
4015 "\n"
4016 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4017 "\n"
4018 " You will be prompted for whether to record changes to each\n"
4019 " modified file, and for files with multiple changes, for each\n"
4020 " change to use. For each query, the following responses are\n"
4021 " possible::\n"
4022 "\n"
4023 " y - record this change\n"
4024 " n - skip this change\n"
4025 "\n"
4026 " s - skip remaining changes to this file\n"
4027 " f - record remaining changes to this file\n"
4028 "\n"
4029 " d - done, skip remaining changes and files\n"
4030 " a - record all changes to all remaining files\n"
4031 " q - quit, recording no changes\n"
4032 "\n"
4033 " ? - display help"
4034 msgstr ""
4035
4036 msgid "'mq' extension not loaded"
4037 msgstr ""
4038
4039 msgid "running non-interactively, use commit instead"
4040 msgstr ""
4041
4042 msgid "no changes to record\n"
4043 msgstr ""
4044
4045 #, python-format
4046 msgid "backup %r as %r\n"
4047 msgstr ""
4048
4049 msgid "applying patch\n"
4050 msgstr ""
4051
4052 msgid "patch failed to apply"
4053 msgstr ""
4054
4055 #, python-format
4056 msgid "restoring %r to %r\n"
4057 msgstr ""
4058
4059 msgid "hg record [OPTION]... [FILE]..."
4060 msgstr ""
4061
4062 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4063 msgstr ""
4064
4065 msgid "share a common history between several working directories"
4066 msgstr ""
4067
4068 msgid ""
4069 "create a new shared repository (experimental)\n"
4070 "\n"
4071 " Initialize a new repository and working directory that shares its\n"
4072 " history with another repository.\n"
4073 "\n"
4074 " NOTE: actions that change history such as rollback or moving the\n"
4075 " source may confuse sharers.\n"
4076 " "
4077 msgstr ""
4078
4079 msgid "do not create a working copy"
4080 msgstr ""
4081
4082 msgid "[-U] SOURCE [DEST]"
4083 msgstr ""
4084
4085 msgid ""
4086 "command to transplant changesets from another branch\n"
4087 "\n"
4088 "This extension allows you to transplant patches from another branch.\n"
4089 "\n"
4090 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4091 "map from a changeset hash to its hash in the source repository.\n"
4092 msgstr ""
4093
4094 #, python-format
4095 msgid "skipping already applied revision %s\n"
4096 msgstr ""
4097
4098 #, python-format
4099 msgid "skipping merge changeset %s:%s\n"
4100 msgstr ""
4101
4102 #, python-format
4103 msgid "%s merged at %s\n"
4104 msgstr ""
4105
4106 #, python-format
4107 msgid "%s transplanted to %s\n"
4108 msgstr ""
4109
4110 #, python-format
4111 msgid "filtering %s\n"
4112 msgstr ""
4113
4114 msgid "filter failed"
4115 msgstr ""
4116
4117 msgid "can only omit patchfile if merging"
4118 msgstr ""
4119
4120 #, python-format
4121 msgid "%s: empty changeset"
4122 msgstr ""
4123
4124 msgid "Fix up the merge and run hg transplant --continue"
4125 msgstr ""
4126
4127 #, python-format
4128 msgid "%s transplanted as %s\n"
4129 msgstr ""
4130
4131 msgid "transplant log file is corrupt"
4132 msgstr ""
4133
4134 #, python-format
4135 msgid "working dir not at transplant parent %s"
4136 msgstr ""
4137
4138 msgid "commit failed"
4139 msgstr ""
4140
4141 msgid "apply changeset? [ynmpcq?]:"
4142 msgstr ""
4143
4144 msgid ""
4145 "transplant changesets from another branch\n"
4146 "\n"
4147 " Selected changesets will be applied on top of the current working\n"
4148 " directory with the log of the original changeset. If --log is\n"
4149 " specified, log messages will have a comment appended of the form::\n"
4150 "\n"
4151 " (transplanted from CHANGESETHASH)\n"
4152 "\n"
4153 " You can rewrite the changelog message with the --filter option.\n"
4154 " Its argument will be invoked with the current changelog message as\n"
4155 " $1 and the patch as $2.\n"
4156 "\n"
4157 " If --source/-s is specified, selects changesets from the named\n"
4158 " repository. If --branch/-b is specified, selects changesets from\n"
4159 " the branch holding the named revision, up to that revision. If\n"
4160 " --all/-a is specified, all changesets on the branch will be\n"
4161 " transplanted, otherwise you will be prompted to select the\n"
4162 " changesets you want.\n"
4163 "\n"
4164 " hg transplant --branch REVISION --all will rebase the selected\n"
4165 " branch (up to the named revision) onto your current working\n"
4166 " directory.\n"
4167 "\n"
4168 " You can optionally mark selected transplanted changesets as merge\n"
4169 " changesets. You will not be prompted to transplant any ancestors\n"
4170 " of a merged transplant, and you can merge descendants of them\n"
4171 " normally instead of transplanting them.\n"
4172 "\n"
4173 " If no merges or revisions are provided, hg transplant will start\n"
4174 " an interactive changeset browser.\n"
4175 "\n"
4176 " If a changeset application fails, you can fix the merge by hand\n"
4177 " and then resume where you left off by calling hg transplant\n"
4178 " --continue/-c.\n"
4179 " "
4180 msgstr ""
4181
4182 msgid "--continue is incompatible with branch, all or merge"
4183 msgstr ""
4184
4185 msgid "no source URL, branch tag or revision list provided"
4186 msgstr ""
4187
4188 msgid "--all requires a branch revision"
4189 msgstr ""
4190
4191 msgid "--all is incompatible with a revision list"
4192 msgstr ""
4193
4194 msgid "no revision checked out"
4195 msgstr ""
4196
4197 msgid "outstanding uncommitted merges"
4198 msgstr ""
4199
4200 msgid "outstanding local changes"
4201 msgstr ""
4202
4203 msgid "pull patches from REPOSITORY"
4204 msgstr ""
4205
4206 msgid "pull patches from branch BRANCH"
4207 msgstr ""
4208
4209 msgid "pull all changesets up to BRANCH"
4210 msgstr ""
4211
4212 msgid "skip over REV"
4213 msgstr ""
4214
4215 msgid "merge at REV"
4216 msgstr ""
4217
4218 msgid "append transplant info to log message"
4219 msgstr ""
4220
4221 msgid "continue last transplant session after repair"
4222 msgstr ""
4223
4224 msgid "filter changesets through FILTER"
4225 msgstr ""
4226
4227 msgid ""
4228 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4229 msgstr ""
4230
4231 msgid ""
4232 "allow the use of MBCS paths with problematic encodings\n"
4233 "\n"
4234 "Some MBCS encodings are not good for some path operations (i.e.\n"
4235 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4236 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4237 "This extension can be used to fix the issue with those encodings by\n"
4238 "wrapping some functions to convert to Unicode string before path\n"
4239 "operation.\n"
4240 "\n"
4241 "This extension is useful for:\n"
4242 "\n"
4243 "- Japanese Windows users using shift_jis encoding.\n"
4244 "- Chinese Windows users using big5 encoding.\n"
4245 "- All users who use a repository with one of problematic encodings on\n"
4246 " case-insensitive file system.\n"
4247 "\n"
4248 "This extension is not needed for:\n"
4249 "\n"
4250 "- Any user who use only ASCII chars in path.\n"
4251 "- Any user who do not use any of problematic encodings.\n"
4252 "\n"
4253 "Note that there are some limitations on using this extension:\n"
4254 "\n"
4255 "- You should use single encoding in one repository.\n"
4256 "- You should set same encoding for the repository by locale or\n"
4257 " HGENCODING.\n"
4258 "\n"
4259 "Path encoding conversion are done between Unicode and\n"
4260 "encoding.encoding which is decided by Mercurial from current locale\n"
4261 "setting or HGENCODING.\n"
4262 msgstr ""
4263
4264 #, python-format
4265 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4266 msgstr ""
4267
4268 msgid "[win32mbcs] cannot activate on this platform.\n"
4269 msgstr ""
4270
4271 #, python-format
4272 msgid "[win32mbcs] activated with encoding: %s\n"
4273 msgstr ""
4274
4275 msgid ""
4276 "perform automatic newline conversion\n"
4277 "\n"
4278 "To perform automatic newline conversion, use::\n"
4279 "\n"
4280 " [extensions]\n"
4281 " hgext.win32text =\n"
4282 " [encode]\n"
4283 " ** = cleverencode:\n"
4284 " # or ** = macencode:\n"
4285 "\n"
4286 " [decode]\n"
4287 " ** = cleverdecode:\n"
4288 " # or ** = macdecode:\n"
4289 "\n"
4290 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4291 "accident::\n"
4292 "\n"
4293 " [hooks]\n"
4294 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4295 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4296 "\n"
4297 "To do the same check on a server to prevent CRLF/CR from being\n"
4298 "pushed or pulled::\n"
4299 "\n"
4300 " [hooks]\n"
4301 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4302 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4303 msgstr ""
4304
4305 #, python-format
4306 msgid ""
4307 "WARNING: %s already has %s line endings\n"
4308 "and does not need EOL conversion by the win32text plugin.\n"
4309 "Before your next commit, please reconsider your encode/decode settings in \n"
4310 "Mercurial.ini or %s.\n"
4311 msgstr ""
4312
4313 #, python-format
4314 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4315 msgstr ""
4316
4317 #, python-format
4318 msgid "in %s: %s\n"
4319 msgstr ""
4320
4321 #, python-format
4322 msgid ""
4323 "\n"
4324 "To prevent this mistake in your local repository,\n"
4325 "add to Mercurial.ini or .hg/hgrc:\n"
4326 "\n"
4327 "[hooks]\n"
4328 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4329 "\n"
4330 "and also consider adding:\n"
4331 "\n"
4332 "[extensions]\n"
4333 "hgext.win32text =\n"
4334 "[encode]\n"
4335 "** = %sencode:\n"
4336 "[decode]\n"
4337 "** = %sdecode:\n"
4338 msgstr ""
4339
4340 msgid ""
4341 "discover and advertise repositories on the local network\n"
4342 "\n"
4343 "Zeroconf enabled repositories will be announced in a network without\n"
4344 "the need to configure a server or a service. They can be discovered\n"
4345 "without knowing their actual IP address.\n"
4346 "\n"
4347 "To allow other people to discover your repository using run \"hg serve\"\n"
4348 "in your repository::\n"
4349 "\n"
4350 " $ cd test\n"
4351 " $ hg serve\n"
4352 "\n"
4353 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4354 "\n"
4355 " $ hg paths\n"
4356 " zc-test = http://example.com:8000/test\n"
4357 msgstr ""
4358
4359 msgid "archive prefix contains illegal components"
4360 msgstr ""
4361
4362 msgid "cannot give prefix when archiving to files"
4363 msgstr ""
4364
4365 #, python-format
4366 msgid "unknown archive type '%s'"
4367 msgstr ""
4368
4369 msgid "invalid changegroup"
4370 msgstr ""
4371
4372 msgid "unknown parent"
4373 msgstr ""
4374
4375 #, python-format
4376 msgid "integrity check failed on %s:%d"
4377 msgstr ""
4378
4379 #, python-format
4380 msgid "%s: not a Mercurial bundle file"
4381 msgstr ""
4382
4383 #, python-format
4384 msgid "%s: unknown bundle version"
4385 msgstr ""
4386
4387 #, python-format
4388 msgid "%s: unknown bundle compression type"
4389 msgstr ""
4390
4391 msgid "cannot create new bundle repository"
4392 msgstr ""
4393
4394 #, python-format
4395 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4396 msgstr ""
4397
4398 msgid "empty username"
4399 msgstr ""
4400
4401 #, python-format
4402 msgid "username %s contains a newline"
4403 msgstr ""
4404
4405 msgid "options --message and --logfile are mutually exclusive"
4406 msgstr ""
4407
4408 #, python-format
4409 msgid "can't read commit message '%s': %s"
4410 msgstr ""
4411
4412 msgid "limit must be a positive integer"
4413 msgstr ""
4414
4415 msgid "limit must be positive"
4416 msgstr ""
4417
4418 msgid "too many revisions specified"
4419 msgstr ""
4420
4421 #, python-format
4422 msgid "invalid format spec '%%%s' in output filename"
4423 msgstr ""
4424
4425 #, python-format
4426 msgid "adding %s\n"
4427 msgstr ""
4428
4429 #, python-format
4430 msgid "removing %s\n"
4431 msgstr "正在删除 %s\n"
4432
4433 #, python-format
4434 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4435 msgstr ""
4436
4437 #, python-format
4438 msgid "%s: not copying - file is not managed\n"
4439 msgstr ""
4440
4441 #, python-format
4442 msgid "%s: not copying - file has been marked for remove\n"
4443 msgstr ""
4444
4445 #, python-format
4446 msgid "%s: not overwriting - %s collides with %s\n"
4447 msgstr ""
4448
4449 #, python-format
4450 msgid "%s: not overwriting - file exists\n"
4451 msgstr ""
4452
4453 #, python-format
4454 msgid "%s: deleted in working copy\n"
4455 msgstr ""
4456
4457 #, python-format
4458 msgid "%s: cannot copy - %s\n"
4459 msgstr ""
4460
4461 #, python-format
4462 msgid "moving %s to %s\n"
4463 msgstr ""
4464
4465 #, fuzzy, python-format
4466 msgid "copying %s to %s\n"
4467 msgstr "正在推到 %s\n"
4468
4469 #, python-format
4470 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4471 msgstr ""
4472
4473 msgid "no source or destination specified"
4474 msgstr ""
4475
4476 msgid "no destination specified"
4477 msgstr ""
4478
4479 msgid "with multiple sources, destination must be an existing directory"
4480 msgstr ""
4481
4482 #, python-format
4483 msgid "destination %s is not a directory"
4484 msgstr ""
4485
4486 msgid "no files to copy"
4487 msgstr ""
4488
4489 msgid "(consider using --after)\n"
4490 msgstr "(考虑使用 --after)\n"
4491
4492 #, python-format
4493 msgid "changeset: %d:%s\n"
4494 msgstr "修改集: %d:%s\n"
4495
4496 #, python-format
4497 msgid "branch: %s\n"
4498 msgstr "分支: %s\n"
4499
4500 #, python-format
4501 msgid "tag: %s\n"
4502 msgstr "标签: %s\n"
4503
4504 #, python-format
4505 msgid "parent: %d:%s\n"
4506 msgstr "父亲: %d:%s\n"
4507
4508 #, python-format
4509 msgid "manifest: %d:%s\n"
4510 msgstr "清单: %d:%s\n"
4511
4512 #, python-format
4513 msgid "user: %s\n"
4514 msgstr "用户: %s\n"
4515
4516 #, python-format
4517 msgid "date: %s\n"
4518 msgstr "日期: %s\n"
4519
4520 msgid "files+:"
4521 msgstr "文件+:"
4522
4523 msgid "files-:"
4524 msgstr "文件-:"
4525
4526 msgid "files:"
4527 msgstr "文件:"
4528
4529 #, python-format
4530 msgid "files: %s\n"
4531 msgstr "文件: %s\n"
4532
4533 #, python-format
4534 msgid "copies: %s\n"
4535 msgstr "复制: %s\n"
4536
4537 #, python-format
4538 msgid "extra: %s=%s\n"
4539 msgstr "额外: %s=%s\n"
4540
4541 msgid "description:\n"
4542 msgstr "描述:\n"
4543
4544 #, python-format
4545 msgid "summary: %s\n"
4546 msgstr "摘要: %s\n"
4547
4548 #, python-format
4549 msgid "%s: no key named '%s'"
4550 msgstr ""
4551
4552 #, python-format
4553 msgid "%s: %s"
4554 msgstr ""
4555
4556 #, python-format
4557 msgid "Found revision %s from %s\n"
4558 msgstr ""
4559
4560 msgid "revision matching date not found"
4561 msgstr ""
4562
4563 #, python-format
4564 msgid "cannot follow nonexistent file: \"%s\""
4565 msgstr ""
4566
4567 #, python-format
4568 msgid "%s:%s copy source revision cannot be found!\n"
4569 msgstr ""
4570
4571 msgid "can only follow copies/renames for explicit filenames"
4572 msgstr ""
4573
4574 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4575 msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。"
4576
4577 msgid "HG: Leave message empty to abort commit."
4578 msgstr ""
4579
4580 #, fuzzy, python-format
4581 msgid "HG: user: %s"
4582 msgstr "用户: %s\n"
4583
4584 msgid "HG: branch merge"
4585 msgstr ""
4586
4587 #, python-format
4588 msgid "HG: branch '%s'"
4589 msgstr ""
4590
4591 #, fuzzy, python-format
4592 msgid "HG: subrepo %s"
4593 msgstr "已删除"
4594
4595 #, python-format
4596 msgid "HG: added %s"
4597 msgstr ""
4598
4599 #, python-format
4600 msgid "HG: changed %s"
4601 msgstr ""
4602
4603 #, fuzzy, python-format
4604 msgid "HG: removed %s"
4605 msgstr "已删除"
4606
4607 #, fuzzy
4608 msgid "HG: no files changed"
4609 msgstr "正在增加文件改变\n"
4610
4611 msgid "empty commit message"
4612 msgstr "空的提交日志"
4613
4614 #, fuzzy
4615 msgid ""
4616 "add the specified files on the next commit\n"
4617 "\n"
4618 " Schedule files to be version controlled and added to the\n"
4619 " repository.\n"
4620 "\n"
4621 " The files will be added to the repository at the next commit. To\n"
4622 " undo an add before that, see hg forget.\n"
4623 "\n"
4624 " If no names are given, add all files to the repository.\n"
4625 " "
4626 msgstr ""
4627 "增加指定文件用于下次提交\n"
4628 "\n"
4629 " 调度文件受版本控制,增加到版本库。\n"
4630 "\n"
4631 " 这些文件将于下次提交时增加到版本库。需要在提交前撤销增加,\n"
4632 " 参见 'hg revert'。\n"
4633 "\n"
4634 " 如果没有给出文件名称,就增加所有文件到版本库。\n"
4635 " "
4636
4637 msgid ""
4638 "add all new files, delete all missing files\n"
4639 "\n"
4640 " Add all new files and remove all missing files from the\n"
4641 " repository.\n"
4642 "\n"
4643 " New files are ignored if they match any of the patterns in\n"
4644 " .hgignore. As with add, these changes take effect at the next\n"
4645 " commit.\n"
4646 "\n"
4647 " Use the -s/--similarity option to detect renamed files. With a\n"
4648 " parameter greater than 0, this compares every removed file with\n"
4649 " every added file and records those similar enough as renames. This\n"
4650 " option takes a percentage between 0 (disabled) and 100 (files must\n"
4651 " be identical) as its parameter. Detecting renamed files this way\n"
4652 " can be expensive.\n"
4653 " "
4654 msgstr ""
4655
4656 msgid "similarity must be a number"
4657 msgstr ""
4658
4659 msgid "similarity must be between 0 and 100"
4660 msgstr ""
4661
4662 #, fuzzy
4663 msgid ""
4664 "show changeset information by line for each file\n"
4665 "\n"
4666 " List changes in files, showing the revision id responsible for\n"
4667 " each line\n"
4668 "\n"
4669 " This command is useful for discovering when a change was made and\n"
4670 " by whom.\n"
4671 "\n"
4672 " Without the -a/--text option, annotate will avoid processing files\n"
4673 " it detects as binary. With -a, annotate will annotate the file\n"
4674 " anyway, although the results will probably be neither useful\n"
4675 " nor desirable.\n"
4676 " "
4677 msgstr ""
4678 "显示指定文件每行的修改集信息\n"
4679 "\n"
4680 " 列出文件中的修改,为每行显示版本标识\n"
4681 "\n"
4682 " 此命令用于查找谁做出的修改,或者什么时候发生的修改\n"
4683 "\n"
4684 " 当没有选项 '-a' 时,annotate 会避免处理检测为二进制的文件\n"
4685 " 当使用选项 '-a' 时,annotate 会直接产生追溯,可能会有不合需要的结果\n"
4686 " "
4687
4688 msgid "at least one filename or pattern is required"
4689 msgstr ""
4690
4691 msgid "at least one of -n/-c is required for -l"
4692 msgstr ""
4693
4694 #, python-format
4695 msgid "%s: binary file\n"
4696 msgstr ""
4697
4698 msgid ""
4699 "create an unversioned archive of a repository revision\n"
4700 "\n"
4701 " By default, the revision used is the parent of the working\n"
4702 " directory; use -r/--rev to specify a different revision.\n"
4703 "\n"
4704 " To specify the type of archive to create, use -t/--type. Valid\n"
4705 " types are::\n"
4706 "\n"
4707 " \"files\" (default): a directory full of files\n"
4708 " \"tar\": tar archive, uncompressed\n"
4709 " \"tbz2\": tar archive, compressed using bzip2\n"
4710 " \"tgz\": tar archive, compressed using gzip\n"
4711 " \"uzip\": zip archive, uncompressed\n"
4712 " \"zip\": zip archive, compressed using deflate\n"
4713 "\n"
4714 " The exact name of the destination archive or directory is given\n"
4715 " using a format string; see 'hg help export' for details.\n"
4716 "\n"
4717 " Each member added to an archive file has a directory prefix\n"
4718 " prepended. Use -p/--prefix to specify a format string for the\n"
4719 " prefix. The default is the basename of the archive, with suffixes\n"
4720 " removed.\n"
4721 " "
4722 msgstr ""
4723
4724 msgid "no working directory: please specify a revision"
4725 msgstr ""
4726
4727 msgid "repository root cannot be destination"
4728 msgstr ""
4729
4730 msgid "cannot archive plain files to stdout"
4731 msgstr ""
4732
4733 msgid ""
4734 "reverse effect of earlier changeset\n"
4735 "\n"
4736 " Commit the backed out changes as a new changeset. The new\n"
4737 " changeset is a child of the backed out changeset.\n"
4738 "\n"
4739 " If you backout a changeset other than the tip, a new head is\n"
4740 " created. This head will be the new tip and you should merge this\n"
4741 " backout changeset with another head.\n"
4742 "\n"
4743 " The --merge option remembers the parent of the working directory\n"
4744 " before starting the backout, then merges the new head with that\n"
4745 " changeset afterwards. This saves you from doing the merge by hand.\n"
4746 " The result of this merge is not committed, as with a normal merge.\n"
4747 "\n"
4748 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4749 " "
4750 msgstr ""
4751
4752 msgid "please specify just one revision"
4753 msgstr ""
4754
4755 msgid "please specify a revision to backout"
4756 msgstr ""
4757
4758 msgid "cannot backout change on a different branch"
4759 msgstr ""
4760
4761 msgid "cannot backout a change with no parents"
4762 msgstr ""
4763
4764 msgid "cannot backout a merge changeset without --parent"
4765 msgstr ""
4766
4767 #, python-format
4768 msgid "%s is not a parent of %s"
4769 msgstr ""
4770
4771 msgid "cannot use --parent on non-merge changeset"
4772 msgstr ""
4773
4774 #, python-format
4775 msgid "changeset %s backs out changeset %s\n"
4776 msgstr ""
4777
4778 #, python-format
4779 msgid "merging with changeset %s\n"
4780 msgstr ""
4781
4782 msgid "the backout changeset is a new head - do not forget to merge\n"
4783 msgstr ""
4784
4785 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4786 msgstr ""
4787
4788 msgid ""
4789 "subdivision search of changesets\n"
4790 "\n"
4791 " This command helps to find changesets which introduce problems. To\n"
4792 " use, mark the earliest changeset you know exhibits the problem as\n"
4793 " bad, then mark the latest changeset which is free from the problem\n"
4794 " as good. Bisect will update your working directory to a revision\n"
4795 " for testing (unless the -U/--noupdate option is specified). Once\n"
4796 " you have performed tests, mark the working directory as good or\n"
4797 " bad, and bisect will either update to another candidate changeset\n"
4798 " or announce that it has found the bad revision.\n"
4799 "\n"
4800 " As a shortcut, you can also use the revision argument to mark a\n"
4801 " revision as good or bad without checking it out first.\n"
4802 "\n"
4803 " If you supply a command, it will be used for automatic bisection.\n"
4804 " Its exit status will be used to mark revisions as good or bad:\n"
4805 " status 0 means good, 125 means to skip the revision, 127\n"
4806 " (command not found) will abort the bisection, and any other\n"
4807 " non-zero exit status means the revision is bad.\n"
4808 " "
4809 msgstr ""
4810
4811 msgid "The first good revision is:\n"
4812 msgstr ""
4813
4814 msgid "The first bad revision is:\n"
4815 msgstr ""
4816
4817 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4818 msgstr ""
4819
4820 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4821 msgstr ""
4822
4823 msgid "cannot bisect (no known good revisions)"
4824 msgstr ""
4825
4826 msgid "cannot bisect (no known bad revisions)"
4827 msgstr ""
4828
4829 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4830 msgstr ""
4831
4832 msgid "incompatible arguments"
4833 msgstr ""
4834
4835 #, python-format
4836 msgid "cannot find executable: %s"
4837 msgstr ""
4838
4839 #, python-format
4840 msgid "failed to execute %s"
4841 msgstr ""
4842
4843 #, python-format
4844 msgid "%s killed"
4845 msgstr ""
4846
4847 #, fuzzy, python-format
4848 msgid "Changeset %d:%s: %s\n"
4849 msgstr "修改集: %d:%s\n"
4850
4851 #, python-format
4852 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
4853 msgstr ""
4854
4855 msgid ""
4856 "set or show the current branch name\n"
4857 "\n"
4858 " With no argument, show the current branch name. With one argument,\n"
4859 " set the working directory branch name (the branch will not exist\n"
4860 " in the repository until the next commit). Standard practice\n"
4861 " recommends that primary development take place on the 'default'\n"
4862 " branch.\n"
4863 "\n"
4864 " Unless -f/--force is specified, branch will not let you set a\n"
4865 " branch name that already exists, even if it's inactive.\n"
4866 "\n"
4867 " Use -C/--clean to reset the working directory branch to that of\n"
4868 " the parent of the working directory, negating a previous branch\n"
4869 " change.\n"
4870 "\n"
4871 " Use the command 'hg update' to switch to an existing branch. Use\n"
4872 " 'hg commit --close-branch' to mark this branch as closed.\n"
4873 " "
4874 msgstr ""
4875
4876 #, python-format
4877 msgid "reset working directory to branch %s\n"
4878 msgstr ""
4879
4880 msgid "a branch of the same name already exists (use --force to override)"
4881 msgstr ""
4882
4883 #, python-format
4884 msgid "marked working directory as branch %s\n"
4885 msgstr ""
4886
4887 msgid ""
4888 "list repository named branches\n"
4889 "\n"
4890 " List the repository's named branches, indicating which ones are\n"
4891 " inactive. If -c/--closed is specified, also list branches which have\n"
4892 " been marked closed (see hg commit --close-branch).\n"
4893 "\n"
4894 " If -a/--active is specified, only show active branches. A branch\n"
4895 " is considered active if it contains repository heads.\n"
4896 "\n"
4897 " Use the command 'hg update' to switch to an existing branch.\n"
4898 " "
4899 msgstr ""
4900
4901 msgid ""
4902 "create a changegroup file\n"
4903 "\n"
4904 " Generate a compressed changegroup file collecting changesets not\n"
4905 " known to be in another repository.\n"
4906 "\n"
4907 " If no destination repository is specified the destination is\n"
4908 " assumed to have all the nodes specified by one or more --base\n"
4909 " parameters. To create a bundle containing all changesets, use\n"
4910 " -a/--all (or --base null).\n"
4911 "\n"
4912 " You can change compression method with the -t/--type option.\n"
4913 " The available compression methods are: none, bzip2, and\n"
4914 " gzip (by default, bundles are compressed using bzip2).\n"
4915 "\n"
4916 " The bundle file can then be transferred using conventional means\n"
4917 " and applied to another repository with the unbundle or pull\n"
4918 " command. This is useful when direct push and pull are not\n"
4919 " available or when exporting an entire repository is undesirable.\n"
4920 "\n"
4921 " Applying bundles preserves all changeset contents including\n"
4922 " permissions, copy/rename information, and revision history.\n"
4923 " "
4924 msgstr ""
4925
4926 msgid "--base is incompatible with specifying a destination"
4927 msgstr ""
4928
4929 msgid "unknown bundle type specified with --type"
4930 msgstr ""
4931
4932 msgid ""
4933 "output the current or given revision of files\n"
4934 "\n"
4935 " Print the specified files as they were at the given revision. If\n"
4936 " no revision is given, the parent of the working directory is used,\n"
4937 " or tip if no revision is checked out.\n"
4938 "\n"
4939 " Output may be to a file, in which case the name of the file is\n"
4940 " given using a format string. The formatting rules are the same as\n"
4941 " for the export command, with the following additions::\n"
4942 "\n"
4943 " %s basename of file being printed\n"
4944 " %d dirname of file being printed, or '.' if in repository root\n"
4945 " %p root-relative path name of file being printed\n"
4946 " "
4947 msgstr ""
4948
4949 msgid ""
4950 "make a copy of an existing repository\n"
4951 "\n"
4952 " Create a copy of an existing repository in a new directory.\n"
4953 "\n"
4954 " If no destination directory name is specified, it defaults to the\n"
4955 " basename of the source.\n"
4956 "\n"
4957 " The location of the source is added to the new repository's\n"
4958 " .hg/hgrc file, as the default to be used for future pulls.\n"
4959 "\n"
4960 " If you use the -r/--rev option to clone up to a specific revision,\n"
4961 " no subsequent revisions (including subsequent tags) will be\n"
4962 " present in the cloned repository. This option implies --pull, even\n"
4963 " on local repositories.\n"
4964 "\n"
4965 " By default, clone will check out the head of the 'default' branch.\n"
4966 " If the -U/--noupdate option is used, the new clone will contain\n"
4967 " only a repository (.hg) and no working copy (the working copy\n"
4968 " parent is the null revision).\n"
4969 "\n"
4970 " See 'hg help urls' for valid source format details.\n"
4971 "\n"
4972 " It is possible to specify an ssh:// URL as the destination, but no\n"
4973 " .hg/hgrc and working directory will be created on the remote side.\n"
4974 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
4975 "\n"
4976 " For efficiency, hardlinks are used for cloning whenever the source\n"
4977 " and destination are on the same filesystem (note this applies only\n"
4978 " to the repository data, not to the checked out files). Some\n"
4979 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
4980 " do not report errors. In these cases, use the --pull option to\n"
4981 " avoid hardlinking.\n"
4982 "\n"
4983 " In some cases, you can clone repositories and checked out files\n"
4984 " using full hardlinks with ::\n"
4985 "\n"
4986 " $ cp -al REPO REPOCLONE\n"
4987 "\n"
4988 " This is the fastest way to clone, but it is not always safe. The\n"
4989 " operation is not atomic (making sure REPO is not modified during\n"
4990 " the operation is up to you) and you have to make sure your editor\n"
4991 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
4992 " this is not compatible with certain extensions that place their\n"
4993 " metadata under the .hg directory, such as mq.\n"
4994 " "
4995 msgstr ""
4996
4997 #, fuzzy
4998 msgid ""
4999 "commit the specified files or all outstanding changes\n"
5000 "\n"
5001 " Commit changes to the given files into the repository. Unlike a\n"
5002 " centralized RCS, this operation is a local operation. See hg push\n"
5003 " for a way to actively distribute your changes.\n"
5004 "\n"
5005 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5006 " will be committed.\n"
5007 "\n"
5008 " If you are committing the result of a merge, do not provide any\n"
5009 " filenames or -I/-X filters.\n"
5010 "\n"
5011 " If no commit message is specified, the configured editor is\n"
5012 " started to prompt you for a message.\n"
5013 "\n"
5014 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5015 " "
5016 msgstr ""
5017 "提交指定文件的修改或全部修改\n"
5018 "\n"
5019 " 将指定文件的修改提交到版本库。\n"
5020 "\n"
5021 " 如果省略了文件列表,那么 \"hg status\" 报告的所有修改都被提交。\n"
5022 "\n"
5023 " 如果你要提交合并结果,请不要提供任何文件名称或过滤器 '-I/-X'。\n"
5024 "\n"
5025 " 如果没有指定提交日志,将会启动配置的编辑器,让你输入信息。\n"
5026 "\n"
5027 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
5028 " "
5029
5030 msgid "nothing changed\n"
5031 msgstr "没有改变\n"
5032
5033 msgid "created new head\n"
5034 msgstr "已经创建新顶点\n"
5035
5036 #, python-format
5037 msgid "committed changeset %d:%s\n"
5038 msgstr "提交修改集 %d:%s\n"
5039
5040 msgid ""
5041 "mark files as copied for the next commit\n"
5042 "\n"
5043 " Mark dest as having copies of source files. If dest is a\n"
5044 " directory, copies are put in that directory. If dest is a file,\n"
5045 " the source must be a single file.\n"
5046 "\n"
5047 " By default, this command copies the contents of files as they\n"
5048 " exist in the working directory. If invoked with -A/--after, the\n"
5049 " operation is recorded, but no copying is performed.\n"
5050 "\n"
5051 " This command takes effect with the next commit. To undo a copy\n"
5052 " before that, see hg revert.\n"
5053 " "
5054 msgstr ""
5055
5056 msgid "find the ancestor revision of two revisions in a given index"
5057 msgstr ""
5058
5059 msgid "There is no Mercurial repository here (.hg not found)"
5060 msgstr "此处没有水银版本库(没有找到 .hg)"
5061
5062 msgid "either two or three arguments required"
5063 msgstr "需要两个或三个参数"
5064
5065 msgid "returns the completion list associated with the given command"
5066 msgstr ""
5067
5068 msgid "rebuild the dirstate as it would look like for the given revision"
5069 msgstr ""
5070
5071 msgid "validate the correctness of the current dirstate"
5072 msgstr ""
5073
5074 #, python-format
5075 msgid "%s in state %s, but not in manifest1\n"
5076 msgstr ""
5077
5078 #, python-format
5079 msgid "%s in state %s, but also in manifest1\n"
5080 msgstr ""
5081
5082 #, python-format
5083 msgid "%s in state %s, but not in either manifest\n"
5084 msgstr ""
5085
5086 #, python-format
5087 msgid "%s in manifest1, but listed as state %s"
5088 msgstr ""
5089
5090 msgid ".hg/dirstate inconsistent with current parent's manifest"
5091 msgstr ""
5092
5093 msgid ""
5094 "show combined config settings from all hgrc files\n"
5095 "\n"
5096 " With no arguments, print names and values of all config items.\n"
5097 "\n"
5098 " With one argument of the form section.name, print just the value\n"
5099 " of that config item.\n"
5100 "\n"
5101 " With multiple arguments, print names and values of all config\n"
5102 " items with matching section names.\n"
5103 "\n"
5104 " With --debug, the source (filename and line number) is printed\n"
5105 " for each config item.\n"
5106 " "
5107 msgstr ""
5108
5109 msgid "only one config item permitted"
5110 msgstr ""
5111
5112 msgid ""
5113 "manually set the parents of the current working directory\n"
5114 "\n"
5115 " This is useful for writing repository conversion tools, but should\n"
5116 " be used with care.\n"
5117 " "
5118 msgstr ""
5119
5120 msgid "show the contents of the current dirstate"
5121 msgstr ""
5122
5123 #, python-format
5124 msgid "copy: %s -> %s\n"
5125 msgstr ""
5126
5127 msgid "dump the contents of a data file revision"
5128 msgstr ""
5129
5130 #, python-format
5131 msgid "invalid revision identifier %s"
5132 msgstr ""
5133
5134 msgid "parse and display a date"
5135 msgstr ""
5136
5137 msgid "dump the contents of an index file"
5138 msgstr ""
5139
5140 msgid "dump an index DAG as a graphviz dot file"
5141 msgstr ""
5142
5143 msgid "test Mercurial installation"
5144 msgstr ""
5145
5146 #, python-format
5147 msgid "Checking encoding (%s)...\n"
5148 msgstr ""
5149
5150 msgid " (check that your locale is properly set)\n"
5151 msgstr ""
5152
5153 msgid "Checking extensions...\n"
5154 msgstr ""
5155
5156 msgid " One or more extensions could not be found"
5157 msgstr ""
5158
5159 msgid " (check that you compiled the extensions)\n"
5160 msgstr ""
5161
5162 msgid "Checking templates...\n"
5163 msgstr ""
5164
5165 msgid " (templates seem to have been installed incorrectly)\n"
5166 msgstr ""
5167
5168 msgid "Checking patch...\n"
5169 msgstr ""
5170
5171 msgid " patch call failed:\n"
5172 msgstr ""
5173
5174 msgid " unexpected patch output!\n"
5175 msgstr ""
5176
5177 msgid " patch test failed!\n"
5178 msgstr ""
5179
5180 msgid ""
5181 " (Current patch tool may be incompatible with patch, or misconfigured. Please "
5182 "check your .hgrc file)\n"
5183 msgstr ""
5184
5185 msgid ""
5186 " Internal patcher failure, please report this error to http://mercurial."
5187 "selenic.com/bts/\n"
5188 msgstr ""
5189
5190 msgid "Checking commit editor...\n"
5191 msgstr ""
5192
5193 msgid " No commit editor set and can't find vi in PATH\n"
5194 msgstr ""
5195
5196 msgid " (specify a commit editor in your .hgrc file)\n"
5197 msgstr ""
5198
5199 #, python-format
5200 msgid " Can't find editor '%s' in PATH\n"
5201 msgstr ""
5202
5203 msgid "Checking username...\n"
5204 msgstr ""
5205
5206 msgid " (specify a username in your .hgrc file)\n"
5207 msgstr ""
5208
5209 msgid "No problems detected\n"
5210 msgstr ""
5211
5212 #, python-format
5213 msgid "%s problems detected, please check your install!\n"
5214 msgstr ""
5215
5216 msgid "dump rename information"
5217 msgstr ""
5218
5219 #, python-format
5220 msgid "%s renamed from %s:%s\n"
5221 msgstr ""
5222
5223 #, python-format
5224 msgid "%s not renamed\n"
5225 msgstr ""
5226
5227 msgid "show how files match on given patterns"
5228 msgstr ""
5229
5230 #, fuzzy
5231 msgid ""
5232 "diff repository (or selected files)\n"
5233 "\n"
5234 " Show differences between revisions for the specified files.\n"
5235 "\n"
5236 " Differences between files are shown using the unified diff format.\n"
5237 "\n"
5238 " NOTE: diff may generate unexpected results for merges, as it will\n"
5239 " default to comparing against the working directory's first parent\n"
5240 " changeset if no revisions are specified.\n"
5241 "\n"
5242 " When two revision arguments are given, then changes are shown\n"
5243 " between those revisions. If only one revision is specified then\n"
5244 " that revision is compared to the working directory, and, when no\n"
5245 " revisions are specified, the working directory files are compared\n"
5246 " to its parent.\n"
5247 "\n"
5248 " Without the -a/--text option, diff will avoid generating diffs of\n"
5249 " files it detects as binary. With -a, diff will generate a diff\n"
5250 " anyway, probably with undesirable results.\n"
5251 "\n"
5252 " Use the -g/--git option to generate diffs in the git extended diff\n"
5253 " format. For more information, read 'hg help diffs'.\n"
5254 " "
5255 msgstr ""
5256 "在版本库中比较(指定的文件)\n"
5257 "\n"
5258 " 显示指定文件在版本间的差异。\n"
5259 "\n"
5260 " 文件间的差异使用同一差异格式显示。\n"
5261 "\n"
5262 " 注意: 对合并的比较可能会产生不期望的结果,因为没有指定版本时,默认\n"
5263 " 与工作目录的直接父亲比较。\n"
5264 "\n"
5265 " 当给出两个版本参数时,会显示在这些版本间的修改。如果只给出一个版本,\n"
5266 " 那么它将与工作目录比较。当没有指定版本时,将比较工作目录中的文件与\n"
5267 " 它的直接父亲。\n"
5268 "\n"
5269 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5270 " 时,可能会有不合需要的结果。\n"
5271 "\n"
5272 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读 'hg help diffs' 以\n"
5273 " 了解更多信息。\n"
5274 " "
5275
5276 #, fuzzy
5277 msgid ""
5278 "dump the header and diffs for one or more changesets\n"
5279 "\n"
5280 " Print the changeset header and diffs for one or more revisions.\n"
5281 "\n"
5282 " The information shown in the changeset header is: author,\n"
5283 " changeset hash, parent(s) and commit comment.\n"
5284 "\n"
5285 " NOTE: export may generate unexpected diff output for merge\n"
5286 " changesets, as it will compare the merge changeset against its\n"
5287 " first parent only.\n"
5288 "\n"
5289 " Output may be to a file, in which case the name of the file is\n"
5290 " given using a format string. The formatting rules are as follows::\n"
5291 "\n"
5292 " %% literal \"%\" character\n"
5293 " %H changeset hash (40 bytes of hexadecimal)\n"
5294 " %N number of patches being generated\n"
5295 " %R changeset revision number\n"
5296 " %b basename of the exporting repository\n"
5297 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5298 " %n zero-padded sequence number, starting at 1\n"
5299 " %r zero-padded changeset revision number\n"
5300 "\n"
5301 " Without the -a/--text option, export will avoid generating diffs\n"
5302 " of files it detects as binary. With -a, export will generate a\n"
5303 " diff anyway, probably with undesirable results.\n"
5304 "\n"
5305 " Use the -g/--git option to generate diffs in the git extended diff\n"
5306 " format. See 'hg help diffs' for more information.\n"
5307 "\n"
5308 " With the --switch-parent option, the diff will be against the\n"
5309 " second parent. It can be useful to review a merge.\n"
5310 " "
5311 msgstr ""
5312 "为一个或多个修改集输出标题和差异\n"
5313 "\n"
5314 " 为一个或多个版本输出标题和差异。\n"
5315 "\n"
5316 " 在修改集标题中显示的信息是: 作者,修改集哈希,父亲和提交日志。\n"
5317 "\n"
5318 " 注意: 对于合并修改集,导出可能产生不期望的差异输出,因为它只会将合并\n"
5319 " 修改集与其第一个父亲比较。\n"
5320 "\n"
5321 " 可以输出到文件,这时会使用指定的格式化字符串构造文件名称。格式化规则\n"
5322 " 如下:\n"
5323 "\n"
5324 " %% 字符 \"%\"\n"
5325 " %H 修改集哈希 (40 位十六进制数字)\n"
5326 " %N 产生的补丁号\n"
5327 " %R 修改集版本号\n"
5328 " %b 待导出的版本库的基本名称\n"
5329 " %h 短修改集哈希(12 位十六进制数字)\n"
5330 " %n 从 1 开始补 0 的序列号\n"
5331 " %r 补 0 的修改集版本号\n"
5332 "\n"
5333 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5334 " 时,可能会有不合需要的结果。\n"
5335 "\n"
5336 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n"
5337 " 更多信息。\n"
5338 "\n"
5339 " 使用选项 '--switch-parent',将会与第二个父亲比较。对于复审合并很有用。\n"
5340 " "
5341
5342 msgid "export requires at least one changeset"
5343 msgstr ""
5344
5345 msgid "exporting patches:\n"
5346 msgstr ""
5347
5348 msgid "exporting patch:\n"
5349 msgstr ""
5350
5351 msgid ""
5352 "forget the specified files on the next commit\n"
5353 "\n"
5354 " Mark the specified files so they will no longer be tracked\n"
5355 " after the next commit.\n"
5356 "\n"
5357 " This only removes files from the current branch, not from the\n"
5358 " entire project history, and it does not delete them from the\n"
5359 " working directory.\n"
5360 "\n"
5361 " To undo a forget before the next commit, see hg add.\n"
5362 " "
5363 msgstr ""
5364
5365 msgid "no files specified"
5366 msgstr ""
5367
5368 #, python-format
5369 msgid "not removing %s: file is already untracked\n"
5370 msgstr ""
5371
5372 msgid ""
5373 "search for a pattern in specified files and revisions\n"
5374 "\n"
5375 " Search revisions of files for a regular expression.\n"
5376 "\n"
5377 " This command behaves differently than Unix grep. It only accepts\n"
5378 " Python/Perl regexps. It searches repository history, not the\n"
5379 " working directory. It always prints the revision number in which a\n"
5380 " match appears.\n"
5381 "\n"
5382 " By default, grep only prints output for the first revision of a\n"
5383 " file in which it finds a match. To get it to print every revision\n"
5384 " that contains a change in match status (\"-\" for a match that\n"
5385 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5386 " use the --all flag.\n"
5387 " "
5388 msgstr ""
5389
5390 #, python-format
5391 msgid "grep: invalid match pattern: %s\n"
5392 msgstr ""
5393
5394 msgid ""
5395 "show current repository heads or show branch heads\n"
5396 "\n"
5397 " With no arguments, show all repository head changesets.\n"
5398 "\n"
5399 " Repository \"heads\" are changesets with no child changesets. They are\n"
5400 " where development generally takes place and are the usual targets\n"
5401 " for update and merge operations.\n"
5402 "\n"
5403 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5404 " the named branch associated with the specified changeset(s).\n"
5405 "\n"
5406 " Branch heads are changesets on a named branch with no descendants on\n"
5407 " the same branch. A branch head could be a \"true\" (repository) head,\n"
5408 " or it could be the last changeset on that branch before it was\n"
5409 " merged into another branch, or it could be the last changeset on the\n"
5410 " branch before a new branch was created. If none of the branch heads\n"
5411 " are true heads, the branch is considered inactive.\n"
5412 "\n"
5413 " If -c/--closed is specified, also show branch heads marked closed\n"
5414 " (see hg commit --close-branch).\n"
5415 "\n"
5416 " If STARTREV is specified, only those heads that are descendants of\n"
5417 " STARTREV will be displayed.\n"
5418 " "
5419 msgstr ""
5420
5421 msgid "you must specify a branch to use --closed"
5422 msgstr ""
5423
5424 #, fuzzy, python-format
5425 msgid "no open branch heads on branch %s\n"
5426 msgstr "svn: 分支没有版本 %s"
5427
5428 #, python-format
5429 msgid "no changes on branch %s containing %s are reachable from %s\n"
5430 msgstr ""
5431
5432 #, python-format
5433 msgid "no changes on branch %s are reachable from %s\n"
5434 msgstr ""
5435
5436 msgid ""
5437 "show help for a given topic or a help overview\n"
5438 "\n"
5439 " With no arguments, print a list of commands with short help messages.\n"
5440 "\n"
5441 " Given a topic, extension, or command name, print help for that\n"
5442 " topic."
5443 msgstr ""
5444
5445 msgid "global options:"
5446 msgstr "全局选项:"
5447
5448 msgid "use \"hg help\" for the full list of commands"
5449 msgstr "使用 \"hg help\" 获得全部命令的列表"
5450
5451 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5452 msgstr "使用 \"hg help\" 获得全部命令的列表,或 \"hg -v\" 获得详细信息"
5453
5454 #, python-format
5455 msgid "use \"hg -v help%s\" to show aliases and global options"
5456 msgstr "使用 \"hg -v help%s\" 显示别名和全局选项"
5457
5458 #, python-format
5459 msgid "use \"hg -v help %s\" to show global options"
5460 msgstr "使用 \"hg -v help %s\" 显示全局选项"
5461
5462 msgid ""
5463 "list of commands:\n"
5464 "\n"
5465 msgstr ""
5466 "命令列表:\n"
5467 "\n"
5468
5469 #, python-format
5470 msgid ""
5471 "\n"
5472 "aliases: %s\n"
5473 msgstr ""
5474 "\n"
5475 "别名: %s\n"
5476
5477 msgid "(no help text available)"
5478 msgstr "(没有可用的帮助信息)"
5479
5480 msgid "options:\n"
5481 msgstr "选项:\n"
5482
5483 msgid "no commands defined\n"
5484 msgstr ""
5485
5486 #, fuzzy
5487 msgid "enabled extensions:"
5488 msgstr ""
5489 "\n"
5490 "启用的扩展:\n"
5491 "\n"
5492
5493 msgid "no help text available"
5494 msgstr "没有可用的帮助信息"
5495
5496 #, fuzzy, python-format
5497 msgid ""
5498 "%s extension - %s\n"
5499 "\n"
5500 msgstr "** 已加载的扩展: %s\n"
5501
5502 msgid "Mercurial Distributed SCM\n"
5503 msgstr "分布式软件配置管理工具 - 水银\n"
5504
5505 msgid ""
5506 "basic commands:\n"
5507 "\n"
5508 msgstr ""
5509 "基本命令:\n"
5510 "\n"
5511
5512 msgid ""
5513 "\n"
5514 "additional help topics:\n"
5515 "\n"
5516 msgstr ""
5517 "\n"
5518 "额外的帮助主题:\n"
5519 "\n"
5520
5521 msgid ""
5522 "identify the working copy or specified revision\n"
5523 "\n"
5524 " With no revision, print a summary of the current state of the\n"
5525 " repository.\n"
5526 "\n"
5527 " Specifying a path to a repository root or Mercurial bundle will\n"
5528 " cause lookup to operate on that repository/bundle.\n"
5529 "\n"
5530 " This summary identifies the repository state using one or two\n"
5531 " parent hash identifiers, followed by a \"+\" if there are\n"
5532 " uncommitted changes in the working directory, a list of tags for\n"
5533 " this revision and a branch name for non-default branches.\n"
5534 " "
5535 msgstr ""
5536
5537 msgid ""
5538 "import an ordered set of patches\n"
5539 "\n"
5540 " Import a list of patches and commit them individually.\n"
5541 "\n"
5542 " If there are outstanding changes in the working directory, import\n"
5543 " will abort unless given the -f/--force flag.\n"
5544 "\n"
5545 " You can import a patch straight from a mail message. Even patches\n"
5546 " as attachments work (to use the body part, it must have type\n"
5547 " text/plain or text/x-patch). From and Subject headers of email\n"
5548 " message are used as default committer and commit message. All\n"
5549 " text/plain body parts before first diff are added to commit\n"
5550 " message.\n"
5551 "\n"
5552 " If the imported patch was generated by hg export, user and\n"
5553 " description from patch override values from message headers and\n"
5554 " body. Values given on command line with -m/--message and -u/--user\n"
5555 " override these.\n"
5556 "\n"
5557 " If --exact is specified, import will set the working directory to\n"
5558 " the parent of each patch before applying it, and will abort if the\n"
5559 " resulting changeset has a different ID than the one recorded in\n"
5560 " the patch. This may happen due to character set problems or other\n"
5561 " deficiencies in the text patch format.\n"
5562 "\n"
5563 " With -s/--similarity, hg will attempt to discover renames and\n"
5564 " copies in the patch in the same way as 'addremove'.\n"
5565 "\n"
5566 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5567 " a URL is specified, the patch will be downloaded from it.\n"
5568 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5569 " "
5570 msgstr ""
5571
5572 msgid "applying patch from stdin\n"
5573 msgstr ""
5574
5575 msgid "no diffs found"
5576 msgstr ""
5577
5578 #, python-format
5579 msgid ""
5580 "message:\n"
5581 "%s\n"
5582 msgstr ""
5583
5584 #, fuzzy
5585 msgid "not a Mercurial patch"
5586 msgstr "%s 不是本地的水银版本库"
5587
5588 msgid "patch is damaged or loses information"
5589 msgstr ""
5590
5591 msgid ""
5592 "show new changesets found in source\n"
5593 "\n"
5594 " Show new changesets found in the specified path/URL or the default\n"
5595 " pull location. These are the changesets that would have been pulled\n"
5596 " if a pull at the time you issued this command.\n"
5597 "\n"
5598 " For remote repository, using --bundle avoids downloading the\n"
5599 " changesets twice if the incoming is followed by a pull.\n"
5600 "\n"
5601 " See pull for valid source format details.\n"
5602 " "
5603 msgstr ""
5604
5605 #, fuzzy
5606 msgid ""
5607 "create a new repository in the given directory\n"
5608 "\n"
5609 " Initialize a new repository in the given directory. If the given\n"
5610 " directory does not exist, it will be created.\n"
5611 "\n"
5612 " If no directory is given, the current directory is used.\n"
5613 "\n"
5614 " It is possible to specify an ssh:// URL as the destination.\n"
5615 " See 'hg help urls' for more information.\n"
5616 " "
5617 msgstr ""
5618 "在指定目录创建新版本库\n"
5619 "\n"
5620 " 在指定目录初始化新版本库。如果指定的目录不存在,那么会被创建。\n"
5621 "\n"
5622 " 如果没有指定目录,就使用当前目录。\n"
5623 "\n"
5624 " 可以指定位置 'ssh://' 作为目标。参见命令 'hg help urls' 的帮助信息,\n"
5625 " 以了解位置 'ssh://' 的重要详情。\n"
5626 " "
5627
5628 msgid ""
5629 "locate files matching specific patterns\n"
5630 "\n"
5631 " Print files under Mercurial control in the working directory whose\n"
5632 " names match the given patterns.\n"
5633 "\n"
5634 " By default, this command searches all directories in the working\n"
5635 " directory. To search just the current directory and its\n"
5636 " subdirectories, use \"--include .\".\n"
5637 "\n"
5638 " If no patterns are given to match, this command prints the names\n"
5639 " of all files under Mercurial control in the working directory.\n"
5640 "\n"
5641 " If you want to feed the output of this command into the \"xargs\"\n"
5642 " command, use the -0 option to both this command and \"xargs\". This\n"
5643 " will avoid the problem of \"xargs\" treating single filenames that\n"
5644 " contain whitespace as multiple filenames.\n"
5645 " "
5646 msgstr ""
5647
5648 #, fuzzy
5649 msgid ""
5650 "show revision history of entire repository or files\n"
5651 "\n"
5652 " Print the revision history of the specified files or the entire\n"
5653 " project.\n"
5654 "\n"
5655 " File history is shown without following rename or copy history of\n"
5656 " files. Use -f/--follow with a filename to follow history across\n"
5657 " renames and copies. --follow without a filename will only show\n"
5658 " ancestors or descendants of the starting revision. --follow-first\n"
5659 " only follows the first parent of merge revisions.\n"
5660 "\n"
5661 " If no revision range is specified, the default is tip:0 unless\n"
5662 " --follow is set, in which case the working directory parent is\n"
5663 " used as the starting revision.\n"
5664 "\n"
5665 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5666 "\n"
5667 " By default this command prints revision number and changeset id,\n"
5668 " tags, non-trivial parents, user, date and time, and a summary for\n"
5669 " each commit. When the -v/--verbose switch is used, the list of\n"
5670 " changed files and full commit message are shown.\n"
5671 "\n"
5672 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5673 " changesets, as it will only compare the merge changeset against\n"
5674 " its first parent. Also, only files different from BOTH parents\n"
5675 " will appear in files:.\n"
5676 " "
5677 msgstr ""
5678 "显示全部版本库或指定文件的版本历史\n"
5679 "\n"
5680 " 显示全部版本库或指定文件的版本历史。\n"
5681 "\n"
5682 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
5683 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
5684 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
5685 " 个父亲。\n"
5686 "\n"
5687 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
5688 " 工作目录的父亲作为开始版本。\n"
5689 "\n"
5690 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
5691 "\n"
5692 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
5693 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
5694 " 变更列表和完整的提交信息。\n"
5695 "\n"
5696 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
5697 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
5698 " 文件列表。\n"
5699 "\n"
5700 " "
5701
5702 msgid ""
5703 "output the current or given revision of the project manifest\n"
5704 "\n"
5705 " Print a list of version controlled files for the given revision.\n"
5706 " If no revision is given, the first parent of the working directory\n"
5707 " is used, or the null revision if no revision is checked out.\n"
5708 "\n"
5709 " With -v, print file permissions, symlink and executable bits.\n"
5710 " With --debug, print file revision hashes.\n"
5711 " "
5712 msgstr ""
5713
5714 #, fuzzy
5715 msgid ""
5716 "merge working directory with another revision\n"
5717 "\n"
5718 " The current working directory is updated with all changes made in\n"
5719 " the requested revision since the last common predecessor revision.\n"
5720 "\n"
5721 " Files that changed between either parent are marked as changed for\n"
5722 " the next commit and a commit must be performed before any further\n"
5723 " updates to the repository are allowed. The next commit will have\n"
5724 " two parents.\n"
5725 "\n"
5726 " If no revision is specified, the working directory's parent is a\n"
5727 " head revision, and the current branch contains exactly one other\n"
5728 " head, the other head is merged with by default. Otherwise, an\n"
5729 " explicit revision with which to merge with must be provided.\n"
5730 " "
5731 msgstr ""
5732 "将工作目录与其它版本合并\n"
5733 "\n"
5734 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
5735 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
5736 "\n"
5737 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
5738 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
5739 " "
5740
5741 #, python-format
5742 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5743 msgstr ""
5744
5745 #, python-format
5746 msgid "branch '%s' has one head - please merge with an explicit rev"
5747 msgstr ""
5748
5749 msgid "there is nothing to merge"
5750 msgstr ""
5751
5752 #, python-format
5753 msgid "%s - use \"hg update\" instead"
5754 msgstr ""
5755
5756 msgid ""
5757 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5758 "rev"
5759 msgstr ""
5760
5761 msgid ""
5762 "show changesets not found in destination\n"
5763 "\n"
5764 " Show changesets not found in the specified destination repository\n"
5765 " or the default push location. These are the changesets that would\n"
5766 " be pushed if a push was requested.\n"
5767 "\n"
5768 " See pull for valid destination format details.\n"
5769 " "
5770 msgstr ""
5771
5772 #, fuzzy
5773 msgid ""
5774 "show the parents of the working directory or revision\n"
5775 "\n"
5776 " Print the working directory's parent revisions. If a revision is\n"
5777 " given via -r/--rev, the parent of that revision will be printed.\n"
5778 " If a file argument is given, the revision in which the file was\n"
5779 " last changed (before the working directory revision or the\n"
5780 " argument to --rev if given) is printed.\n"
5781 " "
5782 msgstr ""
5783 "显示工作目录或指定版本的父亲\n"
5784 "\n"
5785 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
5786 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
5787 " 版本,或 '--rev' 指定的版本)。\n"
5788 " "
5789
5790 msgid "can only specify an explicit filename"
5791 msgstr ""
5792
5793 #, python-format
5794 msgid "'%s' not found in manifest!"
5795 msgstr ""
5796
5797 msgid ""
5798 "show aliases for remote repositories\n"
5799 "\n"
5800 " Show definition of symbolic path name NAME. If no name is given,\n"
5801 " show definition of all available names.\n"
5802 "\n"
5803 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5804 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5805 "\n"
5806 " See 'hg help urls' for more information.\n"
5807 " "
5808 msgstr ""
5809
5810 msgid "not found!\n"
5811 msgstr ""
5812
5813 msgid "not updating, since new heads added\n"
5814 msgstr ""
5815
5816 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5817 msgstr ""
5818
5819 msgid "(run 'hg update' to get a working copy)\n"
5820 msgstr ""
5821
5822 #, fuzzy
5823 msgid ""
5824 "pull changes from the specified source\n"
5825 "\n"
5826 " Pull changes from a remote repository to a local one.\n"
5827 "\n"
5828 " This finds all changes from the repository at the specified path\n"
5829 " or URL and adds them to a local repository (the current one unless\n"
5830 " -R is specified). By default, this does not update the copy of the\n"
5831 " project in the working directory.\n"
5832 "\n"
5833 " Use hg incoming if you want to see what would have been added by a\n"
5834 " pull at the time you issued this command. If you then decide to\n"
5835 " added those changes to the repository, you should use pull -r X\n"
5836 " where X is the last changeset listed by hg incoming.\n"
5837 "\n"
5838 " If SOURCE is omitted, the 'default' path will be used.\n"
5839 " See 'hg help urls' for more information.\n"
5840 " "
5841 msgstr ""
5842 "从指定版本库取得修改集\n"
5843 "\n"
5844 " 从远程版本库取得修改集到本地版本库。\n"
5845 "\n"
5846 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
5847 " 更新工作目录。\n"
5848 "\n"
5849 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
5850 " 更多信息。\n"
5851 " "
5852
5853 #, fuzzy
5854 msgid ""
5855 "push changes to the specified destination\n"
5856 "\n"
5857 " Push changes from the local repository to the given destination.\n"
5858 "\n"
5859 " This is the symmetrical operation for pull. It moves changes from\n"
5860 " the current repository to a different one. If the destination is\n"
5861 " local this is identical to a pull in that directory from the\n"
5862 " current one.\n"
5863 "\n"
5864 " By default, push will refuse to run if it detects the result would\n"
5865 " increase the number of remote heads. This generally indicates the\n"
5866 " user forgot to pull and merge before pushing.\n"
5867 "\n"
5868 " If -r/--rev is used, the named revision and all its ancestors will\n"
5869 " be pushed to the remote repository.\n"
5870 "\n"
5871 " Please see 'hg help urls' for important details about ssh://\n"
5872 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5873 " "
5874 msgstr ""
5875 "推送改变到指定位置\n"
5876 "\n"
5877 " 从本地版本库推送改变到指定位置。\n"
5878 "\n"
5879 " 这是 'pull' 的对称操作。它从当前版本库推送改变到其它版本库。如果目标\n"
5880 " 是本地版本库,那么此操作与在目标版本库从当前版本库执行 'pull' 操作等\n"
5881 " 同。\n"
5882 "\n"
5883 " 推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n"
5884 " 之前忘记取得远程版本库的修改,并且合并。\n"
5885 "\n"
5886 " 如果使用了选项 '-r',此命名修改集以及其祖先都会被推送到远程版本库。\n"
5887 " \n"
5888 "\n"
5889 " 参见主题 'urls' 的帮助信息,以了解位置 'ssh://' 的重要详情。如果没有\n"
5890 " 给出目标位置,那么使用默认路径。参见 'hg help urls' 以了解更多信息。\n"
5891 " "
5892
5893 #, python-format
5894 msgid "pushing to %s\n"
5895 msgstr "正在推到 %s\n"
5896
5897 msgid ""
5898 "roll back an interrupted transaction\n"
5899 "\n"
5900 " Recover from an interrupted commit or pull.\n"
5901 "\n"
5902 " This command tries to fix the repository status after an\n"
5903 " interrupted operation. It should only be necessary when Mercurial\n"
5904 " suggests it.\n"
5905 " "
5906 msgstr ""
5907
5908 #, fuzzy
5909 msgid ""
5910 "remove the specified files on the next commit\n"
5911 "\n"
5912 " Schedule the indicated files for removal from the repository.\n"
5913 "\n"
5914 " This only removes files from the current branch, not from the\n"
5915 " entire project history. -A/--after can be used to remove only\n"
5916 " files that have already been deleted, -f/--force can be used to\n"
5917 " force deletion, and -Af can be used to remove files from the next\n"
5918 " revision without deleting them from the working directory.\n"
5919 "\n"
5920 " The following table details the behavior of remove for different\n"
5921 " file states (columns) and option combinations (rows). The file\n"
5922 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
5923 " reported by hg status). The actions are Warn, Remove (from branch)\n"
5924 " and Delete (from disk)::\n"
5925 "\n"
5926 " A C M !\n"
5927 " none W RD W R\n"
5928 " -f R RD RD R\n"
5929 " -A W W W R\n"
5930 " -Af R R R R\n"
5931 "\n"
5932 " This command schedules the files to be removed at the next commit.\n"
5933 " To undo a remove before that, see hg revert.\n"
5934 " "
5935 msgstr ""
5936 "在下次提交时删除指定文件\n"
5937 "\n"
5938 " 调度从版本库删除指定文件。\n"
5939 "\n"
5940 " 它只从当前分支删除文件,不删除历史。'-A' 用于只移除已经删除的文\n"
5941 " 件,'-f' 用于强制删除,'-Af' 用于从下个版本移除文件,但是不删除\n"
5942 " 它们。\n"
5943 "\n"
5944 " 下表给出了删除不同状态(列)文件的行为和可选的组合(行)。文件状态\n"
5945 " ('hg status' 报告的状态)是增加(A),干净(C),已修改(M),丢失(!)。\n"
5946 " 动作是警告(W),移除(R,从分支),以及删除(D,从磁盘)。\n"
5947 "\n"
5948 " A C M !\n"
5949 " none W RD W R\n"
5950 " -f R RD RD R\n"
5951 " -A W W W R\n"
5952 " -Af R R R R\n"
5953 "\n"
5954 " 此命令调度下次提交时删除文件。\n"
5955 " 要在此之前撤销删除,请参见 'hg revert'。\n"
5956 " "
5957
5958 #, python-format
5959 msgid "not removing %s: file is untracked\n"
5960 msgstr ""
5961
5962 #, python-format
5963 msgid "not removing %s: file %s (use -f to force removal)\n"
5964 msgstr ""
5965
5966 msgid "still exists"
5967 msgstr ""
5968
5969 msgid "is modified"
5970 msgstr ""
5971
5972 msgid "has been marked for add"
5973 msgstr ""
5974
5975 msgid ""
5976 "rename files; equivalent of copy + remove\n"
5977 "\n"
5978 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5979 " is a directory, copies are put in that directory. If dest is a\n"
5980 " file, there can only be one source.\n"
5981 "\n"
5982 " By default, this command copies the contents of files as they\n"
5983 " exist in the working directory. If invoked with -A/--after, the\n"
5984 " operation is recorded, but no copying is performed.\n"
5985 "\n"
5986 " This command takes effect at the next commit. To undo a rename\n"
5987 " before that, see hg revert.\n"
5988 " "
5989 msgstr ""
5990
5991 msgid ""
5992 "retry file merges from a merge or update\n"
5993 "\n"
5994 " This command will cleanly retry unresolved file merges using file\n"
5995 " revisions preserved from the last update or merge. To attempt to\n"
5996 " resolve all unresolved files, use the -a/--all switch.\n"
5997 "\n"
5998 " If a conflict is resolved manually, please note that the changes\n"
5999 " will be overwritten if the merge is retried with resolve. The\n"
6000 " -m/--mark switch should be used to mark the file as resolved.\n"
6001 "\n"
6002 " This command also allows listing resolved files and manually\n"
6003 " indicating whether or not files are resolved. All files must be\n"
6004 " marked as resolved before a commit is permitted.\n"
6005 "\n"
6006 " The codes used to show the status of files are::\n"
6007 "\n"
6008 " U = unresolved\n"
6009 " R = resolved\n"
6010 " "
6011 msgstr ""
6012
6013 msgid "too many options specified"
6014 msgstr ""
6015
6016 msgid "can't specify --all and patterns"
6017 msgstr ""
6018
6019 msgid "no files or directories specified; use --all to remerge all files"
6020 msgstr ""
6021
6022 msgid ""
6023 "restore individual files or directories to an earlier state\n"
6024 "\n"
6025 " (Use update -r to check out earlier revisions, revert does not\n"
6026 " change the working directory parents.)\n"
6027 "\n"
6028 " With no revision specified, revert the named files or directories\n"
6029 " to the contents they had in the parent of the working directory.\n"
6030 " This restores the contents of the affected files to an unmodified\n"
6031 " state and unschedules adds, removes, copies, and renames. If the\n"
6032 " working directory has two parents, you must explicitly specify the\n"
6033 " revision to revert to.\n"
6034 "\n"
6035 " Using the -r/--rev option, revert the given files or directories\n"
6036 " to their contents as of a specific revision. This can be helpful\n"
6037 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6038 " dates' for a list of formats valid for -d/--date.\n"
6039 "\n"
6040 " Revert modifies the working directory. It does not commit any\n"
6041 " changes, or change the parent of the working directory. If you\n"
6042 " revert to a revision other than the parent of the working\n"
6043 " directory, the reverted files will thus appear modified\n"
6044 " afterwards.\n"
6045 "\n"
6046 " If a file has been deleted, it is restored. If the executable mode\n"
6047 " of a file was changed, it is reset.\n"
6048 "\n"
6049 " If names are given, all files matching the names are reverted.\n"
6050 " If no arguments are given, no files are reverted.\n"
6051 "\n"
6052 " Modified files are saved with a .orig suffix before reverting.\n"
6053 " To disable these backups, use --no-backup.\n"
6054 " "
6055 msgstr ""
6056
6057 msgid "you can't specify a revision and a date"
6058 msgstr ""
6059
6060 msgid "no files or directories specified; use --all to revert the whole repo"
6061 msgstr ""
6062
6063 #, python-format
6064 msgid "forgetting %s\n"
6065 msgstr ""
6066
6067 #, python-format
6068 msgid "reverting %s\n"
6069 msgstr "正在恢复 %s\n"
6070
6071 #, python-format
6072 msgid "undeleting %s\n"
6073 msgstr "正在撤销删除 %s\n"
6074
6075 #, python-format
6076 msgid "saving current version of %s as %s\n"
6077 msgstr "保存当前版本的 %s 为 %s\n"
6078
6079 #, python-format
6080 msgid "file not managed: %s\n"
6081 msgstr "文件未被控制: %s\n"
6082
6083 #, python-format
6084 msgid "no changes needed to %s\n"
6085 msgstr "不需要改变 %s\n"
6086
6087 msgid ""
6088 "roll back the last transaction\n"
6089 "\n"
6090 " This command should be used with care. There is only one level of\n"
6091 " rollback, and there is no way to undo a rollback. It will also\n"
6092 " restore the dirstate at the time of the last transaction, losing\n"
6093 " any dirstate changes since that time. This command does not alter\n"
6094 " the working directory.\n"
6095 "\n"
6096 " Transactions are used to encapsulate the effects of all commands\n"
6097 " that create new changesets or propagate existing changesets into a\n"
6098 " repository. For example, the following commands are transactional,\n"
6099 " and their effects can be rolled back::\n"
6100 "\n"
6101 " commit\n"
6102 " import\n"
6103 " pull\n"
6104 " push (with this repository as destination)\n"
6105 " unbundle\n"
6106 "\n"
6107 " This command is not intended for use on public repositories. Once\n"
6108 " changes are visible for pull by other users, rolling a transaction\n"
6109 " back locally is ineffective (someone else may already have pulled\n"
6110 " the changes). Furthermore, a race is possible with readers of the\n"
6111 " repository; for example an in-progress pull from the repository\n"
6112 " may fail if a rollback is performed.\n"
6113 " "
6114 msgstr ""
6115
6116 msgid ""
6117 "print the root (top) of the current working directory\n"
6118 "\n"
6119 " Print the root directory of the current repository.\n"
6120 " "
6121 msgstr ""
6122
6123 #, fuzzy
6124 msgid ""
6125 "export the repository via HTTP\n"
6126 "\n"
6127 " Start a local HTTP repository browser and pull server.\n"
6128 "\n"
6129 " By default, the server logs accesses to stdout and errors to\n"
6130 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6131 " files.\n"
6132 " "
6133 msgstr ""
6134 "通过 HTTP 发布版本库\n"
6135 "\n"
6136 " 启动本地 HTTP 版本库浏览器和发布服务器。\n"
6137 "\n"
6138 " 默认服务器访问日志输出到 stdout,错误日志输出到 stderr。\n"
6139 " 可以使用选项 \"-A\" 和 \"-E\",将这些日志输出到文件。\n"
6140 " "
6141
6142 #, python-format
6143 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6144 msgstr ""
6145
6146 #, fuzzy
6147 msgid ""
6148 "show changed files in the working directory\n"
6149 "\n"
6150 " Show status of files in the repository. If names are given, only\n"
6151 " files that match are shown. Files that are clean or ignored or\n"
6152 " the source of a copy/move operation, are not listed unless\n"
6153 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6154 " Unless options described with \"show only ...\" are given, the\n"
6155 " options -mardu are used.\n"
6156 "\n"
6157 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6158 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6159 "\n"
6160 " NOTE: status may appear to disagree with diff if permissions have\n"
6161 " changed or a merge has occurred. The standard diff format does not\n"
6162 " report permission changes and diff only reports changes relative\n"
6163 " to one merge parent.\n"
6164 "\n"
6165 " If one revision is given, it is used as the base revision.\n"
6166 " If two revisions are given, the differences between them are\n"
6167 " shown.\n"
6168 "\n"
6169 " The codes used to show the status of files are::\n"
6170 "\n"
6171 " M = modified\n"
6172 " A = added\n"
6173 " R = removed\n"
6174 " C = clean\n"
6175 " ! = missing (deleted by non-hg command, but still tracked)\n"
6176 " ? = not tracked\n"
6177 " I = ignored\n"
6178 " = origin of the previous file listed as A (added)\n"
6179 " "
6180 msgstr ""
6181 "显示工作目录中已改变的文件\n"
6182 "\n"
6183 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
6184 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
6185 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
6186 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
6187 "\n"
6188 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
6189 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
6190 "\n"
6191 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
6192 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
6193 " 父亲的改变。\n"
6194 "\n"
6195 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
6196 "\n"
6197 " 显示文件状态的代码是:\n"
6198 " M = 已修改\n"
6199 " A = 已增加\n"
6200 " R = 已移除\n"
6201 " C = 干净的\n"
6202 " ! = 已删除,仍旧被跟踪\n"
6203 " ? = 未跟踪\n"
6204 " I = 已忽略\n"
6205 " = 早先增加的文件自此复制\n"
6206 " "
6207
6208 msgid ""
6209 "add one or more tags for the current or given revision\n"
6210 "\n"
6211 " Name a particular revision using <name>.\n"
6212 "\n"
6213 " Tags are used to name particular revisions of the repository and are\n"
6214 " very useful to compare different revisions, to go back to significant\n"
6215 " earlier versions or to mark branch points as releases, etc.\n"
6216 "\n"
6217 " If no revision is given, the parent of the working directory is\n"
6218 " used, or tip if no revision is checked out.\n"
6219 "\n"
6220 " To facilitate version control, distribution, and merging of tags,\n"
6221 " they are stored as a file named \".hgtags\" which is managed\n"
6222 " similarly to other project files and can be hand-edited if\n"
6223 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6224 " shared among repositories).\n"
6225 "\n"
6226 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6227 " "
6228 msgstr ""
6229
6230 msgid "tag names must be unique"
6231 msgstr ""
6232
6233 #, python-format
6234 msgid "the name '%s' is reserved"
6235 msgstr ""
6236
6237 msgid "--rev and --remove are incompatible"
6238 msgstr ""
6239
6240 #, python-format
6241 msgid "tag '%s' does not exist"
6242 msgstr ""
6243
6244 #, fuzzy, python-format
6245 msgid "tag '%s' is not a global tag"
6246 msgstr "非本地版本库 '%s'"
6247
6248 #, fuzzy, python-format
6249 msgid "tag '%s' is not a local tag"
6250 msgstr "非本地版本库 '%s'"
6251
6252 #, python-format
6253 msgid "tag '%s' already exists (use -f to force)"
6254 msgstr ""
6255
6256 msgid ""
6257 "list repository tags\n"
6258 "\n"
6259 " This lists both regular and local tags. When the -v/--verbose\n"
6260 " switch is used, a third column \"local\" is printed for local tags.\n"
6261 " "
6262 msgstr ""
6263
6264 msgid ""
6265 "show the tip revision\n"
6266 "\n"
6267 " The tip revision (usually just called the tip) is the changeset\n"
6268 " most recently added to the repository (and therefore the most\n"
6269 " recently changed head).\n"
6270 "\n"
6271 " If you have just made a commit, that commit will be the tip. If\n"
6272 " you have just pulled changes from another repository, the tip of\n"
6273 " that repository becomes the current tip. The \"tip\" tag is special\n"
6274 " and cannot be renamed or assigned to a different changeset.\n"
6275 " "
6276 msgstr ""
6277
6278 msgid ""
6279 "apply one or more changegroup files\n"
6280 "\n"
6281 " Apply one or more compressed changegroup files generated by the\n"
6282 " bundle command.\n"
6283 " "
6284 msgstr ""
6285
6286 #, fuzzy
6287 msgid ""
6288 "update working directory\n"
6289 "\n"
6290 " Update the repository's working directory to the specified\n"
6291 " revision, or the tip of the current branch if none is specified.\n"
6292 " Use null as the revision to remove the working copy (like 'hg\n"
6293 " clone -U').\n"
6294 "\n"
6295 " When the working directory contains no uncommitted changes, it\n"
6296 " will be replaced by the state of the requested revision from the\n"
6297 " repository. When the requested revision is on a different branch,\n"
6298 " the working directory will additionally be switched to that\n"
6299 " branch.\n"
6300 "\n"
6301 " When there are uncommitted changes, use option -C/--clean to\n"
6302 " discard them, forcibly replacing the state of the working\n"
6303 " directory with the requested revision. Alternately, use -c/--check\n"
6304 " to abort.\n"
6305 "\n"
6306 " When there are uncommitted changes and option -C/--clean is not\n"
6307 " used, and the parent revision and requested revision are on the\n"
6308 " same branch, and one of them is an ancestor of the other, then the\n"
6309 " new working directory will contain the requested revision merged\n"
6310 " with the uncommitted changes. Otherwise, the update will fail with\n"
6311 " a suggestion to use 'merge' or 'update -C' instead.\n"
6312 "\n"
6313 " If you want to update just one file to an older revision, use\n"
6314 " revert.\n"
6315 "\n"
6316 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6317 " "
6318 msgstr ""
6319 "更新工作目录\n"
6320 "\n"
6321 " 更新工作目录到指定版本,或者到当前分支的顶点。使用 'null' 作为版本可以\n"
6322 " 删除工作副本(类似于 'hg clone -U')。\n"
6323 "\n"
6324 " 当工作目录包含未提交的修改时,它会被版本库中指定版本的状态替换。当请求\n"
6325 " 的版本位于不同分支时,工作目录会被切换到此分支。\n"
6326 "\n"
6327 " 可以使用选项 '-C' 来丢弃未提交的修改,强制使用请求的版本替换工作目录的\n"
6328 " 状态。\n"
6329 "\n"
6330 " 当有未提交的修改,没有使用选项 '-C',父版本和请求版本位于不同分支,并且\n"
6331 " 其中一个是另一个的祖先时,那么新的工作目录包含请求版本与未提交的修改的\n"
6332 " 合并结果。否则,更新会失败,建议使用 'merge' 或 'update -C'。\n"
6333 "\n"
6334 " 如果你只想更新一个文件到旧版本,请使用 'revert'。\n"
6335 "\n"
6336 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6337 " "
6338
6339 msgid "cannot specify both -c/--check and -C/--clean"
6340 msgstr ""
6341
6342 #, fuzzy
6343 msgid "uncommitted local changes"
6344 msgstr "提交修改集 %d:%s\n"
6345
6346 msgid ""
6347 "verify the integrity of the repository\n"
6348 "\n"
6349 " Verify the integrity of the current repository.\n"
6350 "\n"
6351 " This will perform an extensive check of the repository's\n"
6352 " integrity, validating the hashes and checksums of each entry in\n"
6353 " the changelog, manifest, and tracked files, as well as the\n"
6354 " integrity of their crosslinks and indices.\n"
6355 " "
6356 msgstr ""
6357
6358 msgid "output version and copyright information"
6359 msgstr "输出版本和版权信息"
6360
6361 #, python-format
6362 msgid "Mercurial Distributed SCM (version %s)\n"
6363 msgstr "分布式软件配置管理工具 - 水银 (版本 %s)\n"
6364
6365 msgid ""
6366 "\n"
6367 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6368 "This is free software; see the source for copying conditions. There is NO\n"
6369 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6370 msgstr ""
6371 "\n"
6372 "版权所有 (C) 2005-2009 Matt Mackall <mpm@selenic.com> 和其他人。\n"
6373 "这是自由软件,具体参见版权条款。这里没有任何担保,甚至没有适合\n"
6374 "特定目的的隐含的担保。\n"
6375
6376 msgid "repository root directory or symbolic path name"
6377 msgstr "版本库的根目录或符号路径名称"
6378
6379 msgid "change working directory"
6380 msgstr "改变工作目录"
6381
6382 msgid "do not prompt, assume 'yes' for any required answers"
6383 msgstr "不再询问,假定所有答案都是 'yes'"
6384
6385 msgid "suppress output"
6386 msgstr "抑制输出"
6387
6388 msgid "enable additional output"
6389 msgstr "启用额外的输出"
6390
6391 msgid "set/override config option"
6392 msgstr "设置/覆盖配置选项"
6393
6394 msgid "enable debugging output"
6395 msgstr "启用调试输出"
6396
6397 msgid "start debugger"
6398 msgstr "启动调试器"
6399
6400 msgid "set the charset encoding"
6401 msgstr "设置字符集编码"
6402
6403 msgid "set the charset encoding mode"
6404 msgstr "设置字符集编码模式"
6405
6406 msgid "print traceback on exception"
6407 msgstr "显示异常的跟踪"
6408
6409 msgid "time how long the command takes"
6410 msgstr "为命令计时"
6411
6412 msgid "print command execution profile"
6413 msgstr "显示命令执行的剖析"
6414
6415 msgid "output version information and exit"
6416 msgstr "显示版本信息后退出"
6417
6418 msgid "display help and exit"
6419 msgstr "显示帮助后退出"
6420
6421 msgid "do not perform actions, just print output"
6422 msgstr "不执行操作,只打印输出"
6423
6424 msgid "specify ssh command to use"
6425 msgstr "指定要使用的 'ssh' 命令"
6426
6427 msgid "specify hg command to run on the remote side"
6428 msgstr "指定要在远程运行的 'hg' 命令"
6429
6430 msgid "include names matching the given patterns"
6431 msgstr "包含匹配指定模式的名称"
6432
6433 msgid "exclude names matching the given patterns"
6434 msgstr "拒绝匹配指定模式的名称"
6435
6436 msgid "use <text> as commit message"
6437 msgstr "使用 <text> 作为提交日志"
6438
6439 msgid "read commit message from <file>"
6440 msgstr "从 <file> 读取提交日志"
6441
6442 msgid "record datecode as commit date"
6443 msgstr "将提供的日期作为提交日期"
6444
6445 #, fuzzy
6446 msgid "record the specified user as committer"
6447 msgstr "将提供的用户作为提交者"
6448
6449 msgid "display using template map file"
6450 msgstr "使用指定的样式显示"
6451
6452 msgid "display with template"
6453 msgstr "使用指定的模板显示"
6454
6455 msgid "do not show merges"
6456 msgstr "不显示合并"
6457
6458 msgid "treat all files as text"
6459 msgstr "将所有文件视为文本文件"
6460
6461 msgid "don't include dates in diff headers"
6462 msgstr "不要的差异头中包含日期"
6463
6464 msgid "show which function each change is in"
6465 msgstr "为每个修改显示在什么函数中"
6466
6467 msgid "ignore white space when comparing lines"
6468 msgstr "当比较行时忽略空白"
6469
6470 msgid "ignore changes in the amount of white space"
6471 msgstr "忽略空白数量的改变"
6472
6473 msgid "ignore changes whose lines are all blank"
6474 msgstr "忽略空行的改变"
6475
6476 msgid "number of lines of context to show"
6477 msgstr "显示几行上下文"
6478
6479 msgid "guess renamed files by similarity (0<=s<=100)"
6480 msgstr ""
6481
6482 msgid "[OPTION]... [FILE]..."
6483 msgstr ""
6484
6485 msgid "annotate the specified revision"
6486 msgstr "追溯指定版本"
6487
6488 msgid "follow file copies and renames"
6489 msgstr "处理文件复制与改名"
6490
6491 msgid "list the author (long with -v)"
6492 msgstr "列出作者 (增加 '-v' 会以长格式显示)"
6493
6494 msgid "list the date (short with -q)"
6495 msgstr "列出日期 (增加 '-q' 会以短格式显示)"
6496
6497 msgid "list the revision number (default)"
6498 msgstr "列出版本号 (默认)"
6499
6500 msgid "list the changeset"
6501 msgstr "列出修改集"
6502
6503 msgid "show line number at the first appearance"
6504 msgstr "列出首次出现时的行号"
6505
6506 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6507 msgstr ""
6508
6509 msgid "do not pass files through decoders"
6510 msgstr ""
6511
6512 msgid "directory prefix for files in archive"
6513 msgstr ""
6514
6515 msgid "revision to distribute"
6516 msgstr ""
6517
6518 msgid "type of distribution to create"
6519 msgstr ""
6520
6521 msgid "[OPTION]... DEST"
6522 msgstr ""
6523
6524 msgid "merge with old dirstate parent after backout"
6525 msgstr ""
6526
6527 msgid "parent to choose when backing out merge"
6528 msgstr ""
6529
6530 msgid "revision to backout"
6531 msgstr ""
6532
6533 msgid "[OPTION]... [-r] REV"
6534 msgstr ""
6535
6536 msgid "reset bisect state"
6537 msgstr ""
6538
6539 msgid "mark changeset good"
6540 msgstr ""
6541
6542 msgid "mark changeset bad"
6543 msgstr ""
6544
6545 msgid "skip testing changeset"
6546 msgstr ""
6547
6548 msgid "use command to check changeset state"
6549 msgstr ""
6550
6551 msgid "do not update to target"
6552 msgstr ""
6553
6554 msgid "[-gbsr] [-c CMD] [REV]"
6555 msgstr ""
6556
6557 msgid "set branch name even if it shadows an existing branch"
6558 msgstr ""
6559
6560 msgid "reset branch name to parent branch name"
6561 msgstr ""
6562
6563 msgid "[-fC] [NAME]"
6564 msgstr ""
6565
6566 msgid "show only branches that have unmerged heads"
6567 msgstr ""
6568
6569 #, fuzzy
6570 msgid "show normal and closed branches"
6571 msgstr "只显示已增加文件的状态"
6572
6573 msgid "[-a]"
6574 msgstr ""
6575
6576 msgid "run even when remote repository is unrelated"
6577 msgstr "纵然远程版本库是无关的也要执行"
6578
6579 msgid "a changeset up to which you would like to bundle"
6580 msgstr ""
6581
6582 msgid "a base changeset to specify instead of a destination"
6583 msgstr ""
6584
6585 msgid "bundle all changesets in the repository"
6586 msgstr ""
6587
6588 msgid "bundle compression type to use"
6589 msgstr ""
6590
6591 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6592 msgstr ""
6593
6594 msgid "print output to file with formatted name"
6595 msgstr "输出到使用格式化名称的文件中"
6596
6597 msgid "print the given revision"
6598 msgstr ""
6599
6600 msgid "apply any matching decode filter"
6601 msgstr ""
6602
6603 msgid "[OPTION]... FILE..."
6604 msgstr ""
6605
6606 msgid "the clone will only contain a repository (no working copy)"
6607 msgstr "只复制版本库(没有工作副本)"
6608
6609 msgid "a changeset you would like to have after cloning"
6610 msgstr "复制后你期望有的修改集"
6611
6612 msgid "[OPTION]... SOURCE [DEST]"
6613 msgstr ""
6614
6615 msgid "mark new/missing files as added/removed before committing"
6616 msgstr "在提交之前将'新的/丢失的'文件标记为'已增加/已删除'"
6617
6618 msgid "mark a branch as closed, hiding it from the branch list"
6619 msgstr "标记一个分支已关闭,不在分支列表中显示"
6620
6621 msgid "record a copy that has already occurred"
6622 msgstr ""
6623
6624 msgid "forcibly copy over an existing managed file"
6625 msgstr ""
6626
6627 msgid "[OPTION]... [SOURCE]... DEST"
6628 msgstr ""
6629
6630 msgid "[INDEX] REV1 REV2"
6631 msgstr ""
6632
6633 #, fuzzy
6634 msgid "[COMMAND]"
6635 msgstr "命令"
6636
6637 msgid "show the command options"
6638 msgstr ""
6639
6640 msgid "[-o] CMD"
6641 msgstr ""
6642
6643 msgid "try extended date formats"
6644 msgstr ""
6645
6646 msgid "[-e] DATE [RANGE]"
6647 msgstr ""
6648
6649 msgid "FILE REV"
6650 msgstr ""
6651
6652 msgid "[PATH]"
6653 msgstr ""
6654
6655 msgid "FILE"
6656 msgstr ""
6657
6658 msgid "revision to rebuild to"
6659 msgstr ""
6660
6661 msgid "[-r REV] [REV]"
6662 msgstr ""
6663
6664 msgid "revision to debug"
6665 msgstr ""
6666
6667 msgid "[-r REV] FILE"
6668 msgstr ""
6669
6670 msgid "REV1 [REV2]"
6671 msgstr ""
6672
6673 msgid "do not display the saved mtime"
6674 msgstr ""
6675
6676 msgid "[OPTION]..."
6677 msgstr ""
6678
6679 #, fuzzy
6680 msgid "revision to check"
6681 msgstr "要合并的版本"
6682
6683 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6684 msgstr ""
6685
6686 msgid "diff against the second parent"
6687 msgstr "与第二个父亲比较"
6688
6689 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6690 msgstr ""
6691
6692 msgid "end fields with NUL"
6693 msgstr ""
6694
6695 msgid "print all revisions that match"
6696 msgstr ""
6697
6698 msgid "follow changeset history, or file history across copies and renames"
6699 msgstr "跟踪修改集历史,或者跟踪文件的复制与改名操作"
6700
6701 msgid "ignore case when matching"
6702 msgstr ""
6703
6704 msgid "print only filenames and revisions that match"
6705 msgstr ""
6706
6707 msgid "print matching line numbers"
6708 msgstr ""
6709
6710 msgid "search in given revision range"
6711 msgstr ""
6712
6713 msgid "[OPTION]... PATTERN [FILE]..."
6714 msgstr ""
6715
6716 msgid "show only heads which are descendants of REV"
6717 msgstr ""
6718
6719 #, fuzzy
6720 msgid "show only the active branch heads from open branches"
6721 msgstr "svn: 分支没有版本 %s"
6722
6723 #, fuzzy
6724 msgid "show normal and closed branch heads"
6725 msgstr "只显示已增加文件的状态"
6726
6727 msgid "[-r STARTREV] [REV]..."
6728 msgstr ""
6729
6730 msgid "[TOPIC]"
6731 msgstr ""
6732
6733 #, fuzzy
6734 msgid "identify the specified revision"
6735 msgstr "追溯指定版本"
6736
6737 msgid "show local revision number"
6738 msgstr ""
6739
6740 msgid "show global revision id"
6741 msgstr ""
6742
6743 msgid "show branch"
6744 msgstr ""
6745
6746 msgid "show tags"
6747 msgstr ""
6748
6749 msgid "[-nibt] [-r REV] [SOURCE]"
6750 msgstr ""
6751
6752 msgid ""
6753 "directory strip option for patch. This has the same meaning as the "
6754 "corresponding patch option"
6755 msgstr ""
6756
6757 msgid "base path"
6758 msgstr ""
6759
6760 msgid "skip check for outstanding uncommitted changes"
6761 msgstr ""
6762
6763 msgid "don't commit, just update the working directory"
6764 msgstr ""
6765
6766 msgid "apply patch to the nodes from which it was generated"
6767 msgstr ""
6768
6769 msgid "use any branch information in patch (implied by --exact)"
6770 msgstr ""
6771
6772 msgid "[OPTION]... PATCH..."
6773 msgstr ""
6774
6775 msgid "show newest record first"
6776 msgstr ""
6777
6778 msgid "file to store the bundles into"
6779 msgstr ""
6780
6781 msgid "a specific revision up to which you would like to pull"
6782 msgstr "指定要取得的最高版本"
6783
6784 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6785 msgstr ""
6786
6787 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6788 msgstr ""
6789
6790 msgid "search the repository as it stood at REV"
6791 msgstr ""
6792
6793 msgid "end filenames with NUL, for use with xargs"
6794 msgstr "在文件名称结尾增加 NUL,用于 xargs"
6795
6796 msgid "print complete paths from the filesystem root"
6797 msgstr ""
6798
6799 msgid "[OPTION]... [PATTERN]..."
6800 msgstr ""
6801
6802 msgid "only follow the first parent of merge changesets"
6803 msgstr "只跟踪修改集的第一个父亲"
6804
6805 #, fuzzy
6806 msgid "show revisions matching date spec"
6807 msgstr "显示匹配日期的版本"
6808
6809 msgid "show copied files"
6810 msgstr "显示复制的文件"
6811
6812 msgid "do case-insensitive search for a keyword"
6813 msgstr "对关键字执行不区分大小写的搜索"
6814
6815 #, fuzzy
6816 msgid "include revisions where files were removed"
6817 msgstr "包含删除文件的版本"
6818
6819 msgid "show only merges"
6820 msgstr "只显示合并"
6821
6822 #, fuzzy
6823 msgid "revisions committed by user"
6824 msgstr "指定用户提交的版本"
6825
6826 msgid "show only changesets within the given named branch"
6827 msgstr "只显示位于指定命名分支中的修改集"
6828
6829 msgid "do not display revision or any of its ancestors"
6830 msgstr "不显示指定版本或其祖先"
6831
6832 msgid "[OPTION]... [FILE]"
6833 msgstr ""
6834
6835 msgid "revision to display"
6836 msgstr ""
6837
6838 msgid "[-r REV]"
6839 msgstr ""
6840
6841 msgid "force a merge with outstanding changes"
6842 msgstr "强制与已有修改合并"
6843
6844 msgid "revision to merge"
6845 msgstr "要合并的版本"
6846
6847 msgid "review revisions to merge (no merge is performed)"
6848 msgstr ""
6849
6850 msgid "[-f] [[-r] REV]"
6851 msgstr ""
6852
6853 msgid "a specific revision up to which you would like to push"
6854 msgstr "指定你要推送的最高版本"
6855
6856 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6857 msgstr ""
6858
6859 #, fuzzy
6860 msgid "show parents from the specified revision"
6861 msgstr "从指定的版本显示父亲"
6862
6863 msgid "[-r REV] [FILE]"
6864 msgstr ""
6865
6866 msgid "[NAME]"
6867 msgstr ""
6868
6869 msgid "update to new tip if changesets were pulled"
6870 msgstr "如果有新的修改集,就更新到最新版本"
6871
6872 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6873 msgstr ""
6874
6875 msgid "force push"
6876 msgstr "强制推送"
6877
6878 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6879 msgstr ""
6880
6881 msgid "record delete for missing files"
6882 msgstr "将丢失的文件视为删除"
6883
6884 msgid "remove (and delete) file even if added or modified"
6885 msgstr "删除文件,纵然它已被增加或修改"
6886
6887 msgid "record a rename that has already occurred"
6888 msgstr "记录已经发生的改名"
6889
6890 msgid "[OPTION]... SOURCE... DEST"
6891 msgstr ""
6892
6893 msgid "remerge all unresolved files"
6894 msgstr ""
6895
6896 msgid "list state of files needing merge"
6897 msgstr ""
6898
6899 msgid "mark files as resolved"
6900 msgstr ""
6901
6902 msgid "unmark files as resolved"
6903 msgstr ""
6904
6905 msgid "revert all changes when no arguments given"
6906 msgstr ""
6907
6908 msgid "tipmost revision matching date"
6909 msgstr "匹配最接近顶点的日期"
6910
6911 msgid "revision to revert to"
6912 msgstr ""
6913
6914 msgid "do not save backup copies of files"
6915 msgstr ""
6916
6917 msgid "[OPTION]... [-r REV] [NAME]..."
6918 msgstr ""
6919
6920 msgid "name of access log file to write to"
6921 msgstr "记录访问日志的文件名称"
6922
6923 msgid "name of error log file to write to"
6924 msgstr "记录错误日志的文件名称"
6925
6926 msgid "port to listen on (default: 8000)"
6927 msgstr "监听的端口(默认: 8000)"
6928
6929 msgid "address to listen on (default: all interfaces)"
6930 msgstr "监听地址(默认: 所有地址)"
6931
6932 msgid "prefix path to serve from (default: server root)"
6933 msgstr "服务路径前缀(默认: 服务器根)"
6934
6935 #, fuzzy
6936 msgid "name to show in web pages (default: working directory)"
6937 msgstr "在 WEB 页面中显示的名称(默认: 工作目录)"
6938
6939 #, fuzzy
6940 msgid "name of the webdir config file (serve more than one repository)"
6941 msgstr "webdir 配置文件的名称(发布多个版本库)"
6942
6943 msgid "for remote clients"
6944 msgstr "针对远程客户端"
6945
6946 msgid "web templates to use"
6947 msgstr "使用的 WEB 模板"
6948
6949 msgid "template style to use"
6950 msgstr "使用的显示样式"
6951
6952 msgid "use IPv6 in addition to IPv4"
6953 msgstr "同时使用 IPv6 和 IPv4"
6954
6955 msgid "SSL certificate file"
6956 msgstr "SSL 证书文件"
6957
6958 msgid "show untrusted configuration options"
6959 msgstr "显示不能信赖的配置选项"
6960
6961 msgid "[-u] [NAME]..."
6962 msgstr ""
6963
6964 msgid "show status of all files"
6965 msgstr "显示全部文件的状态"
6966
6967 msgid "show only modified files"
6968 msgstr "只显示已修改文件的状态"
6969
6970 msgid "show only added files"
6971 msgstr "只显示已增加文件的状态"
6972
6973 msgid "show only removed files"
6974 msgstr "只显示已移除文件的状态"
6975
6976 msgid "show only deleted (but tracked) files"
6977 msgstr "只显示已删除(但被跟踪)文件的状态"
6978
6979 msgid "show only files without changes"
6980 msgstr "只显示无改动文件的状态"
6981
6982 msgid "show only unknown (not tracked) files"
6983 msgstr "只显示未知(未被跟踪)文件的状态"
6984
6985 msgid "show only ignored files"
6986 msgstr "只显示被忽略文件的状态"
6987
6988 msgid "hide status prefix"
6989 msgstr "隐藏状态前缀"
6990
6991 msgid "show source of copied files"
6992 msgstr "显示文件的复制源"
6993
6994 msgid "show difference from revision"
6995 msgstr "显示版本差异"
6996
6997 msgid "replace existing tag"
6998 msgstr "替换已有的标签"
6999
7000 msgid "make the tag local"
7001 msgstr "标记标签为本地"
7002
7003 msgid "revision to tag"
7004 msgstr "标签对应的版本"
7005
7006 msgid "remove a tag"
7007 msgstr "删除标签"
7008
7009 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7010 msgstr ""
7011
7012 msgid "[-p]"
7013 msgstr ""
7014
7015 msgid "update to new tip if changesets were unbundled"
7016 msgstr ""
7017
7018 msgid "[-u] FILE..."
7019 msgstr ""
7020
7021 msgid "overwrite locally modified files (no backup)"
7022 msgstr "覆盖本地修改的文件(不备份)"
7023
7024 #, fuzzy
7025 msgid "check for uncommitted changes"
7026 msgstr "提交修改集 %d:%s\n"
7027
7028 msgid "[-C] [-d DATE] [[-r] REV]"
7029 msgstr ""
7030
7031 #, python-format
7032 msgid "config error at %s:%d: '%s'"
7033 msgstr ""
7034
7035 msgid "not found in manifest"
7036 msgstr ""
7037
7038 msgid "branch name not in UTF-8!"
7039 msgstr ""
7040
7041 #, python-format
7042 msgid " searching for copies back to rev %d\n"
7043 msgstr ""
7044
7045 #, python-format
7046 msgid ""
7047 " unmatched files in local:\n"
7048 " %s\n"
7049 msgstr ""
7050
7051 #, python-format
7052 msgid ""
7053 " unmatched files in other:\n"
7054 " %s\n"
7055 msgstr ""
7056
7057 msgid " all copies found (* = to merge, ! = divergent):\n"
7058 msgstr ""
7059
7060 msgid " checking for directory renames\n"
7061 msgstr ""
7062
7063 #, python-format
7064 msgid " dir %s -> %s\n"
7065 msgstr ""
7066
7067 #, python-format
7068 msgid " file %s -> %s\n"
7069 msgstr ""
7070
7071 msgid "working directory state appears damaged!"
7072 msgstr ""
7073
7074 #, python-format
7075 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7076 msgstr ""
7077
7078 #, python-format
7079 msgid "directory %r already in dirstate"
7080 msgstr ""
7081
7082 #, python-format
7083 msgid "file %r in dirstate clashes with %r"
7084 msgstr ""
7085
7086 #, python-format
7087 msgid "not in dirstate: %s\n"
7088 msgstr ""
7089
7090 msgid "unknown"
7091 msgstr ""
7092
7093 msgid "character device"
7094 msgstr ""
7095
7096 msgid "block device"
7097 msgstr ""
7098
7099 msgid "fifo"
7100 msgstr ""
7101
7102 msgid "socket"
7103 msgstr ""
7104
7105 msgid "directory"
7106 msgstr ""
7107
7108 #, python-format
7109 msgid "unsupported file type (type is %s)"
7110 msgstr ""
7111
7112 #, python-format
7113 msgid "abort: %s\n"
7114 msgstr "中止: %s\n"
7115
7116 #, python-format
7117 msgid "hg: %s\n"
7118 msgstr ""
7119
7120 #, python-format
7121 msgid ""
7122 "hg: command '%s' is ambiguous:\n"
7123 " %s\n"
7124 msgstr ""
7125
7126 #, python-format
7127 msgid "timed out waiting for lock held by %s"
7128 msgstr ""
7129
7130 #, python-format
7131 msgid "lock held by %s"
7132 msgstr ""
7133
7134 #, python-format
7135 msgid "abort: %s: %s\n"
7136 msgstr "中止: %s: %s\n"
7137
7138 #, python-format
7139 msgid "abort: could not lock %s: %s\n"
7140 msgstr "中止: 不能锁定 %s: %s\n"
7141
7142 #, python-format
7143 msgid "hg %s: %s\n"
7144 msgstr ""
7145
7146 #, python-format
7147 msgid "abort: %s!\n"
7148 msgstr "中止: %s!\n"
7149
7150 #, python-format
7151 msgid "abort: %s"
7152 msgstr "中止: %s"
7153
7154 msgid " empty string\n"
7155 msgstr ""
7156
7157 msgid "killed!\n"
7158 msgstr ""
7159
7160 #, python-format
7161 msgid "hg: unknown command '%s'\n"
7162 msgstr "hg: 未知命令 '%s'\n"
7163
7164 #, python-format
7165 msgid "abort: could not import module %s!\n"
7166 msgstr "中止: 不能导入模块 %s!\n"
7167
7168 msgid "(did you forget to compile extensions?)\n"
7169 msgstr "(你是否忘记了编译扩展?)\n"
7170
7171 msgid "(is your Python install correct?)\n"
7172 msgstr "(你的 Python 安装正确吗?)\n"
7173
7174 #, python-format
7175 msgid "abort: error: %s\n"
7176 msgstr "中止: 失败: %s\n"
7177
7178 msgid "broken pipe\n"
7179 msgstr "坏掉的管道\n"
7180
7181 msgid "interrupted!\n"
7182 msgstr "中断!\n"
7183
7184 msgid ""
7185 "\n"
7186 "broken pipe\n"
7187 msgstr ""
7188 "\n"
7189 "坏掉的管道\n"
7190
7191 msgid "abort: out of memory\n"
7192 msgstr "中止: 内存不足\n"
7193
7194 msgid "** unknown exception encountered, details follow\n"
7195 msgstr "** 遇到了未知异常,详细信息如下\n"
7196
7197 #, fuzzy
7198 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7199 msgstr "** 报告问题详情到 http://www.selenic.com/mercurial/bts\n"
7200
7201 msgid "** or mercurial@selenic.com\n"
7202 msgstr "** 或 mercurial@selenic.com\n"
7203
7204 #, python-format
7205 msgid "** Mercurial Distributed SCM (version %s)\n"
7206 msgstr "** 分布式软件配置管理工具 - 水银 (版本 %s)\n"
7207
7208 #, python-format
7209 msgid "** Extensions loaded: %s\n"
7210 msgstr "** 已加载的扩展: %s\n"
7211
7212 #, python-format
7213 msgid "no definition for alias '%s'\n"
7214 msgstr ""
7215
7216 #, fuzzy, python-format
7217 msgid "alias '%s' resolves to unknown command '%s'\n"
7218 msgstr "hg: 未知命令 '%s'\n"
7219
7220 #, python-format
7221 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7222 msgstr ""
7223
7224 #, fuzzy, python-format
7225 msgid "alias '%s' shadows command\n"
7226 msgstr ""
7227 "命令列表:\n"
7228 "\n"
7229
7230 #, python-format
7231 msgid "malformed --config option: %s"
7232 msgstr "非法 '--config' 选项: %s"
7233
7234 #, python-format
7235 msgid "extension '%s' overrides commands: %s\n"
7236 msgstr "扩展 '%s' 覆盖了命令: %s\n"
7237
7238 msgid "Option --config may not be abbreviated!"
7239 msgstr "选项 '--config' 不能简短!"
7240
7241 msgid "Option --cwd may not be abbreviated!"
7242 msgstr "选项 '--cwd' 不能简短!"
7243
7244 #, fuzzy
7245 msgid ""
7246 "Option -R has to be separated from other options (e.g. not -qR) and --"
7247 "repository may only be abbreviated as --repo!"
7248 msgstr ""
7249 "选项 -R 必须隔离使用(也就是不能 -qR),并且 --repository 只能简短为 --repo!"
7250
7251 #, python-format
7252 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7253 msgstr "时间: 实际 %.3f 秒(用户 %.3f+%.3f 系统 %.3f+%.3f)\n"
7254
7255 #, python-format
7256 msgid "repository '%s' is not local"
7257 msgstr "非本地版本库 '%s'"
7258
7259 msgid "invalid arguments"
7260 msgstr "非法参数"
7261
7262 #, python-format
7263 msgid "unrecognized profiling format '%s' - Ignored\n"
7264 msgstr ""
7265
7266 msgid ""
7267 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7268 "misc/lsprof/"
7269 msgstr ""
7270 "lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装"
7271
7272 #, python-format
7273 msgid "*** failed to import extension %s from %s: %s\n"
7274 msgstr "*** 加载扩展 '%s',自 '%s': %s\n"
7275
7276 #, python-format
7277 msgid "*** failed to import extension %s: %s\n"
7278 msgstr "*** 加载扩展 '%s' 失败: %s\n"
7279
7280 #, python-format
7281 msgid "couldn't find merge tool %s\n"
7282 msgstr "不能找到合并工具 '%s'\n"
7283
7284 #, python-format
7285 msgid "tool %s can't handle symlinks\n"
7286 msgstr "工具 '%s' 不能处理符号链接\n"
7287
7288 #, python-format
7289 msgid "tool %s can't handle binary\n"
7290 msgstr "工具 '%s' 不能处理二进制\n"
7291
7292 #, python-format
7293 msgid "tool %s requires a GUI\n"
7294 msgstr "工具 '%s' 需要 GUI\n"
7295
7296 #, python-format
7297 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7298 msgstr "选择工具 '%s',用于 %s(二进制 %s 符号链接 %s)\n"
7299
7300 #, python-format
7301 msgid ""
7302 " no tool found to merge %s\n"
7303 "keep (l)ocal or take (o)ther?"
7304 msgstr ""
7305 " 没有找到工具合并 %s\n"
7306 "使用本地(l)或者他人(o)的内容?"
7307
7308 msgid "&Local"
7309 msgstr ""
7310
7311 msgid "&Other"
7312 msgstr ""
7313
7314 #, python-format
7315 msgid "merging %s and %s to %s\n"
7316 msgstr ""
7317
7318 #, python-format
7319 msgid "merging %s\n"
7320 msgstr ""
7321
7322 #, python-format
7323 msgid "my %s other %s ancestor %s\n"
7324 msgstr ""
7325
7326 msgid " premerge successful\n"
7327 msgstr ""
7328
7329 #, python-format
7330 msgid ""
7331 " output file %s appears unchanged\n"
7332 "was merge successful (yn)?"
7333 msgstr ""
7334
7335 msgid "&No"
7336 msgstr ""
7337
7338 msgid "&Yes"
7339 msgstr ""
7340
7341 #, python-format
7342 msgid "merging %s failed!\n"
7343 msgstr ""
7344
7345 #, python-format
7346 msgid "Inconsistent state, %s:%s is good and bad"
7347 msgstr ""
7348
7349 #, python-format
7350 msgid "unknown bisect kind %s"
7351 msgstr ""
7352
7353 msgid ""
7354 "\n"
7355 " Mercurial has the ability to add new features through the use of\n"
7356 " extensions. Extensions may add new commands, add options to\n"
7357 " existing commands, change the default behavior of commands, or\n"
7358 " implement hooks.\n"
7359 "\n"
7360 " Extensions are not loaded by default for a variety of reasons:\n"
7361 " they can increase startup overhead; they may be meant for advanced\n"
7362 " usage only; they may provide potentially dangerous abilities (such\n"
7363 " as letting you destroy or modify history); they might not be ready\n"
7364 " for prime time; or they may alter some usual behaviors of stock\n"
7365 " Mercurial. It is thus up to the user to activate extensions as\n"
7366 " needed.\n"
7367 "\n"
7368 " To enable the \"foo\" extension, either shipped with Mercurial or in\n"
7369 " the Python search path, create an entry for it in your hgrc, like\n"
7370 " this::\n"
7371 "\n"
7372 " [extensions]\n"
7373 " foo =\n"
7374 "\n"
7375 " You may also specify the full path to an extension::\n"
7376 "\n"
7377 " [extensions]\n"
7378 " myfeature = ~/.hgext/myfeature.py\n"
7379 "\n"
7380 " To explicitly disable an extension enabled in an hgrc of broader\n"
7381 " scope, prepend its path with !::\n"
7382 "\n"
7383 " [extensions]\n"
7384 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7385 " hgext.bar = !/path/to/extension/bar.py\n"
7386 " # ditto, but no path was supplied for extension baz\n"
7387 " hgext.baz = !\n"
7388 " "
7389 msgstr ""
7390
7391 #, fuzzy
7392 msgid "disabled extensions:"
7393 msgstr ""
7394 "\n"
7395 "启用的扩展:\n"
7396 "\n"
7397
7398 msgid "Date Formats"
7399 msgstr ""
7400
7401 msgid ""
7402 "\n"
7403 " Some commands allow the user to specify a date, e.g.:\n"
7404 "\n"
7405 " - backout, commit, import, tag: Specify the commit date.\n"
7406 " - log, revert, update: Select revision(s) by date.\n"
7407 "\n"
7408 " Many date formats are valid. Here are some examples::\n"
7409 "\n"
7410 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7411 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7412 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7413 " \"Dec 6\" (midnight)\n"
7414 " \"13:18\" (today assumed)\n"
7415 " \"3:39\" (3:39AM assumed)\n"
7416 " \"3:39pm\" (15:39)\n"
7417 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7418 " \"2006-12-6 13:18\"\n"
7419 " \"2006-12-6\"\n"
7420 " \"12-6\"\n"
7421 " \"12/6\"\n"
7422 " \"12/6/6\" (Dec 6 2006)\n"
7423 "\n"
7424 " Lastly, there is Mercurial's internal format::\n"
7425 "\n"
7426 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7427 "\n"
7428 " This is the internal representation format for dates. unixtime is\n"
7429 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7430 " offset is the offset of the local timezone, in seconds west of UTC\n"
7431 " (negative if the timezone is east of UTC).\n"
7432 "\n"
7433 " The log command also accepts date ranges::\n"
7434 "\n"
7435 " \"<{datetime}\" - at or before a given date/time\n"
7436 " \">{datetime}\" - on or after a given date/time\n"
7437 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7438 " \"-{days}\" - within a given number of days of today\n"
7439 " "
7440 msgstr ""
7441
7442 msgid "File Name Patterns"
7443 msgstr ""
7444
7445 msgid ""
7446 "\n"
7447 " Mercurial accepts several notations for identifying one or more\n"
7448 " files at a time.\n"
7449 "\n"
7450 " By default, Mercurial treats filenames as shell-style extended\n"
7451 " glob patterns.\n"
7452 "\n"
7453 " Alternate pattern notations must be specified explicitly.\n"
7454 "\n"
7455 " To use a plain path name without any pattern matching, start it\n"
7456 " with \"path:\". These path names must completely match starting at\n"
7457 " the current repository root.\n"
7458 "\n"
7459 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7460 " rooted at the current directory; a glob such as \"``*.c``\" will\n"
7461 " only match files in the current directory ending with \".c\".\n"
7462 "\n"
7463 " The supported glob syntax extensions are \"``**``\" to match any\n"
7464 " string across path separators and \"{a,b}\" to mean \"a or b\".\n"
7465 "\n"
7466 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7467 " Regexp pattern matching is anchored at the root of the repository.\n"
7468 "\n"
7469 " Plain examples::\n"
7470 "\n"
7471 " path:foo/bar a name bar in a directory named foo in the root\n"
7472 " of the repository\n"
7473 " path:path:name a file or directory named \"path:name\"\n"
7474 "\n"
7475 " Glob examples::\n"
7476 "\n"
7477 " glob:*.c any name ending in \".c\" in the current directory\n"
7478 " *.c any name ending in \".c\" in the current directory\n"
7479 " **.c any name ending in \".c\" in any subdirectory of the\n"
7480 " current directory including itself.\n"
7481 " foo/*.c any name ending in \".c\" in the directory foo\n"
7482 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7483 " including itself.\n"
7484 "\n"
7485 " Regexp examples::\n"
7486 "\n"
7487 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7488 "\n"
7489 " "
7490 msgstr ""
7491
7492 msgid "Environment Variables"
7493 msgstr ""
7494
7495 msgid ""
7496 "\n"
185 "HG\n" 7497 "HG\n"
186 " Path to the 'hg' executable, automatically passed when running\n" 7498 " Path to the 'hg' executable, automatically passed when running\n"
187 " hooks, extensions or external tools. If unset or empty, this is\n" 7499 " hooks, extensions or external tools. If unset or empty, this is\n"
188 " the hg executable's name if it's frozen, or an executable named\n" 7500 " the hg executable's name if it's frozen, or an executable named\n"
189 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" 7501 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
256 " defaults to 'vi'.\n" 7568 " defaults to 'vi'.\n"
257 "\n" 7569 "\n"
258 "PYTHONPATH\n" 7570 "PYTHONPATH\n"
259 " This is used by Python to find imported modules and may need to be\n" 7571 " This is used by Python to find imported modules and may need to be\n"
260 " set appropriately if this Mercurial is not installed system-wide.\n" 7572 " set appropriately if this Mercurial is not installed system-wide.\n"
261 msgstr "" 7573 " "
262 7574 msgstr ""
263 msgid "" 7575
264 "Mercurial has the ability to add new features through the use of\n" 7576 msgid "Specifying Single Revisions"
265 "extensions. Extensions may add new commands, add options to\n" 7577 msgstr ""
266 "existing commands, change the default behavior of commands, or\n" 7578
267 "implement hooks.\n" 7579 msgid ""
268 "\n" 7580 "\n"
269 "Extensions are not loaded by default for a variety of reasons:\n" 7581 " Mercurial supports several ways to specify individual revisions.\n"
270 "they can increase startup overhead; they may be meant for advanced\n" 7582 "\n"
271 "usage only; they may provide potentially dangerous abilities (such\n" 7583 " A plain integer is treated as a revision number. Negative integers\n"
272 "as letting you destroy or modify history); they might not be ready\n" 7584 " are treated as sequential offsets from the tip, with -1 denoting\n"
273 "for prime time; or they may alter some usual behaviors of stock\n" 7585 " the tip, -2 denoting the revision prior to the tip, and so forth.\n"
274 "Mercurial. It is thus up to the user to activate extensions as\n" 7586 "\n"
275 "needed.\n" 7587 " A 40-digit hexadecimal string is treated as a unique revision\n"
276 "\n" 7588 " identifier.\n"
277 "To enable the \"foo\" extension, either shipped with Mercurial or in\n" 7589 "\n"
278 "the Python search path, create an entry for it in your hgrc, like\n" 7590 " A hexadecimal string less than 40 characters long is treated as a\n"
279 "this::\n" 7591 " unique revision identifier and is referred to as a short-form\n"
280 "\n" 7592 " identifier. A short-form identifier is only valid if it is the\n"
281 " [extensions]\n" 7593 " prefix of exactly one full-length identifier.\n"
282 " foo =\n" 7594 "\n"
283 "\n" 7595 " Any other string is treated as a tag or branch name. A tag name is\n"
284 "You may also specify the full path to an extension::\n" 7596 " a symbolic name associated with a revision identifier. A branch\n"
285 "\n" 7597 " name denotes the tipmost revision of that branch. Tag and branch\n"
286 " [extensions]\n" 7598 " names must not contain the \":\" character.\n"
287 " myfeature = ~/.hgext/myfeature.py\n" 7599 "\n"
288 "\n" 7600 " The reserved name \"tip\" is a special tag that always identifies\n"
289 "To explicitly disable an extension enabled in an hgrc of broader\n" 7601 " the most recent revision.\n"
290 "scope, prepend its path with !::\n" 7602 "\n"
291 "\n" 7603 " The reserved name \"null\" indicates the null revision. This is the\n"
292 " [extensions]\n" 7604 " revision of an empty repository, and the parent of revision 0.\n"
293 " # disabling extension bar residing in /path/to/extension/bar.py\n" 7605 "\n"
294 " hgext.bar = !/path/to/extension/bar.py\n" 7606 " The reserved name \".\" indicates the working directory parent. If\n"
295 " # ditto, but no path was supplied for extension baz\n" 7607 " no working directory is checked out, it is equivalent to null. If\n"
296 " hgext.baz = !\n" 7608 " an uncommitted merge is in progress, \".\" is the revision of the\n"
297 msgstr "" 7609 " first parent.\n"
7610 " "
7611 msgstr ""
7612
7613 msgid "Specifying Multiple Revisions"
7614 msgstr "指定多个版本"
298 7615
299 #, fuzzy 7616 #, fuzzy
300 msgid "" 7617 msgid ""
301 "When Mercurial accepts more than one revision, they may be specified\n" 7618 "\n"
302 "individually, or provided as a topologically continuous range,\n" 7619 " When Mercurial accepts more than one revision, they may be\n"
303 "separated by the \":\" character.\n" 7620 " specified individually, or provided as a topologically continuous\n"
304 "\n" 7621 " range, separated by the \":\" character.\n"
305 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" 7622 "\n"
306 "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" 7623 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
307 "specified, it defaults to revision number 0. If END is not specified,\n" 7624 " are revision identifiers. Both BEGIN and END are optional. If\n"
308 "it defaults to the tip. The range \":\" thus means \"all revisions\".\n" 7625 " BEGIN is not specified, it defaults to revision number 0. If END\n"
309 "\n" 7626 " is not specified, it defaults to the tip. The range \":\" thus means\n"
310 "If BEGIN is greater than END, revisions are treated in reverse order.\n" 7627 " \"all revisions\".\n"
311 "\n" 7628 "\n"
312 "A range acts as a closed interval. This means that a range of 3:5\n" 7629 " If BEGIN is greater than END, revisions are treated in reverse\n"
313 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" 7630 " order.\n"
7631 "\n"
7632 " A range acts as a closed interval. This means that a range of 3:5\n"
7633 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7634 " "
314 msgstr "" 7635 msgstr ""
315 "\n" 7636 "\n"
316 " 当水银接受多个版本时,它们可以单独给出,或者以字符 \":\" 分割的拓扑连续\n" 7637 " 当水银接受多个版本时,它们可以单独给出,或者以字符 \":\" 分割的拓扑连续\n"
317 " 范围格式提供。\n" 7638 " 范围格式提供。\n"
318 "\n" 7639 "\n"
325 "\n" 7646 "\n"
326 " 范围是闭区间。即范围 '3:5' 是 '3','4','5'。同样,范围 '9:6' 是 '9',\n" 7647 " 范围是闭区间。即范围 '3:5' 是 '3','4','5'。同样,范围 '9:6' 是 '9',\n"
327 " '8','7' 和 '6'。\n" 7648 " '8','7' 和 '6'。\n"
328 " " 7649 " "
329 7650
330 msgid "" 7651 msgid "Diff Formats"
331 "Mercurial accepts several notations for identifying one or more files\n" 7652 msgstr "差异格式"
332 "at a time.\n"
333 "\n"
334 "By default, Mercurial treats filenames as shell-style extended glob\n"
335 "patterns.\n"
336 "\n"
337 "Alternate pattern notations must be specified explicitly.\n"
338 "\n"
339 "To use a plain path name without any pattern matching, start it with\n"
340 "``path:``. These path names must completely match starting at the\n"
341 "current repository root.\n"
342 "\n"
343 "To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
344 "at the current directory; a glob such as ``*.c`` will only match files\n"
345 "in the current directory ending with ``.c``.\n"
346 "\n"
347 "The supported glob syntax extensions are ``**`` to match any string\n"
348 "across path separators and ``{a,b}`` to mean \"a or b\".\n"
349 "\n"
350 "To use a Perl/Python regular expression, start a name with ``re:``.\n"
351 "Regexp pattern matching is anchored at the root of the repository.\n"
352 "\n"
353 "Plain examples::\n"
354 "\n"
355 " path:foo/bar a name bar in a directory named foo in the root\n"
356 " of the repository\n"
357 " path:path:name a file or directory named \"path:name\"\n"
358 "\n"
359 "Glob examples::\n"
360 "\n"
361 " glob:*.c any name ending in \".c\" in the current directory\n"
362 " *.c any name ending in \".c\" in the current directory\n"
363 " **.c any name ending in \".c\" in any subdirectory of the\n"
364 " current directory including itself.\n"
365 " foo/*.c any name ending in \".c\" in the directory foo\n"
366 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
367 " including itself.\n"
368 "\n"
369 "Regexp examples::\n"
370 "\n"
371 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
372 msgstr ""
373
374 msgid ""
375 "Mercurial supports several ways to specify individual revisions.\n"
376 "\n"
377 "A plain integer is treated as a revision number. Negative integers are\n"
378 "treated as sequential offsets from the tip, with -1 denoting the tip,\n"
379 "-2 denoting the revision prior to the tip, and so forth.\n"
380 "\n"
381 "A 40-digit hexadecimal string is treated as a unique revision\n"
382 "identifier.\n"
383 "\n"
384 "A hexadecimal string less than 40 characters long is treated as a\n"
385 "unique revision identifier and is referred to as a short-form\n"
386 "identifier. A short-form identifier is only valid if it is the prefix\n"
387 "of exactly one full-length identifier.\n"
388 "\n"
389 "Any other string is treated as a tag or branch name. A tag name is a\n"
390 "symbolic name associated with a revision identifier. A branch name\n"
391 "denotes the tipmost revision of that branch. Tag and branch names must\n"
392 "not contain the \":\" character.\n"
393 "\n"
394 "The reserved name \"tip\" is a special tag that always identifies the\n"
395 "most recent revision.\n"
396 "\n"
397 "The reserved name \"null\" indicates the null revision. This is the\n"
398 "revision of an empty repository, and the parent of revision 0.\n"
399 "\n"
400 "The reserved name \".\" indicates the working directory parent. If no\n"
401 "working directory is checked out, it is equivalent to null. If an\n"
402 "uncommitted merge is in progress, \".\" is the revision of the first\n"
403 "parent.\n"
404 msgstr ""
405 7653
406 #, fuzzy 7654 #, fuzzy
407 msgid "" 7655 msgid ""
408 "Mercurial allows you to customize output of commands through\n" 7656 "\n"
409 "templates. You can either pass in a template from the command\n" 7657 " Mercurial's default format for showing changes between two\n"
410 "line, via the --template option, or select an existing\n" 7658 " versions of a file is compatible with the unified format of GNU\n"
411 "template-style (--style).\n" 7659 " diff, which can be used by GNU patch and many other standard\n"
412 "\n" 7660 " tools.\n"
413 "You can customize output for any \"log-like\" command: log,\n" 7661 "\n"
414 "outgoing, incoming, tip, parents, heads and glog.\n" 7662 " While this standard format is often enough, it does not encode the\n"
415 "\n" 7663 " following information:\n"
416 "Three styles are packaged with Mercurial: default (the style used\n" 7664 "\n"
417 "when no explicit preference is passed), compact and changelog.\n" 7665 " - executable status and other permission bits\n"
418 "Usage::\n" 7666 " - copy or rename information\n"
419 "\n" 7667 " - changes in binary files\n"
420 " $ hg log -r1 --style changelog\n" 7668 " - creation or deletion of empty files\n"
421 "\n" 7669 "\n"
422 "A template is a piece of text, with markup to invoke variable\n" 7670 " Mercurial also supports the extended diff format from the git VCS\n"
423 "expansion::\n" 7671 " which addresses these limitations. The git diff format is not\n"
424 "\n" 7672 " produced by default because a few widespread tools still do not\n"
425 " $ hg log -r1 --template \"{node}\\n\"\n" 7673 " understand this format.\n"
426 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" 7674 "\n"
427 "\n" 7675 " This means that when generating diffs from a Mercurial repository\n"
428 "Strings in curly braces are called keywords. The availability of\n" 7676 " (e.g. with \"hg export\"), you should be careful about things like\n"
429 "keywords depends on the exact context of the templater. These\n" 7677 " file copies and renames or other things mentioned above, because\n"
430 "keywords are usually available for templating a log-like command:\n" 7678 " when applying a standard diff to a different repository, this\n"
431 "\n" 7679 " extra information is lost. Mercurial's internal operations (like\n"
432 ":author: String. The unmodified author of the changeset.\n" 7680 " push and pull) are not affected by this, because they use an\n"
433 ":branches: String. The name of the branch on which the changeset\n" 7681 " internal binary format for communicating changes.\n"
434 " was committed. Will be empty if the branch name was\n" 7682 "\n"
435 " default.\n" 7683 " To make Mercurial produce the git extended diff format, use the\n"
436 ":date: Date information. The date when the changeset was\n" 7684 " --git option available for many commands, or set 'git = True' in\n"
437 " committed.\n" 7685 " the [diff] section of your hgrc. You do not need to set this\n"
438 ":desc: String. The text of the changeset description.\n" 7686 " option when importing diffs in this format or using them in the mq\n"
439 ":diffstat: String. Statistics of changes with the following\n" 7687 " extension.\n"
440 " format: \"modified files: +added/-removed lines\"\n" 7688 " "
441 ":files: List of strings. All files modified, added, or removed\n" 7689 msgstr ""
442 " by this changeset.\n" 7690 "\n"
443 ":file_adds: List of strings. Files added by this changeset.\n" 7691 " 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容,可用于\n"
444 ":file_mods: List of strings. Files modified by this changeset.\n" 7692 " GNU patch 和许多标准工具。\n"
445 ":file_dels: List of strings. Files removed by this changeset.\n" 7693 "\n"
446 ":node: String. The changeset identification hash, as a\n" 7694 " 虽然标准格式在大多数情况下都能满足要求,但是它不包含下述信息:\n"
447 " 40-character hexadecimal string.\n" 7695 "\n"
448 ":parents: List of strings. The parents of the changeset.\n" 7696 " - 可执行状态和其它权限位\n"
449 ":rev: Integer. The repository-local changeset revision\n" 7697 " - 复制或改名信息\n"
450 " number.\n" 7698 " - 二进制文件的修改\n"
451 ":tags: List of strings. Any tags associated with the\n" 7699 " - 创建或删除空文件\n"
452 " changeset.\n" 7700 "\n"
453 ":latesttag: String. Most recent global tag in the ancestors of this\n" 7701 " 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n"
454 " changeset.\n" 7702 " 此格式,所以它不是默认格式。\n"
455 ":latesttagdistance: Integer. Longest path to the latest tag.\n" 7703 "\n"
456 "\n" 7704 " 这意味着当从水银版本库(例如 \"hg export\")产生差异时,在其它版本库应用标\n"
457 "The \"date\" keyword does not produce human-readable output. If you\n" 7705 " 准差异时,会丢失文件复制或改名等额外信息,所以你要小心处理。水银的内部\n"
458 "want to use a date in your output, you can use a filter to process\n" 7706 " 操作(例如 push 和 pull)在传达改变时,使用内部的二进制格式,所以不受影\n"
459 "it. Filters are functions which return a string based on the input\n" 7707 " 响。\n"
460 "variable. You can also use a chain of filters to get the desired\n" 7708 "\n"
461 "output::\n" 7709 " 要让水银产生 git 扩展差异格式,可以对许多命令使用选项 '--git',或者在\n"
462 "\n" 7710 " 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时,\n"
463 " $ hg tip --template \"{date|isodate}\\n\"\n" 7711 " 或在 mq 扩展中使用时,不需要设置此选项。\n"
464 " 2008-08-21 18:22 +0000\n" 7712 " "
465 "\n" 7713
466 "List of filters:\n" 7714 msgid "Template Usage"
467 "\n" 7715 msgstr "模版用法"
468 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" 7716
469 " every line except the last.\n" 7717 #, fuzzy
470 ":age: Date. Returns a human-readable date/time difference\n" 7718 msgid ""
471 " between the given date/time and the current\n" 7719 "\n"
472 " date/time.\n" 7720 " Mercurial allows you to customize output of commands through\n"
473 ":basename: Any text. Treats the text as a path, and returns the\n" 7721 " templates. You can either pass in a template from the command\n"
474 " last component of the path after splitting by the\n" 7722 " line, via the --template option, or select an existing\n"
475 " path separator (ignoring trailing separators). For\n" 7723 " template-style (--style).\n"
476 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" 7724 "\n"
477 " becomes \"bar\".\n" 7725 " You can customize output for any \"log-like\" command: log,\n"
478 ":stripdir: Treat the text as path and strip a directory level,\n" 7726 " outgoing, incoming, tip, parents, heads and glog.\n"
479 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n" 7727 "\n"
480 " \"foo\".\n" 7728 " Three styles are packaged with Mercurial: default (the style used\n"
481 ":date: Date. Returns a date in a Unix date format, including\n" 7729 " when no explicit preference is passed), compact and changelog.\n"
482 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" 7730 " Usage::\n"
483 ":domain: Any text. Finds the first string that looks like an\n" 7731 "\n"
484 " email address, and extracts just the domain\n" 7732 " $ hg log -r1 --style changelog\n"
485 " component. Example: 'User <user@example.com>' becomes\n" 7733 "\n"
486 " 'example.com'.\n" 7734 " A template is a piece of text, with markup to invoke variable\n"
487 ":email: Any text. Extracts the first string that looks like\n" 7735 " expansion::\n"
488 " an email address. Example: 'User <user@example.com>'\n" 7736 "\n"
489 " becomes 'user@example.com'.\n" 7737 " $ hg log -r1 --template \"{node}\\n\"\n"
490 ":escape: Any text. Replaces the special XML/XHTML characters\n" 7738 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
491 " \"&\", \"<\" and \">\" with XML entities.\n" 7739 "\n"
492 ":fill68: Any text. Wraps the text to fit in 68 columns.\n" 7740 " Strings in curly braces are called keywords. The availability of\n"
493 ":fill76: Any text. Wraps the text to fit in 76 columns.\n" 7741 " keywords depends on the exact context of the templater. These\n"
494 ":firstline: Any text. Returns the first line of text.\n" 7742 " keywords are usually available for templating a log-like command:\n"
495 ":nonempty: Any text. Returns '(none)' if the string is empty.\n" 7743 "\n"
496 ":hgdate: Date. Returns the date as a pair of numbers:\n" 7744 " :author: String. The unmodified author of the changeset.\n"
497 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" 7745 " :branches: String. The name of the branch on which the changeset\n"
498 ":isodate: Date. Returns the date in ISO 8601 format:\n" 7746 " was committed. Will be empty if the branch name was\n"
499 " \"2009-08-18 13:00 +0200\".\n" 7747 " default.\n"
500 ":isodatesec: Date. Returns the date in ISO 8601 format, including\n" 7748 " :date: Date information. The date when the changeset was\n"
501 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" 7749 " committed.\n"
502 " rfc3339date filter.\n" 7750 " :desc: String. The text of the changeset description.\n"
503 ":localdate: Date. Converts a date to local date.\n" 7751 " :diffstat: String. Statistics of changes with the following\n"
504 ":obfuscate: Any text. Returns the input text rendered as a\n" 7752 " format: \"modified files: +added/-removed lines\"\n"
505 " sequence of XML entities.\n" 7753 " :files: List of strings. All files modified, added, or removed\n"
506 ":person: Any text. Returns the text before an email address.\n" 7754 " by this changeset.\n"
507 ":rfc822date: Date. Returns a date using the same format used in\n" 7755 " :file_adds: List of strings. Files added by this changeset.\n"
508 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" 7756 " :file_mods: List of strings. Files modified by this changeset.\n"
509 ":rfc3339date: Date. Returns a date using the Internet date format\n" 7757 " :file_dels: List of strings. Files removed by this changeset.\n"
510 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" 7758 " :node: String. The changeset identification hash, as a\n"
511 ":short: Changeset hash. Returns the short form of a changeset\n" 7759 " 40-character hexadecimal string.\n"
512 " hash, i.e. a 12-byte hexadecimal string.\n" 7760 " :parents: List of strings. The parents of the changeset.\n"
513 ":shortdate: Date. Returns a date like \"2006-09-18\".\n" 7761 " :rev: Integer. The repository-local changeset revision\n"
514 ":strip: Any text. Strips all leading and trailing whitespace.\n" 7762 " number.\n"
515 ":tabindent: Any text. Returns the text, with every line except\n" 7763 " :tags: List of strings. Any tags associated with the\n"
516 " the first starting with a tab character.\n" 7764 " changeset.\n"
517 ":urlescape: Any text. Escapes all \"special\" characters. For\n" 7765 "\n"
518 " example, \"foo bar\" becomes \"foo%20bar\".\n" 7766 " The \"date\" keyword does not produce human-readable output. If you\n"
519 ":user: Any text. Returns the user portion of an email\n" 7767 " want to use a date in your output, you can use a filter to process\n"
520 " address.\n" 7768 " it. Filters are functions which return a string based on the input\n"
7769 " variable. You can also use a chain of filters to get the desired\n"
7770 " output::\n"
7771 "\n"
7772 " $ hg tip --template \"{date|isodate}\\n\"\n"
7773 " 2008-08-21 18:22 +0000\n"
7774 "\n"
7775 " List of filters:\n"
7776 "\n"
7777 " :addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7778 " every line except the last.\n"
7779 " :age: Date. Returns a human-readable date/time difference\n"
7780 " between the given date/time and the current\n"
7781 " date/time.\n"
7782 " :basename: Any text. Treats the text as a path, and returns the\n"
7783 " last component of the path after splitting by the\n"
7784 " path separator (ignoring trailing separators). For\n"
7785 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
7786 " becomes \"bar\".\n"
7787 " :stripdir: Treat the text as path and strip a directory level,\n"
7788 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
7789 " \"foo\".\n"
7790 " :date: Date. Returns a date in a Unix date format, including\n"
7791 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7792 " :domain: Any text. Finds the first string that looks like an\n"
7793 " email address, and extracts just the domain\n"
7794 " component. Example: 'User <user@example.com>' becomes\n"
7795 " 'example.com'.\n"
7796 " :email: Any text. Extracts the first string that looks like\n"
7797 " an email address. Example: 'User <user@example.com>'\n"
7798 " becomes 'user@example.com'.\n"
7799 " :escape: Any text. Replaces the special XML/XHTML characters\n"
7800 " \"&\", \"<\" and \">\" with XML entities.\n"
7801 " :fill68: Any text. Wraps the text to fit in 68 columns.\n"
7802 " :fill76: Any text. Wraps the text to fit in 76 columns.\n"
7803 " :firstline: Any text. Returns the first line of text.\n"
7804 " :nonempty: Any text. Returns '(none)' if the string is empty.\n"
7805 " :hgdate: Date. Returns the date as a pair of numbers:\n"
7806 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7807 " :isodate: Date. Returns the date in ISO 8601 format:\n"
7808 " \"2009-08-18 13:00 +0200\".\n"
7809 " :isodatesec: Date. Returns the date in ISO 8601 format, including\n"
7810 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
7811 " rfc3339date filter.\n"
7812 " :localdate: Date. Converts a date to local date.\n"
7813 " :obfuscate: Any text. Returns the input text rendered as a\n"
7814 " sequence of XML entities.\n"
7815 " :person: Any text. Returns the text before an email address.\n"
7816 " :rfc822date: Date. Returns a date using the same format used in\n"
7817 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
7818 " :rfc3339date: Date. Returns a date using the Internet date format\n"
7819 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
7820 " :short: Changeset hash. Returns the short form of a changeset\n"
7821 " hash, i.e. a 12-byte hexadecimal string.\n"
7822 " :shortdate: Date. Returns a date like \"2006-09-18\".\n"
7823 " :strip: Any text. Strips all leading and trailing whitespace.\n"
7824 " :tabindent: Any text. Returns the text, with every line except\n"
7825 " the first starting with a tab character.\n"
7826 " :urlescape: Any text. Escapes all \"special\" characters. For\n"
7827 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7828 " :user: Any text. Returns the user portion of an email\n"
7829 " address.\n"
7830 " "
521 msgstr "" 7831 msgstr ""
522 "\n" 7832 "\n"
523 " 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n" 7833 " 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n"
524 " 来使用模版,或者选择已有的模版样式(--style)。\n" 7834 " 来使用模版,或者选择已有的模版样式(--style)。\n"
525 "\n" 7835 "\n"
549 " - node: 字符串。修改集的哈系标识,40 个字符的 16 进制字符串。\n" 7859 " - node: 字符串。修改集的哈系标识,40 个字符的 16 进制字符串。\n"
550 " - parents: 字符串列表。修改集的父亲。\n" 7860 " - parents: 字符串列表。修改集的父亲。\n"
551 " - rev: 整数。本地版本库的修改集的版本号。\n" 7861 " - rev: 整数。本地版本库的修改集的版本号。\n"
552 " - tags: 字符串列表。修改集的标签。\n" 7862 " - tags: 字符串列表。修改集的标签。\n"
553 "\n" 7863 "\n"
554 " 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期,可以使" 7864 " 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期,可以使用\n"
555 "用\n"
556 " 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n" 7865 " 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n"
557 " 链来产生理想的输出:\n" 7866 " 链来产生理想的输出:\n"
558 "\n" 7867 "\n"
559 " $ hg tip --template \"{date|isodate}\\n\"\n" 7868 " $ hg tip --template \"{date|isodate}\\n\"\n"
560 " 2008-08-21 18:22 +0000\n" 7869 " 2008-08-21 18:22 +0000\n"
594 " \"foo bar\" 成为 \"foo%20bar\"。\n" 7903 " \"foo bar\" 成为 \"foo%20bar\"。\n"
595 " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n" 7904 " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n"
596 " " 7905 " "
597 7906
598 #, fuzzy 7907 #, fuzzy
599 msgid "" 7908 msgid "URL Paths"
600 "Valid URLs are of the form::\n" 7909 msgstr "统一资源定位路径"
601 "\n" 7910
602 " local/filesystem/path[#revision]\n" 7911 #, fuzzy
603 " file://local/filesystem/path[#revision]\n" 7912 msgid ""
604 " http://[user[:pass]@]host[:port]/[path][#revision]\n" 7913 "\n"
605 " https://[user[:pass]@]host[:port]/[path][#revision]\n" 7914 " Valid URLs are of the form::\n"
606 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n" 7915 "\n"
607 "\n" 7916 " local/filesystem/path[#revision]\n"
608 "Paths in the local filesystem can either point to Mercurial\n" 7917 " file://local/filesystem/path[#revision]\n"
609 "repositories or to bundle files (as created by 'hg bundle' or 'hg\n" 7918 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
610 "incoming --bundle').\n" 7919 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
611 "\n" 7920 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
612 "An optional identifier after # indicates a particular branch, tag, or\n" 7921 "\n"
613 "changeset to use from the remote repository. See also 'hg help\n" 7922 " Paths in the local filesystem can either point to Mercurial\n"
614 "revisions'.\n" 7923 " repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
615 "\n" 7924 " incoming --bundle').\n"
616 "Some features, such as pushing to http:// and https:// URLs are only\n" 7925 "\n"
617 "possible if the feature is explicitly enabled on the remote Mercurial\n" 7926 " An optional identifier after # indicates a particular branch, tag,\n"
618 "server.\n" 7927 " or changeset to use from the remote repository. See also 'hg help\n"
619 "\n" 7928 " revisions'.\n"
620 "Some notes about using SSH with Mercurial:\n" 7929 "\n"
621 "\n" 7930 " Some features, such as pushing to http:// and https:// URLs are\n"
622 "- SSH requires an accessible shell account on the destination machine\n" 7931 " only possible if the feature is explicitly enabled on the remote\n"
623 " and a copy of hg in the remote path or specified with as remotecmd.\n" 7932 " Mercurial server.\n"
624 "- path is relative to the remote user's home directory by default. Use\n" 7933 "\n"
625 " an extra slash at the start of a path to specify an absolute path::\n" 7934 " Some notes about using SSH with Mercurial:\n"
626 "\n" 7935 "\n"
627 " ssh://example.com//tmp/repository\n" 7936 " - SSH requires an accessible shell account on the destination\n"
628 "\n" 7937 " machine and a copy of hg in the remote path or specified with as\n"
629 "- Mercurial doesn't use its own compression via SSH; the right thing\n" 7938 " remotecmd.\n"
630 " to do is to configure it in your ~/.ssh/config, e.g.::\n" 7939 " - path is relative to the remote user's home directory by default.\n"
631 "\n" 7940 " Use an extra slash at the start of a path to specify an absolute\n"
632 " Host *.mylocalnetwork.example.com\n" 7941 " path::\n"
633 " Compression no\n" 7942 "\n"
634 " Host *\n" 7943 " ssh://example.com//tmp/repository\n"
635 " Compression yes\n" 7944 "\n"
636 "\n" 7945 " - Mercurial doesn't use its own compression via SSH; the right\n"
637 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" 7946 " thing to do is to configure it in your ~/.ssh/config, e.g.::\n"
638 " with the --ssh command line option.\n" 7947 "\n"
639 "\n" 7948 " Host *.mylocalnetwork.example.com\n"
640 "These URLs can all be stored in your hgrc with path aliases under the\n" 7949 " Compression no\n"
641 "[paths] section like so::\n" 7950 " Host *\n"
642 "\n" 7951 " Compression yes\n"
643 " [paths]\n" 7952 "\n"
644 " alias1 = URL1\n" 7953 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
645 " alias2 = URL2\n" 7954 " or with the --ssh command line option.\n"
646 " ...\n" 7955 "\n"
647 "\n" 7956 " These URLs can all be stored in your hgrc with path aliases under\n"
648 "You can then use the alias for any command that uses a URL (for\n" 7957 " the [paths] section like so::\n"
649 "example 'hg pull alias1' would pull from the 'alias1' path).\n" 7958 "\n"
650 "\n" 7959 " [paths]\n"
651 "Two path aliases are special because they are used as defaults when\n" 7960 " alias1 = URL1\n"
652 "you do not provide the URL to a command:\n" 7961 " alias2 = URL2\n"
653 "\n" 7962 " ...\n"
654 "default:\n" 7963 "\n"
655 " When you create a repository with hg clone, the clone command saves\n" 7964 " You can then use the alias for any command that uses a URL (for\n"
656 " the location of the source repository as the new repository's\n" 7965 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
657 " 'default' path. This is then used when you omit path from push- and\n" 7966 "\n"
658 " pull-like commands (including incoming and outgoing).\n" 7967 " Two path aliases are special because they are used as defaults\n"
659 "\n" 7968 " when you do not provide the URL to a command:\n"
660 "default-push:\n" 7969 "\n"
661 " The push command will look for a path named 'default-push', and\n" 7970 " default:\n"
662 " prefer it over 'default' if both are defined.\n" 7971 " When you create a repository with hg clone, the clone command\n"
7972 " saves the location of the source repository as the new\n"
7973 " repository's 'default' path. This is then used when you omit\n"
7974 " path from push- and pull-like commands (including incoming and\n"
7975 " outgoing).\n"
7976 "\n"
7977 " default-push:\n"
7978 " The push command will look for a path named 'default-push', and\n"
7979 " prefer it over 'default' if both are defined.\n"
7980 " "
663 msgstr "" 7981 msgstr ""
664 "\n" 7982 "\n"
665 " 有效的位置格式:\n" 7983 " 有效的位置格式:\n"
666 "\n" 7984 "\n"
667 " local/filesystem/path (or file://local/filesystem/path)\n" 7985 " local/filesystem/path (or file://local/filesystem/path)\n"
707 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n" 8025 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
708 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n" 8026 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
709 " 的命令省略路径(包含进和出)。\n" 8027 " 的命令省略路径(包含进和出)。\n"
710 "\n" 8028 "\n"
711 " default-push:\n" 8029 " default-push:\n"
712 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 " 8030 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
713 "'default'。\n" 8031 " "
714 " "
715
716 msgid ""
717 "hooks for controlling repository access\n"
718 "\n"
719 "This hook makes it possible to allow or deny write access to portions\n"
720 "of a repository when receiving incoming changesets.\n"
721 "\n"
722 "The authorization is matched based on the local user name on the\n"
723 "system where the hook runs, and not the committer of the original\n"
724 "changeset (since the latter is merely informative).\n"
725 "\n"
726 "The acl hook is best used along with a restricted shell like hgsh,\n"
727 "preventing authenticating users from doing anything other than\n"
728 "pushing or pulling. The hook is not safe to use if users have\n"
729 "interactive shell access, as they can then disable the hook.\n"
730 "Nor is it safe if remote users share an account, because then there\n"
731 "is no way to distinguish them.\n"
732 "\n"
733 "To use this hook, configure the acl extension in your hgrc like this::\n"
734 "\n"
735 " [extensions]\n"
736 " hgext.acl =\n"
737 "\n"
738 " [hooks]\n"
739 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
740 "\n"
741 " [acl]\n"
742 " # Check whether the source of incoming changes is in this list\n"
743 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
744 " sources = serve\n"
745 "\n"
746 "The allow and deny sections take a subtree pattern as key (with a glob\n"
747 "syntax by default), and a comma separated list of users as the\n"
748 "corresponding value. The deny list is checked before the allow list\n"
749 "is. ::\n"
750 "\n"
751 " [acl.allow]\n"
752 " # If acl.allow is not present, all users are allowed by default.\n"
753 " # An empty acl.allow section means no users allowed.\n"
754 " docs/** = doc_writer\n"
755 " .hgtags = release_engineer\n"
756 "\n"
757 " [acl.deny]\n"
758 " # If acl.deny is not present, no users are refused by default.\n"
759 " # An empty acl.deny section means all users allowed.\n"
760 " glob pattern = user4, user5\n"
761 " ** = user6\n"
762 msgstr ""
763
764 #, python-format
765 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
766 msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集"
767
768 #, python-format
769 msgid "acl: access denied for changeset %s"
770 msgstr "acl: 拒绝访问修改集 %s"
771
772 msgid ""
773 "track a line of development with movable markers\n"
774 "\n"
775 "Bookmarks are local movable markers to changesets. Every bookmark\n"
776 "points to a changeset identified by its hash. If you commit a\n"
777 "changeset that is based on a changeset that has a bookmark on it, the\n"
778 "bookmark shifts to the new changeset.\n"
779 "\n"
780 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
781 "merge, hg update).\n"
782 "\n"
783 "By default, when several bookmarks point to the same changeset, they\n"
784 "will all move forward together. It is possible to obtain a more\n"
785 "git-like experience by adding the following configuration option to\n"
786 "your .hgrc::\n"
787 "\n"
788 " [bookmarks]\n"
789 " track.current = True\n"
790 "\n"
791 "This will cause Mercurial to track the bookmark that you are currently\n"
792 "using, and only update it. This is similar to git's approach to\n"
793 "branching.\n"
794 msgstr ""
795
796 msgid ""
797 "track a line of development with movable markers\n"
798 "\n"
799 " Bookmarks are pointers to certain commits that move when\n"
800 " committing. Bookmarks are local. They can be renamed, copied and\n"
801 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
802 " 'hg update' to merge and update respectively to a given bookmark.\n"
803 "\n"
804 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
805 " directory's parent revision with the given name. If you specify\n"
806 " a revision using -r REV (where REV may be an existing bookmark),\n"
807 " the bookmark is assigned to that revision.\n"
808 " "
809 msgstr ""
810
811 msgid "a bookmark of this name does not exist"
812 msgstr ""
813
814 msgid "a bookmark of the same name already exists"
815 msgstr ""
816
817 msgid "new bookmark name required"
818 msgstr ""
819
820 msgid "bookmark name required"
821 msgstr ""
822
823 msgid "bookmark name cannot contain newlines"
824 msgstr ""
825
826 msgid "a bookmark cannot have the name of an existing branch"
827 msgstr ""
828
829 msgid "force"
830 msgstr "强制"
831
832 msgid "revision"
833 msgstr "版本"
834
835 msgid "delete a given bookmark"
836 msgstr "删除指定书签"
837
838 msgid "rename a given bookmark"
839 msgstr "改名指定书签"
840
841 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
842 msgstr ""
843
844 msgid ""
845 "hooks for integrating with the Bugzilla bug tracker\n"
846 "\n"
847 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
848 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
849 "bug status.\n"
850 "\n"
851 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
852 "installations using MySQL are supported.\n"
853 "\n"
854 "The hook relies on a Bugzilla script to send bug change notification\n"
855 "emails. That script changes between Bugzilla versions; the\n"
856 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
857 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
858 "be run by Mercurial as the user pushing the change; you will need to\n"
859 "ensure the Bugzilla install file permissions are set appropriately.\n"
860 "\n"
861 "The extension is configured through three different configuration\n"
862 "sections. These keys are recognized in the [bugzilla] section:\n"
863 "\n"
864 "host\n"
865 " Hostname of the MySQL server holding the Bugzilla database.\n"
866 "\n"
867 "db\n"
868 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
869 "\n"
870 "user\n"
871 " Username to use to access MySQL server. Default 'bugs'.\n"
872 "\n"
873 "password\n"
874 " Password to use to access MySQL server.\n"
875 "\n"
876 "timeout\n"
877 " Database connection timeout (seconds). Default 5.\n"
878 "\n"
879 "version\n"
880 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
881 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
882 " to 2.18.\n"
883 "\n"
884 "bzuser\n"
885 " Fallback Bugzilla user name to record comments with, if changeset\n"
886 " committer cannot be found as a Bugzilla user.\n"
887 "\n"
888 "bzdir\n"
889 " Bugzilla install directory. Used by default notify. Default\n"
890 " '/var/www/html/bugzilla'.\n"
891 "\n"
892 "notify\n"
893 " The command to run to get Bugzilla to send bug change notification\n"
894 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
895 " and 'user' (committer bugzilla email). Default depends on version;\n"
896 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
897 " %(id)s %(user)s\".\n"
898 "\n"
899 "regexp\n"
900 " Regular expression to match bug IDs in changeset commit message.\n"
901 " Must contain one \"()\" group. The default expression matches 'Bug\n"
902 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
903 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
904 "\n"
905 "style\n"
906 " The style file to use when formatting comments.\n"
907 "\n"
908 "template\n"
909 " Template to use when formatting comments. Overrides style if\n"
910 " specified. In addition to the usual Mercurial keywords, the\n"
911 " extension specifies::\n"
912 "\n"
913 " {bug} The Bugzilla bug ID.\n"
914 " {root} The full pathname of the Mercurial repository.\n"
915 " {webroot} Stripped pathname of the Mercurial repository.\n"
916 " {hgweb} Base URL for browsing Mercurial repositories.\n"
917 "\n"
918 " Default 'changeset {node|short} in repo {root} refers '\n"
919 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
920 "\n"
921 "strip\n"
922 " The number of slashes to strip from the front of {root} to produce\n"
923 " {webroot}. Default 0.\n"
924 "\n"
925 "usermap\n"
926 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
927 " mappings. If specified, the file should contain one mapping per\n"
928 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
929 "\n"
930 "The [usermap] section is used to specify mappings of Mercurial\n"
931 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
932 "\"committer\"=\"Bugzilla user\"\n"
933 "\n"
934 "Finally, the [web] section supports one entry:\n"
935 "\n"
936 "baseurl\n"
937 " Base URL for browsing Mercurial repositories. Reference from\n"
938 " templates as {hgweb}.\n"
939 "\n"
940 "Activating the extension::\n"
941 "\n"
942 " [extensions]\n"
943 " hgext.bugzilla =\n"
944 "\n"
945 " [hooks]\n"
946 " # run bugzilla hook on every change pulled or pushed in here\n"
947 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
948 "\n"
949 "Example configuration:\n"
950 "\n"
951 "This example configuration is for a collection of Mercurial\n"
952 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
953 "installation in /opt/bugzilla-3.2. ::\n"
954 "\n"
955 " [bugzilla]\n"
956 " host=localhost\n"
957 " password=XYZZY\n"
958 " version=3.0\n"
959 " bzuser=unknown@domain.com\n"
960 " bzdir=/opt/bugzilla-3.2\n"
961 " template=Changeset {node|short} in {root|basename}.\n"
962 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
963 " {desc}\\n\n"
964 " strip=5\n"
965 "\n"
966 " [web]\n"
967 " baseurl=http://dev.domain.com/hg\n"
968 "\n"
969 " [usermap]\n"
970 " user@emaildomain.com=user.name@bugzilladomain.com\n"
971 "\n"
972 "Commits add a comment to the Bugzilla bug record of the form::\n"
973 "\n"
974 " Changeset 3b16791d6642 in repository-name.\n"
975 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
976 "\n"
977 " Changeset commit comment. Bug 1234.\n"
978 msgstr ""
979
980 #, python-format
981 msgid "connecting to %s:%s as %s, password %s\n"
982 msgstr "连接到 %s:%s as %s,密码 %s\n"
983
984 #, python-format
985 msgid "query: %s %s\n"
986 msgstr "查询: %s %s\n"
987
988 #, python-format
989 msgid "failed query: %s %s\n"
990 msgstr "查询失败: %s %s\n"
991
992 msgid "unknown database schema"
993 msgstr "未知的数据库方案"
994
995 #, python-format
996 msgid "bug %d already knows about changeset %s\n"
997 msgstr ""
998
999 msgid "telling bugzilla to send mail:\n"
1000 msgstr ""
1001
1002 #, python-format
1003 msgid " bug %s\n"
1004 msgstr ""
1005
1006 #, python-format
1007 msgid "running notify command %s\n"
1008 msgstr ""
1009
1010 #, python-format
1011 msgid "bugzilla notify command %s"
1012 msgstr ""
1013
1014 msgid "done\n"
1015 msgstr "完成\n"
1016
1017 #, python-format
1018 msgid "looking up user %s\n"
1019 msgstr ""
1020
1021 #, python-format
1022 msgid "cannot find bugzilla user id for %s"
1023 msgstr ""
1024
1025 #, python-format
1026 msgid "cannot find bugzilla user id for %s or %s"
1027 msgstr ""
1028
1029 #, python-format
1030 msgid "bugzilla version %s not supported"
1031 msgstr ""
1032
1033 msgid ""
1034 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
1035 "details:\n"
1036 "\t{desc|tabindent}"
1037 msgstr ""
1038
1039 #, python-format
1040 msgid "python mysql support not available: %s"
1041 msgstr ""
1042
1043 #, python-format
1044 msgid "hook type %s does not pass a changeset id"
1045 msgstr ""
1046
1047 #, python-format
1048 msgid "database error: %s"
1049 msgstr ""
1050
1051 #, fuzzy
1052 msgid "command to display child changesets"
1053 msgstr "列出修改集"
1054
1055 #, fuzzy
1056 msgid ""
1057 "show the children of the given or working directory revision\n"
1058 "\n"
1059 " Print the children of the working directory's revisions. If a\n"
1060 " revision is given via -r/--rev, the children of that revision will\n"
1061 " be printed. If a file argument is given, revision in which the\n"
1062 " file was last changed (after the working directory revision or the\n"
1063 " argument to --rev if given) is printed.\n"
1064 " "
1065 msgstr ""
1066 "显示工作目录或指定版本的父亲\n"
1067 "\n"
1068 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
1069 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
1070 " 版本,或 '--rev' 指定的版本)。\n"
1071 " "
1072
1073 #, fuzzy
1074 msgid "show children of the specified revision"
1075 msgstr "从指定的版本显示父亲"
1076
1077 msgid "hg children [-r REV] [FILE]"
1078 msgstr ""
1079
1080 msgid "command to display statistics about repository history"
1081 msgstr ""
1082
1083 #, python-format
1084 msgid "Revision %d is a merge, ignoring...\n"
1085 msgstr ""
1086
1087 #, python-format
1088 msgid "generating stats: %d%%"
1089 msgstr ""
1090
1091 msgid ""
1092 "histogram of changes to the repository\n"
1093 "\n"
1094 " This command will display a histogram representing the number\n"
1095 " of changed lines or revisions, grouped according to the given\n"
1096 " template. The default template will group changes by author.\n"
1097 " The --dateformat option may be used to group the results by\n"
1098 " date instead.\n"
1099 "\n"
1100 " Statistics are based on the number of changed lines, or\n"
1101 " alternatively the number of matching revisions if the\n"
1102 " --changesets option is specified.\n"
1103 "\n"
1104 " Examples::\n"
1105 "\n"
1106 " # display count of changed lines for every committer\n"
1107 " hg churn -t '{author|email}'\n"
1108 "\n"
1109 " # display daily activity graph\n"
1110 " hg churn -f '%H' -s -c\n"
1111 "\n"
1112 " # display activity of developers by month\n"
1113 " hg churn -f '%Y-%m' -s -c\n"
1114 "\n"
1115 " # display count of lines changed in every year\n"
1116 " hg churn -f '%Y' -s\n"
1117 "\n"
1118 " It is possible to map alternate email addresses to a main address\n"
1119 " by providing a file using the following format::\n"
1120 "\n"
1121 " <alias email> <actual email>\n"
1122 "\n"
1123 " Such a file may be specified with the --aliases option, otherwise\n"
1124 " a .hgchurn file will be looked for in the working directory root.\n"
1125 " "
1126 msgstr ""
1127
1128 msgid "count rate for the specified revision or range"
1129 msgstr ""
1130
1131 #, fuzzy
1132 msgid "count rate for revisions matching date spec"
1133 msgstr "显示匹配日期的版本"
1134
1135 msgid "template to group changesets"
1136 msgstr ""
1137
1138 msgid "strftime-compatible format for grouping by date"
1139 msgstr ""
1140
1141 msgid "count rate by number of changesets"
1142 msgstr ""
1143
1144 msgid "sort by key (default: sort by count)"
1145 msgstr ""
1146
1147 msgid "file with email aliases"
1148 msgstr ""
1149
1150 msgid "show progress"
1151 msgstr ""
1152
1153 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
1154 msgstr ""
1155
1156 msgid ""
1157 "colorize output from some commands\n"
1158 "\n"
1159 "This extension modifies the status command to add color to its output\n"
1160 "to reflect file status, the qseries command to add color to reflect\n"
1161 "patch status (applied, unapplied, missing), and to diff-related\n"
1162 "commands to highlight additions, removals, diff headers, and trailing\n"
1163 "whitespace.\n"
1164 "\n"
1165 "Other effects in addition to color, like bold and underlined text, are\n"
1166 "also available. Effects are rendered with the ECMA-48 SGR control\n"
1167 "function (aka ANSI escape codes). This module also provides the\n"
1168 "render_text function, which can be used to add effects to any text.\n"
1169 "\n"
1170 "Default effects may be overridden from the .hgrc file::\n"
1171 "\n"
1172 " [color]\n"
1173 " status.modified = blue bold underline red_background\n"
1174 " status.added = green bold\n"
1175 " status.removed = red bold blue_background\n"
1176 " status.deleted = cyan bold underline\n"
1177 " status.unknown = magenta bold underline\n"
1178 " status.ignored = black bold\n"
1179 "\n"
1180 " # 'none' turns off all effects\n"
1181 " status.clean = none\n"
1182 " status.copied = none\n"
1183 "\n"
1184 " qseries.applied = blue bold underline\n"
1185 " qseries.unapplied = black bold\n"
1186 " qseries.missing = red bold\n"
1187 "\n"
1188 " diff.diffline = bold\n"
1189 " diff.extended = cyan bold\n"
1190 " diff.file_a = red bold\n"
1191 " diff.file_b = green bold\n"
1192 " diff.hunk = magenta\n"
1193 " diff.deleted = red\n"
1194 " diff.inserted = green\n"
1195 " diff.changed = white\n"
1196 " diff.trailingwhitespace = bold red_background\n"
1197 msgstr ""
1198
1199 msgid "when to colorize (always, auto, or never)"
1200 msgstr ""
1201
1202 #, fuzzy
1203 msgid "don't colorize output (DEPRECATED)"
1204 msgstr "编辑提交日志(不赞成)"
1205
1206 #, python-format
1207 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
1208 msgstr ""
1209
1210 msgid "import revisions from foreign VCS repositories into Mercurial"
1211 msgstr ""
1212
1213 msgid ""
1214 "convert a foreign SCM repository to a Mercurial one.\n"
1215 "\n"
1216 " Accepted source formats [identifiers]:\n"
1217 "\n"
1218 " - Mercurial [hg]\n"
1219 " - CVS [cvs]\n"
1220 " - Darcs [darcs]\n"
1221 " - git [git]\n"
1222 " - Subversion [svn]\n"
1223 " - Monotone [mtn]\n"
1224 " - GNU Arch [gnuarch]\n"
1225 " - Bazaar [bzr]\n"
1226 " - Perforce [p4]\n"
1227 "\n"
1228 " Accepted destination formats [identifiers]:\n"
1229 "\n"
1230 " - Mercurial [hg]\n"
1231 " - Subversion [svn] (history on branches is not preserved)\n"
1232 "\n"
1233 " If no revision is given, all revisions will be converted.\n"
1234 " Otherwise, convert will only import up to the named revision\n"
1235 " (given in a format understood by the source).\n"
1236 "\n"
1237 " If no destination directory name is specified, it defaults to the\n"
1238 " basename of the source with '-hg' appended. If the destination\n"
1239 " repository doesn't exist, it will be created.\n"
1240 "\n"
1241 " By default, all sources except Mercurial will use --branchsort.\n"
1242 " Mercurial uses --sourcesort to preserve original revision numbers\n"
1243 " order. Sort modes have the following effects:\n"
1244 "\n"
1245 " --branchsort convert from parent to child revision when possible,\n"
1246 " which means branches are usually converted one after\n"
1247 " the other. It generates more compact repositories.\n"
1248 "\n"
1249 " --datesort sort revisions by date. Converted repositories have\n"
1250 " good-looking changelogs but are often an order of\n"
1251 " magnitude larger than the same ones generated by\n"
1252 " --branchsort.\n"
1253 "\n"
1254 " --sourcesort try to preserve source revisions order, only\n"
1255 " supported by Mercurial sources.\n"
1256 "\n"
1257 " If <REVMAP> isn't given, it will be put in a default location\n"
1258 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
1259 " that maps each source commit ID to the destination ID for that\n"
1260 " revision, like so::\n"
1261 "\n"
1262 " <source ID> <destination ID>\n"
1263 "\n"
1264 " If the file doesn't exist, it's automatically created. It's\n"
1265 " updated on each commit copied, so convert-repo can be interrupted\n"
1266 " and can be run repeatedly to copy new commits.\n"
1267 "\n"
1268 " The [username mapping] file is a simple text file that maps each\n"
1269 " source commit author to a destination commit author. It is handy\n"
1270 " for source SCMs that use unix logins to identify authors (eg:\n"
1271 " CVS). One line per author mapping and the line format is:\n"
1272 " srcauthor=whatever string you want\n"
1273 "\n"
1274 " The filemap is a file that allows filtering and remapping of files\n"
1275 " and directories. Comment lines start with '#'. Each line can\n"
1276 " contain one of the following directives::\n"
1277 "\n"
1278 " include path/to/file\n"
1279 "\n"
1280 " exclude path/to/file\n"
1281 "\n"
1282 " rename from/file to/file\n"
1283 "\n"
1284 " The 'include' directive causes a file, or all files under a\n"
1285 " directory, to be included in the destination repository, and the\n"
1286 " exclusion of all other files and directories not explicitly\n"
1287 " included. The 'exclude' directive causes files or directories to\n"
1288 " be omitted. The 'rename' directive renames a file or directory. To\n"
1289 " rename from a subdirectory into the root of the repository, use\n"
1290 " '.' as the path to rename to.\n"
1291 "\n"
1292 " The splicemap is a file that allows insertion of synthetic\n"
1293 " history, letting you specify the parents of a revision. This is\n"
1294 " useful if you want to e.g. give a Subversion merge two parents, or\n"
1295 " graft two disconnected series of history together. Each entry\n"
1296 " contains a key, followed by a space, followed by one or two\n"
1297 " comma-separated values. The key is the revision ID in the source\n"
1298 " revision control system whose parents should be modified (same\n"
1299 " format as a key in .hg/shamap). The values are the revision IDs\n"
1300 " (in either the source or destination revision control system) that\n"
1301 " should be used as the new parents for that node.\n"
1302 "\n"
1303 " The branchmap is a file that allows you to rename a branch when it is\n"
1304 " being brought in from whatever external repository. When used in\n"
1305 " conjunction with a splicemap, it allows for a powerful combination\n"
1306 " to help fix even the most badly mismanaged repositories and turn them\n"
1307 " into nicely structured Mercurial repositories. The branchmap contains\n"
1308 " lines of the form \"original_branch_name new_branch_name\".\n"
1309 " \"original_branch_name\" is the name of the branch in the source\n"
1310 " repository, and \"new_branch_name\" is the name of the branch is the\n"
1311 " destination repository. This can be used to (for instance) move code\n"
1312 " in one repository from \"default\" to a named branch.\n"
1313 "\n"
1314 " Mercurial Source\n"
1315 " ----------------\n"
1316 "\n"
1317 " --config convert.hg.ignoreerrors=False (boolean)\n"
1318 " ignore integrity errors when reading. Use it to fix Mercurial\n"
1319 " repositories with missing revlogs, by converting from and to\n"
1320 " Mercurial.\n"
1321 " --config convert.hg.saverev=False (boolean)\n"
1322 " store original revision ID in changeset (forces target IDs to\n"
1323 " change)\n"
1324 " --config convert.hg.startrev=0 (hg revision identifier)\n"
1325 " convert start revision and its descendants\n"
1326 "\n"
1327 " CVS Source\n"
1328 " ----------\n"
1329 "\n"
1330 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
1331 " to indicate the starting point of what will be converted. Direct\n"
1332 " access to the repository files is not needed, unless of course the\n"
1333 " repository is :local:. The conversion uses the top level directory\n"
1334 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
1335 " commands to find files to convert. This means that unless a\n"
1336 " filemap is given, all files under the starting directory will be\n"
1337 " converted, and that any directory reorganization in the CVS\n"
1338 " sandbox is ignored.\n"
1339 "\n"
1340 " The options shown are the defaults.\n"
1341 "\n"
1342 " --config convert.cvsps.cache=True (boolean)\n"
1343 " Set to False to disable remote log caching, for testing and\n"
1344 " debugging purposes.\n"
1345 " --config convert.cvsps.fuzz=60 (integer)\n"
1346 " Specify the maximum time (in seconds) that is allowed between\n"
1347 " commits with identical user and log message in a single\n"
1348 " changeset. When very large files were checked in as part of a\n"
1349 " changeset then the default may not be long enough.\n"
1350 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
1351 " Specify a regular expression to which commit log messages are\n"
1352 " matched. If a match occurs, then the conversion process will\n"
1353 " insert a dummy revision merging the branch on which this log\n"
1354 " message occurs to the branch indicated in the regex.\n"
1355 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
1356 " Specify a regular expression to which commit log messages are\n"
1357 " matched. If a match occurs, then the conversion process will\n"
1358 " add the most recent revision on the branch indicated in the\n"
1359 " regex as the second parent of the changeset.\n"
1360 "\n"
1361 " An additional \"debugcvsps\" Mercurial command allows the builtin\n"
1362 " changeset merging code to be run without doing a conversion. Its\n"
1363 " parameters and output are similar to that of cvsps 2.1. Please see\n"
1364 " the command help for more details.\n"
1365 "\n"
1366 " Subversion Source\n"
1367 " -----------------\n"
1368 "\n"
1369 " Subversion source detects classical trunk/branches/tags layouts.\n"
1370 " By default, the supplied \"svn://repo/path/\" source URL is\n"
1371 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
1372 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
1373 " its subdirectories are listed as possible branches. If\n"
1374 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
1375 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
1376 " can be overridden with following options. Set them to paths\n"
1377 " relative to the source URL, or leave them blank to disable auto\n"
1378 " detection.\n"
1379 "\n"
1380 " --config convert.svn.branches=branches (directory name)\n"
1381 " specify the directory containing branches\n"
1382 " --config convert.svn.tags=tags (directory name)\n"
1383 " specify the directory containing tags\n"
1384 " --config convert.svn.trunk=trunk (directory name)\n"
1385 " specify the name of the trunk branch\n"
1386 "\n"
1387 " Source history can be retrieved starting at a specific revision,\n"
1388 " instead of being integrally converted. Only single branch\n"
1389 " conversions are supported.\n"
1390 "\n"
1391 " --config convert.svn.startrev=0 (svn revision number)\n"
1392 " specify start Subversion revision.\n"
1393 "\n"
1394 " Perforce Source\n"
1395 " ---------------\n"
1396 "\n"
1397 " The Perforce (P4) importer can be given a p4 depot path or a\n"
1398 " client specification as source. It will convert all files in the\n"
1399 " source to a flat Mercurial repository, ignoring labels, branches\n"
1400 " and integrations. Note that when a depot path is given you then\n"
1401 " usually should specify a target directory, because otherwise the\n"
1402 " target may be named ...-hg.\n"
1403 "\n"
1404 " It is possible to limit the amount of source history to be\n"
1405 " converted by specifying an initial Perforce revision.\n"
1406 "\n"
1407 " --config convert.p4.startrev=0 (perforce changelist number)\n"
1408 " specify initial Perforce revision.\n"
1409 "\n"
1410 " Mercurial Destination\n"
1411 " ---------------------\n"
1412 "\n"
1413 " --config convert.hg.clonebranches=False (boolean)\n"
1414 " dispatch source branches in separate clones.\n"
1415 " --config convert.hg.tagsbranch=default (branch name)\n"
1416 " tag revisions branch name\n"
1417 " --config convert.hg.usebranchnames=True (boolean)\n"
1418 " preserve branch names\n"
1419 "\n"
1420 " "
1421 msgstr ""
1422
1423 msgid ""
1424 "create changeset information from CVS\n"
1425 "\n"
1426 " This command is intended as a debugging tool for the CVS to\n"
1427 " Mercurial converter, and can be used as a direct replacement for\n"
1428 " cvsps.\n"
1429 "\n"
1430 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
1431 " named directory) in the CVS repository, and converts the log to a\n"
1432 " series of changesets based on matching commit log entries and\n"
1433 " dates."
1434 msgstr ""
1435
1436 msgid "username mapping filename"
1437 msgstr ""
1438
1439 msgid "destination repository type"
1440 msgstr ""
1441
1442 msgid "remap file names using contents of file"
1443 msgstr ""
1444
1445 msgid "import up to target revision REV"
1446 msgstr ""
1447
1448 msgid "source repository type"
1449 msgstr ""
1450
1451 msgid "splice synthesized history into place"
1452 msgstr ""
1453
1454 msgid "change branch names while converting"
1455 msgstr ""
1456
1457 msgid "try to sort changesets by branches"
1458 msgstr ""
1459
1460 msgid "try to sort changesets by date"
1461 msgstr ""
1462
1463 msgid "preserve source changesets order"
1464 msgstr ""
1465
1466 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
1467 msgstr ""
1468
1469 msgid "only return changes on specified branches"
1470 msgstr ""
1471
1472 msgid "prefix to remove from file names"
1473 msgstr ""
1474
1475 msgid "only return changes after or between specified tags"
1476 msgstr ""
1477
1478 msgid "update cvs log cache"
1479 msgstr ""
1480
1481 msgid "create new cvs log cache"
1482 msgstr ""
1483
1484 msgid "set commit time fuzz in seconds"
1485 msgstr ""
1486
1487 msgid "specify cvsroot"
1488 msgstr ""
1489
1490 msgid "show parent changesets"
1491 msgstr ""
1492
1493 msgid "show current changeset in ancestor branches"
1494 msgstr ""
1495
1496 msgid "ignored for compatibility"
1497 msgstr ""
1498
1499 msgid "hg debugcvsps [OPTION]... [PATH]..."
1500 msgstr ""
1501
1502 msgid ""
1503 "warning: lightweight checkouts may cause conversion failures, try with a "
1504 "regular branch instead.\n"
1505 msgstr ""
1506
1507 msgid "bzr source type could not be determined\n"
1508 msgstr ""
1509
1510 #, python-format
1511 msgid "%s is not a valid revision in current branch"
1512 msgstr ""
1513
1514 #, python-format
1515 msgid "%s is not available in %s anymore"
1516 msgstr ""
1517
1518 #, python-format
1519 msgid "%s.%s symlink has no target"
1520 msgstr ""
1521
1522 #, python-format
1523 msgid "cannot find required \"%s\" tool"
1524 msgstr ""
1525
1526 #, python-format
1527 msgid "%s error:\n"
1528 msgstr ""
1529
1530 #, python-format
1531 msgid "syntax error in %s(%d): key/value pair expected"
1532 msgstr ""
1533
1534 #, python-format
1535 msgid "could not open map file %r: %s"
1536 msgstr ""
1537
1538 #, python-format
1539 msgid "%s: missing or unsupported repository"
1540 msgstr ""
1541
1542 #, python-format
1543 msgid "convert: %s\n"
1544 msgstr ""
1545
1546 #, python-format
1547 msgid "%s: unknown repository type"
1548 msgstr ""
1549
1550 #, fuzzy, python-format
1551 msgid "unknown sort mode: %s"
1552 msgstr "hg: 未知命令 '%s'\n"
1553
1554 #, python-format
1555 msgid "cycle detected between %s and %s"
1556 msgstr ""
1557
1558 msgid "not all revisions were sorted"
1559 msgstr ""
1560
1561 #, python-format
1562 msgid "Writing author map file %s\n"
1563 msgstr ""
1564
1565 #, python-format
1566 msgid "Ignoring bad line in author map file %s: %s\n"
1567 msgstr ""
1568
1569 #, python-format
1570 msgid "mapping author %s to %s\n"
1571 msgstr ""
1572
1573 #, python-format
1574 msgid "overriding mapping for author %s, was %s, will be %s\n"
1575 msgstr ""
1576
1577 #, python-format
1578 msgid "spliced in %s as parents of %s\n"
1579 msgstr ""
1580
1581 msgid "scanning source...\n"
1582 msgstr ""
1583
1584 msgid "sorting...\n"
1585 msgstr ""
1586
1587 msgid "converting...\n"
1588 msgstr ""
1589
1590 #, python-format
1591 msgid "source: %s\n"
1592 msgstr ""
1593
1594 #, python-format
1595 msgid "assuming destination %s\n"
1596 msgstr ""
1597
1598 msgid "more than one sort mode specified"
1599 msgstr ""
1600
1601 msgid "--sourcesort is not supported by this data source"
1602 msgstr ""
1603
1604 #, fuzzy, python-format
1605 msgid "revision %s is not a patchset number"
1606 msgstr "svn: 版本 %s 不是整数"
1607
1608 #, python-format
1609 msgid "connecting to %s\n"
1610 msgstr ""
1611
1612 msgid "CVS pserver authentication failed"
1613 msgstr ""
1614
1615 #, python-format
1616 msgid ""
1617 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1618 msgstr ""
1619
1620 #, python-format
1621 msgid "%d bytes missing from remote file"
1622 msgstr ""
1623
1624 #, python-format
1625 msgid "cvs server: %s\n"
1626 msgstr ""
1627
1628 #, python-format
1629 msgid "unknown CVS response: %s"
1630 msgstr ""
1631
1632 msgid "collecting CVS rlog\n"
1633 msgstr ""
1634
1635 #, python-format
1636 msgid "reading cvs log cache %s\n"
1637 msgstr ""
1638
1639 #, python-format
1640 msgid "cache has %d log entries\n"
1641 msgstr ""
1642
1643 #, python-format
1644 msgid "error reading cache: %r\n"
1645 msgstr ""
1646
1647 #, python-format
1648 msgid "running %s\n"
1649 msgstr ""
1650
1651 msgid "RCS file must be followed by working file"
1652 msgstr ""
1653
1654 msgid "must have at least some revisions"
1655 msgstr ""
1656
1657 msgid "expected revision number"
1658 msgstr ""
1659
1660 msgid "revision must be followed by date line"
1661 msgstr ""
1662
1663 #, python-format
1664 msgid "writing cvs log cache %s\n"
1665 msgstr ""
1666
1667 #, python-format
1668 msgid "%d log entries\n"
1669 msgstr ""
1670
1671 msgid "creating changesets\n"
1672 msgstr ""
1673
1674 msgid "synthetic changeset cannot have multiple parents"
1675 msgstr ""
1676
1677 #, python-format
1678 msgid ""
1679 "warning: CVS commit message references non-existent branch %r:\n"
1680 "%s\n"
1681 msgstr ""
1682
1683 #, python-format
1684 msgid "%d changeset entries\n"
1685 msgstr ""
1686
1687 #, python-format
1688 msgid "darcs version 2.1 or newer needed (found %r)"
1689 msgstr ""
1690
1691 msgid "Python ElementTree module is not available"
1692 msgstr ""
1693
1694 msgid "internal calling inconsistency"
1695 msgstr ""
1696
1697 msgid "errors in filemap"
1698 msgstr ""
1699
1700 #, python-format
1701 msgid "%s:%d: %r already in %s list\n"
1702 msgstr ""
1703
1704 #, python-format
1705 msgid "%s:%d: unknown directive %r\n"
1706 msgstr ""
1707
1708 msgid "source repository doesn't support --filemap"
1709 msgstr ""
1710
1711 #, python-format
1712 msgid "%s does not look like a GNU Arch repo"
1713 msgstr ""
1714
1715 msgid "cannot find a GNU Arch tool"
1716 msgstr ""
1717
1718 #, python-format
1719 msgid "analyzing tree version %s...\n"
1720 msgstr ""
1721
1722 #, python-format
1723 msgid ""
1724 "tree analysis stopped because it points to an unregistered archive %s...\n"
1725 msgstr ""
1726
1727 #, python-format
1728 msgid "could not parse cat-log of %s"
1729 msgstr ""
1730
1731 #, python-format
1732 msgid "%s is not a local Mercurial repo"
1733 msgstr "%s 不是本地的水银版本库"
1734
1735 #, python-format
1736 msgid "initializing destination %s repository\n"
1737 msgstr "初始化目标版本库 %s\n"
1738
1739 #, python-format
1740 msgid "pulling from %s into %s\n"
1741 msgstr "自 %s 拉到 %s\n"
1742
1743 msgid "filtering out empty revision\n"
1744 msgstr ""
1745
1746 msgid "updating tags\n"
1747 msgstr "正在更新标签\n"
1748
1749 #, python-format
1750 msgid "%s is not a valid start revision"
1751 msgstr "%s 不是有效的开始版本"
1752
1753 #, python-format
1754 msgid "ignoring: %s\n"
1755 msgstr "忽略: %s\n"
1756
1757 #, python-format
1758 msgid "%s does not look like a monotone repo"
1759 msgstr "%s 不像是单纯的 monotone 版本库"
1760
1761 #, fuzzy, python-format
1762 msgid "copying file in renamed directory from '%s' to '%s'"
1763 msgstr "从已改名的目录 '%s' 复制文件到 '%s'"
1764
1765 msgid "reading p4 views\n"
1766 msgstr ""
1767
1768 msgid "collecting p4 changelists\n"
1769 msgstr "正在搜索 p4 修改集\n"
1770
1771 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1772 msgstr ""
1773
1774 msgid "Subversion python bindings could not be loaded"
1775 msgstr "不能加载 svn 的 python 绑定"
1776
1777 #, python-format
1778 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1779 msgstr "发现 svn 的 python 绑定版本 %d.%d,需要 1.4 或更新的版本"
1780
1781 msgid "Subversion python bindings are too old, 1.4 or later required"
1782 msgstr "svn 的 python 绑定太旧,需要 1.4 或更新的版本"
1783
1784 #, python-format
1785 msgid "svn: revision %s is not an integer"
1786 msgstr "svn: 版本 %s 不是整数"
1787
1788 #, python-format
1789 msgid "svn: start revision %s is not an integer"
1790 msgstr "svn: 开始版本 %s 不是整数"
1791
1792 #, python-format
1793 msgid "no revision found in module %s"
1794 msgstr "没有在模块 %s 中发现版本"
1795
1796 #, python-format
1797 msgid "expected %s to be at %r, but not found"
1798 msgstr "期望 %s 位于 %r,但是没有发现"
1799
1800 #, python-format
1801 msgid "found %s at %r\n"
1802 msgstr "发现 %s 位于 %r\n"
1803
1804 #, python-format
1805 msgid "ignoring empty branch %s\n"
1806 msgstr "忽略空的分支 %s\n"
1807
1808 #, python-format
1809 msgid "found branch %s at %d\n"
1810 msgstr "发现分支 %s 位于 %d\n"
1811
1812 #, fuzzy
1813 msgid "svn: start revision is not supported with more than one branch"
1814 msgstr "svn: 在给出多于一个分支时不支持开始版本"
1815
1816 #, python-format
1817 msgid "svn: no revision found after start revision %d"
1818 msgstr "svn: 在开始版本 %d 之后没有版本"
1819
1820 #, python-format
1821 msgid "no tags found at revision %d\n"
1822 msgstr "在版本 %d 没有发现标签\n"
1823
1824 #, python-format
1825 msgid "%s not found up to revision %d"
1826 msgstr "没有发现 %s,一直到版本 %d"
1827
1828 #, python-format
1829 msgid "found parent of branch %s at %d: %s\n"
1830 msgstr "发现分支 %s 的父亲,在 %d: %s\n"
1831
1832 #, python-format
1833 msgid "fetching revision log for \"%s\" from %d to %d\n"
1834 msgstr "为 \"%s\" 获取版本日志,自 %d 到 %d\n"
1835
1836 #, python-format
1837 msgid "svn: branch has no revision %s"
1838 msgstr "svn: 分支没有版本 %s"
1839
1840 #, python-format
1841 msgid "initializing svn repo %r\n"
1842 msgstr "初始化 svn 版本库 %r\n"
1843
1844 #, python-format
1845 msgid "initializing svn wc %r\n"
1846 msgstr "初始化 svn 工作副本 %r\n"
1847
1848 msgid "unexpected svn output:\n"
1849 msgstr "意外的 svn 输出:\n"
1850
1851 msgid "unable to cope with svn output"
1852 msgstr "不能处理 svn 的输出"
1853
1854 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1855 msgstr ""
1856
1857 msgid ""
1858 "command to allow external programs to compare revisions\n"
1859 "\n"
1860 "The extdiff Mercurial extension allows you to use external programs\n"
1861 "to compare revisions, or revision with working directory. The external\n"
1862 "diff programs are called with a configurable set of options and two\n"
1863 "non-option arguments: paths to directories containing snapshots of\n"
1864 "files to compare.\n"
1865 "\n"
1866 "The extdiff extension also allows to configure new diff commands, so\n"
1867 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
1868 "\n"
1869 " [extdiff]\n"
1870 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1871 " cdiff = gdiff -Nprc5\n"
1872 " ## or the old way:\n"
1873 " #cmd.cdiff = gdiff\n"
1874 " #opts.cdiff = -Nprc5\n"
1875 "\n"
1876 " # add new command called vdiff, runs kdiff3\n"
1877 " vdiff = kdiff3\n"
1878 "\n"
1879 " # add new command called meld, runs meld (no need to name twice)\n"
1880 " meld =\n"
1881 "\n"
1882 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1883 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1884 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1885 " # your .vimrc\n"
1886 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1887 "\n"
1888 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1889 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1890 "files, so running the external diff program will actually be pretty\n"
1891 "fast (at least faster than having to compare the entire tree).\n"
1892 msgstr ""
1893
1894 #, python-format
1895 msgid "making snapshot of %d files from rev %s\n"
1896 msgstr ""
1897
1898 #, python-format
1899 msgid "making snapshot of %d files from working directory\n"
1900 msgstr ""
1901
1902 msgid "cannot specify --rev and --change at the same time"
1903 msgstr "不能同时指定 '--rev' 和 '--change'"
1904
1905 msgid "cleaning up temp directory\n"
1906 msgstr ""
1907
1908 msgid ""
1909 "use external program to diff repository (or selected files)\n"
1910 "\n"
1911 " Show differences between revisions for the specified files, using\n"
1912 " an external program. The default program used is diff, with\n"
1913 " default options \"-Npru\".\n"
1914 "\n"
1915 " To select a different program, use the -p/--program option. The\n"
1916 " program will be passed the names of two directories to compare. To\n"
1917 " pass additional options to the program, use -o/--option. These\n"
1918 " will be passed before the names of the directories to compare.\n"
1919 "\n"
1920 " When two revision arguments are given, then changes are shown\n"
1921 " between those revisions. If only one revision is specified then\n"
1922 " that revision is compared to the working directory, and, when no\n"
1923 " revisions are specified, the working directory files are compared\n"
1924 " to its parent."
1925 msgstr ""
1926
1927 msgid "comparison program to run"
1928 msgstr ""
1929
1930 msgid "pass option to comparison program"
1931 msgstr ""
1932
1933 msgid "change made by revision"
1934 msgstr "此版本的修改"
1935
1936 msgid "hg extdiff [OPT]... [FILE]..."
1937 msgstr ""
1938
1939 #, python-format
1940 msgid ""
1941 "use %(path)s to diff repository (or selected files)\n"
1942 "\n"
1943 " Show differences between revisions for the specified files, using the\n"
1944 " %(path)s program.\n"
1945 "\n"
1946 " When two revision arguments are given, then changes are shown between\n"
1947 " those revisions. If only one revision is specified then that revision "
1948 "is\n"
1949 " compared to the working directory, and, when no revisions are "
1950 "specified,\n"
1951 " the working directory files are compared to its parent."
1952 msgstr ""
1953
1954 #, python-format
1955 msgid "hg %s [OPTION]... [FILE]..."
1956 msgstr ""
1957
1958 msgid "pull, update and merge in one command"
1959 msgstr ""
1960
1961 msgid ""
1962 "pull changes from a remote repository, merge new changes if needed.\n"
1963 "\n"
1964 " This finds all changes from the repository at the specified path\n"
1965 " or URL and adds them to the local repository.\n"
1966 "\n"
1967 " If the pulled changes add a new branch head, the head is\n"
1968 " automatically merged, and the result of the merge is committed.\n"
1969 " Otherwise, the working directory is updated to include the new\n"
1970 " changes.\n"
1971 "\n"
1972 " When a merge occurs, the newly pulled changes are assumed to be\n"
1973 " \"authoritative\". The head of the new changes is used as the first\n"
1974 " parent, with local changes as the second. To switch the merge\n"
1975 " order, use --switch-parent.\n"
1976 "\n"
1977 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1978 " "
1979 msgstr ""
1980
1981 msgid ""
1982 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1983 msgstr ""
1984
1985 msgid "outstanding uncommitted merge"
1986 msgstr ""
1987
1988 msgid "outstanding uncommitted changes"
1989 msgstr ""
1990
1991 msgid "working directory is missing some files"
1992 msgstr ""
1993
1994 msgid ""
1995 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1996 msgstr ""
1997
1998 #, python-format
1999 msgid "pulling from %s\n"
2000 msgstr "正在拉自 %s\n"
2001
2002 msgid ""
2003 "Other repository doesn't support revision lookup, so a rev cannot be "
2004 "specified."
2005 msgstr ""
2006
2007 #, python-format
2008 msgid ""
2009 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
2010 "\" to merge them)\n"
2011 msgstr ""
2012
2013 #, python-format
2014 msgid "updating to %d:%s\n"
2015 msgstr ""
2016
2017 #, python-format
2018 msgid "merging with %d:%s\n"
2019 msgstr ""
2020
2021 #, python-format
2022 msgid "new changeset %d:%s merges remote changes with local\n"
2023 msgstr "新修改集 '%d:%s' 将远程修改与本地合并\n"
2024
2025 msgid "a specific revision you would like to pull"
2026 msgstr "指定取得的版本"
2027
2028 msgid "edit commit message"
2029 msgstr "编辑提交日志"
2030
2031 msgid "edit commit message (DEPRECATED)"
2032 msgstr "编辑提交日志(不赞成)"
2033
2034 msgid "switch parents when merging"
2035 msgstr "当合并时切换父亲"
2036
2037 msgid "hg fetch [SOURCE]"
2038 msgstr ""
2039
2040 #, fuzzy
2041 msgid "commands to sign and verify changesets"
2042 msgstr "正在增加修改集\n"
2043
2044 msgid "error while verifying signature"
2045 msgstr ""
2046
2047 #, python-format
2048 msgid "%s Bad signature from \"%s\"\n"
2049 msgstr ""
2050
2051 #, python-format
2052 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
2053 msgstr ""
2054
2055 #, python-format
2056 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
2057 msgstr ""
2058
2059 msgid "list signed changesets"
2060 msgstr ""
2061
2062 #, python-format
2063 msgid "%s:%d node does not exist\n"
2064 msgstr ""
2065
2066 msgid "verify all the signatures there may be for a particular revision"
2067 msgstr ""
2068
2069 #, python-format
2070 msgid "No valid signature for %s\n"
2071 msgstr ""
2072
2073 msgid ""
2074 "add a signature for the current or given revision\n"
2075 "\n"
2076 " If no revision is given, the parent of the working directory is used,\n"
2077 " or tip if no revision is checked out.\n"
2078 "\n"
2079 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
2080 " "
2081 msgstr ""
2082
2083 msgid "uncommitted merge - please provide a specific revision"
2084 msgstr ""
2085
2086 msgid "Error while signing"
2087 msgstr ""
2088
2089 msgid ""
2090 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
2091 "force)"
2092 msgstr ""
2093
2094 msgid "unknown signature version"
2095 msgstr ""
2096
2097 msgid "make the signature local"
2098 msgstr ""
2099
2100 msgid "sign even if the sigfile is modified"
2101 msgstr ""
2102
2103 msgid "do not commit the sigfile after signing"
2104 msgstr ""
2105
2106 msgid "the key id to sign with"
2107 msgstr ""
2108
2109 msgid "commit message"
2110 msgstr ""
2111
2112 msgid "hg sign [OPTION]... [REVISION]..."
2113 msgstr ""
2114
2115 msgid "hg sigcheck REVISION"
2116 msgstr ""
2117
2118 msgid "hg sigs"
2119 msgstr ""
2120
2121 msgid ""
2122 "command to view revision graphs from a shell\n"
2123 "\n"
2124 "This extension adds a --graph option to the incoming, outgoing and log\n"
2125 "commands. When this options is given, an ASCII representation of the\n"
2126 "revision graph is also shown.\n"
2127 msgstr ""
2128
2129 #, python-format
2130 msgid "--graph option is incompatible with --%s"
2131 msgstr ""
2132
2133 msgid ""
2134 "show revision history alongside an ASCII revision graph\n"
2135 "\n"
2136 " Print a revision history alongside a revision graph drawn with\n"
2137 " ASCII characters.\n"
2138 "\n"
2139 " Nodes printed as an @ character are parents of the working\n"
2140 " directory.\n"
2141 " "
2142 msgstr ""
2143
2144 #, python-format
2145 msgid "comparing with %s\n"
2146 msgstr ""
2147
2148 msgid "no changes found\n"
2149 msgstr "没有发现修改\n"
2150
2151 msgid "show the revision DAG"
2152 msgstr "显示版本分支图"
2153
2154 msgid "limit number of changes displayed"
2155 msgstr "限制显示的修改集数量"
2156
2157 msgid "show patch"
2158 msgstr "显示补丁"
2159
2160 msgid "show the specified revision or range"
2161 msgstr ""
2162
2163 msgid "hg glog [OPTION]... [FILE]"
2164 msgstr ""
2165
2166 msgid ""
2167 "hooks for integrating with the CIA.vc notification service\n"
2168 "\n"
2169 "This is meant to be run as a changegroup or incoming hook. To\n"
2170 "configure it, set the following options in your hgrc::\n"
2171 "\n"
2172 " [cia]\n"
2173 " # your registered CIA user name\n"
2174 " user = foo\n"
2175 " # the name of the project in CIA\n"
2176 " project = foo\n"
2177 " # the module (subproject) (optional)\n"
2178 " #module = foo\n"
2179 " # Append a diffstat to the log message (optional)\n"
2180 " #diffstat = False\n"
2181 " # Template to use for log messages (optional)\n"
2182 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
2183 " # Style to use (optional)\n"
2184 " #style = foo\n"
2185 " # The URL of the CIA notification service (optional)\n"
2186 " # You can use mailto: URLs to send by email, eg\n"
2187 " # mailto:cia@cia.vc\n"
2188 " # Make sure to set email.from if you do this.\n"
2189 " #url = http://cia.vc/\n"
2190 " # print message instead of sending it (optional)\n"
2191 " #test = False\n"
2192 "\n"
2193 " [hooks]\n"
2194 " # one of these:\n"
2195 " changegroup.cia = python:hgcia.hook\n"
2196 " #incoming.cia = python:hgcia.hook\n"
2197 "\n"
2198 " [web]\n"
2199 " # If you want hyperlinks (optional)\n"
2200 " baseurl = http://server/path/to/repo\n"
2201 msgstr ""
2202
2203 #, python-format
2204 msgid "hgcia: sending update to %s\n"
2205 msgstr ""
2206
2207 msgid "email.from must be defined when sending by email"
2208 msgstr ""
2209
2210 msgid ""
2211 "browse the repository in a graphical way\n"
2212 "\n"
2213 "The hgk extension allows browsing the history of a repository in a\n"
2214 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
2215 "distributed with Mercurial.)\n"
2216 "\n"
2217 "hgk consists of two parts: a Tcl script that does the displaying and\n"
2218 "querying of information, and an extension to Mercurial named hgk.py,\n"
2219 "which provides hooks for hgk to get information. hgk can be found in\n"
2220 "the contrib directory, and the extension is shipped in the hgext\n"
2221 "repository, and needs to be enabled.\n"
2222 "\n"
2223 "The hg view command will launch the hgk Tcl script. For this command\n"
2224 "to work, hgk must be in your search path. Alternately, you can specify\n"
2225 "the path to hgk in your .hgrc file::\n"
2226 "\n"
2227 " [hgk]\n"
2228 " path=/location/of/hgk\n"
2229 "\n"
2230 "hgk can make use of the extdiff extension to visualize revisions.\n"
2231 "Assuming you had already configured extdiff vdiff command, just add::\n"
2232 "\n"
2233 " [hgk]\n"
2234 " vdiff=vdiff\n"
2235 "\n"
2236 "Revisions context menu will now display additional entries to fire\n"
2237 "vdiff on hovered and selected revisions.\n"
2238 msgstr ""
2239
2240 msgid "diff trees from two commits"
2241 msgstr ""
2242
2243 msgid "output common ancestor information"
2244 msgstr ""
2245
2246 msgid "cat a specific revision"
2247 msgstr ""
2248
2249 msgid "cat-file: type or revision not supplied\n"
2250 msgstr ""
2251
2252 msgid "aborting hg cat-file only understands commits\n"
2253 msgstr ""
2254
2255 msgid "parse given revisions"
2256 msgstr ""
2257
2258 msgid "print revisions"
2259 msgstr ""
2260
2261 msgid "print extension options"
2262 msgstr ""
2263
2264 msgid "start interactive history viewer"
2265 msgstr ""
2266
2267 msgid "hg view [-l LIMIT] [REVRANGE]"
2268 msgstr ""
2269
2270 msgid "generate patch"
2271 msgstr ""
2272
2273 msgid "recursive"
2274 msgstr ""
2275
2276 msgid "pretty"
2277 msgstr ""
2278
2279 msgid "stdin"
2280 msgstr ""
2281
2282 msgid "detect copies"
2283 msgstr ""
2284
2285 msgid "search"
2286 msgstr ""
2287
2288 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
2289 msgstr ""
2290
2291 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
2292 msgstr ""
2293
2294 msgid "hg debug-config"
2295 msgstr ""
2296
2297 msgid "hg debug-merge-base REV REV"
2298 msgstr ""
2299
2300 msgid "ignored"
2301 msgstr ""
2302
2303 msgid "hg debug-rev-parse REV"
2304 msgstr ""
2305
2306 msgid "header"
2307 msgstr ""
2308
2309 msgid "topo-order"
2310 msgstr ""
2311
2312 msgid "parents"
2313 msgstr ""
2314
2315 msgid "max-count"
2316 msgstr ""
2317
2318 msgid "hg debug-rev-list [OPTION]... REV..."
2319 msgstr ""
2320
2321 msgid ""
2322 "syntax highlighting for hgweb (requires Pygments)\n"
2323 "\n"
2324 "It depends on the Pygments syntax highlighting library:\n"
2325 "http://pygments.org/\n"
2326 "\n"
2327 "There is a single configuration option::\n"
2328 "\n"
2329 " [web]\n"
2330 " pygments_style = <style>\n"
2331 "\n"
2332 "The default is 'colorful'.\n"
2333 msgstr ""
2334
2335 msgid "accelerate status report using Linux's inotify service"
2336 msgstr ""
2337
2338 msgid "start an inotify server for this repository"
2339 msgstr "为此版本库启动服务 'inotify'"
2340
2341 msgid ""
2342 "debugging information for inotify extension\n"
2343 "\n"
2344 " Prints the list of directories being watched by the inotify server.\n"
2345 " "
2346 msgstr ""
2347
2348 msgid "directories being watched:\n"
2349 msgstr ""
2350
2351 msgid "run server in background"
2352 msgstr "在后台运行服务"
2353
2354 msgid "used internally by daemon mode"
2355 msgstr "在后台服务模式内部使用"
2356
2357 msgid "minutes to sit idle before exiting"
2358 msgstr "空闲几分钟后退出"
2359
2360 msgid "name of file to write process ID to"
2361 msgstr "写入进程标识符的文件名称"
2362
2363 msgid "hg inserve [OPTION]..."
2364 msgstr ""
2365
2366 msgid "(found dead inotify server socket; removing it)\n"
2367 msgstr ""
2368
2369 #, python-format
2370 msgid "could not start inotify server: %s\n"
2371 msgstr ""
2372
2373 #, python-format
2374 msgid "could not talk to new inotify server: %s\n"
2375 msgstr ""
2376
2377 #, python-format
2378 msgid "failed to contact inotify server: %s\n"
2379 msgstr ""
2380
2381 msgid "received empty answer from inotify server"
2382 msgstr ""
2383
2384 #, python-format
2385 msgid "(inotify: received response from incompatible server version %d)\n"
2386 msgstr ""
2387
2388 #, python-format
2389 msgid "(inotify: received '%s' response when expecting '%s')\n"
2390 msgstr ""
2391
2392 msgid "this system does not seem to support inotify"
2393 msgstr ""
2394
2395 #, python-format
2396 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2397 msgstr ""
2398
2399 msgid "*** this limit is too low to watch every directory in this repository\n"
2400 msgstr ""
2401
2402 msgid "*** counting directories: "
2403 msgstr ""
2404
2405 #, python-format
2406 msgid "found %d\n"
2407 msgstr ""
2408
2409 #, python-format
2410 msgid "*** to raise the limit from %d to %d (run as root):\n"
2411 msgstr ""
2412
2413 #, python-format
2414 msgid "*** echo %d > %s\n"
2415 msgstr ""
2416
2417 #, python-format
2418 msgid "cannot watch %s until inotify watch limit is raised"
2419 msgstr ""
2420
2421 #, python-format
2422 msgid "inotify service not available: %s"
2423 msgstr ""
2424
2425 #, python-format
2426 msgid "watching %r\n"
2427 msgstr ""
2428
2429 #, python-format
2430 msgid "watching directories under %r\n"
2431 msgstr ""
2432
2433 #, python-format
2434 msgid "status: %r %s -> %s\n"
2435 msgstr ""
2436
2437 #, python-format
2438 msgid "%s dirstate reload\n"
2439 msgstr ""
2440
2441 #, python-format
2442 msgid "%s end dirstate reload\n"
2443 msgstr ""
2444
2445 msgid "rescanning due to .hgignore change\n"
2446 msgstr ""
2447
2448 #, python-format
2449 msgid "%s event: created %s\n"
2450 msgstr ""
2451
2452 #, python-format
2453 msgid "%s event: deleted %s\n"
2454 msgstr ""
2455
2456 #, python-format
2457 msgid "%s event: modified %s\n"
2458 msgstr ""
2459
2460 #, python-format
2461 msgid "filesystem containing %s was unmounted\n"
2462 msgstr ""
2463
2464 #, python-format
2465 msgid "%s readable: %d bytes\n"
2466 msgstr ""
2467
2468 #, python-format
2469 msgid "%s below threshold - unhooking\n"
2470 msgstr ""
2471
2472 #, python-format
2473 msgid "%s reading %d events\n"
2474 msgstr ""
2475
2476 #, python-format
2477 msgid "%s hooking back up with %d bytes readable\n"
2478 msgstr ""
2479
2480 #, python-format
2481 msgid "could not start server: %s"
2482 msgstr ""
2483
2484 #, python-format
2485 msgid "answering query for %r\n"
2486 msgstr ""
2487
2488 #, python-format
2489 msgid "received query from incompatible client version %d\n"
2490 msgstr ""
2491
2492 #, python-format
2493 msgid "unrecognized query type: %s\n"
2494 msgstr ""
2495
2496 msgid "finished setup\n"
2497 msgstr ""
2498
2499 msgid ""
2500 "expand expressions into changelog and summaries\n"
2501 "\n"
2502 "This extension allows the use of a special syntax in summaries, which\n"
2503 "will be automatically expanded into links or any other arbitrary\n"
2504 "expression, much like InterWiki does.\n"
2505 "\n"
2506 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2507 "in your hgrc::\n"
2508 "\n"
2509 " [interhg]\n"
2510 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2511 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2512 "i\n"
2513 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2514 msgstr ""
2515
2516 #, python-format
2517 msgid "interhg: invalid pattern for %s: %s\n"
2518 msgstr ""
2519
2520 #, python-format
2521 msgid "interhg: invalid regexp for %s: %s\n"
2522 msgstr ""
2523
2524 msgid ""
2525 "expand keywords in tracked files\n"
2526 "\n"
2527 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2528 "tracked text files selected by your configuration.\n"
2529 "\n"
2530 "Keywords are only expanded in local repositories and not stored in the\n"
2531 "change history. The mechanism can be regarded as a convenience for the\n"
2532 "current user or for archive distribution.\n"
2533 "\n"
2534 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2535 "hgrc files.\n"
2536 "\n"
2537 "Example::\n"
2538 "\n"
2539 " [keyword]\n"
2540 " # expand keywords in every python file except those matching \"x*\"\n"
2541 " **.py =\n"
2542 " x* = ignore\n"
2543 "\n"
2544 "NOTE: the more specific you are in your filename patterns the less you\n"
2545 "lose speed in huge repositories.\n"
2546 "\n"
2547 "For [keywordmaps] template mapping and expansion demonstration and\n"
2548 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2549 "available templates and filters.\n"
2550 "\n"
2551 "An additional date template filter {date|utcdate} is provided. It\n"
2552 "returns a date like \"2006/09/18 15:13:13\".\n"
2553 "\n"
2554 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2555 "replaced with customized keywords and templates. Again, run \"hg\n"
2556 "kwdemo\" to control the results of your config changes.\n"
2557 "\n"
2558 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2559 "the risk of inadvertently storing expanded keywords in the change\n"
2560 "history.\n"
2561 "\n"
2562 "To force expansion after enabling it, or a configuration change, run\n"
2563 "\"hg kwexpand\".\n"
2564 "\n"
2565 "Also, when committing with the record extension or using mq's qrecord,\n"
2566 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2567 "the files in question to update keyword expansions after all changes\n"
2568 "have been checked in.\n"
2569 "\n"
2570 "Expansions spanning more than one line and incremental expansions,\n"
2571 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2572 "{desc}\" expands to the first line of the changeset description.\n"
2573 msgstr ""
2574
2575 #, python-format
2576 msgid "overwriting %s expanding keywords\n"
2577 msgstr ""
2578
2579 #, python-format
2580 msgid "overwriting %s shrinking keywords\n"
2581 msgstr ""
2582
2583 msgid "[keyword] patterns cannot match"
2584 msgstr ""
2585
2586 msgid "no [keyword] patterns configured"
2587 msgstr ""
2588
2589 msgid ""
2590 "print [keywordmaps] configuration and an expansion example\n"
2591 "\n"
2592 " Show current, custom, or default keyword template maps and their\n"
2593 " expansions.\n"
2594 "\n"
2595 " Extend the current configuration by specifying maps as arguments\n"
2596 " and using -f/--rcfile to source an external hgrc file.\n"
2597 "\n"
2598 " Use -d/--default to disable current configuration.\n"
2599 "\n"
2600 " See \"hg help templates\" for information on templates and filters.\n"
2601 " "
2602 msgstr ""
2603
2604 #, fuzzy, python-format
2605 msgid "creating temporary repository at %s\n"
2606 msgstr ""
2607 "\n"
2608 "正在删除临时版本库 %s\n"
2609
2610 msgid ""
2611 "\n"
2612 "\tconfiguration using custom keyword template maps\n"
2613 msgstr ""
2614
2615 msgid "\textending current template maps\n"
2616 msgstr ""
2617
2618 msgid "\toverriding default template maps\n"
2619 msgstr ""
2620
2621 msgid ""
2622 "\n"
2623 "\tconfiguration using default keyword template maps\n"
2624 msgstr ""
2625
2626 #, fuzzy
2627 msgid "\tdisabling current template maps\n"
2628 msgstr "使用指定的样式显示"
2629
2630 msgid ""
2631 "\n"
2632 "\tconfiguration using current keyword template maps\n"
2633 msgstr ""
2634
2635 #, python-format
2636 msgid ""
2637 "\n"
2638 "keywords written to %s:\n"
2639 msgstr ""
2640
2641 msgid "unhooked all commit hooks\n"
2642 msgstr ""
2643
2644 msgid ""
2645 "\n"
2646 "\tkeywords expanded\n"
2647 msgstr ""
2648
2649 msgid ""
2650 "expand keywords in the working directory\n"
2651 "\n"
2652 " Run after (re)enabling keyword expansion.\n"
2653 "\n"
2654 " kwexpand refuses to run if given files contain local changes.\n"
2655 " "
2656 msgstr ""
2657
2658 msgid ""
2659 "show files configured for keyword expansion\n"
2660 "\n"
2661 " List which files in the working directory are matched by the\n"
2662 " [keyword] configuration patterns.\n"
2663 "\n"
2664 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2665 " execution by including only files that are actual candidates for\n"
2666 " expansion.\n"
2667 "\n"
2668 " See \"hg help keyword\" on how to construct patterns both for\n"
2669 " inclusion and exclusion of files.\n"
2670 "\n"
2671 " With -A/--all and -v/--verbose the codes used to show the status\n"
2672 " of files are::\n"
2673 "\n"
2674 " K = keyword expansion candidate\n"
2675 " k = keyword expansion candidate (not tracked)\n"
2676 " I = ignored\n"
2677 " i = ignored (not tracked)\n"
2678 " "
2679 msgstr ""
2680
2681 msgid ""
2682 "revert expanded keywords in the working directory\n"
2683 "\n"
2684 " Run before changing/disabling active keywords or if you experience\n"
2685 " problems with \"hg import\" or \"hg merge\".\n"
2686 "\n"
2687 " kwshrink refuses to run if given files contain local changes.\n"
2688 " "
2689 msgstr ""
2690
2691 msgid "show default keyword template maps"
2692 msgstr ""
2693
2694 msgid "read maps from rcfile"
2695 msgstr ""
2696
2697 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2698 msgstr ""
2699
2700 msgid "hg kwexpand [OPTION]... [FILE]..."
2701 msgstr ""
2702
2703 msgid "show keyword status flags of all files"
2704 msgstr ""
2705
2706 msgid "show files excluded from expansion"
2707 msgstr ""
2708
2709 #, fuzzy
2710 msgid "only show unknown (not tracked) files"
2711 msgstr "只显示未知(未被跟踪)文件的状态"
2712
2713 #, fuzzy
2714 msgid "show keyword status flags of all files (DEPRECATED)"
2715 msgstr "显示全部文件的状态"
2716
2717 msgid "only show untracked files (DEPRECATED)"
2718 msgstr ""
2719
2720 msgid "hg kwfiles [OPTION]... [FILE]..."
2721 msgstr ""
2722
2723 msgid "hg kwshrink [OPTION]... [FILE]..."
2724 msgstr ""
2725
2726 msgid ""
2727 "manage a stack of patches\n"
2728 "\n"
2729 "This extension lets you work with a stack of patches in a Mercurial\n"
2730 "repository. It manages two stacks of patches - all known patches, and\n"
2731 "applied patches (subset of known patches).\n"
2732 "\n"
2733 "Known patches are represented as patch files in the .hg/patches\n"
2734 "directory. Applied patches are both patch files and changesets.\n"
2735 "\n"
2736 "Common tasks (use \"hg help command\" for more details)::\n"
2737 "\n"
2738 " prepare repository to work with patches qinit\n"
2739 " create new patch qnew\n"
2740 " import existing patch qimport\n"
2741 "\n"
2742 " print patch series qseries\n"
2743 " print applied patches qapplied\n"
2744 "\n"
2745 " add known patch to applied stack qpush\n"
2746 " remove patch from applied stack qpop\n"
2747 " refresh contents of top applied patch qrefresh\n"
2748 msgstr ""
2749
2750 #, python-format
2751 msgid "%s appears more than once in %s"
2752 msgstr ""
2753
2754 msgid "guard cannot be an empty string"
2755 msgstr ""
2756
2757 #, python-format
2758 msgid "guard %r starts with invalid character: %r"
2759 msgstr ""
2760
2761 #, python-format
2762 msgid "invalid character in guard %r: %r"
2763 msgstr ""
2764
2765 #, python-format
2766 msgid "guard %r too short"
2767 msgstr ""
2768
2769 #, python-format
2770 msgid "guard %r starts with invalid char"
2771 msgstr ""
2772
2773 #, python-format
2774 msgid "allowing %s - no guards in effect\n"
2775 msgstr ""
2776
2777 #, python-format
2778 msgid "allowing %s - no matching negative guards\n"
2779 msgstr ""
2780
2781 #, python-format
2782 msgid "allowing %s - guarded by %r\n"
2783 msgstr ""
2784
2785 #, python-format
2786 msgid "skipping %s - guarded by %r\n"
2787 msgstr ""
2788
2789 #, python-format
2790 msgid "skipping %s - no matching guards\n"
2791 msgstr ""
2792
2793 #, python-format
2794 msgid "error removing undo: %s\n"
2795 msgstr ""
2796
2797 #, python-format
2798 msgid "apply failed for patch %s"
2799 msgstr ""
2800
2801 #, python-format
2802 msgid "patch didn't work out, merging %s\n"
2803 msgstr ""
2804
2805 #, python-format
2806 msgid "update returned %d"
2807 msgstr ""
2808
2809 msgid "repo commit failed"
2810 msgstr ""
2811
2812 #, python-format
2813 msgid "unable to read %s"
2814 msgstr ""
2815
2816 #, python-format
2817 msgid "patch %s does not exist\n"
2818 msgstr ""
2819
2820 #, python-format
2821 msgid "patch %s is not applied\n"
2822 msgstr ""
2823
2824 msgid "patch failed, unable to continue (try -v)\n"
2825 msgstr ""
2826
2827 #, python-format
2828 msgid "applying %s\n"
2829 msgstr ""
2830
2831 #, fuzzy, python-format
2832 msgid "unable to read %s\n"
2833 msgstr ""
2834 "解析 '%s' 失败\n"
2835 "%s"
2836
2837 #, python-format
2838 msgid "imported patch %s\n"
2839 msgstr ""
2840
2841 #, python-format
2842 msgid ""
2843 "\n"
2844 "imported patch %s"
2845 msgstr ""
2846
2847 #, python-format
2848 msgid "patch %s is empty\n"
2849 msgstr ""
2850
2851 msgid "patch failed, rejects left in working dir\n"
2852 msgstr ""
2853
2854 msgid "fuzz found when applying patch, stopping\n"
2855 msgstr ""
2856
2857 #, python-format
2858 msgid "revision %d is not managed"
2859 msgstr ""
2860
2861 #, python-format
2862 msgid "cannot delete revision %d above applied patches"
2863 msgstr ""
2864
2865 #, fuzzy, python-format
2866 msgid "patch %s finalized without changeset message\n"
2867 msgstr "只显示无改动文件的状态"
2868
2869 msgid "qdelete requires at least one revision or patch name"
2870 msgstr ""
2871
2872 #, python-format
2873 msgid "cannot delete applied patch %s"
2874 msgstr ""
2875
2876 #, python-format
2877 msgid "patch %s not in series file"
2878 msgstr ""
2879
2880 msgid "no patches applied"
2881 msgstr ""
2882
2883 msgid "working directory revision is not qtip"
2884 msgstr ""
2885
2886 msgid "local changes found, refresh first"
2887 msgstr ""
2888
2889 msgid "local changes found"
2890 msgstr ""
2891
2892 #, python-format
2893 msgid "\"%s\" cannot be used as the name of a patch"
2894 msgstr ""
2895
2896 #, python-format
2897 msgid "patch \"%s\" already exists"
2898 msgstr ""
2899
2900 #, python-format
2901 msgid "error unlinking %s\n"
2902 msgstr ""
2903
2904 #, python-format
2905 msgid "patch name \"%s\" is ambiguous:\n"
2906 msgstr ""
2907
2908 #, python-format
2909 msgid "patch %s not in series"
2910 msgstr ""
2911
2912 msgid "(working directory not at a head)\n"
2913 msgstr ""
2914
2915 msgid "no patches in series\n"
2916 msgstr ""
2917
2918 #, python-format
2919 msgid "cannot push to a previous patch: %s"
2920 msgstr ""
2921
2922 #, python-format
2923 msgid "qpush: %s is already at the top\n"
2924 msgstr ""
2925
2926 #, python-format
2927 msgid "guarded by %r"
2928 msgstr ""
2929
2930 msgid "no matching guards"
2931 msgstr ""
2932
2933 #, python-format
2934 msgid "cannot push '%s' - %s\n"
2935 msgstr ""
2936
2937 msgid "all patches are currently applied\n"
2938 msgstr ""
2939
2940 msgid "patch series already fully applied\n"
2941 msgstr ""
2942
2943 msgid "cleaning up working directory..."
2944 msgstr ""
2945
2946 #, python-format
2947 msgid "errors during apply, please fix and refresh %s\n"
2948 msgstr ""
2949
2950 #, python-format
2951 msgid "now at: %s\n"
2952 msgstr ""
2953
2954 #, python-format
2955 msgid "patch %s is not applied"
2956 msgstr ""
2957
2958 msgid "no patches applied\n"
2959 msgstr ""
2960
2961 #, python-format
2962 msgid "qpop: %s is already at the top\n"
2963 msgstr ""
2964
2965 msgid "qpop: forcing dirstate update\n"
2966 msgstr ""
2967
2968 #, python-format
2969 msgid "trying to pop unknown node %s"
2970 msgstr ""
2971
2972 msgid "popping would remove a revision not managed by this patch queue"
2973 msgstr ""
2974
2975 msgid "deletions found between repo revs"
2976 msgstr ""
2977
2978 #, fuzzy, python-format
2979 msgid "popping %s\n"
2980 msgstr "使用 %s\n"
2981
2982 msgid "patch queue now empty\n"
2983 msgstr ""
2984
2985 msgid "cannot refresh a revision with children"
2986 msgstr ""
2987
2988 msgid ""
2989 "refresh interrupted while patch was popped! (revert --all, qpush to "
2990 "recover)\n"
2991 msgstr ""
2992
2993 msgid "patch queue directory already exists"
2994 msgstr ""
2995
2996 #, python-format
2997 msgid "patch %s is not in series file"
2998 msgstr ""
2999
3000 msgid "No saved patch data found\n"
3001 msgstr ""
3002
3003 #, python-format
3004 msgid "restoring status: %s\n"
3005 msgstr ""
3006
3007 msgid "save entry has children, leaving it alone\n"
3008 msgstr ""
3009
3010 #, python-format
3011 msgid "removing save entry %s\n"
3012 msgstr ""
3013
3014 #, python-format
3015 msgid "saved queue repository parents: %s %s\n"
3016 msgstr ""
3017
3018 msgid "queue directory updating\n"
3019 msgstr ""
3020
3021 msgid "Unable to load queue repository\n"
3022 msgstr ""
3023
3024 msgid "save: no patches applied, exiting\n"
3025 msgstr ""
3026
3027 msgid "status is already saved\n"
3028 msgstr ""
3029
3030 msgid "hg patches saved state"
3031 msgstr ""
3032
3033 msgid "repo commit failed\n"
3034 msgstr ""
3035
3036 #, python-format
3037 msgid "patch %s is already in the series file"
3038 msgstr ""
3039
3040 msgid "option \"-r\" not valid when importing files"
3041 msgstr ""
3042
3043 msgid "option \"-n\" not valid when importing multiple patches"
3044 msgstr ""
3045
3046 #, python-format
3047 msgid "revision %d is the root of more than one branch"
3048 msgstr ""
3049
3050 #, python-format
3051 msgid "revision %d is already managed"
3052 msgstr ""
3053
3054 #, python-format
3055 msgid "revision %d is not the parent of the queue"
3056 msgstr ""
3057
3058 #, python-format
3059 msgid "revision %d has unmanaged children"
3060 msgstr ""
3061
3062 #, python-format
3063 msgid "cannot import merge revision %d"
3064 msgstr ""
3065
3066 #, python-format
3067 msgid "revision %d is not the parent of %d"
3068 msgstr ""
3069
3070 msgid "-e is incompatible with import from -"
3071 msgstr ""
3072
3073 #, python-format
3074 msgid "patch %s does not exist"
3075 msgstr ""
3076
3077 msgid "need --name to import a patch from -"
3078 msgstr ""
3079
3080 #, python-format
3081 msgid "adding %s to series file\n"
3082 msgstr ""
3083
3084 msgid ""
3085 "remove patches from queue\n"
3086 "\n"
3087 " The patches must not be applied, and at least one patch is required. "
3088 "With\n"
3089 " -k/--keep, the patch files are preserved in the patch directory.\n"
3090 "\n"
3091 " To stop managing a patch and move it into permanent history,\n"
3092 " use the qfinish command."
3093 msgstr ""
3094
3095 msgid "print the patches already applied"
3096 msgstr ""
3097
3098 msgid "only one patch applied\n"
3099 msgstr ""
3100
3101 msgid "print the patches not yet applied"
3102 msgstr ""
3103
3104 msgid "all patches applied\n"
3105 msgstr ""
3106
3107 #, fuzzy
3108 msgid ""
3109 "import a patch\n"
3110 "\n"
3111 " The patch is inserted into the series after the last applied\n"
3112 " patch. If no patches have been applied, qimport prepends the patch\n"
3113 " to the series.\n"
3114 "\n"
3115 " The patch will have the same name as its source file unless you\n"
3116 " give it a new one with -n/--name.\n"
3117 "\n"
3118 " You can register an existing patch inside the patch directory with\n"
3119 " the -e/--existing flag.\n"
3120 "\n"
3121 " With -f/--force, an existing patch of the same name will be\n"
3122 " overwritten.\n"
3123 "\n"
3124 " An existing changeset may be placed under mq control with -r/--rev\n"
3125 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
3126 " With -g/--git, patches imported with --rev will use the git diff\n"
3127 " format. See the diffs help topic for information on why this is\n"
3128 " important for preserving rename/copy information and permission\n"
3129 " changes.\n"
3130 "\n"
3131 " To import a patch from standard input, pass - as the patch file.\n"
3132 " When importing from standard input, a patch name must be specified\n"
3133 " using the --name flag.\n"
3134 " "
3135 msgstr ""
3136 "导入补丁\n"
3137 "\n"
3138 " 此补丁插入到最近一次应用的补丁序列中。\n"
3139 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
3140 "\n"
3141 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
3142 "\n"
3143 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
3144 "\n"
3145 " 使用 '--force' 会覆盖已有的补丁。\n"
3146 "\n"
3147 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
3148 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
3149 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
3150 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
3151 " "
3152
3153 #, fuzzy
3154 msgid ""
3155 "init a new queue repository\n"
3156 "\n"
3157 " The queue repository is unversioned by default. If\n"
3158 " -c/--create-repo is specified, qinit will create a separate nested\n"
3159 " repository for patches (qinit -c may also be run later to convert\n"
3160 " an unversioned patch repository into a versioned one). You can use\n"
3161 " qcommit to commit changes to this queue repository."
3162 msgstr ""
3163 "初始化队列仓库\n"
3164 "\n"
3165 " 默认队列仓库不受版本控制。如果指定了 '-c',那么 qinit 会为补丁创建一个\n"
3166 " 单独的嵌套版本库(也可以稍后运行 'qinit -c' 来将不受版本控制的补丁仓库\n"
3167 " 转换成受版本控制)。你可以使用 'qcommit' 提交改变到此队列版本库。"
3168
3169 msgid ""
3170 "clone main and patch repository at same time\n"
3171 "\n"
3172 " If source is local, destination will have no patches applied. If\n"
3173 " source is remote, this command can not check if patches are\n"
3174 " applied in source, so cannot guarantee that patches are not\n"
3175 " applied in destination. If you clone remote repository, be sure\n"
3176 " before that it has no patches applied.\n"
3177 "\n"
3178 " Source patch repository is looked for in <src>/.hg/patches by\n"
3179 " default. Use -p <url> to change.\n"
3180 "\n"
3181 " The patch directory must be a nested Mercurial repository, as\n"
3182 " would be created by qinit -c.\n"
3183 " "
3184 msgstr ""
3185
3186 msgid "versioned patch repository not found (see qinit -c)"
3187 msgstr ""
3188
3189 #, fuzzy
3190 msgid "cloning main repository\n"
3191 msgstr "初始化目标版本库 %s\n"
3192
3193 msgid "cloning patch repository\n"
3194 msgstr ""
3195
3196 #, fuzzy
3197 msgid "stripping applied patches from destination repository\n"
3198 msgstr "初始化目标版本库 %s\n"
3199
3200 #, fuzzy
3201 msgid "updating destination repository\n"
3202 msgstr "初始化目标版本库 %s\n"
3203
3204 msgid "commit changes in the queue repository"
3205 msgstr ""
3206
3207 msgid "print the entire series file"
3208 msgstr ""
3209
3210 msgid "print the name of the current patch"
3211 msgstr ""
3212
3213 msgid "print the name of the next patch"
3214 msgstr ""
3215
3216 msgid "print the name of the previous patch"
3217 msgstr ""
3218
3219 msgid ""
3220 "create a new patch\n"
3221 "\n"
3222 " qnew creates a new patch on top of the currently-applied patch (if\n"
3223 " any). It will refuse to run if there are any outstanding changes\n"
3224 " unless -f/--force is specified, in which case the patch will be\n"
3225 " initialized with them. You may also use -I/--include,\n"
3226 " -X/--exclude, and/or a list of files after the patch name to add\n"
3227 " only changes to matching files to the new patch, leaving the rest\n"
3228 " as uncommitted modifications.\n"
3229 "\n"
3230 " -u/--user and -d/--date can be used to set the (given) user and\n"
3231 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
3232 " to current user and date to current date.\n"
3233 "\n"
3234 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
3235 " well as the commit message. If none is specified, the header is\n"
3236 " empty and the commit message is '[mq]: PATCH'.\n"
3237 "\n"
3238 " Use the -g/--git option to keep the patch in the git extended diff\n"
3239 " format. Read the diffs help topic for more information on why this\n"
3240 " is important for preserving permission changes and copy/rename\n"
3241 " information.\n"
3242 " "
3243 msgstr ""
3244
3245 #, fuzzy
3246 msgid ""
3247 "update the current patch\n"
3248 "\n"
3249 " If any file patterns are provided, the refreshed patch will\n"
3250 " contain only the modifications that match those patterns; the\n"
3251 " remaining modifications will remain in the working directory.\n"
3252 "\n"
3253 " If -s/--short is specified, files currently included in the patch\n"
3254 " will be refreshed just like matched files and remain in the patch.\n"
3255 "\n"
3256 " hg add/remove/copy/rename work as usual, though you might want to\n"
3257 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
3258 " and renames. See the diffs help topic for more information on the\n"
3259 " git diff format.\n"
3260 " "
3261 msgstr ""
3262 "更新当前补丁\n"
3263 "\n"
3264 " 如果提供了文件匹配模式,更新后的补丁只包含匹配这些模式的修改,其它\n"
3265 " 的修改仍旧在工作目录中。\n"
3266 "\n"
3267 " 如果指定了 '--short',只更新已经在补丁中的文件,与文件匹配模式类似。\n"
3268 "\n"
3269 " 'hg add/remove/copy/rename' 如常工作,你可能想使用 git 格式补丁(使\n"
3270 " 用选项 '--git' 或在配置文件的 [diff] 区中设置 git=1)以跟踪复制和改\n"
3271 " 名。请参见差异帮助主题,以了解关于 git 差异格式的更多信息。\n"
3272 " "
3273
3274 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
3275 msgstr ""
3276
3277 #, fuzzy
3278 msgid ""
3279 "diff of the current patch and subsequent modifications\n"
3280 "\n"
3281 " Shows a diff which includes the current patch as well as any\n"
3282 " changes which have been made in the working directory since the\n"
3283 " last refresh (thus showing what the current patch would become\n"
3284 " after a qrefresh).\n"
3285 "\n"
3286 " Use 'hg diff' if you only want to see the changes made since the\n"
3287 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
3288 " by the current patch without including changes made since the\n"
3289 " qrefresh.\n"
3290 " "
3291 msgstr ""
3292 "显式当前的补丁和后续的修改\n"
3293 "\n"
3294 " 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n"
3295 " 显示当前的补丁)。\n"
3296 "\n"
3297 " 如果你只想看到最近一次刷新之后的修改请使用 'hg diff',如果你只想看到当\n"
3298 " 前的补丁请使用 'hg export qtip'。\n"
3299 " "
3300
3301 msgid ""
3302 "fold the named patches into the current patch\n"
3303 "\n"
3304 " Patches must not yet be applied. Each patch will be successively\n"
3305 " applied to the current patch in the order given. If all the\n"
3306 " patches apply successfully, the current patch will be refreshed\n"
3307 " with the new cumulative patch, and the folded patches will be\n"
3308 " deleted. With -k/--keep, the folded patch files will not be\n"
3309 " removed afterwards.\n"
3310 "\n"
3311 " The header for each folded patch will be concatenated with the\n"
3312 " current patch header, separated by a line of '* * *'."
3313 msgstr ""
3314
3315 msgid "qfold requires at least one patch name"
3316 msgstr ""
3317
3318 msgid "No patches applied"
3319 msgstr ""
3320
3321 #, python-format
3322 msgid "Skipping already folded patch %s"
3323 msgstr ""
3324
3325 #, python-format
3326 msgid "qfold cannot fold already applied patch %s"
3327 msgstr ""
3328
3329 #, python-format
3330 msgid "Error folding patch %s"
3331 msgstr ""
3332
3333 msgid "push or pop patches until named patch is at top of stack"
3334 msgstr ""
3335
3336 msgid ""
3337 "set or print guards for a patch\n"
3338 "\n"
3339 " Guards control whether a patch can be pushed. A patch with no\n"
3340 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3341 " pushed only if the qselect command has activated it. A patch with\n"
3342 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3343 " has activated it.\n"
3344 "\n"
3345 " With no arguments, print the currently active guards.\n"
3346 " With arguments, set guards for the named patch.\n"
3347 " NOTE: Specifying negative guards now requires '--'.\n"
3348 "\n"
3349 " To set guards on another patch:\n"
3350 " hg qguard -- other.patch +2.6.17 -stable\n"
3351 " "
3352 msgstr ""
3353
3354 msgid "cannot mix -l/--list with options or arguments"
3355 msgstr ""
3356
3357 msgid "no patch to work with"
3358 msgstr ""
3359
3360 #, python-format
3361 msgid "no patch named %s"
3362 msgstr ""
3363
3364 msgid "print the header of the topmost or specified patch"
3365 msgstr ""
3366
3367 #, fuzzy
3368 msgid ""
3369 "push the next patch onto the stack\n"
3370 "\n"
3371 " When -f/--force is applied, all local changes in patched files\n"
3372 " will be lost.\n"
3373 " "
3374 msgstr ""
3375 "将下个补丁压入堆栈\n"
3376 "\n"
3377 " 当指定 '--force' 时,所有在补丁文件中的本地修改都会丢失。\n"
3378 " "
3379
3380 msgid "no saved queues found, please use -n\n"
3381 msgstr ""
3382
3383 #, python-format
3384 msgid "merging with queue at: %s\n"
3385 msgstr ""
3386
3387 #, fuzzy
3388 msgid ""
3389 "pop the current patch off the stack\n"
3390 "\n"
3391 " By default, pops off the top of the patch stack. If given a patch\n"
3392 " name, keeps popping off patches until the named patch is at the\n"
3393 " top of the stack.\n"
3394 " "
3395 msgstr ""
3396 "将当前补丁弹出堆栈\n"
3397 "\n"
3398 " 默认将补丁堆栈的顶部弹出。如果指定了补丁名称,那么就会一直弹出,直到此\n"
3399 " 补丁位于堆栈顶部。\n"
3400 " "
3401
3402 #, python-format
3403 msgid "using patch queue: %s\n"
3404 msgstr ""
3405
3406 msgid ""
3407 "rename a patch\n"
3408 "\n"
3409 " With one argument, renames the current patch to PATCH1.\n"
3410 " With two arguments, renames PATCH1 to PATCH2."
3411 msgstr ""
3412
3413 #, python-format
3414 msgid "%s already exists"
3415 msgstr ""
3416
3417 #, python-format
3418 msgid "A patch named %s already exists in the series file"
3419 msgstr ""
3420
3421 msgid "restore the queue state saved by a revision"
3422 msgstr ""
3423
3424 msgid "save current queue state"
3425 msgstr ""
3426
3427 #, python-format
3428 msgid "destination %s exists and is not a directory"
3429 msgstr ""
3430
3431 #, python-format
3432 msgid "destination %s exists, use -f to force"
3433 msgstr ""
3434
3435 #, python-format
3436 msgid "copy %s to %s\n"
3437 msgstr ""
3438
3439 #, fuzzy
3440 msgid ""
3441 "strip a revision and all its descendants from the repository\n"
3442 "\n"
3443 " If one of the working directory's parent revisions is stripped, the\n"
3444 " working directory will be updated to the parent of the stripped\n"
3445 " revision.\n"
3446 " "
3447 msgstr ""
3448 "从版本库删除一个版本以及它的子孙\n"
3449 "\n"
3450 " 如果有工作目录的父版本被删除,那么此目录会被更新到已删除版本的父版本。\n"
3451 " "
3452
3453 msgid ""
3454 "set or print guarded patches to push\n"
3455 "\n"
3456 " Use the qguard command to set or print guards on patch, then use\n"
3457 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3458 " it has no guards or any positive guards match the currently\n"
3459 " selected guard, but will not be pushed if any negative guards\n"
3460 " match the current guard. For example:\n"
3461 "\n"
3462 " qguard foo.patch -stable (negative guard)\n"
3463 " qguard bar.patch +stable (positive guard)\n"
3464 " qselect stable\n"
3465 "\n"
3466 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3467 " it has a negative match) but push bar.patch (because it has a\n"
3468 " positive match).\n"
3469 "\n"
3470 " With no arguments, prints the currently active guards.\n"
3471 " With one argument, sets the active guard.\n"
3472 "\n"
3473 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3474 " When no guards are active, patches with positive guards are\n"
3475 " skipped and patches with negative guards are pushed.\n"
3476 "\n"
3477 " qselect can change the guards on applied patches. It does not pop\n"
3478 " guarded patches by default. Use --pop to pop back to the last\n"
3479 " applied patch that is not guarded. Use --reapply (which implies\n"
3480 " --pop) to push back to the current patch afterwards, but skip\n"
3481 " guarded patches.\n"
3482 "\n"
3483 " Use -s/--series to print a list of all guards in the series file\n"
3484 " (no other arguments needed). Use -v for more information."
3485 msgstr ""
3486
3487 msgid "guards deactivated\n"
3488 msgstr ""
3489
3490 #, python-format
3491 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3492 msgstr ""
3493
3494 #, python-format
3495 msgid "number of guarded, applied patches has changed from %d to %d\n"
3496 msgstr ""
3497
3498 msgid "guards in series file:\n"
3499 msgstr ""
3500
3501 msgid "no guards in series file\n"
3502 msgstr ""
3503
3504 msgid "active guards:\n"
3505 msgstr ""
3506
3507 msgid "no active guards\n"
3508 msgstr ""
3509
3510 msgid "popping guarded patches\n"
3511 msgstr ""
3512
3513 msgid "reapplying unguarded patches\n"
3514 msgstr ""
3515
3516 msgid ""
3517 "move applied patches into repository history\n"
3518 "\n"
3519 " Finishes the specified revisions (corresponding to applied\n"
3520 " patches) by moving them out of mq control into regular repository\n"
3521 " history.\n"
3522 "\n"
3523 " Accepts a revision range or the -a/--applied option. If --applied\n"
3524 " is specified, all applied mq revisions are removed from mq\n"
3525 " control. Otherwise, the given revisions must be at the base of the\n"
3526 " stack of applied patches.\n"
3527 "\n"
3528 " This can be especially useful if your changes have been applied to\n"
3529 " an upstream repository, or if you are about to push your changes\n"
3530 " to upstream.\n"
3531 " "
3532 msgstr ""
3533
3534 msgid "no revisions specified"
3535 msgstr ""
3536
3537 msgid "cannot commit over an applied mq patch"
3538 msgstr ""
3539
3540 msgid "source has mq patches applied"
3541 msgstr ""
3542
3543 #, python-format
3544 msgid "mq status file refers to unknown node %s\n"
3545 msgstr ""
3546
3547 #, python-format
3548 msgid "Tag %s overrides mq patch of the same name\n"
3549 msgstr ""
3550
3551 msgid "cannot import over an applied patch"
3552 msgstr ""
3553
3554 msgid "print first line of patch header"
3555 msgstr ""
3556
3557 #, fuzzy
3558 msgid "show only the last patch"
3559 msgstr "只显示已增加文件的状态"
3560
3561 msgid "hg qapplied [-1] [-s] [PATCH]"
3562 msgstr ""
3563
3564 msgid "use pull protocol to copy metadata"
3565 msgstr "数用协议 'pull' 来复制元数据"
3566
3567 msgid "do not update the new working directories"
3568 msgstr ""
3569
3570 msgid "use uncompressed transfer (fast over LAN)"
3571 msgstr "使用不压缩的传输(在局域网更快)"
3572
3573 #, fuzzy
3574 msgid "location of source patch repository"
3575 msgstr "为此版本库启动服务 'inotify'"
3576
3577 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3578 msgstr ""
3579
3580 msgid "hg qcommit [OPTION]... [FILE]..."
3581 msgstr ""
3582
3583 msgid "hg qdiff [OPTION]... [FILE]..."
3584 msgstr ""
3585
3586 msgid "keep patch file"
3587 msgstr ""
3588
3589 msgid "stop managing a revision (DEPRECATED)"
3590 msgstr ""
3591
3592 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3593 msgstr ""
3594
3595 msgid "edit patch header"
3596 msgstr ""
3597
3598 msgid "keep folded patch files"
3599 msgstr ""
3600
3601 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3602 msgstr ""
3603
3604 msgid "overwrite any local changes"
3605 msgstr ""
3606
3607 msgid "hg qgoto [OPTION]... PATCH"
3608 msgstr ""
3609
3610 msgid "list all patches and guards"
3611 msgstr ""
3612
3613 msgid "drop all guards"
3614 msgstr ""
3615
3616 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3617 msgstr ""
3618
3619 msgid "hg qheader [PATCH]"
3620 msgstr ""
3621
3622 #, fuzzy
3623 msgid "import file in patch directory"
3624 msgstr "从补丁目录导入文件"
3625
3626 #, fuzzy
3627 msgid "name of patch file"
3628 msgstr "补丁文件名称"
3629
3630 msgid "overwrite existing files"
3631 msgstr "覆盖已有文件"
3632
3633 msgid "place existing revisions under mq control"
3634 msgstr "将现有的版本置于 mq 控制下"
3635
3636 msgid "use git extended diff format"
3637 msgstr "使用 git 扩展差异格式"
3638
3639 msgid "qpush after importing"
3640 msgstr ""
3641
3642 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3643 msgstr ""
3644
3645 msgid "create queue repository"
3646 msgstr "创建队列版本库"
3647
3648 msgid "hg qinit [-c]"
3649 msgstr ""
3650
3651 msgid "import uncommitted changes into patch"
3652 msgstr ""
3653
3654 msgid "add \"From: <current user>\" to patch"
3655 msgstr ""
3656
3657 msgid "add \"From: <given user>\" to patch"
3658 msgstr ""
3659
3660 msgid "add \"Date: <current date>\" to patch"
3661 msgstr ""
3662
3663 msgid "add \"Date: <given date>\" to patch"
3664 msgstr ""
3665
3666 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3667 msgstr ""
3668
3669 msgid "hg qnext [-s]"
3670 msgstr ""
3671
3672 msgid "hg qprev [-s]"
3673 msgstr ""
3674
3675 msgid "pop all patches"
3676 msgstr "弹出全部补丁"
3677
3678 msgid "queue name to pop"
3679 msgstr "操作的队列名称"
3680
3681 #, fuzzy
3682 msgid "forget any local changes to patched files"
3683 msgstr "丢弃本地修改"
3684
3685 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3686 msgstr ""
3687
3688 msgid "apply if the patch has rejects"
3689 msgstr "强制应用补丁"
3690
3691 msgid "list patch name in commit text"
3692 msgstr "在提交日志中列出补丁名称"
3693
3694 msgid "apply all patches"
3695 msgstr "应用所有补丁"
3696
3697 msgid "merge from another queue"
3698 msgstr "从其它队列合并"
3699
3700 msgid "merge queue name"
3701 msgstr "合并队列的名称"
3702
3703 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3704 msgstr ""
3705
3706 msgid "refresh only files already in the patch and specified files"
3707 msgstr "仅当文件已经在补丁或指定文件中时才更新"
3708
3709 msgid "add/update author field in patch with current user"
3710 msgstr ""
3711
3712 msgid "add/update author field in patch with given user"
3713 msgstr ""
3714
3715 #, fuzzy
3716 msgid "add/update date field in patch with current date"
3717 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3718
3719 #, fuzzy
3720 msgid "add/update date field in patch with given date"
3721 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3722
3723 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3724 msgstr ""
3725
3726 msgid "hg qrename PATCH1 [PATCH2]"
3727 msgstr ""
3728
3729 msgid "delete save entry"
3730 msgstr ""
3731
3732 #, fuzzy
3733 msgid "update queue working directory"
3734 msgstr "正在更新工作目录\n"
3735
3736 msgid "hg qrestore [-d] [-u] REV"
3737 msgstr ""
3738
3739 msgid "copy patch directory"
3740 msgstr ""
3741
3742 msgid "copy directory name"
3743 msgstr ""
3744
3745 msgid "clear queue status file"
3746 msgstr ""
3747
3748 msgid "force copy"
3749 msgstr ""
3750
3751 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3752 msgstr ""
3753
3754 msgid "disable all guards"
3755 msgstr ""
3756
3757 msgid "list all guards in series file"
3758 msgstr ""
3759
3760 msgid "pop to before first guarded applied patch"
3761 msgstr ""
3762
3763 msgid "pop, then reapply patches"
3764 msgstr ""
3765
3766 msgid "hg qselect [OPTION]... [GUARD]..."
3767 msgstr ""
3768
3769 msgid "print patches not in series"
3770 msgstr ""
3771
3772 msgid "hg qseries [-ms]"
3773 msgstr ""
3774
3775 msgid "force removal with local changes"
3776 msgstr "强制删除,纵然有本地修改"
3777
3778 msgid "bundle unrelated changesets"
3779 msgstr "打包不相关的修改集"
3780
3781 msgid "no backups"
3782 msgstr "不备份"
3783
3784 msgid "hg strip [-f] [-b] [-n] REV"
3785 msgstr ""
3786
3787 msgid "hg qtop [-s]"
3788 msgstr ""
3789
3790 #, fuzzy
3791 msgid "show only the first patch"
3792 msgstr "只显示已增加文件的状态"
3793
3794 msgid "hg qunapplied [-1] [-s] [PATCH]"
3795 msgstr ""
3796
3797 msgid "finish all applied changesets"
3798 msgstr ""
3799
3800 msgid "hg qfinish [-a] [REV]..."
3801 msgstr ""
3802
3803 msgid ""
3804 "hooks for sending email notifications at commit/push time\n"
3805 "\n"
3806 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3807 "print messages to stdout, for testing and configuring.\n"
3808 "\n"
3809 "To use, configure the notify extension and enable it in hgrc like\n"
3810 "this::\n"
3811 "\n"
3812 " [extensions]\n"
3813 " hgext.notify =\n"
3814 "\n"
3815 " [hooks]\n"
3816 " # one email for each incoming changeset\n"
3817 " incoming.notify = python:hgext.notify.hook\n"
3818 " # batch emails when many changesets incoming at one time\n"
3819 " changegroup.notify = python:hgext.notify.hook\n"
3820 "\n"
3821 " [notify]\n"
3822 " # config items go here\n"
3823 "\n"
3824 "Required configuration items::\n"
3825 "\n"
3826 " config = /path/to/file # file containing subscriptions\n"
3827 "\n"
3828 "Optional configuration items::\n"
3829 "\n"
3830 " test = True # print messages to stdout for testing\n"
3831 " strip = 3 # number of slashes to strip for url paths\n"
3832 " domain = example.com # domain to use if committer missing domain\n"
3833 " style = ... # style file to use when formatting email\n"
3834 " template = ... # template to use when formatting email\n"
3835 " incoming = ... # template to use when run as incoming hook\n"
3836 " changegroup = ... # template when run as changegroup hook\n"
3837 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3838 " maxsubject = 67 # truncate subject line longer than this\n"
3839 " diffstat = True # add a diffstat before the diff content\n"
3840 " sources = serve # notify if source of incoming changes in this "
3841 "list\n"
3842 " # (serve == ssh or http, push, pull, bundle)\n"
3843 " merge = False # send notification for merges (default True)\n"
3844 " [email]\n"
3845 " from = user@host.com # email address to send as if none given\n"
3846 " [web]\n"
3847 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3848 "\n"
3849 "The notify config file has same format as a regular hgrc file. It has\n"
3850 "two sections so you can express subscriptions in whatever way is\n"
3851 "handier for you.\n"
3852 "\n"
3853 "::\n"
3854 "\n"
3855 " [usersubs]\n"
3856 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3857 " user@host = pattern\n"
3858 "\n"
3859 " [reposubs]\n"
3860 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3861 " pattern = user@host\n"
3862 "\n"
3863 "Glob patterns are matched against path to repository root.\n"
3864 "\n"
3865 "If you like, you can put notify config file in repository that users\n"
3866 "can push changes to, they can manage their own subscriptions.\n"
3867 msgstr ""
3868
3869 #, python-format
3870 msgid "%s: %d new changesets"
3871 msgstr ""
3872
3873 #, python-format
3874 msgid "notify: sending %d subscribers %d changes\n"
3875 msgstr ""
3876
3877 #, python-format
3878 msgid ""
3879 "\n"
3880 "diffs (truncated from %d to %d lines):\n"
3881 "\n"
3882 msgstr ""
3883
3884 #, python-format
3885 msgid ""
3886 "\n"
3887 "diffs (%d lines):\n"
3888 "\n"
3889 msgstr ""
3890
3891 #, python-format
3892 msgid "notify: suppressing notification for merge %d:%s\n"
3893 msgstr ""
3894
3895 msgid ""
3896 "browse command output with an external pager\n"
3897 "\n"
3898 "To set the pager that should be used, set the application variable::\n"
3899 "\n"
3900 " [pager]\n"
3901 " pager = LESS='FSRX' less\n"
3902 "\n"
3903 "If no pager is set, the pager extensions uses the environment variable\n"
3904 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3905 "\n"
3906 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3907 "setting::\n"
3908 "\n"
3909 " [pager]\n"
3910 " quiet = True\n"
3911 "\n"
3912 "You can disable the pager for certain commands by adding them to the\n"
3913 "pager.ignore list::\n"
3914 "\n"
3915 " [pager]\n"
3916 " ignore = version, help, update\n"
3917 "\n"
3918 "You can also enable the pager only for certain commands using\n"
3919 "pager.attend::\n"
3920 "\n"
3921 " [pager]\n"
3922 " attend = log\n"
3923 "\n"
3924 "If pager.attend is present, pager.ignore will be ignored.\n"
3925 "\n"
3926 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3927 "specify them in the global .hgrc\n"
3928 msgstr ""
3929
3930 msgid ""
3931 "interpret suffixes to refer to ancestor revisions\n"
3932 "\n"
3933 "This extension allows you to use git-style suffixes to refer to the\n"
3934 "ancestors of a specific revision.\n"
3935 "\n"
3936 "For example, if you can refer to a revision as \"foo\", then::\n"
3937 "\n"
3938 " foo^N = Nth parent of foo\n"
3939 " foo^0 = foo\n"
3940 " foo^1 = first parent of foo\n"
3941 " foo^2 = second parent of foo\n"
3942 " foo^ = foo^1\n"
3943 "\n"
3944 " foo~N = Nth first grandparent of foo\n"
3945 " foo~0 = foo\n"
3946 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3947 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3948 msgstr ""
3949
3950 msgid ""
3951 "command to send changesets as (a series of) patch emails\n"
3952 "\n"
3953 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3954 "describes the series as a whole.\n"
3955 "\n"
3956 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3957 "first line of the changeset description as the subject text. The\n"
3958 "message contains two or three body parts:\n"
3959 "\n"
3960 "- The changeset description.\n"
3961 "- [Optional] The result of running diffstat on the patch.\n"
3962 "- The patch itself, as generated by \"hg export\".\n"
3963 "\n"
3964 "Each message refers to the first in the series using the In-Reply-To\n"
3965 "and References headers, so they will show up as a sequence in threaded\n"
3966 "mail and news readers, and in mail archives.\n"
3967 "\n"
3968 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3969 "with a diffstat summary and the changeset summary, so you can be sure\n"
3970 "you are sending the right changes.\n"
3971 "\n"
3972 "To configure other defaults, add a section like this to your hgrc\n"
3973 "file::\n"
3974 "\n"
3975 " [email]\n"
3976 " from = My Name <my@email>\n"
3977 " to = recipient1, recipient2, ...\n"
3978 " cc = cc1, cc2, ...\n"
3979 " bcc = bcc1, bcc2, ...\n"
3980 "\n"
3981 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3982 "as a patchbomb.\n"
3983 "\n"
3984 "To avoid sending patches prematurely, it is a good idea to first run\n"
3985 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3986 "prompted for an email recipient address, a subject and an introductory\n"
3987 "message describing the patches of your patchbomb. Then when all is\n"
3988 "done, patchbomb messages are displayed. If the PAGER environment\n"
3989 "variable is set, your pager will be fired up once for each patchbomb\n"
3990 "message, so you can verify everything is alright.\n"
3991 "\n"
3992 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3993 "patchbomb message in a pager or sending the messages directly, it will\n"
3994 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3995 "can be previewed with any mail user agent which supports UNIX mbox\n"
3996 "files, e.g. with mutt::\n"
3997 "\n"
3998 " % mutt -R -f mbox\n"
3999 "\n"
4000 "When you are previewing the patchbomb messages, you can use ``formail``\n"
4001 "(a utility that is commonly installed as part of the procmail\n"
4002 "package), to send each message out::\n"
4003 "\n"
4004 " % formail -s sendmail -bm -t < mbox\n"
4005 "\n"
4006 "That should be all. Now your patchbomb is on its way out.\n"
4007 "\n"
4008 "You can also either configure the method option in the email section\n"
4009 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
4010 "that the patchbomb extension can automatically send patchbombs\n"
4011 "directly from the commandline. See the [email] and [smtp] sections in\n"
4012 "hgrc(5) for details.\n"
4013 msgstr ""
4014
4015 #, python-format
4016 msgid "%sPlease enter a valid value"
4017 msgstr ""
4018
4019 msgid "Please enter a valid value.\n"
4020 msgstr ""
4021
4022 msgid "does the diffstat above look okay? "
4023 msgstr ""
4024
4025 msgid "diffstat rejected"
4026 msgstr ""
4027
4028 msgid ""
4029 "send changesets by email\n"
4030 "\n"
4031 " By default, diffs are sent in the format generated by hg export,\n"
4032 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
4033 " introduction, which describes the series as a whole.\n"
4034 "\n"
4035 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
4036 " the first line of the changeset description as the subject text.\n"
4037 " The message contains two or three parts. First, the changeset\n"
4038 " description. Next, (optionally) if the diffstat program is\n"
4039 " installed and -d/--diffstat is used, the result of running\n"
4040 " diffstat on the patch. Finally, the patch itself, as generated by\n"
4041 " \"hg export\".\n"
4042 "\n"
4043 " By default the patch is included as text in the email body for\n"
4044 " easy reviewing. Using the -a/--attach option will instead create\n"
4045 " an attachment for the patch. With -i/--inline an inline attachment\n"
4046 " will be created.\n"
4047 "\n"
4048 " With -o/--outgoing, emails will be generated for patches not found\n"
4049 " in the destination repository (or only those which are ancestors\n"
4050 " of the specified revisions if any are provided)\n"
4051 "\n"
4052 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
4053 " single email containing a binary Mercurial bundle as an attachment\n"
4054 " will be sent.\n"
4055 "\n"
4056 " Examples::\n"
4057 "\n"
4058 " hg email -r 3000 # send patch 3000 only\n"
4059 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
4060 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
4061 " hg email 3000 # send patch 3000 (deprecated)\n"
4062 "\n"
4063 " hg email -o # send all patches not in default\n"
4064 " hg email -o DEST # send all patches not in DEST\n"
4065 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
4066 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
4067 "\n"
4068 " hg email -b # send bundle of all patches not in default\n"
4069 " hg email -b DEST # send bundle of all patches not in DEST\n"
4070 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
4071 "default\n"
4072 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in "
4073 "DEST\n"
4074 "\n"
4075 " Before using this command, you will need to enable email in your\n"
4076 " hgrc. See the [email] section in hgrc(5) for details.\n"
4077 " "
4078 msgstr ""
4079
4080 msgid "specify at least one changeset with -r or -o"
4081 msgstr ""
4082
4083 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
4084 msgstr ""
4085
4086 msgid "too many destinations"
4087 msgstr ""
4088
4089 msgid "use only one form to specify the revision"
4090 msgstr ""
4091
4092 msgid ""
4093 "\n"
4094 "Write the introductory message for the patch series.\n"
4095 "\n"
4096 msgstr ""
4097
4098 #, python-format
4099 msgid ""
4100 "This patch series consists of %d patches.\n"
4101 "\n"
4102 msgstr ""
4103
4104 msgid "Final summary:\n"
4105 msgstr ""
4106
4107 msgid "Displaying "
4108 msgstr ""
4109
4110 msgid "Writing "
4111 msgstr ""
4112
4113 msgid "Sending "
4114 msgstr ""
4115
4116 msgid "send patches as attachments"
4117 msgstr ""
4118
4119 msgid "send patches as inline attachments"
4120 msgstr ""
4121
4122 msgid "email addresses of blind carbon copy recipients"
4123 msgstr ""
4124
4125 msgid "email addresses of copy recipients"
4126 msgstr ""
4127
4128 msgid "add diffstat output to messages"
4129 msgstr ""
4130
4131 msgid "use the given date as the sending date"
4132 msgstr ""
4133
4134 msgid "use the given file as the series description"
4135 msgstr ""
4136
4137 msgid "email address of sender"
4138 msgstr ""
4139
4140 msgid "print messages that would be sent"
4141 msgstr ""
4142
4143 msgid "write messages to mbox file instead of sending them"
4144 msgstr ""
4145
4146 msgid "subject of first message (intro or single patch)"
4147 msgstr ""
4148
4149 msgid "message identifier to reply to"
4150 msgstr ""
4151
4152 msgid "flags to add in subject prefixes"
4153 msgstr ""
4154
4155 msgid "email addresses of recipients"
4156 msgstr ""
4157
4158 msgid "omit hg patch header"
4159 msgstr ""
4160
4161 msgid "send changes not found in the target repository"
4162 msgstr ""
4163
4164 msgid "send changes not in target as a binary bundle"
4165 msgstr ""
4166
4167 msgid "name of the bundle attachment file"
4168 msgstr ""
4169
4170 msgid "a revision to send"
4171 msgstr ""
4172
4173 #, fuzzy
4174 msgid "run even when remote repository is unrelated (with -b/--bundle)"
4175 msgstr "纵然远程版本库是无关的也要执行"
4176
4177 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
4178 msgstr ""
4179
4180 msgid "send an introduction email for a single patch"
4181 msgstr ""
4182
4183 msgid "hg email [OPTION]... [DEST]..."
4184 msgstr ""
4185
4186 msgid "command to delete untracked files from the working directory"
4187 msgstr ""
4188
4189 msgid ""
4190 "removes files not tracked by Mercurial\n"
4191 "\n"
4192 " Delete files not known to Mercurial. This is useful to test local\n"
4193 " and uncommitted changes in an otherwise-clean source tree.\n"
4194 "\n"
4195 " This means that purge will delete:\n"
4196 "\n"
4197 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
4198 " - Empty directories: in fact Mercurial ignores directories unless\n"
4199 " they contain files under source control management\n"
4200 "\n"
4201 " But it will leave untouched:\n"
4202 "\n"
4203 " - Modified and unmodified tracked files\n"
4204 " - Ignored files (unless --all is specified)\n"
4205 " - New files added to the repository (with \"hg add\")\n"
4206 "\n"
4207 " If directories are given on the command line, only files in these\n"
4208 " directories are considered.\n"
4209 "\n"
4210 " Be careful with purge, as you could irreversibly delete some files\n"
4211 " you forgot to add to the repository. If you only want to print the\n"
4212 " list of files that this program would delete, use the --print\n"
4213 " option.\n"
4214 " "
4215 msgstr ""
4216
4217 #, python-format
4218 msgid "%s cannot be removed"
4219 msgstr ""
4220
4221 #, python-format
4222 msgid "warning: %s\n"
4223 msgstr ""
4224
4225 #, python-format
4226 msgid "Removing file %s\n"
4227 msgstr "正在删除文件 %s\n"
4228
4229 #, python-format
4230 msgid "Removing directory %s\n"
4231 msgstr "正在删除目录 %s\n"
4232
4233 msgid "abort if an error occurs"
4234 msgstr ""
4235
4236 msgid "purge ignored files too"
4237 msgstr ""
4238
4239 msgid "print filenames instead of deleting them"
4240 msgstr ""
4241
4242 #, fuzzy
4243 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
4244 msgstr "在文件名称结尾增加 NUL,用于 xargs"
4245
4246 msgid "hg purge [OPTION]... [DIR]..."
4247 msgstr ""
4248
4249 msgid ""
4250 "command to move sets of revisions to a different ancestor\n"
4251 "\n"
4252 "This extension lets you rebase changesets in an existing Mercurial\n"
4253 "repository.\n"
4254 "\n"
4255 "For more information:\n"
4256 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
4257 msgstr ""
4258
4259 msgid ""
4260 "move changeset (and descendants) to a different branch\n"
4261 "\n"
4262 " Rebase uses repeated merging to graft changesets from one part of\n"
4263 " history onto another. This can be useful for linearizing local\n"
4264 " changes relative to a master development tree.\n"
4265 "\n"
4266 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4267 " continued with --continue/-c or aborted with --abort/-a.\n"
4268 " "
4269 msgstr ""
4270
4271 msgid "cannot use both abort and continue"
4272 msgstr ""
4273
4274 msgid "cannot use collapse with continue or abort"
4275 msgstr ""
4276
4277 msgid "abort and continue do not allow specifying revisions"
4278 msgstr ""
4279
4280 msgid "cannot specify both a revision and a base"
4281 msgstr ""
4282
4283 msgid "nothing to rebase\n"
4284 msgstr ""
4285
4286 msgid "cannot use both keepbranches and extrafn"
4287 msgstr ""
4288
4289 msgid "rebase merging completed\n"
4290 msgstr ""
4291
4292 msgid "warning: new changesets detected on source branch, not stripping\n"
4293 msgstr ""
4294
4295 msgid "rebase completed\n"
4296 msgstr ""
4297
4298 #, python-format
4299 msgid "%d revisions have been skipped\n"
4300 msgstr ""
4301
4302 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4303 msgstr ""
4304
4305 #, python-format
4306 msgid "no changes, revision %d skipped\n"
4307 msgstr ""
4308
4309 #, python-format
4310 msgid "cannot use revision %d as base, result would have 3 parents"
4311 msgstr ""
4312
4313 msgid "no rebase in progress"
4314 msgstr ""
4315
4316 msgid "warning: new changesets detected on target branch, not stripping\n"
4317 msgstr ""
4318
4319 msgid "rebase aborted\n"
4320 msgstr ""
4321
4322 msgid "cannot rebase onto an applied mq patch"
4323 msgstr ""
4324
4325 msgid "source is ancestor of destination"
4326 msgstr ""
4327
4328 msgid "source is descendant of destination"
4329 msgstr ""
4330
4331 msgid "unable to collapse, there is more than one external parent"
4332 msgstr ""
4333
4334 msgid "rebase working directory to branch head"
4335 msgstr ""
4336
4337 msgid "rebase from a given revision"
4338 msgstr ""
4339
4340 msgid "rebase from the base of a given revision"
4341 msgstr ""
4342
4343 msgid "rebase onto a given revision"
4344 msgstr ""
4345
4346 #, fuzzy
4347 msgid "collapse the rebased changesets"
4348 msgstr "打包不相关的修改集"
4349
4350 #, fuzzy
4351 msgid "keep original changesets"
4352 msgstr "列出修改集"
4353
4354 msgid "keep original branch names"
4355 msgstr ""
4356
4357 msgid "continue an interrupted rebase"
4358 msgstr ""
4359
4360 msgid "abort an interrupted rebase"
4361 msgstr ""
4362
4363 msgid ""
4364 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4365 "| [-c] | [-a]"
4366 msgstr ""
4367
4368 msgid "commands to interactively select changes for commit/qrefresh"
4369 msgstr ""
4370
4371 msgid "this modifies a binary file (all or nothing)\n"
4372 msgstr ""
4373
4374 msgid "this is a binary file\n"
4375 msgstr ""
4376
4377 #, python-format
4378 msgid "%d hunks, %d lines changed\n"
4379 msgstr ""
4380
4381 msgid "[Ynsfdaq?]"
4382 msgstr ""
4383
4384 msgid "&Yes, record this change"
4385 msgstr ""
4386
4387 msgid "&No, skip this change"
4388 msgstr ""
4389
4390 msgid "&Skip remaining changes to this file"
4391 msgstr ""
4392
4393 msgid "Record remaining changes to this &file"
4394 msgstr ""
4395
4396 msgid "&Done, skip remaining changes and files"
4397 msgstr ""
4398
4399 #, fuzzy
4400 msgid "Record &all changes to all remaining files"
4401 msgstr "将丢失的文件视为删除"
4402
4403 #, fuzzy
4404 msgid "&Quit, recording no changes"
4405 msgstr "正在搜索修改\n"
4406
4407 msgid "&?"
4408 msgstr ""
4409
4410 msgid "y - record this change"
4411 msgstr ""
4412
4413 msgid "user quit"
4414 msgstr "用户退出"
4415
4416 #, python-format
4417 msgid "examine changes to %s?"
4418 msgstr ""
4419
4420 msgid " and "
4421 msgstr ""
4422
4423 msgid "y"
4424 msgstr ""
4425
4426 #, python-format
4427 msgid "record this change to %r?"
4428 msgstr ""
4429
4430 #, fuzzy, python-format
4431 msgid "record change %d/%d to %r?"
4432 msgstr "不需要改变 %s\n"
4433
4434 msgid ""
4435 "interactively select changes to commit\n"
4436 "\n"
4437 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4438 " will be candidates for recording.\n"
4439 "\n"
4440 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4441 "\n"
4442 " You will be prompted for whether to record changes to each\n"
4443 " modified file, and for files with multiple changes, for each\n"
4444 " change to use. For each query, the following responses are\n"
4445 " possible::\n"
4446 "\n"
4447 " y - record this change\n"
4448 " n - skip this change\n"
4449 "\n"
4450 " s - skip remaining changes to this file\n"
4451 " f - record remaining changes to this file\n"
4452 "\n"
4453 " d - done, skip remaining changes and files\n"
4454 " a - record all changes to all remaining files\n"
4455 " q - quit, recording no changes\n"
4456 "\n"
4457 " ? - display help"
4458 msgstr ""
4459
4460 msgid "'mq' extension not loaded"
4461 msgstr ""
4462
4463 msgid "running non-interactively, use commit instead"
4464 msgstr ""
4465
4466 msgid "no changes to record\n"
4467 msgstr ""
4468
4469 msgid "patch failed to apply"
4470 msgstr ""
4471
4472 msgid "hg record [OPTION]... [FILE]..."
4473 msgstr ""
4474
4475 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4476 msgstr ""
4477
4478 msgid "share a common history between several working directories"
4479 msgstr ""
4480
4481 msgid ""
4482 "create a new shared repository (experimental)\n"
4483 "\n"
4484 " Initialize a new repository and working directory that shares its\n"
4485 " history with another repository.\n"
4486 "\n"
4487 " NOTE: actions that change history such as rollback or moving the\n"
4488 " source may confuse sharers.\n"
4489 " "
4490 msgstr ""
4491
4492 msgid "do not create a working copy"
4493 msgstr ""
4494
4495 msgid "[-U] SOURCE [DEST]"
4496 msgstr ""
4497
4498 msgid ""
4499 "command to transplant changesets from another branch\n"
4500 "\n"
4501 "This extension allows you to transplant patches from another branch.\n"
4502 "\n"
4503 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4504 "map from a changeset hash to its hash in the source repository.\n"
4505 msgstr ""
4506
4507 #, python-format
4508 msgid "skipping already applied revision %s\n"
4509 msgstr ""
4510
4511 #, python-format
4512 msgid "skipping merge changeset %s:%s\n"
4513 msgstr ""
4514
4515 #, python-format
4516 msgid "%s merged at %s\n"
4517 msgstr ""
4518
4519 #, python-format
4520 msgid "%s transplanted to %s\n"
4521 msgstr ""
4522
4523 #, python-format
4524 msgid "filtering %s\n"
4525 msgstr ""
4526
4527 msgid "filter failed"
4528 msgstr ""
4529
4530 msgid "can only omit patchfile if merging"
4531 msgstr ""
4532
4533 #, python-format
4534 msgid "%s: empty changeset"
4535 msgstr ""
4536
4537 msgid "Fix up the merge and run hg transplant --continue"
4538 msgstr ""
4539
4540 #, python-format
4541 msgid "%s transplanted as %s\n"
4542 msgstr ""
4543
4544 msgid "transplant log file is corrupt"
4545 msgstr ""
4546
4547 #, python-format
4548 msgid "working dir not at transplant parent %s"
4549 msgstr ""
4550
4551 msgid "commit failed"
4552 msgstr ""
4553
4554 msgid "apply changeset? [ynmpcq?]:"
4555 msgstr ""
4556
4557 msgid ""
4558 "transplant changesets from another branch\n"
4559 "\n"
4560 " Selected changesets will be applied on top of the current working\n"
4561 " directory with the log of the original changeset. If --log is\n"
4562 " specified, log messages will have a comment appended of the form::\n"
4563 "\n"
4564 " (transplanted from CHANGESETHASH)\n"
4565 "\n"
4566 " You can rewrite the changelog message with the --filter option.\n"
4567 " Its argument will be invoked with the current changelog message as\n"
4568 " $1 and the patch as $2.\n"
4569 "\n"
4570 " If --source/-s is specified, selects changesets from the named\n"
4571 " repository. If --branch/-b is specified, selects changesets from\n"
4572 " the branch holding the named revision, up to that revision. If\n"
4573 " --all/-a is specified, all changesets on the branch will be\n"
4574 " transplanted, otherwise you will be prompted to select the\n"
4575 " changesets you want.\n"
4576 "\n"
4577 " hg transplant --branch REVISION --all will rebase the selected\n"
4578 " branch (up to the named revision) onto your current working\n"
4579 " directory.\n"
4580 "\n"
4581 " You can optionally mark selected transplanted changesets as merge\n"
4582 " changesets. You will not be prompted to transplant any ancestors\n"
4583 " of a merged transplant, and you can merge descendants of them\n"
4584 " normally instead of transplanting them.\n"
4585 "\n"
4586 " If no merges or revisions are provided, hg transplant will start\n"
4587 " an interactive changeset browser.\n"
4588 "\n"
4589 " If a changeset application fails, you can fix the merge by hand\n"
4590 " and then resume where you left off by calling hg transplant\n"
4591 " --continue/-c.\n"
4592 " "
4593 msgstr ""
4594
4595 msgid "--continue is incompatible with branch, all or merge"
4596 msgstr ""
4597
4598 msgid "no source URL, branch tag or revision list provided"
4599 msgstr ""
4600
4601 msgid "--all requires a branch revision"
4602 msgstr ""
4603
4604 msgid "--all is incompatible with a revision list"
4605 msgstr ""
4606
4607 msgid "no revision checked out"
4608 msgstr ""
4609
4610 msgid "outstanding uncommitted merges"
4611 msgstr ""
4612
4613 msgid "outstanding local changes"
4614 msgstr ""
4615
4616 msgid "pull patches from REPOSITORY"
4617 msgstr ""
4618
4619 msgid "pull patches from branch BRANCH"
4620 msgstr ""
4621
4622 msgid "pull all changesets up to BRANCH"
4623 msgstr ""
4624
4625 msgid "skip over REV"
4626 msgstr ""
4627
4628 msgid "merge at REV"
4629 msgstr ""
4630
4631 msgid "append transplant info to log message"
4632 msgstr ""
4633
4634 msgid "continue last transplant session after repair"
4635 msgstr ""
4636
4637 msgid "filter changesets through FILTER"
4638 msgstr ""
4639
4640 msgid ""
4641 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4642 msgstr ""
4643
4644 msgid ""
4645 "allow the use of MBCS paths with problematic encodings\n"
4646 "\n"
4647 "Some MBCS encodings are not good for some path operations (i.e.\n"
4648 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4649 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4650 "This extension can be used to fix the issue with those encodings by\n"
4651 "wrapping some functions to convert to Unicode string before path\n"
4652 "operation.\n"
4653 "\n"
4654 "This extension is useful for:\n"
4655 "\n"
4656 "- Japanese Windows users using shift_jis encoding.\n"
4657 "- Chinese Windows users using big5 encoding.\n"
4658 "- All users who use a repository with one of problematic encodings on\n"
4659 " case-insensitive file system.\n"
4660 "\n"
4661 "This extension is not needed for:\n"
4662 "\n"
4663 "- Any user who use only ASCII chars in path.\n"
4664 "- Any user who do not use any of problematic encodings.\n"
4665 "\n"
4666 "Note that there are some limitations on using this extension:\n"
4667 "\n"
4668 "- You should use single encoding in one repository.\n"
4669 "- You should set same encoding for the repository by locale or\n"
4670 " HGENCODING.\n"
4671 "\n"
4672 "Path encoding conversion are done between Unicode and\n"
4673 "encoding.encoding which is decided by Mercurial from current locale\n"
4674 "setting or HGENCODING.\n"
4675 msgstr ""
4676
4677 #, python-format
4678 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4679 msgstr ""
4680
4681 msgid "[win32mbcs] cannot activate on this platform.\n"
4682 msgstr ""
4683
4684 msgid ""
4685 "perform automatic newline conversion\n"
4686 "\n"
4687 "To perform automatic newline conversion, use::\n"
4688 "\n"
4689 " [extensions]\n"
4690 " hgext.win32text =\n"
4691 " [encode]\n"
4692 " ** = cleverencode:\n"
4693 " # or ** = macencode:\n"
4694 "\n"
4695 " [decode]\n"
4696 " ** = cleverdecode:\n"
4697 " # or ** = macdecode:\n"
4698 "\n"
4699 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4700 "accident::\n"
4701 "\n"
4702 " [hooks]\n"
4703 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4704 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4705 "\n"
4706 "To do the same check on a server to prevent CRLF/CR from being\n"
4707 "pushed or pulled::\n"
4708 "\n"
4709 " [hooks]\n"
4710 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4711 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4712 msgstr ""
4713
4714 #, python-format
4715 msgid ""
4716 "WARNING: %s already has %s line endings\n"
4717 "and does not need EOL conversion by the win32text plugin.\n"
4718 "Before your next commit, please reconsider your encode/decode settings in \n"
4719 "Mercurial.ini or %s.\n"
4720 msgstr ""
4721
4722 #, python-format
4723 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4724 msgstr ""
4725
4726 #, python-format
4727 msgid "in %s: %s\n"
4728 msgstr ""
4729
4730 #, python-format
4731 msgid ""
4732 "\n"
4733 "To prevent this mistake in your local repository,\n"
4734 "add to Mercurial.ini or .hg/hgrc:\n"
4735 "\n"
4736 "[hooks]\n"
4737 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4738 "\n"
4739 "and also consider adding:\n"
4740 "\n"
4741 "[extensions]\n"
4742 "hgext.win32text =\n"
4743 "[encode]\n"
4744 "** = %sencode:\n"
4745 "[decode]\n"
4746 "** = %sdecode:\n"
4747 msgstr ""
4748
4749 msgid ""
4750 "discover and advertise repositories on the local network\n"
4751 "\n"
4752 "Zeroconf enabled repositories will be announced in a network without\n"
4753 "the need to configure a server or a service. They can be discovered\n"
4754 "without knowing their actual IP address.\n"
4755 "\n"
4756 "To allow other people to discover your repository using run \"hg serve\"\n"
4757 "in your repository::\n"
4758 "\n"
4759 " $ cd test\n"
4760 " $ hg serve\n"
4761 "\n"
4762 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4763 "\n"
4764 " $ hg paths\n"
4765 " zc-test = http://example.com:8000/test\n"
4766 msgstr ""
4767
4768 msgid "archive prefix contains illegal components"
4769 msgstr ""
4770
4771 msgid "cannot give prefix when archiving to files"
4772 msgstr ""
4773
4774 #, python-format
4775 msgid "unknown archive type '%s'"
4776 msgstr ""
4777
4778 msgid "invalid changegroup"
4779 msgstr ""
4780
4781 msgid "unknown parent"
4782 msgstr ""
4783
4784 #, python-format
4785 msgid "integrity check failed on %s:%d"
4786 msgstr ""
4787
4788 #, python-format
4789 msgid "%s: not a Mercurial bundle file"
4790 msgstr ""
4791
4792 #, python-format
4793 msgid "%s: unknown bundle version"
4794 msgstr ""
4795
4796 #, python-format
4797 msgid "%s: unknown bundle compression type"
4798 msgstr ""
4799
4800 msgid "cannot create new bundle repository"
4801 msgstr ""
4802
4803 #, python-format
4804 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4805 msgstr ""
4806
4807 msgid "empty username"
4808 msgstr ""
4809
4810 #, python-format
4811 msgid "username %s contains a newline"
4812 msgstr ""
4813
4814 msgid "options --message and --logfile are mutually exclusive"
4815 msgstr ""
4816
4817 #, python-format
4818 msgid "can't read commit message '%s': %s"
4819 msgstr ""
4820
4821 msgid "limit must be a positive integer"
4822 msgstr ""
4823
4824 msgid "limit must be positive"
4825 msgstr ""
4826
4827 msgid "too many revisions specified"
4828 msgstr ""
4829
4830 #, python-format
4831 msgid "invalid format spec '%%%s' in output filename"
4832 msgstr ""
4833
4834 #, python-format
4835 msgid "adding %s\n"
4836 msgstr ""
4837
4838 #, python-format
4839 msgid "removing %s\n"
4840 msgstr "正在删除 %s\n"
4841
4842 #, python-format
4843 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4844 msgstr ""
4845
4846 #, python-format
4847 msgid "%s: not copying - file is not managed\n"
4848 msgstr ""
4849
4850 #, python-format
4851 msgid "%s: not copying - file has been marked for remove\n"
4852 msgstr ""
4853
4854 #, python-format
4855 msgid "%s: not overwriting - %s collides with %s\n"
4856 msgstr ""
4857
4858 #, python-format
4859 msgid "%s: not overwriting - file exists\n"
4860 msgstr ""
4861
4862 #, python-format
4863 msgid "%s: deleted in working copy\n"
4864 msgstr ""
4865
4866 #, python-format
4867 msgid "%s: cannot copy - %s\n"
4868 msgstr ""
4869
4870 #, python-format
4871 msgid "moving %s to %s\n"
4872 msgstr ""
4873
4874 #, fuzzy, python-format
4875 msgid "copying %s to %s\n"
4876 msgstr "正在推到 %s\n"
4877
4878 #, python-format
4879 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4880 msgstr ""
4881
4882 msgid "no source or destination specified"
4883 msgstr ""
4884
4885 msgid "no destination specified"
4886 msgstr ""
4887
4888 msgid "with multiple sources, destination must be an existing directory"
4889 msgstr ""
4890
4891 #, python-format
4892 msgid "destination %s is not a directory"
4893 msgstr ""
4894
4895 msgid "no files to copy"
4896 msgstr ""
4897
4898 msgid "(consider using --after)\n"
4899 msgstr "(考虑使用 --after)\n"
4900
4901 #, python-format
4902 msgid "changeset: %d:%s\n"
4903 msgstr "修改集: %d:%s\n"
4904
4905 #, python-format
4906 msgid "branch: %s\n"
4907 msgstr "分支: %s\n"
4908
4909 #, python-format
4910 msgid "tag: %s\n"
4911 msgstr "标签: %s\n"
4912
4913 #, python-format
4914 msgid "parent: %d:%s\n"
4915 msgstr "父亲: %d:%s\n"
4916
4917 #, python-format
4918 msgid "manifest: %d:%s\n"
4919 msgstr "清单: %d:%s\n"
4920
4921 #, python-format
4922 msgid "user: %s\n"
4923 msgstr "用户: %s\n"
4924
4925 #, python-format
4926 msgid "date: %s\n"
4927 msgstr "日期: %s\n"
4928
4929 msgid "files+:"
4930 msgstr "文件+:"
4931
4932 msgid "files-:"
4933 msgstr "文件-:"
4934
4935 msgid "files:"
4936 msgstr "文件:"
4937
4938 #, python-format
4939 msgid "files: %s\n"
4940 msgstr "文件: %s\n"
4941
4942 #, python-format
4943 msgid "copies: %s\n"
4944 msgstr "复制: %s\n"
4945
4946 #, python-format
4947 msgid "extra: %s=%s\n"
4948 msgstr "额外: %s=%s\n"
4949
4950 msgid "description:\n"
4951 msgstr "描述:\n"
4952
4953 #, python-format
4954 msgid "summary: %s\n"
4955 msgstr "摘要: %s\n"
4956
4957 #, python-format
4958 msgid "%s: no key named '%s'"
4959 msgstr ""
4960
4961 #, python-format
4962 msgid "%s: %s"
4963 msgstr ""
4964
4965 #, python-format
4966 msgid "Found revision %s from %s\n"
4967 msgstr ""
4968
4969 msgid "revision matching date not found"
4970 msgstr ""
4971
4972 #, python-format
4973 msgid "cannot follow nonexistent file: \"%s\""
4974 msgstr ""
4975
4976 #, python-format
4977 msgid "%s:%s copy source revision cannot be found!\n"
4978 msgstr ""
4979
4980 msgid "can only follow copies/renames for explicit filenames"
4981 msgstr ""
4982
4983 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4984 msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。"
4985
4986 msgid "HG: Leave message empty to abort commit."
4987 msgstr ""
4988
4989 #, fuzzy, python-format
4990 msgid "HG: user: %s"
4991 msgstr "用户: %s\n"
4992
4993 msgid "HG: branch merge"
4994 msgstr ""
4995
4996 #, python-format
4997 msgid "HG: branch '%s'"
4998 msgstr ""
4999
5000 #, fuzzy, python-format
5001 msgid "HG: subrepo %s"
5002 msgstr "已删除"
5003
5004 #, python-format
5005 msgid "HG: added %s"
5006 msgstr ""
5007
5008 #, python-format
5009 msgid "HG: changed %s"
5010 msgstr ""
5011
5012 #, fuzzy, python-format
5013 msgid "HG: removed %s"
5014 msgstr "已删除"
5015
5016 #, fuzzy
5017 msgid "HG: no files changed"
5018 msgstr "正在增加文件改变\n"
5019
5020 msgid "empty commit message"
5021 msgstr "空的提交日志"
5022
5023 #, fuzzy
5024 msgid ""
5025 "add the specified files on the next commit\n"
5026 "\n"
5027 " Schedule files to be version controlled and added to the\n"
5028 " repository.\n"
5029 "\n"
5030 " The files will be added to the repository at the next commit. To\n"
5031 " undo an add before that, see hg forget.\n"
5032 "\n"
5033 " If no names are given, add all files to the repository.\n"
5034 " "
5035 msgstr ""
5036 "增加指定文件用于下次提交\n"
5037 "\n"
5038 " 调度文件受版本控制,增加到版本库。\n"
5039 "\n"
5040 " 这些文件将于下次提交时增加到版本库。需要在提交前撤销增加,\n"
5041 " 参见 'hg revert'。\n"
5042 "\n"
5043 " 如果没有给出文件名称,就增加所有文件到版本库。\n"
5044 " "
5045
5046 msgid ""
5047 "add all new files, delete all missing files\n"
5048 "\n"
5049 " Add all new files and remove all missing files from the\n"
5050 " repository.\n"
5051 "\n"
5052 " New files are ignored if they match any of the patterns in\n"
5053 " .hgignore. As with add, these changes take effect at the next\n"
5054 " commit.\n"
5055 "\n"
5056 " Use the -s/--similarity option to detect renamed files. With a\n"
5057 " parameter greater than 0, this compares every removed file with\n"
5058 " every added file and records those similar enough as renames. This\n"
5059 " option takes a percentage between 0 (disabled) and 100 (files must\n"
5060 " be identical) as its parameter. Detecting renamed files this way\n"
5061 " can be expensive.\n"
5062 " "
5063 msgstr ""
5064
5065 msgid "similarity must be a number"
5066 msgstr ""
5067
5068 msgid "similarity must be between 0 and 100"
5069 msgstr ""
5070
5071 #, fuzzy
5072 msgid ""
5073 "show changeset information by line for each file\n"
5074 "\n"
5075 " List changes in files, showing the revision id responsible for\n"
5076 " each line\n"
5077 "\n"
5078 " This command is useful for discovering when a change was made and\n"
5079 " by whom.\n"
5080 "\n"
5081 " Without the -a/--text option, annotate will avoid processing files\n"
5082 " it detects as binary. With -a, annotate will annotate the file\n"
5083 " anyway, although the results will probably be neither useful\n"
5084 " nor desirable.\n"
5085 " "
5086 msgstr ""
5087 "显示指定文件每行的修改集信息\n"
5088 "\n"
5089 " 列出文件中的修改,为每行显示版本标识\n"
5090 "\n"
5091 " 此命令用于查找谁做出的修改,或者什么时候发生的修改\n"
5092 "\n"
5093 " 当没有选项 '-a' 时,annotate 会避免处理检测为二进制的文件\n"
5094 " 当使用选项 '-a' 时,annotate 会直接产生追溯,可能会有不合需要的结果\n"
5095 " "
5096
5097 msgid "at least one filename or pattern is required"
5098 msgstr ""
5099
5100 msgid "at least one of -n/-c is required for -l"
5101 msgstr ""
5102
5103 #, python-format
5104 msgid "%s: binary file\n"
5105 msgstr ""
5106
5107 msgid ""
5108 "create an unversioned archive of a repository revision\n"
5109 "\n"
5110 " By default, the revision used is the parent of the working\n"
5111 " directory; use -r/--rev to specify a different revision.\n"
5112 "\n"
5113 " To specify the type of archive to create, use -t/--type. Valid\n"
5114 " types are::\n"
5115 "\n"
5116 " \"files\" (default): a directory full of files\n"
5117 " \"tar\": tar archive, uncompressed\n"
5118 " \"tbz2\": tar archive, compressed using bzip2\n"
5119 " \"tgz\": tar archive, compressed using gzip\n"
5120 " \"uzip\": zip archive, uncompressed\n"
5121 " \"zip\": zip archive, compressed using deflate\n"
5122 "\n"
5123 " The exact name of the destination archive or directory is given\n"
5124 " using a format string; see 'hg help export' for details.\n"
5125 "\n"
5126 " Each member added to an archive file has a directory prefix\n"
5127 " prepended. Use -p/--prefix to specify a format string for the\n"
5128 " prefix. The default is the basename of the archive, with suffixes\n"
5129 " removed.\n"
5130 " "
5131 msgstr ""
5132
5133 msgid "no working directory: please specify a revision"
5134 msgstr ""
5135
5136 msgid "repository root cannot be destination"
5137 msgstr ""
5138
5139 msgid "cannot archive plain files to stdout"
5140 msgstr ""
5141
5142 msgid ""
5143 "reverse effect of earlier changeset\n"
5144 "\n"
5145 " Commit the backed out changes as a new changeset. The new\n"
5146 " changeset is a child of the backed out changeset.\n"
5147 "\n"
5148 " If you backout a changeset other than the tip, a new head is\n"
5149 " created. This head will be the new tip and you should merge this\n"
5150 " backout changeset with another head.\n"
5151 "\n"
5152 " The --merge option remembers the parent of the working directory\n"
5153 " before starting the backout, then merges the new head with that\n"
5154 " changeset afterwards. This saves you from doing the merge by hand.\n"
5155 " The result of this merge is not committed, as with a normal merge.\n"
5156 "\n"
5157 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5158 " "
5159 msgstr ""
5160
5161 msgid "please specify just one revision"
5162 msgstr ""
5163
5164 msgid "please specify a revision to backout"
5165 msgstr ""
5166
5167 msgid "cannot backout change on a different branch"
5168 msgstr ""
5169
5170 msgid "cannot backout a change with no parents"
5171 msgstr ""
5172
5173 msgid "cannot backout a merge changeset without --parent"
5174 msgstr ""
5175
5176 #, python-format
5177 msgid "%s is not a parent of %s"
5178 msgstr ""
5179
5180 msgid "cannot use --parent on non-merge changeset"
5181 msgstr ""
5182
5183 #, python-format
5184 msgid "changeset %s backs out changeset %s\n"
5185 msgstr ""
5186
5187 #, python-format
5188 msgid "merging with changeset %s\n"
5189 msgstr ""
5190
5191 msgid "the backout changeset is a new head - do not forget to merge\n"
5192 msgstr ""
5193
5194 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5195 msgstr ""
5196
5197 msgid ""
5198 "subdivision search of changesets\n"
5199 "\n"
5200 " This command helps to find changesets which introduce problems. To\n"
5201 " use, mark the earliest changeset you know exhibits the problem as\n"
5202 " bad, then mark the latest changeset which is free from the problem\n"
5203 " as good. Bisect will update your working directory to a revision\n"
5204 " for testing (unless the -U/--noupdate option is specified). Once\n"
5205 " you have performed tests, mark the working directory as good or\n"
5206 " bad, and bisect will either update to another candidate changeset\n"
5207 " or announce that it has found the bad revision.\n"
5208 "\n"
5209 " As a shortcut, you can also use the revision argument to mark a\n"
5210 " revision as good or bad without checking it out first.\n"
5211 "\n"
5212 " If you supply a command, it will be used for automatic bisection.\n"
5213 " Its exit status will be used to mark revisions as good or bad:\n"
5214 " status 0 means good, 125 means to skip the revision, 127\n"
5215 " (command not found) will abort the bisection, and any other\n"
5216 " non-zero exit status means the revision is bad.\n"
5217 " "
5218 msgstr ""
5219
5220 msgid "The first good revision is:\n"
5221 msgstr ""
5222
5223 msgid "The first bad revision is:\n"
5224 msgstr ""
5225
5226 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5227 msgstr ""
5228
5229 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5230 msgstr ""
5231
5232 msgid "cannot bisect (no known good revisions)"
5233 msgstr ""
5234
5235 msgid "cannot bisect (no known bad revisions)"
5236 msgstr ""
5237
5238 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5239 msgstr ""
5240
5241 msgid "incompatible arguments"
5242 msgstr ""
5243
5244 #, python-format
5245 msgid "failed to execute %s"
5246 msgstr ""
5247
5248 #, python-format
5249 msgid "%s killed"
5250 msgstr ""
5251
5252 #, fuzzy, python-format
5253 msgid "Changeset %d:%s: %s\n"
5254 msgstr "修改集: %d:%s\n"
5255
5256 #, python-format
5257 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
5258 msgstr ""
5259
5260 msgid ""
5261 "set or show the current branch name\n"
5262 "\n"
5263 " With no argument, show the current branch name. With one argument,\n"
5264 " set the working directory branch name (the branch will not exist\n"
5265 " in the repository until the next commit). Standard practice\n"
5266 " recommends that primary development take place on the 'default'\n"
5267 " branch.\n"
5268 "\n"
5269 " Unless -f/--force is specified, branch will not let you set a\n"
5270 " branch name that already exists, even if it's inactive.\n"
5271 "\n"
5272 " Use -C/--clean to reset the working directory branch to that of\n"
5273 " the parent of the working directory, negating a previous branch\n"
5274 " change.\n"
5275 "\n"
5276 " Use the command 'hg update' to switch to an existing branch. Use\n"
5277 " 'hg commit --close-branch' to mark this branch as closed.\n"
5278 " "
5279 msgstr ""
5280
5281 #, python-format
5282 msgid "reset working directory to branch %s\n"
5283 msgstr ""
5284
5285 msgid "a branch of the same name already exists (use --force to override)"
5286 msgstr ""
5287
5288 #, python-format
5289 msgid "marked working directory as branch %s\n"
5290 msgstr ""
5291
5292 msgid ""
5293 "list repository named branches\n"
5294 "\n"
5295 " List the repository's named branches, indicating which ones are\n"
5296 " inactive. If -c/--closed is specified, also list branches which have\n"
5297 " been marked closed (see hg commit --close-branch).\n"
5298 "\n"
5299 " If -a/--active is specified, only show active branches. A branch\n"
5300 " is considered active if it contains repository heads.\n"
5301 "\n"
5302 " Use the command 'hg update' to switch to an existing branch.\n"
5303 " "
5304 msgstr ""
5305
5306 msgid ""
5307 "create a changegroup file\n"
5308 "\n"
5309 " Generate a compressed changegroup file collecting changesets not\n"
5310 " known to be in another repository.\n"
5311 "\n"
5312 " If no destination repository is specified the destination is\n"
5313 " assumed to have all the nodes specified by one or more --base\n"
5314 " parameters. To create a bundle containing all changesets, use\n"
5315 " -a/--all (or --base null).\n"
5316 "\n"
5317 " You can change compression method with the -t/--type option.\n"
5318 " The available compression methods are: none, bzip2, and\n"
5319 " gzip (by default, bundles are compressed using bzip2).\n"
5320 "\n"
5321 " The bundle file can then be transferred using conventional means\n"
5322 " and applied to another repository with the unbundle or pull\n"
5323 " command. This is useful when direct push and pull are not\n"
5324 " available or when exporting an entire repository is undesirable.\n"
5325 "\n"
5326 " Applying bundles preserves all changeset contents including\n"
5327 " permissions, copy/rename information, and revision history.\n"
5328 " "
5329 msgstr ""
5330
5331 msgid "--base is incompatible with specifying a destination"
5332 msgstr ""
5333
5334 msgid "unknown bundle type specified with --type"
5335 msgstr ""
5336
5337 msgid ""
5338 "output the current or given revision of files\n"
5339 "\n"
5340 " Print the specified files as they were at the given revision. If\n"
5341 " no revision is given, the parent of the working directory is used,\n"
5342 " or tip if no revision is checked out.\n"
5343 "\n"
5344 " Output may be to a file, in which case the name of the file is\n"
5345 " given using a format string. The formatting rules are the same as\n"
5346 " for the export command, with the following additions::\n"
5347 "\n"
5348 " %s basename of file being printed\n"
5349 " %d dirname of file being printed, or '.' if in repository root\n"
5350 " %p root-relative path name of file being printed\n"
5351 " "
5352 msgstr ""
5353
5354 msgid ""
5355 "make a copy of an existing repository\n"
5356 "\n"
5357 " Create a copy of an existing repository in a new directory.\n"
5358 "\n"
5359 " If no destination directory name is specified, it defaults to the\n"
5360 " basename of the source.\n"
5361 "\n"
5362 " The location of the source is added to the new repository's\n"
5363 " .hg/hgrc file, as the default to be used for future pulls.\n"
5364 "\n"
5365 " If you use the -r/--rev option to clone up to a specific revision,\n"
5366 " no subsequent revisions (including subsequent tags) will be\n"
5367 " present in the cloned repository. This option implies --pull, even\n"
5368 " on local repositories.\n"
5369 "\n"
5370 " By default, clone will check out the head of the 'default' branch.\n"
5371 " If the -U/--noupdate option is used, the new clone will contain\n"
5372 " only a repository (.hg) and no working copy (the working copy\n"
5373 " parent is the null revision).\n"
5374 "\n"
5375 " See 'hg help urls' for valid source format details.\n"
5376 "\n"
5377 " It is possible to specify an ssh:// URL as the destination, but no\n"
5378 " .hg/hgrc and working directory will be created on the remote side.\n"
5379 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5380 "\n"
5381 " For efficiency, hardlinks are used for cloning whenever the source\n"
5382 " and destination are on the same filesystem (note this applies only\n"
5383 " to the repository data, not to the checked out files). Some\n"
5384 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5385 " do not report errors. In these cases, use the --pull option to\n"
5386 " avoid hardlinking.\n"
5387 "\n"
5388 " In some cases, you can clone repositories and checked out files\n"
5389 " using full hardlinks with ::\n"
5390 "\n"
5391 " $ cp -al REPO REPOCLONE\n"
5392 "\n"
5393 " This is the fastest way to clone, but it is not always safe. The\n"
5394 " operation is not atomic (making sure REPO is not modified during\n"
5395 " the operation is up to you) and you have to make sure your editor\n"
5396 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5397 " this is not compatible with certain extensions that place their\n"
5398 " metadata under the .hg directory, such as mq.\n"
5399 " "
5400 msgstr ""
5401
5402 #, fuzzy
5403 msgid ""
5404 "commit the specified files or all outstanding changes\n"
5405 "\n"
5406 " Commit changes to the given files into the repository. Unlike a\n"
5407 " centralized RCS, this operation is a local operation. See hg push\n"
5408 " for a way to actively distribute your changes.\n"
5409 "\n"
5410 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5411 " will be committed.\n"
5412 "\n"
5413 " If you are committing the result of a merge, do not provide any\n"
5414 " filenames or -I/-X filters.\n"
5415 "\n"
5416 " If no commit message is specified, the configured editor is\n"
5417 " started to prompt you for a message.\n"
5418 "\n"
5419 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5420 " "
5421 msgstr ""
5422 "提交指定文件的修改或全部修改\n"
5423 "\n"
5424 " 将指定文件的修改提交到版本库。\n"
5425 "\n"
5426 " 如果省略了文件列表,那么 \"hg status\" 报告的所有修改都被提交。\n"
5427 "\n"
5428 " 如果你要提交合并结果,请不要提供任何文件名称或过滤器 '-I/-X'。\n"
5429 "\n"
5430 " 如果没有指定提交日志,将会启动配置的编辑器,让你输入信息。\n"
5431 "\n"
5432 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
5433 " "
5434
5435 msgid "nothing changed\n"
5436 msgstr "没有改变\n"
5437
5438 msgid "created new head\n"
5439 msgstr "已经创建新顶点\n"
5440
5441 #, python-format
5442 msgid "committed changeset %d:%s\n"
5443 msgstr "提交修改集 %d:%s\n"
5444
5445 msgid ""
5446 "mark files as copied for the next commit\n"
5447 "\n"
5448 " Mark dest as having copies of source files. If dest is a\n"
5449 " directory, copies are put in that directory. If dest is a file,\n"
5450 " the source must be a single file.\n"
5451 "\n"
5452 " By default, this command copies the contents of files as they\n"
5453 " exist in the working directory. If invoked with -A/--after, the\n"
5454 " operation is recorded, but no copying is performed.\n"
5455 "\n"
5456 " This command takes effect with the next commit. To undo a copy\n"
5457 " before that, see hg revert.\n"
5458 " "
5459 msgstr ""
5460
5461 msgid "find the ancestor revision of two revisions in a given index"
5462 msgstr ""
5463
5464 msgid "There is no Mercurial repository here (.hg not found)"
5465 msgstr "此处没有水银版本库(没有找到 .hg)"
5466
5467 msgid "either two or three arguments required"
5468 msgstr "需要两个或三个参数"
5469
5470 msgid "returns the completion list associated with the given command"
5471 msgstr ""
5472
5473 msgid "rebuild the dirstate as it would look like for the given revision"
5474 msgstr ""
5475
5476 msgid "validate the correctness of the current dirstate"
5477 msgstr ""
5478
5479 #, python-format
5480 msgid "%s in state %s, but not in manifest1\n"
5481 msgstr ""
5482
5483 #, python-format
5484 msgid "%s in state %s, but also in manifest1\n"
5485 msgstr ""
5486
5487 #, python-format
5488 msgid "%s in state %s, but not in either manifest\n"
5489 msgstr ""
5490
5491 #, python-format
5492 msgid "%s in manifest1, but listed as state %s"
5493 msgstr ""
5494
5495 msgid ".hg/dirstate inconsistent with current parent's manifest"
5496 msgstr ""
5497
5498 msgid ""
5499 "show combined config settings from all hgrc files\n"
5500 "\n"
5501 " With no arguments, print names and values of all config items.\n"
5502 "\n"
5503 " With one argument of the form section.name, print just the value\n"
5504 " of that config item.\n"
5505 "\n"
5506 " With multiple arguments, print names and values of all config\n"
5507 " items with matching section names.\n"
5508 "\n"
5509 " With --debug, the source (filename and line number) is printed\n"
5510 " for each config item.\n"
5511 " "
5512 msgstr ""
5513
5514 msgid "only one config item permitted"
5515 msgstr ""
5516
5517 msgid ""
5518 "manually set the parents of the current working directory\n"
5519 "\n"
5520 " This is useful for writing repository conversion tools, but should\n"
5521 " be used with care.\n"
5522 " "
5523 msgstr ""
5524
5525 msgid "show the contents of the current dirstate"
5526 msgstr ""
5527
5528 #, python-format
5529 msgid "copy: %s -> %s\n"
5530 msgstr ""
5531
5532 msgid "dump the contents of a data file revision"
5533 msgstr ""
5534
5535 #, python-format
5536 msgid "invalid revision identifier %s"
5537 msgstr ""
5538
5539 msgid "parse and display a date"
5540 msgstr ""
5541
5542 msgid "dump the contents of an index file"
5543 msgstr ""
5544
5545 msgid "dump an index DAG as a graphviz dot file"
5546 msgstr ""
5547
5548 msgid "test Mercurial installation"
5549 msgstr ""
5550
5551 #, python-format
5552 msgid "Checking encoding (%s)...\n"
5553 msgstr ""
5554
5555 msgid " (check that your locale is properly set)\n"
5556 msgstr ""
5557
5558 msgid "Checking extensions...\n"
5559 msgstr ""
5560
5561 msgid " One or more extensions could not be found"
5562 msgstr ""
5563
5564 msgid " (check that you compiled the extensions)\n"
5565 msgstr ""
5566
5567 msgid "Checking templates...\n"
5568 msgstr ""
5569
5570 msgid " (templates seem to have been installed incorrectly)\n"
5571 msgstr ""
5572
5573 msgid "Checking patch...\n"
5574 msgstr ""
5575
5576 msgid " patch call failed:\n"
5577 msgstr ""
5578
5579 msgid " unexpected patch output!\n"
5580 msgstr ""
5581
5582 msgid " patch test failed!\n"
5583 msgstr ""
5584
5585 msgid ""
5586 " (Current patch tool may be incompatible with patch, or misconfigured. "
5587 "Please check your .hgrc file)\n"
5588 msgstr ""
5589
5590 msgid ""
5591 " Internal patcher failure, please report this error to http://mercurial."
5592 "selenic.com/bts/\n"
5593 msgstr ""
5594
5595 msgid "Checking commit editor...\n"
5596 msgstr ""
5597
5598 msgid " No commit editor set and can't find vi in PATH\n"
5599 msgstr ""
5600
5601 msgid " (specify a commit editor in your .hgrc file)\n"
5602 msgstr ""
5603
5604 #, python-format
5605 msgid " Can't find editor '%s' in PATH\n"
5606 msgstr ""
5607
5608 msgid "Checking username...\n"
5609 msgstr ""
5610
5611 msgid " (specify a username in your .hgrc file)\n"
5612 msgstr ""
5613
5614 msgid "No problems detected\n"
5615 msgstr ""
5616
5617 #, python-format
5618 msgid "%s problems detected, please check your install!\n"
5619 msgstr ""
5620
5621 msgid "dump rename information"
5622 msgstr ""
5623
5624 #, python-format
5625 msgid "%s renamed from %s:%s\n"
5626 msgstr ""
5627
5628 #, python-format
5629 msgid "%s not renamed\n"
5630 msgstr ""
5631
5632 msgid "show how files match on given patterns"
5633 msgstr ""
5634
5635 #, fuzzy
5636 msgid ""
5637 "diff repository (or selected files)\n"
5638 "\n"
5639 " Show differences between revisions for the specified files.\n"
5640 "\n"
5641 " Differences between files are shown using the unified diff format.\n"
5642 "\n"
5643 " NOTE: diff may generate unexpected results for merges, as it will\n"
5644 " default to comparing against the working directory's first parent\n"
5645 " changeset if no revisions are specified.\n"
5646 "\n"
5647 " When two revision arguments are given, then changes are shown\n"
5648 " between those revisions. If only one revision is specified then\n"
5649 " that revision is compared to the working directory, and, when no\n"
5650 " revisions are specified, the working directory files are compared\n"
5651 " to its parent.\n"
5652 "\n"
5653 " Without the -a/--text option, diff will avoid generating diffs of\n"
5654 " files it detects as binary. With -a, diff will generate a diff\n"
5655 " anyway, probably with undesirable results.\n"
5656 "\n"
5657 " Use the -g/--git option to generate diffs in the git extended diff\n"
5658 " format. For more information, read 'hg help diffs'.\n"
5659 " "
5660 msgstr ""
5661 "在版本库中比较(指定的文件)\n"
5662 "\n"
5663 " 显示指定文件在版本间的差异。\n"
5664 "\n"
5665 " 文件间的差异使用同一差异格式显示。\n"
5666 "\n"
5667 " 注意: 对合并的比较可能会产生不期望的结果,因为没有指定版本时,默认\n"
5668 " 与工作目录的直接父亲比较。\n"
5669 "\n"
5670 " 当给出两个版本参数时,会显示在这些版本间的修改。如果只给出一个版本,\n"
5671 " 那么它将与工作目录比较。当没有指定版本时,将比较工作目录中的文件与\n"
5672 " 它的直接父亲。\n"
5673 "\n"
5674 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5675 " 时,可能会有不合需要的结果。\n"
5676 "\n"
5677 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读 'hg help diffs' 以\n"
5678 " 了解更多信息。\n"
5679 " "
5680
5681 #, fuzzy
5682 msgid ""
5683 "dump the header and diffs for one or more changesets\n"
5684 "\n"
5685 " Print the changeset header and diffs for one or more revisions.\n"
5686 "\n"
5687 " The information shown in the changeset header is: author,\n"
5688 " changeset hash, parent(s) and commit comment.\n"
5689 "\n"
5690 " NOTE: export may generate unexpected diff output for merge\n"
5691 " changesets, as it will compare the merge changeset against its\n"
5692 " first parent only.\n"
5693 "\n"
5694 " Output may be to a file, in which case the name of the file is\n"
5695 " given using a format string. The formatting rules are as follows::\n"
5696 "\n"
5697 " %% literal \"%\" character\n"
5698 " %H changeset hash (40 bytes of hexadecimal)\n"
5699 " %N number of patches being generated\n"
5700 " %R changeset revision number\n"
5701 " %b basename of the exporting repository\n"
5702 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5703 " %n zero-padded sequence number, starting at 1\n"
5704 " %r zero-padded changeset revision number\n"
5705 "\n"
5706 " Without the -a/--text option, export will avoid generating diffs\n"
5707 " of files it detects as binary. With -a, export will generate a\n"
5708 " diff anyway, probably with undesirable results.\n"
5709 "\n"
5710 " Use the -g/--git option to generate diffs in the git extended diff\n"
5711 " format. See 'hg help diffs' for more information.\n"
5712 "\n"
5713 " With the --switch-parent option, the diff will be against the\n"
5714 " second parent. It can be useful to review a merge.\n"
5715 " "
5716 msgstr ""
5717 "为一个或多个修改集输出标题和差异\n"
5718 "\n"
5719 " 为一个或多个版本输出标题和差异。\n"
5720 "\n"
5721 " 在修改集标题中显示的信息是: 作者,修改集哈希,父亲和提交日志。\n"
5722 "\n"
5723 " 注意: 对于合并修改集,导出可能产生不期望的差异输出,因为它只会将合并\n"
5724 " 修改集与其第一个父亲比较。\n"
5725 "\n"
5726 " 可以输出到文件,这时会使用指定的格式化字符串构造文件名称。格式化规则\n"
5727 " 如下:\n"
5728 "\n"
5729 " %% 字符 \"%\"\n"
5730 " %H 修改集哈希 (40 位十六进制数字)\n"
5731 " %N 产生的补丁号\n"
5732 " %R 修改集版本号\n"
5733 " %b 待导出的版本库的基本名称\n"
5734 " %h 短修改集哈希(12 位十六进制数字)\n"
5735 " %n 从 1 开始补 0 的序列号\n"
5736 " %r 补 0 的修改集版本号\n"
5737 "\n"
5738 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5739 " 时,可能会有不合需要的结果。\n"
5740 "\n"
5741 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n"
5742 " 更多信息。\n"
5743 "\n"
5744 " 使用选项 '--switch-parent',将会与第二个父亲比较。对于复审合并很有用。\n"
5745 " "
5746
5747 msgid "export requires at least one changeset"
5748 msgstr ""
5749
5750 msgid "exporting patches:\n"
5751 msgstr ""
5752
5753 msgid "exporting patch:\n"
5754 msgstr ""
5755
5756 msgid ""
5757 "forget the specified files on the next commit\n"
5758 "\n"
5759 " Mark the specified files so they will no longer be tracked\n"
5760 " after the next commit.\n"
5761 "\n"
5762 " This only removes files from the current branch, not from the\n"
5763 " entire project history, and it does not delete them from the\n"
5764 " working directory.\n"
5765 "\n"
5766 " To undo a forget before the next commit, see hg add.\n"
5767 " "
5768 msgstr ""
5769
5770 msgid "no files specified"
5771 msgstr ""
5772
5773 #, python-format
5774 msgid "not removing %s: file is already untracked\n"
5775 msgstr ""
5776
5777 msgid ""
5778 "search for a pattern in specified files and revisions\n"
5779 "\n"
5780 " Search revisions of files for a regular expression.\n"
5781 "\n"
5782 " This command behaves differently than Unix grep. It only accepts\n"
5783 " Python/Perl regexps. It searches repository history, not the\n"
5784 " working directory. It always prints the revision number in which a\n"
5785 " match appears.\n"
5786 "\n"
5787 " By default, grep only prints output for the first revision of a\n"
5788 " file in which it finds a match. To get it to print every revision\n"
5789 " that contains a change in match status (\"-\" for a match that\n"
5790 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5791 " use the --all flag.\n"
5792 " "
5793 msgstr ""
5794
5795 #, python-format
5796 msgid "grep: invalid match pattern: %s\n"
5797 msgstr ""
5798
5799 msgid ""
5800 "show current repository heads or show branch heads\n"
5801 "\n"
5802 " With no arguments, show all repository head changesets.\n"
5803 "\n"
5804 " Repository \"heads\" are changesets with no child changesets. They are\n"
5805 " where development generally takes place and are the usual targets\n"
5806 " for update and merge operations.\n"
5807 "\n"
5808 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5809 " the named branch associated with the specified changeset(s).\n"
5810 "\n"
5811 " Branch heads are changesets on a named branch with no descendants on\n"
5812 " the same branch. A branch head could be a \"true\" (repository) head,\n"
5813 " or it could be the last changeset on that branch before it was\n"
5814 " merged into another branch, or it could be the last changeset on the\n"
5815 " branch before a new branch was created. If none of the branch heads\n"
5816 " are true heads, the branch is considered inactive.\n"
5817 "\n"
5818 " If -c/--closed is specified, also show branch heads marked closed\n"
5819 " (see hg commit --close-branch).\n"
5820 "\n"
5821 " If STARTREV is specified, only those heads that are descendants of\n"
5822 " STARTREV will be displayed.\n"
5823 " "
5824 msgstr ""
5825
5826 msgid "you must specify a branch to use --closed"
5827 msgstr ""
5828
5829 #, fuzzy, python-format
5830 msgid "no open branch heads on branch %s\n"
5831 msgstr "svn: 分支没有版本 %s"
5832
5833 #, python-format
5834 msgid "no changes on branch %s containing %s are reachable from %s\n"
5835 msgstr ""
5836
5837 #, python-format
5838 msgid "no changes on branch %s are reachable from %s\n"
5839 msgstr ""
5840
5841 msgid ""
5842 "show help for a given topic or a help overview\n"
5843 "\n"
5844 " With no arguments, print a list of commands with short help messages.\n"
5845 "\n"
5846 " Given a topic, extension, or command name, print help for that\n"
5847 " topic."
5848 msgstr ""
5849
5850 msgid "global options:"
5851 msgstr "全局选项:"
5852
5853 msgid "use \"hg help\" for the full list of commands"
5854 msgstr "使用 \"hg help\" 获得全部命令的列表"
5855
5856 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5857 msgstr "使用 \"hg help\" 获得全部命令的列表,或 \"hg -v\" 获得详细信息"
5858
5859 #, python-format
5860 msgid "use \"hg -v help%s\" to show aliases and global options"
5861 msgstr "使用 \"hg -v help%s\" 显示别名和全局选项"
5862
5863 #, python-format
5864 msgid "use \"hg -v help %s\" to show global options"
5865 msgstr "使用 \"hg -v help %s\" 显示全局选项"
5866
5867 msgid ""
5868 "list of commands:\n"
5869 "\n"
5870 msgstr ""
5871 "命令列表:\n"
5872 "\n"
5873
5874 #, python-format
5875 msgid ""
5876 "\n"
5877 "aliases: %s\n"
5878 msgstr ""
5879 "\n"
5880 "别名: %s\n"
5881
5882 msgid "(no help text available)"
5883 msgstr "(没有可用的帮助信息)"
5884
5885 msgid "options:\n"
5886 msgstr "选项:\n"
5887
5888 msgid "no commands defined\n"
5889 msgstr ""
5890
5891 #, fuzzy
5892 msgid "enabled extensions:"
5893 msgstr ""
5894 "\n"
5895 "启用的扩展:\n"
5896 "\n"
5897
5898 msgid "no help text available"
5899 msgstr "没有可用的帮助信息"
5900
5901 #, fuzzy, python-format
5902 msgid ""
5903 "%s extension - %s\n"
5904 "\n"
5905 msgstr "** 已加载的扩展: %s\n"
5906
5907 msgid "Mercurial Distributed SCM\n"
5908 msgstr "分布式软件配置管理工具 - 水银\n"
5909
5910 msgid ""
5911 "basic commands:\n"
5912 "\n"
5913 msgstr ""
5914 "基本命令:\n"
5915 "\n"
5916
5917 msgid ""
5918 "\n"
5919 "additional help topics:\n"
5920 "\n"
5921 msgstr ""
5922 "\n"
5923 "额外的帮助主题:\n"
5924 "\n"
5925
5926 msgid ""
5927 "identify the working copy or specified revision\n"
5928 "\n"
5929 " With no revision, print a summary of the current state of the\n"
5930 " repository.\n"
5931 "\n"
5932 " Specifying a path to a repository root or Mercurial bundle will\n"
5933 " cause lookup to operate on that repository/bundle.\n"
5934 "\n"
5935 " This summary identifies the repository state using one or two\n"
5936 " parent hash identifiers, followed by a \"+\" if there are\n"
5937 " uncommitted changes in the working directory, a list of tags for\n"
5938 " this revision and a branch name for non-default branches.\n"
5939 " "
5940 msgstr ""
5941
5942 msgid ""
5943 "import an ordered set of patches\n"
5944 "\n"
5945 " Import a list of patches and commit them individually.\n"
5946 "\n"
5947 " If there are outstanding changes in the working directory, import\n"
5948 " will abort unless given the -f/--force flag.\n"
5949 "\n"
5950 " You can import a patch straight from a mail message. Even patches\n"
5951 " as attachments work (to use the body part, it must have type\n"
5952 " text/plain or text/x-patch). From and Subject headers of email\n"
5953 " message are used as default committer and commit message. All\n"
5954 " text/plain body parts before first diff are added to commit\n"
5955 " message.\n"
5956 "\n"
5957 " If the imported patch was generated by hg export, user and\n"
5958 " description from patch override values from message headers and\n"
5959 " body. Values given on command line with -m/--message and -u/--user\n"
5960 " override these.\n"
5961 "\n"
5962 " If --exact is specified, import will set the working directory to\n"
5963 " the parent of each patch before applying it, and will abort if the\n"
5964 " resulting changeset has a different ID than the one recorded in\n"
5965 " the patch. This may happen due to character set problems or other\n"
5966 " deficiencies in the text patch format.\n"
5967 "\n"
5968 " With -s/--similarity, hg will attempt to discover renames and\n"
5969 " copies in the patch in the same way as 'addremove'.\n"
5970 "\n"
5971 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5972 " a URL is specified, the patch will be downloaded from it.\n"
5973 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5974 " "
5975 msgstr ""
5976
5977 msgid "applying patch from stdin\n"
5978 msgstr ""
5979
5980 msgid "no diffs found"
5981 msgstr ""
5982
5983 #, fuzzy
5984 msgid "not a Mercurial patch"
5985 msgstr "%s 不是本地的水银版本库"
5986
5987 msgid "patch is damaged or loses information"
5988 msgstr ""
5989
5990 msgid ""
5991 "show new changesets found in source\n"
5992 "\n"
5993 " Show new changesets found in the specified path/URL or the default\n"
5994 " pull location. These are the changesets that would have been pulled\n"
5995 " if a pull at the time you issued this command.\n"
5996 "\n"
5997 " For remote repository, using --bundle avoids downloading the\n"
5998 " changesets twice if the incoming is followed by a pull.\n"
5999 "\n"
6000 " See pull for valid source format details.\n"
6001 " "
6002 msgstr ""
6003
6004 #, fuzzy
6005 msgid ""
6006 "create a new repository in the given directory\n"
6007 "\n"
6008 " Initialize a new repository in the given directory. If the given\n"
6009 " directory does not exist, it will be created.\n"
6010 "\n"
6011 " If no directory is given, the current directory is used.\n"
6012 "\n"
6013 " It is possible to specify an ssh:// URL as the destination.\n"
6014 " See 'hg help urls' for more information.\n"
6015 " "
6016 msgstr ""
6017 "在指定目录创建新版本库\n"
6018 "\n"
6019 " 在指定目录初始化新版本库。如果指定的目录不存在,那么会被创建。\n"
6020 "\n"
6021 " 如果没有指定目录,就使用当前目录。\n"
6022 "\n"
6023 " 可以指定位置 'ssh://' 作为目标。参见命令 'hg help urls' 的帮助信息,\n"
6024 " 以了解位置 'ssh://' 的重要详情。\n"
6025 " "
6026
6027 msgid ""
6028 "locate files matching specific patterns\n"
6029 "\n"
6030 " Print files under Mercurial control in the working directory whose\n"
6031 " names match the given patterns.\n"
6032 "\n"
6033 " By default, this command searches all directories in the working\n"
6034 " directory. To search just the current directory and its\n"
6035 " subdirectories, use \"--include .\".\n"
6036 "\n"
6037 " If no patterns are given to match, this command prints the names\n"
6038 " of all files under Mercurial control in the working directory.\n"
6039 "\n"
6040 " If you want to feed the output of this command into the \"xargs\"\n"
6041 " command, use the -0 option to both this command and \"xargs\". This\n"
6042 " will avoid the problem of \"xargs\" treating single filenames that\n"
6043 " contain whitespace as multiple filenames.\n"
6044 " "
6045 msgstr ""
6046
6047 #, fuzzy
6048 msgid ""
6049 "show revision history of entire repository or files\n"
6050 "\n"
6051 " Print the revision history of the specified files or the entire\n"
6052 " project.\n"
6053 "\n"
6054 " File history is shown without following rename or copy history of\n"
6055 " files. Use -f/--follow with a filename to follow history across\n"
6056 " renames and copies. --follow without a filename will only show\n"
6057 " ancestors or descendants of the starting revision. --follow-first\n"
6058 " only follows the first parent of merge revisions.\n"
6059 "\n"
6060 " If no revision range is specified, the default is tip:0 unless\n"
6061 " --follow is set, in which case the working directory parent is\n"
6062 " used as the starting revision.\n"
6063 "\n"
6064 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6065 "\n"
6066 " By default this command prints revision number and changeset id,\n"
6067 " tags, non-trivial parents, user, date and time, and a summary for\n"
6068 " each commit. When the -v/--verbose switch is used, the list of\n"
6069 " changed files and full commit message are shown.\n"
6070 "\n"
6071 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
6072 " changesets, as it will only compare the merge changeset against\n"
6073 " its first parent. Also, only files different from BOTH parents\n"
6074 " will appear in files:.\n"
6075 " "
6076 msgstr ""
6077 "显示全部版本库或指定文件的版本历史\n"
6078 "\n"
6079 " 显示全部版本库或指定文件的版本历史。\n"
6080 "\n"
6081 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6082 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6083 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6084 " 个父亲。\n"
6085 "\n"
6086 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6087 " 工作目录的父亲作为开始版本。\n"
6088 "\n"
6089 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6090 "\n"
6091 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6092 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6093 " 变更列表和完整的提交信息。\n"
6094 "\n"
6095 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6096 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6097 " 文件列表。\n"
6098 "\n"
6099 " "
6100
6101 msgid ""
6102 "output the current or given revision of the project manifest\n"
6103 "\n"
6104 " Print a list of version controlled files for the given revision.\n"
6105 " If no revision is given, the first parent of the working directory\n"
6106 " is used, or the null revision if no revision is checked out.\n"
6107 "\n"
6108 " With -v, print file permissions, symlink and executable bits.\n"
6109 " With --debug, print file revision hashes.\n"
6110 " "
6111 msgstr ""
6112
6113 #, fuzzy
6114 msgid ""
6115 "merge working directory with another revision\n"
6116 "\n"
6117 " The current working directory is updated with all changes made in\n"
6118 " the requested revision since the last common predecessor revision.\n"
6119 "\n"
6120 " Files that changed between either parent are marked as changed for\n"
6121 " the next commit and a commit must be performed before any further\n"
6122 " updates to the repository are allowed. The next commit will have\n"
6123 " two parents.\n"
6124 "\n"
6125 " If no revision is specified, the working directory's parent is a\n"
6126 " head revision, and the current branch contains exactly one other\n"
6127 " head, the other head is merged with by default. Otherwise, an\n"
6128 " explicit revision with which to merge with must be provided.\n"
6129 " "
6130 msgstr ""
6131 "将工作目录与其它版本合并\n"
6132 "\n"
6133 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6134 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6135 "\n"
6136 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6137 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6138 " "
6139
6140 #, python-format
6141 msgid "branch '%s' has %d heads - please merge with an explicit rev"
6142 msgstr ""
6143
6144 #, python-format
6145 msgid "branch '%s' has one head - please merge with an explicit rev"
6146 msgstr ""
6147
6148 msgid "there is nothing to merge"
6149 msgstr ""
6150
6151 #, python-format
6152 msgid "%s - use \"hg update\" instead"
6153 msgstr ""
6154
6155 msgid ""
6156 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
6157 "rev"
6158 msgstr ""
6159
6160 msgid ""
6161 "show changesets not found in destination\n"
6162 "\n"
6163 " Show changesets not found in the specified destination repository\n"
6164 " or the default push location. These are the changesets that would\n"
6165 " be pushed if a push was requested.\n"
6166 "\n"
6167 " See pull for valid destination format details.\n"
6168 " "
6169 msgstr ""
6170
6171 #, fuzzy
6172 msgid ""
6173 "show the parents of the working directory or revision\n"
6174 "\n"
6175 " Print the working directory's parent revisions. If a revision is\n"
6176 " given via -r/--rev, the parent of that revision will be printed.\n"
6177 " If a file argument is given, the revision in which the file was\n"
6178 " last changed (before the working directory revision or the\n"
6179 " argument to --rev if given) is printed.\n"
6180 " "
6181 msgstr ""
6182 "显示工作目录或指定版本的父亲\n"
6183 "\n"
6184 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
6185 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
6186 " 版本,或 '--rev' 指定的版本)。\n"
6187 " "
6188
6189 msgid "can only specify an explicit filename"
6190 msgstr ""
6191
6192 #, python-format
6193 msgid "'%s' not found in manifest!"
6194 msgstr ""
6195
6196 msgid ""
6197 "show aliases for remote repositories\n"
6198 "\n"
6199 " Show definition of symbolic path name NAME. If no name is given,\n"
6200 " show definition of all available names.\n"
6201 "\n"
6202 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6203 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
6204 "\n"
6205 " See 'hg help urls' for more information.\n"
6206 " "
6207 msgstr ""
6208
6209 msgid "not found!\n"
6210 msgstr ""
6211
6212 msgid "not updating, since new heads added\n"
6213 msgstr ""
6214
6215 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
6216 msgstr ""
6217
6218 msgid "(run 'hg update' to get a working copy)\n"
6219 msgstr ""
6220
6221 #, fuzzy
6222 msgid ""
6223 "pull changes from the specified source\n"
6224 "\n"
6225 " Pull changes from a remote repository to a local one.\n"
6226 "\n"
6227 " This finds all changes from the repository at the specified path\n"
6228 " or URL and adds them to a local repository (the current one unless\n"
6229 " -R is specified). By default, this does not update the copy of the\n"
6230 " project in the working directory.\n"
6231 "\n"
6232 " Use hg incoming if you want to see what would have been added by a\n"
6233 " pull at the time you issued this command. If you then decide to\n"
6234 " added those changes to the repository, you should use pull -r X\n"
6235 " where X is the last changeset listed by hg incoming.\n"
6236 "\n"
6237 " If SOURCE is omitted, the 'default' path will be used.\n"
6238 " See 'hg help urls' for more information.\n"
6239 " "
6240 msgstr ""
6241 "从指定版本库取得修改集\n"
6242 "\n"
6243 " 从远程版本库取得修改集到本地版本库。\n"
6244 "\n"
6245 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6246 " 更新工作目录。\n"
6247 "\n"
6248 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6249 " 更多信息。\n"
6250 " "
6251
6252 #, fuzzy
6253 msgid ""
6254 "push changes to the specified destination\n"
6255 "\n"
6256 " Push changes from the local repository to the given destination.\n"
6257 "\n"
6258 " This is the symmetrical operation for pull. It moves changes from\n"
6259 " the current repository to a different one. If the destination is\n"
6260 " local this is identical to a pull in that directory from the\n"
6261 " current one.\n"
6262 "\n"
6263 " By default, push will refuse to run if it detects the result would\n"
6264 " increase the number of remote heads. This generally indicates the\n"
6265 " user forgot to pull and merge before pushing.\n"
6266 "\n"
6267 " If -r/--rev is used, the named revision and all its ancestors will\n"
6268 " be pushed to the remote repository.\n"
6269 "\n"
6270 " Please see 'hg help urls' for important details about ssh://\n"
6271 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6272 " "
6273 msgstr ""
6274 "推送改变到指定位置\n"
6275 "\n"
6276 " 从本地版本库推送改变到指定位置。\n"
6277 "\n"
6278 " 这是 'pull' 的对称操作。它从当前版本库推送改变到其它版本库。如果目标\n"
6279 " 是本地版本库,那么此操作与在目标版本库从当前版本库执行 'pull' 操作等\n"
6280 " 同。\n"
6281 "\n"
6282 " 推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n"
6283 " 之前忘记取得远程版本库的修改,并且合并。\n"
6284 "\n"
6285 " 如果使用了选项 '-r',此命名修改集以及其祖先都会被推送到远程版本库。\n"
6286 " \n"
6287 "\n"
6288 " 参见主题 'urls' 的帮助信息,以了解位置 'ssh://' 的重要详情。如果没有\n"
6289 " 给出目标位置,那么使用默认路径。参见 'hg help urls' 以了解更多信息。\n"
6290 " "
6291
6292 #, python-format
6293 msgid "pushing to %s\n"
6294 msgstr "正在推到 %s\n"
6295
6296 msgid ""
6297 "roll back an interrupted transaction\n"
6298 "\n"
6299 " Recover from an interrupted commit or pull.\n"
6300 "\n"
6301 " This command tries to fix the repository status after an\n"
6302 " interrupted operation. It should only be necessary when Mercurial\n"
6303 " suggests it.\n"
6304 " "
6305 msgstr ""
6306
6307 #, fuzzy
6308 msgid ""
6309 "remove the specified files on the next commit\n"
6310 "\n"
6311 " Schedule the indicated files for removal from the repository.\n"
6312 "\n"
6313 " This only removes files from the current branch, not from the\n"
6314 " entire project history. -A/--after can be used to remove only\n"
6315 " files that have already been deleted, -f/--force can be used to\n"
6316 " force deletion, and -Af can be used to remove files from the next\n"
6317 " revision without deleting them from the working directory.\n"
6318 "\n"
6319 " The following table details the behavior of remove for different\n"
6320 " file states (columns) and option combinations (rows). The file\n"
6321 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6322 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6323 " and Delete (from disk)::\n"
6324 "\n"
6325 " A C M !\n"
6326 " none W RD W R\n"
6327 " -f R RD RD R\n"
6328 " -A W W W R\n"
6329 " -Af R R R R\n"
6330 "\n"
6331 " This command schedules the files to be removed at the next commit.\n"
6332 " To undo a remove before that, see hg revert.\n"
6333 " "
6334 msgstr ""
6335 "在下次提交时删除指定文件\n"
6336 "\n"
6337 " 调度从版本库删除指定文件。\n"
6338 "\n"
6339 " 它只从当前分支删除文件,不删除历史。'-A' 用于只移除已经删除的文\n"
6340 " 件,'-f' 用于强制删除,'-Af' 用于从下个版本移除文件,但是不删除\n"
6341 " 它们。\n"
6342 "\n"
6343 " 下表给出了删除不同状态(列)文件的行为和可选的组合(行)。文件状态\n"
6344 " ('hg status' 报告的状态)是增加(A),干净(C),已修改(M),丢失(!)。\n"
6345 " 动作是警告(W),移除(R,从分支),以及删除(D,从磁盘)。\n"
6346 "\n"
6347 " A C M !\n"
6348 " none W RD W R\n"
6349 " -f R RD RD R\n"
6350 " -A W W W R\n"
6351 " -Af R R R R\n"
6352 "\n"
6353 " 此命令调度下次提交时删除文件。\n"
6354 " 要在此之前撤销删除,请参见 'hg revert'。\n"
6355 " "
6356
6357 #, python-format
6358 msgid "not removing %s: file is untracked\n"
6359 msgstr ""
6360
6361 #, python-format
6362 msgid "not removing %s: file %s (use -f to force removal)\n"
6363 msgstr ""
6364
6365 msgid "still exists"
6366 msgstr ""
6367
6368 msgid "is modified"
6369 msgstr ""
6370
6371 msgid "has been marked for add"
6372 msgstr ""
6373
6374 msgid ""
6375 "rename files; equivalent of copy + remove\n"
6376 "\n"
6377 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6378 " is a directory, copies are put in that directory. If dest is a\n"
6379 " file, there can only be one source.\n"
6380 "\n"
6381 " By default, this command copies the contents of files as they\n"
6382 " exist in the working directory. If invoked with -A/--after, the\n"
6383 " operation is recorded, but no copying is performed.\n"
6384 "\n"
6385 " This command takes effect at the next commit. To undo a rename\n"
6386 " before that, see hg revert.\n"
6387 " "
6388 msgstr ""
6389
6390 msgid ""
6391 "retry file merges from a merge or update\n"
6392 "\n"
6393 " This command will cleanly retry unresolved file merges using file\n"
6394 " revisions preserved from the last update or merge. To attempt to\n"
6395 " resolve all unresolved files, use the -a/--all switch.\n"
6396 "\n"
6397 " If a conflict is resolved manually, please note that the changes\n"
6398 " will be overwritten if the merge is retried with resolve. The\n"
6399 " -m/--mark switch should be used to mark the file as resolved.\n"
6400 "\n"
6401 " This command also allows listing resolved files and manually\n"
6402 " indicating whether or not files are resolved. All files must be\n"
6403 " marked as resolved before a commit is permitted.\n"
6404 "\n"
6405 " The codes used to show the status of files are::\n"
6406 "\n"
6407 " U = unresolved\n"
6408 " R = resolved\n"
6409 " "
6410 msgstr ""
6411
6412 msgid "too many options specified"
6413 msgstr ""
6414
6415 msgid "can't specify --all and patterns"
6416 msgstr ""
6417
6418 msgid "no files or directories specified; use --all to remerge all files"
6419 msgstr ""
6420
6421 msgid ""
6422 "restore individual files or directories to an earlier state\n"
6423 "\n"
6424 " (Use update -r to check out earlier revisions, revert does not\n"
6425 " change the working directory parents.)\n"
6426 "\n"
6427 " With no revision specified, revert the named files or directories\n"
6428 " to the contents they had in the parent of the working directory.\n"
6429 " This restores the contents of the affected files to an unmodified\n"
6430 " state and unschedules adds, removes, copies, and renames. If the\n"
6431 " working directory has two parents, you must explicitly specify the\n"
6432 " revision to revert to.\n"
6433 "\n"
6434 " Using the -r/--rev option, revert the given files or directories\n"
6435 " to their contents as of a specific revision. This can be helpful\n"
6436 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6437 " dates' for a list of formats valid for -d/--date.\n"
6438 "\n"
6439 " Revert modifies the working directory. It does not commit any\n"
6440 " changes, or change the parent of the working directory. If you\n"
6441 " revert to a revision other than the parent of the working\n"
6442 " directory, the reverted files will thus appear modified\n"
6443 " afterwards.\n"
6444 "\n"
6445 " If a file has been deleted, it is restored. If the executable mode\n"
6446 " of a file was changed, it is reset.\n"
6447 "\n"
6448 " If names are given, all files matching the names are reverted.\n"
6449 " If no arguments are given, no files are reverted.\n"
6450 "\n"
6451 " Modified files are saved with a .orig suffix before reverting.\n"
6452 " To disable these backups, use --no-backup.\n"
6453 " "
6454 msgstr ""
6455
6456 msgid "you can't specify a revision and a date"
6457 msgstr ""
6458
6459 msgid "no files or directories specified; use --all to revert the whole repo"
6460 msgstr ""
6461
6462 #, python-format
6463 msgid "forgetting %s\n"
6464 msgstr ""
6465
6466 #, python-format
6467 msgid "reverting %s\n"
6468 msgstr "正在恢复 %s\n"
6469
6470 #, python-format
6471 msgid "undeleting %s\n"
6472 msgstr "正在撤销删除 %s\n"
6473
6474 #, python-format
6475 msgid "saving current version of %s as %s\n"
6476 msgstr "保存当前版本的 %s 为 %s\n"
6477
6478 #, python-format
6479 msgid "file not managed: %s\n"
6480 msgstr "文件未被控制: %s\n"
6481
6482 #, python-format
6483 msgid "no changes needed to %s\n"
6484 msgstr "不需要改变 %s\n"
6485
6486 msgid ""
6487 "roll back the last transaction\n"
6488 "\n"
6489 " This command should be used with care. There is only one level of\n"
6490 " rollback, and there is no way to undo a rollback. It will also\n"
6491 " restore the dirstate at the time of the last transaction, losing\n"
6492 " any dirstate changes since that time. This command does not alter\n"
6493 " the working directory.\n"
6494 "\n"
6495 " Transactions are used to encapsulate the effects of all commands\n"
6496 " that create new changesets or propagate existing changesets into a\n"
6497 " repository. For example, the following commands are transactional,\n"
6498 " and their effects can be rolled back::\n"
6499 "\n"
6500 " commit\n"
6501 " import\n"
6502 " pull\n"
6503 " push (with this repository as destination)\n"
6504 " unbundle\n"
6505 "\n"
6506 " This command is not intended for use on public repositories. Once\n"
6507 " changes are visible for pull by other users, rolling a transaction\n"
6508 " back locally is ineffective (someone else may already have pulled\n"
6509 " the changes). Furthermore, a race is possible with readers of the\n"
6510 " repository; for example an in-progress pull from the repository\n"
6511 " may fail if a rollback is performed.\n"
6512 " "
6513 msgstr ""
6514
6515 msgid ""
6516 "print the root (top) of the current working directory\n"
6517 "\n"
6518 " Print the root directory of the current repository.\n"
6519 " "
6520 msgstr ""
6521
6522 #, fuzzy
6523 msgid ""
6524 "export the repository via HTTP\n"
6525 "\n"
6526 " Start a local HTTP repository browser and pull server.\n"
6527 "\n"
6528 " By default, the server logs accesses to stdout and errors to\n"
6529 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6530 " files.\n"
6531 " "
6532 msgstr ""
6533 "通过 HTTP 发布版本库\n"
6534 "\n"
6535 " 启动本地 HTTP 版本库浏览器和发布服务器。\n"
6536 "\n"
6537 " 默认服务器访问日志输出到 stdout,错误日志输出到 stderr。\n"
6538 " 可以使用选项 \"-A\" 和 \"-E\",将这些日志输出到文件。\n"
6539 " "
6540
6541 #, python-format
6542 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6543 msgstr ""
6544
6545 #, fuzzy
6546 msgid ""
6547 "show changed files in the working directory\n"
6548 "\n"
6549 " Show status of files in the repository. If names are given, only\n"
6550 " files that match are shown. Files that are clean or ignored or\n"
6551 " the source of a copy/move operation, are not listed unless\n"
6552 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6553 " Unless options described with \"show only ...\" are given, the\n"
6554 " options -mardu are used.\n"
6555 "\n"
6556 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6557 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6558 "\n"
6559 " NOTE: status may appear to disagree with diff if permissions have\n"
6560 " changed or a merge has occurred. The standard diff format does not\n"
6561 " report permission changes and diff only reports changes relative\n"
6562 " to one merge parent.\n"
6563 "\n"
6564 " If one revision is given, it is used as the base revision.\n"
6565 " If two revisions are given, the differences between them are\n"
6566 " shown.\n"
6567 "\n"
6568 " The codes used to show the status of files are::\n"
6569 "\n"
6570 " M = modified\n"
6571 " A = added\n"
6572 " R = removed\n"
6573 " C = clean\n"
6574 " ! = missing (deleted by non-hg command, but still tracked)\n"
6575 " ? = not tracked\n"
6576 " I = ignored\n"
6577 " = origin of the previous file listed as A (added)\n"
6578 " "
6579 msgstr ""
6580 "显示工作目录中已改变的文件\n"
6581 "\n"
6582 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
6583 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
6584 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
6585 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
6586 "\n"
6587 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
6588 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
6589 "\n"
6590 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
6591 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
6592 " 父亲的改变。\n"
6593 "\n"
6594 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
6595 "\n"
6596 " 显示文件状态的代码是:\n"
6597 " M = 已修改\n"
6598 " A = 已增加\n"
6599 " R = 已移除\n"
6600 " C = 干净的\n"
6601 " ! = 已删除,仍旧被跟踪\n"
6602 " ? = 未跟踪\n"
6603 " I = 已忽略\n"
6604 " = 早先增加的文件自此复制\n"
6605 " "
6606
6607 msgid ""
6608 "summarize working directory state\n"
6609 "\n"
6610 " This generates a brief summary of the working directory state,\n"
6611 " including parents, branch, commit status, and available updates.\n"
6612 "\n"
6613 " With the --remote option, this will check the default paths for\n"
6614 " incoming and outgoing changes. This can be time-consuming.\n"
6615 " "
6616 msgstr ""
6617
6618 #, fuzzy
6619 msgid " (empty repository)"
6620 msgstr "创建队列版本库"
6621
6622 #, fuzzy
6623 msgid " (no revision checked out)"
6624 msgstr "要合并的版本"
6625
6626 #, fuzzy, python-format
6627 msgid "parent: %d:%s %s\n"
6628 msgstr "父亲: %d:%s\n"
6629
6630 #, fuzzy, python-format
6631 msgid "branch: %s\n"
6632 msgstr "分支: %s\n"
6633
6634 #, python-format
6635 msgid "%d added"
6636 msgstr ""
6637
6638 #, python-format
6639 msgid "%d modified"
6640 msgstr ""
6641
6642 #, fuzzy, python-format
6643 msgid "%d removed"
6644 msgstr "已删除"
6645
6646 #, python-format
6647 msgid "%d deleted"
6648 msgstr ""
6649
6650 #, python-format
6651 msgid "%d ignored"
6652 msgstr ""
6653
6654 #, python-format
6655 msgid "%d unknown"
6656 msgstr ""
6657
6658 #, fuzzy, python-format
6659 msgid "%d unresolved"
6660 msgstr "未解决"
6661
6662 #, fuzzy
6663 msgid " (merge)"
6664 msgstr "已合并"
6665
6666 msgid " (new branch)"
6667 msgstr ""
6668
6669 msgid " (clean)"
6670 msgstr ""
6671
6672 msgid " (new branch head)"
6673 msgstr ""
6674
6675 #, fuzzy, python-format
6676 msgid "commit: %s\n"
6677 msgstr "中止: %s\n"
6678
6679 msgid "update: (current)\n"
6680 msgstr ""
6681
6682 #, fuzzy, python-format
6683 msgid "update: %d new changesets (update)\n"
6684 msgstr "如果有新的修改集,就更新到最新版本"
6685
6686 #, python-format
6687 msgid "update: %d new changesets, %d branch heads (merge)\n"
6688 msgstr ""
6689
6690 msgid "1 or more incoming"
6691 msgstr ""
6692
6693 #, python-format
6694 msgid "%d outgoing"
6695 msgstr ""
6696
6697 #, fuzzy, python-format
6698 msgid "remote: %s\n"
6699 msgstr "领域: %s\n"
6700
6701 msgid "remote: (synced)\n"
6702 msgstr ""
6703
6704 msgid ""
6705 "add one or more tags for the current or given revision\n"
6706 "\n"
6707 " Name a particular revision using <name>.\n"
6708 "\n"
6709 " Tags are used to name particular revisions of the repository and are\n"
6710 " very useful to compare different revisions, to go back to significant\n"
6711 " earlier versions or to mark branch points as releases, etc.\n"
6712 "\n"
6713 " If no revision is given, the parent of the working directory is\n"
6714 " used, or tip if no revision is checked out.\n"
6715 "\n"
6716 " To facilitate version control, distribution, and merging of tags,\n"
6717 " they are stored as a file named \".hgtags\" which is managed\n"
6718 " similarly to other project files and can be hand-edited if\n"
6719 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6720 " shared among repositories).\n"
6721 "\n"
6722 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6723 " "
6724 msgstr ""
6725
6726 msgid "tag names must be unique"
6727 msgstr ""
6728
6729 #, python-format
6730 msgid "the name '%s' is reserved"
6731 msgstr ""
6732
6733 msgid "--rev and --remove are incompatible"
6734 msgstr ""
6735
6736 #, python-format
6737 msgid "tag '%s' does not exist"
6738 msgstr ""
6739
6740 #, fuzzy, python-format
6741 msgid "tag '%s' is not a global tag"
6742 msgstr "非本地版本库 '%s'"
6743
6744 #, fuzzy, python-format
6745 msgid "tag '%s' is not a local tag"
6746 msgstr "非本地版本库 '%s'"
6747
6748 #, python-format
6749 msgid "tag '%s' already exists (use -f to force)"
6750 msgstr ""
6751
6752 msgid ""
6753 "list repository tags\n"
6754 "\n"
6755 " This lists both regular and local tags. When the -v/--verbose\n"
6756 " switch is used, a third column \"local\" is printed for local tags.\n"
6757 " "
6758 msgstr ""
6759
6760 msgid ""
6761 "show the tip revision\n"
6762 "\n"
6763 " The tip revision (usually just called the tip) is the changeset\n"
6764 " most recently added to the repository (and therefore the most\n"
6765 " recently changed head).\n"
6766 "\n"
6767 " If you have just made a commit, that commit will be the tip. If\n"
6768 " you have just pulled changes from another repository, the tip of\n"
6769 " that repository becomes the current tip. The \"tip\" tag is special\n"
6770 " and cannot be renamed or assigned to a different changeset.\n"
6771 " "
6772 msgstr ""
6773
6774 msgid ""
6775 "apply one or more changegroup files\n"
6776 "\n"
6777 " Apply one or more compressed changegroup files generated by the\n"
6778 " bundle command.\n"
6779 " "
6780 msgstr ""
6781
6782 #, fuzzy
6783 msgid ""
6784 "update working directory\n"
6785 "\n"
6786 " Update the repository's working directory to the specified\n"
6787 " revision, or the tip of the current branch if none is specified.\n"
6788 " Use null as the revision to remove the working copy (like 'hg\n"
6789 " clone -U').\n"
6790 "\n"
6791 " When the working directory contains no uncommitted changes, it\n"
6792 " will be replaced by the state of the requested revision from the\n"
6793 " repository. When the requested revision is on a different branch,\n"
6794 " the working directory will additionally be switched to that\n"
6795 " branch.\n"
6796 "\n"
6797 " When there are uncommitted changes, use option -C/--clean to\n"
6798 " discard them, forcibly replacing the state of the working\n"
6799 " directory with the requested revision. Alternately, use -c/--check\n"
6800 " to abort.\n"
6801 "\n"
6802 " When there are uncommitted changes and option -C/--clean is not\n"
6803 " used, and the parent revision and requested revision are on the\n"
6804 " same branch, and one of them is an ancestor of the other, then the\n"
6805 " new working directory will contain the requested revision merged\n"
6806 " with the uncommitted changes. Otherwise, the update will fail with\n"
6807 " a suggestion to use 'merge' or 'update -C' instead.\n"
6808 "\n"
6809 " If you want to update just one file to an older revision, use\n"
6810 " revert.\n"
6811 "\n"
6812 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6813 " "
6814 msgstr ""
6815 "更新工作目录\n"
6816 "\n"
6817 " 更新工作目录到指定版本,或者到当前分支的顶点。使用 'null' 作为版本可以\n"
6818 " 删除工作副本(类似于 'hg clone -U')。\n"
6819 "\n"
6820 " 当工作目录包含未提交的修改时,它会被版本库中指定版本的状态替换。当请求\n"
6821 " 的版本位于不同分支时,工作目录会被切换到此分支。\n"
6822 "\n"
6823 " 可以使用选项 '-C' 来丢弃未提交的修改,强制使用请求的版本替换工作目录的\n"
6824 " 状态。\n"
6825 "\n"
6826 " 当有未提交的修改,没有使用选项 '-C',父版本和请求版本位于不同分支,并且\n"
6827 " 其中一个是另一个的祖先时,那么新的工作目录包含请求版本与未提交的修改的\n"
6828 " 合并结果。否则,更新会失败,建议使用 'merge' 或 'update -C'。\n"
6829 "\n"
6830 " 如果你只想更新一个文件到旧版本,请使用 'revert'。\n"
6831 "\n"
6832 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6833 " "
6834
6835 msgid "cannot specify both -c/--check and -C/--clean"
6836 msgstr ""
6837
6838 #, fuzzy
6839 msgid "uncommitted local changes"
6840 msgstr "提交修改集 %d:%s\n"
6841
6842 msgid ""
6843 "verify the integrity of the repository\n"
6844 "\n"
6845 " Verify the integrity of the current repository.\n"
6846 "\n"
6847 " This will perform an extensive check of the repository's\n"
6848 " integrity, validating the hashes and checksums of each entry in\n"
6849 " the changelog, manifest, and tracked files, as well as the\n"
6850 " integrity of their crosslinks and indices.\n"
6851 " "
6852 msgstr ""
6853
6854 msgid "output version and copyright information"
6855 msgstr "输出版本和版权信息"
6856
6857 #, python-format
6858 msgid "Mercurial Distributed SCM (version %s)\n"
6859 msgstr "分布式软件配置管理工具 - 水银 (版本 %s)\n"
6860
6861 msgid ""
6862 "\n"
6863 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6864 "This is free software; see the source for copying conditions. There is NO\n"
6865 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6866 msgstr ""
6867 "\n"
6868 "版权所有 (C) 2005-2009 Matt Mackall <mpm@selenic.com> 和其他人。\n"
6869 "这是自由软件,具体参见版权条款。这里没有任何担保,甚至没有适合\n"
6870 "特定目的的隐含的担保。\n"
6871
6872 #, fuzzy
6873 msgid "repository root directory or name of overlay bundle file"
6874 msgstr "版本库的根目录或符号路径名称"
6875
6876 msgid "change working directory"
6877 msgstr "改变工作目录"
6878
6879 msgid "do not prompt, assume 'yes' for any required answers"
6880 msgstr "不再询问,假定所有答案都是 'yes'"
6881
6882 msgid "suppress output"
6883 msgstr "抑制输出"
6884
6885 msgid "enable additional output"
6886 msgstr "启用额外的输出"
6887
6888 msgid "set/override config option"
6889 msgstr "设置/覆盖配置选项"
6890
6891 msgid "enable debugging output"
6892 msgstr "启用调试输出"
6893
6894 msgid "start debugger"
6895 msgstr "启动调试器"
6896
6897 msgid "set the charset encoding"
6898 msgstr "设置字符集编码"
6899
6900 msgid "set the charset encoding mode"
6901 msgstr "设置字符集编码模式"
6902
6903 msgid "print traceback on exception"
6904 msgstr "显示异常的跟踪"
6905
6906 msgid "time how long the command takes"
6907 msgstr "为命令计时"
6908
6909 msgid "print command execution profile"
6910 msgstr "显示命令执行的剖析"
6911
6912 msgid "output version information and exit"
6913 msgstr "显示版本信息后退出"
6914
6915 msgid "display help and exit"
6916 msgstr "显示帮助后退出"
6917
6918 msgid "do not perform actions, just print output"
6919 msgstr "不执行操作,只打印输出"
6920
6921 msgid "specify ssh command to use"
6922 msgstr "指定要使用的 'ssh' 命令"
6923
6924 msgid "specify hg command to run on the remote side"
6925 msgstr "指定要在远程运行的 'hg' 命令"
6926
6927 msgid "include names matching the given patterns"
6928 msgstr "包含匹配指定模式的名称"
6929
6930 msgid "exclude names matching the given patterns"
6931 msgstr "拒绝匹配指定模式的名称"
6932
6933 msgid "use <text> as commit message"
6934 msgstr "使用 <text> 作为提交日志"
6935
6936 msgid "read commit message from <file>"
6937 msgstr "从 <file> 读取提交日志"
6938
6939 msgid "record datecode as commit date"
6940 msgstr "将提供的日期作为提交日期"
6941
6942 #, fuzzy
6943 msgid "record the specified user as committer"
6944 msgstr "将提供的用户作为提交者"
6945
6946 msgid "display using template map file"
6947 msgstr "使用指定的样式显示"
6948
6949 msgid "display with template"
6950 msgstr "使用指定的模板显示"
6951
6952 msgid "do not show merges"
6953 msgstr "不显示合并"
6954
6955 msgid "treat all files as text"
6956 msgstr "将所有文件视为文本文件"
6957
6958 msgid "don't include dates in diff headers"
6959 msgstr "不要的差异头中包含日期"
6960
6961 msgid "show which function each change is in"
6962 msgstr "为每个修改显示在什么函数中"
6963
6964 msgid "ignore white space when comparing lines"
6965 msgstr "当比较行时忽略空白"
6966
6967 msgid "ignore changes in the amount of white space"
6968 msgstr "忽略空白数量的改变"
6969
6970 msgid "ignore changes whose lines are all blank"
6971 msgstr "忽略空行的改变"
6972
6973 msgid "number of lines of context to show"
6974 msgstr "显示几行上下文"
6975
6976 msgid "guess renamed files by similarity (0<=s<=100)"
6977 msgstr ""
6978
6979 msgid "[OPTION]... [FILE]..."
6980 msgstr ""
6981
6982 msgid "annotate the specified revision"
6983 msgstr "追溯指定版本"
6984
6985 msgid "follow file copies and renames"
6986 msgstr "处理文件复制与改名"
6987
6988 msgid "list the author (long with -v)"
6989 msgstr "列出作者 (增加 '-v' 会以长格式显示)"
6990
6991 msgid "list the date (short with -q)"
6992 msgstr "列出日期 (增加 '-q' 会以短格式显示)"
6993
6994 msgid "list the revision number (default)"
6995 msgstr "列出版本号 (默认)"
6996
6997 msgid "list the changeset"
6998 msgstr "列出修改集"
6999
7000 msgid "show line number at the first appearance"
7001 msgstr "列出首次出现时的行号"
7002
7003 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
7004 msgstr ""
7005
7006 msgid "do not pass files through decoders"
7007 msgstr ""
7008
7009 msgid "directory prefix for files in archive"
7010 msgstr ""
7011
7012 msgid "revision to distribute"
7013 msgstr ""
7014
7015 msgid "type of distribution to create"
7016 msgstr ""
7017
7018 msgid "[OPTION]... DEST"
7019 msgstr ""
7020
7021 msgid "merge with old dirstate parent after backout"
7022 msgstr ""
7023
7024 msgid "parent to choose when backing out merge"
7025 msgstr ""
7026
7027 msgid "revision to backout"
7028 msgstr ""
7029
7030 msgid "[OPTION]... [-r] REV"
7031 msgstr ""
7032
7033 msgid "reset bisect state"
7034 msgstr ""
7035
7036 msgid "mark changeset good"
7037 msgstr ""
7038
7039 msgid "mark changeset bad"
7040 msgstr ""
7041
7042 msgid "skip testing changeset"
7043 msgstr ""
7044
7045 msgid "use command to check changeset state"
7046 msgstr ""
7047
7048 msgid "do not update to target"
7049 msgstr ""
7050
7051 msgid "[-gbsr] [-c CMD] [REV]"
7052 msgstr ""
7053
7054 msgid "set branch name even if it shadows an existing branch"
7055 msgstr ""
7056
7057 msgid "reset branch name to parent branch name"
7058 msgstr ""
7059
7060 msgid "[-fC] [NAME]"
7061 msgstr ""
7062
7063 msgid "show only branches that have unmerged heads"
7064 msgstr ""
7065
7066 #, fuzzy
7067 msgid "show normal and closed branches"
7068 msgstr "只显示已增加文件的状态"
7069
7070 msgid "[-a]"
7071 msgstr ""
7072
7073 msgid "run even when remote repository is unrelated"
7074 msgstr "纵然远程版本库是无关的也要执行"
7075
7076 msgid "a changeset up to which you would like to bundle"
7077 msgstr ""
7078
7079 msgid "a base changeset to specify instead of a destination"
7080 msgstr ""
7081
7082 msgid "bundle all changesets in the repository"
7083 msgstr ""
7084
7085 msgid "bundle compression type to use"
7086 msgstr ""
7087
7088 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
7089 msgstr ""
7090
7091 msgid "print output to file with formatted name"
7092 msgstr "输出到使用格式化名称的文件中"
7093
7094 msgid "print the given revision"
7095 msgstr ""
7096
7097 msgid "apply any matching decode filter"
7098 msgstr ""
7099
7100 msgid "[OPTION]... FILE..."
7101 msgstr ""
7102
7103 msgid "the clone will only contain a repository (no working copy)"
7104 msgstr "只复制版本库(没有工作副本)"
7105
7106 msgid "a changeset you would like to have after cloning"
7107 msgstr "复制后你期望有的修改集"
7108
7109 msgid "[OPTION]... SOURCE [DEST]"
7110 msgstr ""
7111
7112 msgid "mark new/missing files as added/removed before committing"
7113 msgstr "在提交之前将'新的/丢失的'文件标记为'已增加/已删除'"
7114
7115 msgid "mark a branch as closed, hiding it from the branch list"
7116 msgstr "标记一个分支已关闭,不在分支列表中显示"
7117
7118 msgid "record a copy that has already occurred"
7119 msgstr ""
7120
7121 msgid "forcibly copy over an existing managed file"
7122 msgstr ""
7123
7124 msgid "[OPTION]... [SOURCE]... DEST"
7125 msgstr ""
7126
7127 msgid "[INDEX] REV1 REV2"
7128 msgstr ""
7129
7130 #, fuzzy
7131 msgid "[COMMAND]"
7132 msgstr "命令"
7133
7134 msgid "show the command options"
7135 msgstr ""
7136
7137 msgid "[-o] CMD"
7138 msgstr ""
7139
7140 msgid "try extended date formats"
7141 msgstr ""
7142
7143 msgid "[-e] DATE [RANGE]"
7144 msgstr ""
7145
7146 msgid "FILE REV"
7147 msgstr ""
7148
7149 msgid "[PATH]"
7150 msgstr ""
7151
7152 msgid "FILE"
7153 msgstr ""
7154
7155 msgid "revision to rebuild to"
7156 msgstr ""
7157
7158 msgid "[-r REV] [REV]"
7159 msgstr ""
7160
7161 msgid "revision to debug"
7162 msgstr ""
7163
7164 msgid "[-r REV] FILE"
7165 msgstr ""
7166
7167 msgid "REV1 [REV2]"
7168 msgstr ""
7169
7170 msgid "do not display the saved mtime"
7171 msgstr ""
7172
7173 msgid "[OPTION]..."
7174 msgstr ""
7175
7176 #, fuzzy
7177 msgid "revision to check"
7178 msgstr "要合并的版本"
7179
7180 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
7181 msgstr ""
7182
7183 msgid "diff against the second parent"
7184 msgstr "与第二个父亲比较"
7185
7186 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
7187 msgstr ""
7188
7189 msgid "end fields with NUL"
7190 msgstr ""
7191
7192 msgid "print all revisions that match"
7193 msgstr ""
7194
7195 msgid "follow changeset history, or file history across copies and renames"
7196 msgstr "跟踪修改集历史,或者跟踪文件的复制与改名操作"
7197
7198 msgid "ignore case when matching"
7199 msgstr ""
7200
7201 msgid "print only filenames and revisions that match"
7202 msgstr ""
7203
7204 msgid "print matching line numbers"
7205 msgstr ""
7206
7207 msgid "search in given revision range"
7208 msgstr ""
7209
7210 msgid "[OPTION]... PATTERN [FILE]..."
7211 msgstr ""
7212
7213 msgid "show only heads which are descendants of REV"
7214 msgstr ""
7215
7216 #, fuzzy
7217 msgid "show only the active branch heads from open branches"
7218 msgstr "svn: 分支没有版本 %s"
7219
7220 #, fuzzy
7221 msgid "show normal and closed branch heads"
7222 msgstr "只显示已增加文件的状态"
7223
7224 msgid "[-r STARTREV] [REV]..."
7225 msgstr ""
7226
7227 msgid "[TOPIC]"
7228 msgstr ""
7229
7230 #, fuzzy
7231 msgid "identify the specified revision"
7232 msgstr "追溯指定版本"
7233
7234 msgid "show local revision number"
7235 msgstr ""
7236
7237 msgid "show global revision id"
7238 msgstr ""
7239
7240 msgid "show branch"
7241 msgstr ""
7242
7243 msgid "show tags"
7244 msgstr ""
7245
7246 msgid "[-nibt] [-r REV] [SOURCE]"
7247 msgstr ""
7248
7249 msgid ""
7250 "directory strip option for patch. This has the same meaning as the "
7251 "corresponding patch option"
7252 msgstr ""
7253
7254 msgid "base path"
7255 msgstr ""
7256
7257 msgid "skip check for outstanding uncommitted changes"
7258 msgstr ""
7259
7260 msgid "don't commit, just update the working directory"
7261 msgstr ""
7262
7263 msgid "apply patch to the nodes from which it was generated"
7264 msgstr ""
7265
7266 msgid "use any branch information in patch (implied by --exact)"
7267 msgstr ""
7268
7269 msgid "[OPTION]... PATCH..."
7270 msgstr ""
7271
7272 msgid "show newest record first"
7273 msgstr ""
7274
7275 msgid "file to store the bundles into"
7276 msgstr ""
7277
7278 msgid "a specific revision up to which you would like to pull"
7279 msgstr "指定要取得的最高版本"
7280
7281 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7282 msgstr ""
7283
7284 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7285 msgstr ""
7286
7287 msgid "search the repository as it stood at REV"
7288 msgstr ""
7289
7290 msgid "end filenames with NUL, for use with xargs"
7291 msgstr "在文件名称结尾增加 NUL,用于 xargs"
7292
7293 msgid "print complete paths from the filesystem root"
7294 msgstr ""
7295
7296 msgid "[OPTION]... [PATTERN]..."
7297 msgstr ""
7298
7299 msgid "only follow the first parent of merge changesets"
7300 msgstr "只跟踪修改集的第一个父亲"
7301
7302 #, fuzzy
7303 msgid "show revisions matching date spec"
7304 msgstr "显示匹配日期的版本"
7305
7306 msgid "show copied files"
7307 msgstr "显示复制的文件"
7308
7309 msgid "do case-insensitive search for a keyword"
7310 msgstr "对关键字执行不区分大小写的搜索"
7311
7312 #, fuzzy
7313 msgid "include revisions where files were removed"
7314 msgstr "包含删除文件的版本"
7315
7316 msgid "show only merges"
7317 msgstr "只显示合并"
7318
7319 #, fuzzy
7320 msgid "revisions committed by user"
7321 msgstr "指定用户提交的版本"
7322
7323 msgid "show only changesets within the given named branch"
7324 msgstr "只显示位于指定命名分支中的修改集"
7325
7326 msgid "do not display revision or any of its ancestors"
7327 msgstr "不显示指定版本或其祖先"
7328
7329 msgid "[OPTION]... [FILE]"
7330 msgstr ""
7331
7332 msgid "revision to display"
7333 msgstr ""
7334
7335 msgid "[-r REV]"
7336 msgstr ""
7337
7338 msgid "force a merge with outstanding changes"
7339 msgstr "强制与已有修改合并"
7340
7341 msgid "revision to merge"
7342 msgstr "要合并的版本"
7343
7344 msgid "review revisions to merge (no merge is performed)"
7345 msgstr ""
7346
7347 msgid "[-f] [[-r] REV]"
7348 msgstr ""
7349
7350 msgid "a specific revision up to which you would like to push"
7351 msgstr "指定你要推送的最高版本"
7352
7353 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
7354 msgstr ""
7355
7356 #, fuzzy
7357 msgid "show parents from the specified revision"
7358 msgstr "从指定的版本显示父亲"
7359
7360 msgid "[-r REV] [FILE]"
7361 msgstr ""
7362
7363 msgid "[NAME]"
7364 msgstr ""
7365
7366 msgid "update to new tip if changesets were pulled"
7367 msgstr "如果有新的修改集,就更新到最新版本"
7368
7369 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
7370 msgstr ""
7371
7372 msgid "force push"
7373 msgstr "强制推送"
7374
7375 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
7376 msgstr ""
7377
7378 msgid "record delete for missing files"
7379 msgstr "将丢失的文件视为删除"
7380
7381 msgid "remove (and delete) file even if added or modified"
7382 msgstr "删除文件,纵然它已被增加或修改"
7383
7384 msgid "record a rename that has already occurred"
7385 msgstr "记录已经发生的改名"
7386
7387 msgid "[OPTION]... SOURCE... DEST"
7388 msgstr ""
7389
7390 msgid "remerge all unresolved files"
7391 msgstr ""
7392
7393 msgid "list state of files needing merge"
7394 msgstr ""
7395
7396 msgid "mark files as resolved"
7397 msgstr ""
7398
7399 msgid "unmark files as resolved"
7400 msgstr ""
7401
7402 msgid "revert all changes when no arguments given"
7403 msgstr ""
7404
7405 msgid "tipmost revision matching date"
7406 msgstr "匹配最接近顶点的日期"
7407
7408 msgid "revision to revert to"
7409 msgstr ""
7410
7411 msgid "do not save backup copies of files"
7412 msgstr ""
7413
7414 msgid "[OPTION]... [-r REV] [NAME]..."
7415 msgstr ""
7416
7417 msgid "name of access log file to write to"
7418 msgstr "记录访问日志的文件名称"
7419
7420 msgid "name of error log file to write to"
7421 msgstr "记录错误日志的文件名称"
7422
7423 msgid "port to listen on (default: 8000)"
7424 msgstr "监听的端口(默认: 8000)"
7425
7426 msgid "address to listen on (default: all interfaces)"
7427 msgstr "监听地址(默认: 所有地址)"
7428
7429 msgid "prefix path to serve from (default: server root)"
7430 msgstr "服务路径前缀(默认: 服务器根)"
7431
7432 #, fuzzy
7433 msgid "name to show in web pages (default: working directory)"
7434 msgstr "在 WEB 页面中显示的名称(默认: 工作目录)"
7435
7436 #, fuzzy
7437 msgid "name of the webdir config file (serve more than one repository)"
7438 msgstr "webdir 配置文件的名称(发布多个版本库)"
7439
7440 msgid "for remote clients"
7441 msgstr "针对远程客户端"
7442
7443 msgid "web templates to use"
7444 msgstr "使用的 WEB 模板"
7445
7446 msgid "template style to use"
7447 msgstr "使用的显示样式"
7448
7449 msgid "use IPv6 in addition to IPv4"
7450 msgstr "同时使用 IPv6 和 IPv4"
7451
7452 msgid "SSL certificate file"
7453 msgstr "SSL 证书文件"
7454
7455 msgid "show untrusted configuration options"
7456 msgstr "显示不能信赖的配置选项"
7457
7458 msgid "[-u] [NAME]..."
7459 msgstr ""
7460
7461 msgid "check for push and pull"
7462 msgstr ""
7463
7464 msgid "show status of all files"
7465 msgstr "显示全部文件的状态"
7466
7467 msgid "show only modified files"
7468 msgstr "只显示已修改文件的状态"
7469
7470 msgid "show only added files"
7471 msgstr "只显示已增加文件的状态"
7472
7473 msgid "show only removed files"
7474 msgstr "只显示已移除文件的状态"
7475
7476 msgid "show only deleted (but tracked) files"
7477 msgstr "只显示已删除(但被跟踪)文件的状态"
7478
7479 msgid "show only files without changes"
7480 msgstr "只显示无改动文件的状态"
7481
7482 msgid "show only unknown (not tracked) files"
7483 msgstr "只显示未知(未被跟踪)文件的状态"
7484
7485 msgid "show only ignored files"
7486 msgstr "只显示被忽略文件的状态"
7487
7488 msgid "hide status prefix"
7489 msgstr "隐藏状态前缀"
7490
7491 msgid "show source of copied files"
7492 msgstr "显示文件的复制源"
7493
7494 msgid "show difference from revision"
7495 msgstr "显示版本差异"
7496
7497 msgid "replace existing tag"
7498 msgstr "替换已有的标签"
7499
7500 msgid "make the tag local"
7501 msgstr "标记标签为本地"
7502
7503 msgid "revision to tag"
7504 msgstr "标签对应的版本"
7505
7506 msgid "remove a tag"
7507 msgstr "删除标签"
7508
7509 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7510 msgstr ""
7511
7512 msgid "[-p]"
7513 msgstr ""
7514
7515 msgid "update to new tip if changesets were unbundled"
7516 msgstr ""
7517
7518 msgid "[-u] FILE..."
7519 msgstr ""
7520
7521 msgid "overwrite locally modified files (no backup)"
7522 msgstr "覆盖本地修改的文件(不备份)"
7523
7524 #, fuzzy
7525 msgid "check for uncommitted changes"
7526 msgstr "提交修改集 %d:%s\n"
7527
7528 msgid "[-C] [-d DATE] [[-r] REV]"
7529 msgstr ""
7530
7531 #, python-format
7532 msgid "config error at %s:%d: '%s'"
7533 msgstr ""
7534
7535 msgid "not found in manifest"
7536 msgstr ""
7537
7538 msgid "branch name not in UTF-8!"
7539 msgstr ""
7540
7541 msgid "working directory state appears damaged!"
7542 msgstr ""
7543
7544 #, python-format
7545 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7546 msgstr ""
7547
7548 #, python-format
7549 msgid "directory %r already in dirstate"
7550 msgstr ""
7551
7552 #, python-format
7553 msgid "file %r in dirstate clashes with %r"
7554 msgstr ""
7555
7556 #, python-format
7557 msgid "not in dirstate: %s\n"
7558 msgstr ""
7559
7560 msgid "unknown"
7561 msgstr ""
7562
7563 msgid "character device"
7564 msgstr ""
7565
7566 msgid "block device"
7567 msgstr ""
7568
7569 msgid "fifo"
7570 msgstr ""
7571
7572 msgid "socket"
7573 msgstr ""
7574
7575 msgid "directory"
7576 msgstr ""
7577
7578 #, python-format
7579 msgid "unsupported file type (type is %s)"
7580 msgstr ""
7581
7582 #, python-format
7583 msgid "abort: %s\n"
7584 msgstr "中止: %s\n"
7585
7586 #, python-format
7587 msgid "hg: %s\n"
7588 msgstr ""
7589
7590 #, python-format
7591 msgid ""
7592 "hg: command '%s' is ambiguous:\n"
7593 " %s\n"
7594 msgstr ""
7595
7596 #, python-format
7597 msgid "timed out waiting for lock held by %s"
7598 msgstr ""
7599
7600 #, python-format
7601 msgid "lock held by %s"
7602 msgstr ""
7603
7604 #, python-format
7605 msgid "abort: %s: %s\n"
7606 msgstr "中止: %s: %s\n"
7607
7608 #, python-format
7609 msgid "abort: could not lock %s: %s\n"
7610 msgstr "中止: 不能锁定 %s: %s\n"
7611
7612 #, python-format
7613 msgid "hg %s: %s\n"
7614 msgstr ""
7615
7616 #, python-format
7617 msgid "abort: %s!\n"
7618 msgstr "中止: %s!\n"
7619
7620 #, python-format
7621 msgid "abort: %s"
7622 msgstr "中止: %s"
7623
7624 msgid " empty string\n"
7625 msgstr ""
7626
7627 msgid "killed!\n"
7628 msgstr ""
7629
7630 #, python-format
7631 msgid "hg: unknown command '%s'\n"
7632 msgstr "hg: 未知命令 '%s'\n"
7633
7634 #, python-format
7635 msgid "abort: could not import module %s!\n"
7636 msgstr "中止: 不能导入模块 %s!\n"
7637
7638 msgid "(did you forget to compile extensions?)\n"
7639 msgstr "(你是否忘记了编译扩展?)\n"
7640
7641 msgid "(is your Python install correct?)\n"
7642 msgstr "(你的 Python 安装正确吗?)\n"
7643
7644 #, python-format
7645 msgid "abort: error: %s\n"
7646 msgstr "中止: 失败: %s\n"
7647
7648 msgid "broken pipe\n"
7649 msgstr "坏掉的管道\n"
7650
7651 msgid "interrupted!\n"
7652 msgstr "中断!\n"
7653
7654 msgid ""
7655 "\n"
7656 "broken pipe\n"
7657 msgstr ""
7658 "\n"
7659 "坏掉的管道\n"
7660
7661 msgid "abort: out of memory\n"
7662 msgstr "中止: 内存不足\n"
7663
7664 msgid "** unknown exception encountered, details follow\n"
7665 msgstr "** 遇到了未知异常,详细信息如下\n"
7666
7667 #, fuzzy
7668 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7669 msgstr "** 报告问题详情到 http://www.selenic.com/mercurial/bts\n"
7670
7671 msgid "** or mercurial@selenic.com\n"
7672 msgstr "** 或 mercurial@selenic.com\n"
7673
7674 #, python-format
7675 msgid "** Mercurial Distributed SCM (version %s)\n"
7676 msgstr "** 分布式软件配置管理工具 - 水银 (版本 %s)\n"
7677
7678 #, python-format
7679 msgid "** Extensions loaded: %s\n"
7680 msgstr "** 已加载的扩展: %s\n"
7681
7682 #, python-format
7683 msgid "no definition for alias '%s'\n"
7684 msgstr ""
7685
7686 #, fuzzy, python-format
7687 msgid "alias '%s' resolves to unknown command '%s'\n"
7688 msgstr "hg: 未知命令 '%s'\n"
7689
7690 #, python-format
7691 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7692 msgstr ""
7693
7694 #, python-format
7695 msgid "malformed --config option: %s"
7696 msgstr "非法 '--config' 选项: %s"
7697
7698 #, python-format
7699 msgid "extension '%s' overrides commands: %s\n"
7700 msgstr "扩展 '%s' 覆盖了命令: %s\n"
7701
7702 msgid "Option --config may not be abbreviated!"
7703 msgstr "选项 '--config' 不能简短!"
7704
7705 msgid "Option --cwd may not be abbreviated!"
7706 msgstr "选项 '--cwd' 不能简短!"
7707
7708 #, fuzzy
7709 msgid ""
7710 "Option -R has to be separated from other options (e.g. not -qR) and --"
7711 "repository may only be abbreviated as --repo!"
7712 msgstr ""
7713 "选项 -R 必须隔离使用(也就是不能 -qR),并且 --repository 只能简短为 --repo!"
7714
7715 #, python-format
7716 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7717 msgstr "时间: 实际 %.3f 秒(用户 %.3f+%.3f 系统 %.3f+%.3f)\n"
7718
7719 #, python-format
7720 msgid "repository '%s' is not local"
7721 msgstr "非本地版本库 '%s'"
7722
7723 msgid "invalid arguments"
7724 msgstr "非法参数"
7725
7726 #, python-format
7727 msgid "unrecognized profiling format '%s' - Ignored\n"
7728 msgstr ""
7729
7730 msgid ""
7731 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7732 "misc/lsprof/"
7733 msgstr ""
7734 "lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装"
7735
7736 #, python-format
7737 msgid "*** failed to import extension %s from %s: %s\n"
7738 msgstr "*** 加载扩展 '%s',自 '%s': %s\n"
7739
7740 #, python-format
7741 msgid "*** failed to import extension %s: %s\n"
7742 msgstr "*** 加载扩展 '%s' 失败: %s\n"
7743
7744 #, python-format
7745 msgid "couldn't find merge tool %s\n"
7746 msgstr "不能找到合并工具 '%s'\n"
7747
7748 #, python-format
7749 msgid "tool %s can't handle symlinks\n"
7750 msgstr "工具 '%s' 不能处理符号链接\n"
7751
7752 #, python-format
7753 msgid "tool %s can't handle binary\n"
7754 msgstr "工具 '%s' 不能处理二进制\n"
7755
7756 #, python-format
7757 msgid "tool %s requires a GUI\n"
7758 msgstr "工具 '%s' 需要 GUI\n"
7759
7760 #, python-format
7761 msgid ""
7762 " no tool found to merge %s\n"
7763 "keep (l)ocal or take (o)ther?"
7764 msgstr ""
7765 " 没有找到工具合并 %s\n"
7766 "使用本地(l)或者他人(o)的内容?"
7767
7768 msgid "&Local"
7769 msgstr ""
7770
7771 msgid "&Other"
7772 msgstr ""
7773
7774 #, python-format
7775 msgid "merging %s and %s to %s\n"
7776 msgstr ""
7777
7778 #, python-format
7779 msgid "merging %s\n"
7780 msgstr ""
7781
7782 #, python-format
7783 msgid ""
7784 " output file %s appears unchanged\n"
7785 "was merge successful (yn)?"
7786 msgstr ""
7787
7788 msgid "&No"
7789 msgstr ""
7790
7791 msgid "&Yes"
7792 msgstr ""
7793
7794 #, python-format
7795 msgid "merging %s failed!\n"
7796 msgstr ""
7797
7798 #, python-format
7799 msgid "Inconsistent state, %s:%s is good and bad"
7800 msgstr ""
7801
7802 #, python-format
7803 msgid "unknown bisect kind %s"
7804 msgstr ""
7805
7806 #, fuzzy
7807 msgid "disabled extensions:"
7808 msgstr ""
7809 "\n"
7810 "启用的扩展:\n"
7811 "\n"
7812
7813 msgid "Date Formats"
7814 msgstr ""
7815
7816 msgid "File Name Patterns"
7817 msgstr ""
7818
7819 msgid "Environment Variables"
7820 msgstr ""
7821
7822 msgid "Specifying Single Revisions"
7823 msgstr ""
7824
7825 msgid "Specifying Multiple Revisions"
7826 msgstr "指定多个版本"
7827
7828 msgid "Diff Formats"
7829 msgstr "差异格式"
7830
7831 msgid "Template Usage"
7832 msgstr "模版用法"
7833
7834 #, fuzzy
7835 msgid "URL Paths"
7836 msgstr "统一资源定位路径"
7837 8032
7838 #, fuzzy 8033 #, fuzzy
7839 msgid "Using additional features" 8034 msgid "Using additional features"
7840 msgstr "启用额外的输出" 8035 msgstr "启用额外的输出"
7841 8036
7868 msgstr "" 8063 msgstr ""
7869 8064
7870 msgid "clone from remote to remote not supported" 8065 msgid "clone from remote to remote not supported"
7871 msgstr "" 8066 msgstr ""
7872 8067
7873 #, fuzzy, python-format 8068 msgid "updated"
7874 msgid "updating to branch %s\n" 8069 msgstr "已更新"
7875 msgstr "正在更新标签\n" 8070
7876 8071 msgid "merged"
7877 #, python-format 8072 msgstr "已合并"
7878 msgid "" 8073
7879 "%d files updated, %d files merged, %d files removed, %d files unresolved\n" 8074 msgid "removed"
7880 msgstr "" 8075 msgstr "已删除"
8076
8077 msgid "unresolved"
8078 msgstr "未解决"
8079
8080 #, python-format
8081 msgid "%d files %s"
8082 msgstr "%d 个文件%s"
7881 8083
7882 msgid "use 'hg resolve' to retry unresolved file merges\n" 8084 msgid "use 'hg resolve' to retry unresolved file merges\n"
7883 msgstr "" 8085 msgstr ""
7884 8086
7885 msgid "" 8087 msgid ""
7886 "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " 8088 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7887 "abandon\n" 8089 "abandon\n"
7888 msgstr "" 8090 msgstr ""
7889 8091
7890 msgid "(branch merge, don't forget to commit)\n" 8092 msgid "(branch merge, don't forget to commit)\n"
7891 msgstr "" 8093 msgstr ""
7957 8159
7958 #, python-format 8160 #, python-format
7959 msgid "unsupported URL component: \"%s\"" 8161 msgid "unsupported URL component: \"%s\""
7960 msgstr "" 8162 msgstr ""
7961 8163
8164 #, python-format
8165 msgid "using %s\n"
8166 msgstr "使用 %s\n"
8167
8168 #, python-format
8169 msgid "capabilities: %s\n"
8170 msgstr ""
8171
7962 msgid "operation not supported over http" 8172 msgid "operation not supported over http"
7963 msgstr "" 8173 msgstr ""
8174
8175 #, python-format
8176 msgid "sending %s command\n"
8177 msgstr "发送命令 '%s'\n"
8178
8179 #, python-format
8180 msgid "sending %s bytes\n"
8181 msgstr "发送 %s 字节\n"
7964 8182
7965 msgid "authorization failed" 8183 msgid "authorization failed"
7966 msgstr "授权失败" 8184 msgstr "授权失败"
7967 8185
8186 #, python-format
8187 msgid "http error while sending %s command\n"
8188 msgstr ""
8189
7968 msgid "http error, possibly caused by proxy setting" 8190 msgid "http error, possibly caused by proxy setting"
7969 msgstr "" 8191 msgstr ""
7970 8192
7971 #, python-format 8193 #, python-format
7972 msgid "real URL is %s\n" 8194 msgid "real URL is %s\n"
7973 msgstr "实际 URL 是 '%s'\n" 8195 msgstr "实际 URL 是 '%s'\n"
7974 8196
8197 #, fuzzy, python-format
8198 msgid "requested URL: '%s'\n"
8199 msgstr "请求的 URL: '%s'\n"
8200
7975 #, python-format 8201 #, python-format
7976 msgid "'%s' does not appear to be an hg repository" 8202 msgid "'%s' does not appear to be an hg repository"
7977 msgstr "'%s' 似乎不是水银版本库" 8203 msgstr "'%s' 似乎不是水银版本库"
7978 8204
7979 #, python-format 8205 #, python-format
8043 8269
8044 #, python-format 8270 #, python-format
8045 msgid "unknown revision '%s'" 8271 msgid "unknown revision '%s'"
8046 msgstr "" 8272 msgstr ""
8047 8273
8274 #, python-format
8275 msgid "filtering %s through %s\n"
8276 msgstr ""
8277
8048 msgid "journal already exists - run hg recover" 8278 msgid "journal already exists - run hg recover"
8049 msgstr "" 8279 msgstr ""
8050 8280
8051 msgid "rolling back interrupted transaction\n" 8281 msgid "rolling back interrupted transaction\n"
8052 msgstr "回滚中断的事务\n" 8282 msgstr "回滚中断的事务\n"
8072 msgid "repository %s" 8302 msgid "repository %s"
8073 msgstr "" 8303 msgstr ""
8074 8304
8075 #, python-format 8305 #, python-format
8076 msgid "working directory of %s" 8306 msgid "working directory of %s"
8307 msgstr ""
8308
8309 #, python-format
8310 msgid " %s: searching for copy revision for %s\n"
8311 msgstr ""
8312
8313 #, python-format
8314 msgid " %s: copy %s:%s\n"
8077 msgstr "" 8315 msgstr ""
8078 8316
8079 msgid "cannot partially commit a merge (do not specify files or patterns)" 8317 msgid "cannot partially commit a merge (do not specify files or patterns)"
8080 msgstr "" 8318 msgstr ""
8081 8319
8141 msgstr "" 8379 msgstr ""
8142 8380
8143 msgid "searching for changes\n" 8381 msgid "searching for changes\n"
8144 msgstr "正在搜索修改\n" 8382 msgstr "正在搜索修改\n"
8145 8383
8384 #, python-format
8385 msgid "examining %s:%s\n"
8386 msgstr ""
8387
8388 msgid "branch already found\n"
8389 msgstr ""
8390
8391 #, python-format
8392 msgid "found incomplete branch %s:%s\n"
8393 msgstr ""
8394
8395 #, python-format
8396 msgid "found new changeset %s\n"
8397 msgstr ""
8398
8399 #, python-format
8400 msgid "request %d: %s\n"
8401 msgstr ""
8402
8403 #, python-format
8404 msgid "received %s:%s\n"
8405 msgstr ""
8406
8407 #, python-format
8408 msgid "narrowing %d:%d %s\n"
8409 msgstr ""
8410
8411 #, python-format
8412 msgid "found new branch changeset %s\n"
8413 msgstr ""
8414
8415 #, python-format
8416 msgid "narrowed branch search to %s:%s\n"
8417 msgstr ""
8418
8146 msgid "already have changeset " 8419 msgid "already have changeset "
8147 msgstr "" 8420 msgstr ""
8148 8421
8149 msgid "warning: repository is unrelated\n" 8422 msgid "warning: repository is unrelated\n"
8150 msgstr "" 8423 msgstr ""
8151 8424
8152 msgid "repository is unrelated" 8425 msgid "repository is unrelated"
8426 msgstr ""
8427
8428 msgid "found new changesets starting at "
8429 msgstr ""
8430
8431 #, python-format
8432 msgid "%d total queries\n"
8433 msgstr ""
8434
8435 msgid "common changesets up to "
8153 msgstr "" 8436 msgstr ""
8154 8437
8155 msgid "requesting all changes\n" 8438 msgid "requesting all changes\n"
8156 msgstr "正在请求全部修改\n" 8439 msgstr "正在请求全部修改\n"
8157 8440
8175 8458
8176 #, python-format 8459 #, python-format
8177 msgid "%d changesets found\n" 8460 msgid "%d changesets found\n"
8178 msgstr "已发现 %d 个修改集\n" 8461 msgstr "已发现 %d 个修改集\n"
8179 8462
8463 msgid "list of changesets:\n"
8464 msgstr ""
8465
8180 #, python-format 8466 #, python-format
8181 msgid "empty or missing revlog for %s" 8467 msgid "empty or missing revlog for %s"
8468 msgstr ""
8469
8470 #, python-format
8471 msgid "add changeset %s\n"
8182 msgstr "" 8472 msgstr ""
8183 8473
8184 msgid "adding changesets\n" 8474 msgid "adding changesets\n"
8185 msgstr "正在增加修改集\n" 8475 msgstr "正在增加修改集\n"
8186 8476
8191 msgstr "正在增加清单\n" 8481 msgstr "正在增加清单\n"
8192 8482
8193 msgid "adding file changes\n" 8483 msgid "adding file changes\n"
8194 msgstr "正在增加文件改变\n" 8484 msgstr "正在增加文件改变\n"
8195 8485
8486 #, python-format
8487 msgid "adding %s revisions\n"
8488 msgstr ""
8489
8196 msgid "received file revlog group is empty" 8490 msgid "received file revlog group is empty"
8197 msgstr "" 8491 msgstr ""
8198 8492
8199 #, python-format 8493 #, python-format
8200 msgid " (%+d heads)" 8494 msgid " (%+d heads)"
8202 8496
8203 #, python-format 8497 #, python-format
8204 msgid "added %d changesets with %d changes to %d files%s\n" 8498 msgid "added %d changesets with %d changes to %d files%s\n"
8205 msgstr "已增加 %d 个修改集,包含 %d 个改变,修改了 %d 个文件%s\n" 8499 msgstr "已增加 %d 个修改集,包含 %d 个改变,修改了 %d 个文件%s\n"
8206 8500
8501 msgid "updating the branch cache\n"
8502 msgstr ""
8503
8207 msgid "Unexpected response from remote server:" 8504 msgid "Unexpected response from remote server:"
8208 msgstr "" 8505 msgstr ""
8209 8506
8210 msgid "operation forbidden by server" 8507 msgid "operation forbidden by server"
8211 msgstr "" 8508 msgstr ""
8219 msgid "streaming all changes\n" 8516 msgid "streaming all changes\n"
8220 msgstr "" 8517 msgstr ""
8221 8518
8222 #, python-format 8519 #, python-format
8223 msgid "%d files to transfer, %s of data\n" 8520 msgid "%d files to transfer, %s of data\n"
8521 msgstr ""
8522
8523 #, python-format
8524 msgid "adding %s (%s)\n"
8224 msgstr "" 8525 msgstr ""
8225 8526
8226 #, python-format 8527 #, python-format
8227 msgid "transferred %s in %.1f seconds (%s/sec)\n" 8528 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8228 msgstr "" 8529 msgstr ""
8303 8604
8304 msgid "resolving manifests\n" 8605 msgid "resolving manifests\n"
8305 msgstr "正在解析清单\n" 8606 msgstr "正在解析清单\n"
8306 8607
8307 #, python-format 8608 #, python-format
8609 msgid " overwrite %s partial %s\n"
8610 msgstr ""
8611
8612 #, python-format
8613 msgid " ancestor %s local %s remote %s\n"
8614 msgstr ""
8615
8616 #, python-format
8308 msgid "" 8617 msgid ""
8309 " local changed %s which remote deleted\n" 8618 " local changed %s which remote deleted\n"
8310 "use (c)hanged version or (d)elete?" 8619 "use (c)hanged version or (d)elete?"
8311 msgstr "" 8620 msgstr ""
8312 8621
8324 8633
8325 msgid "&Deleted" 8634 msgid "&Deleted"
8326 msgstr "" 8635 msgstr ""
8327 8636
8328 #, python-format 8637 #, python-format
8638 msgid "preserving %s for resolve of %s\n"
8639 msgstr ""
8640
8641 #, python-format
8329 msgid "update failed to remove %s: %s!\n" 8642 msgid "update failed to remove %s: %s!\n"
8330 msgstr "" 8643 msgstr ""
8331 8644
8332 #, python-format 8645 #, python-format
8333 msgid "getting %s\n" 8646 msgid "getting %s\n"
8370 #, python-format 8683 #, python-format
8371 msgid "cannot create %s: unable to create destination directory" 8684 msgid "cannot create %s: unable to create destination directory"
8372 msgstr "" 8685 msgstr ""
8373 8686
8374 #, python-format 8687 #, python-format
8688 msgid "found patch at byte %d\n"
8689 msgstr ""
8690
8691 msgid "patch generated by hg export\n"
8692 msgstr ""
8693
8694 #, python-format
8375 msgid "unable to find '%s' for patching\n" 8695 msgid "unable to find '%s' for patching\n"
8376 msgstr "" 8696 msgstr ""
8377 8697
8378 #, python-format 8698 #, python-format
8379 msgid "patching file %s\n" 8699 msgid "patching file %s\n"
8440 #, python-format 8760 #, python-format
8441 msgid "Unsupported line endings type: %s" 8761 msgid "Unsupported line endings type: %s"
8442 msgstr "" 8762 msgstr ""
8443 8763
8444 #, python-format 8764 #, python-format
8765 msgid "no valid hunks found; trying with %r instead\n"
8766 msgstr ""
8767
8768 #, python-format
8445 msgid " %d files changed, %d insertions(+), %d deletions(-)\n" 8769 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
8446 msgstr "" 8770 msgstr ""
8447 8771
8448 #, python-format 8772 #, python-format
8449 msgid "exited with status %d" 8773 msgid "exited with status %d"
8452 #, python-format 8776 #, python-format
8453 msgid "killed by signal %d" 8777 msgid "killed by signal %d"
8454 msgstr "" 8778 msgstr ""
8455 8779
8456 #, python-format 8780 #, python-format
8781 msgid "stopped by signal %d"
8782 msgstr ""
8783
8784 msgid "invalid exit code"
8785 msgstr ""
8786
8787 #, python-format
8457 msgid "saving bundle to %s\n" 8788 msgid "saving bundle to %s\n"
8458 msgstr "" 8789 msgstr ""
8459 8790
8460 msgid "adding branch\n" 8791 msgid "adding branch\n"
8461 msgstr "" 8792 msgstr ""
8522 msgstr "" 8853 msgstr ""
8523 8854
8524 msgid "could not create remote repo" 8855 msgid "could not create remote repo"
8525 msgstr "" 8856 msgstr ""
8526 8857
8858 msgid "remote: "
8859 msgstr ""
8860
8527 msgid "no suitable response from remote hg" 8861 msgid "no suitable response from remote hg"
8528 msgstr "" 8862 msgstr ""
8529 8863
8530 msgid "remote: "
8531 msgstr ""
8532
8533 #, python-format 8864 #, python-format
8534 msgid "push refused: %s" 8865 msgid "push refused: %s"
8535 msgstr "" 8866 msgstr ""
8536 8867
8537 msgid "unsynced changes" 8868 msgid "unsynced changes"
8544 msgstr "" 8875 msgstr ""
8545 8876
8546 #, python-format 8877 #, python-format
8547 msgid "invalid entry in fncache, line %s" 8878 msgid "invalid entry in fncache, line %s"
8548 msgstr "" 8879 msgstr ""
8880
8881 msgid "scanning\n"
8882 msgstr "正在扫描\n"
8883
8884 #, python-format
8885 msgid "%d files, %d bytes to transfer\n"
8886 msgstr "需要传输 %d 个文件,%d 字节\n"
8887
8888 #, python-format
8889 msgid "sending %s (%d bytes)\n"
8890 msgstr "正在发送 %s (%d 字节)\n"
8549 8891
8550 #, python-format 8892 #, python-format
8551 msgid "" 8893 msgid ""
8552 " subrepository sources for %s differ\n" 8894 " subrepository sources for %s differ\n"
8553 "use (l)ocal source (%s) or (r)emote source (%s)?" 8895 "use (l)ocal source (%s) or (r)emote source (%s)?"
8688 #, python-format 9030 #, python-format
8689 msgid "http auth: user %s, password %s\n" 9031 msgid "http auth: user %s, password %s\n"
8690 msgstr "" 9032 msgstr ""
8691 9033
8692 #, python-format 9034 #, python-format
9035 msgid "proxying through http://%s:%s\n"
9036 msgstr ""
9037
9038 #, python-format
8693 msgid "command '%s' failed: %s" 9039 msgid "command '%s' failed: %s"
8694 msgstr "" 9040 msgstr ""
8695 9041
8696 #, python-format 9042 #, python-format
8697 msgid "path contains illegal component: %s" 9043 msgid "path contains illegal component: %s"
8885 #, python-format 9231 #, python-format
8886 msgid "unpacking %s" 9232 msgid "unpacking %s"
8887 msgstr "" 9233 msgstr ""
8888 9234
8889 #, python-format 9235 #, python-format
8890 msgid "warning: copy source of '%s' not in parents of %s"
8891 msgstr ""
8892
8893 #, python-format
8894 msgid "empty or missing copy source revlog %s:%s" 9236 msgid "empty or missing copy source revlog %s:%s"
8895 msgstr "" 9237 msgstr ""
8896 9238
8897 #, python-format 9239 #, python-format
8898 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" 9240 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"