##// END OF EJS Templates
i18n-zh_CN: split messages into paragraphs
Martin Geisler -
r11400:e5b7841e default
parent child Browse files
Show More
This diff has been collapsed as it changes many lines, (5507 lines changed) Show them Hide them
@@ -1,9272 +1,11357 b''
1 #
2 1 # Chinese (simplified) translation for Mercurial
3 2 # This file is distributed under the same license as Mercurial
4 3 #
5 4 # Copyright (C) 2009 the Mercurial team
6 5 # Dongsheng Song <dongsheng.song@gmail.com>, 2009
7 6 #
8 7 # Update with pot file:
9 8 # msgmerge --update zh_CN.po hg.pot
10 9 # msgfmt --statistics -c zh_CN.po
11 10 #
12 11 # Please test your translation before commit:
13 12 # python setup.py build_py -c -d . build_ext -i build_mo
14 13 # LC_ALL=zh_CN.UTF-8 ./hg
15 14 #
16 15 # Please format your translation before commit:
17 16 # msgcat --width=80 --sort-by-file -o zh_CN_new.po zh_CN.po
18 17 # mv -f zh_CN_new.po zh_CN.po
19 18 #
20 19 # Please remove '#: filename:line' lines before submit to hg:
21 20 # msgcat --width=80 --no-location -o zh_CN_new.po zh_CN.po
22 21 # mv -f zh_CN_new.po zh_CN.po
23 22 #
24 23 # Dictionary:
25 24 # blame 追溯
26 25 # branch 分支
27 26 # changes 修改
28 27 # changeset 修改集
29 28 # checkout 检出
30 29 # remove 移除(从版本库删除)
31 30 # delete 删除(只从文件系统删除)
32 31 # patchset 补丁集
33 32 # pushing to 推到
34 33 # pulling from 拉自
35 34 # rename 改名
36 35 # repository 版本库
37 36 # revert 恢复
38 37 # revision 版本
39 38 # tag 标签
40 39 # tip 顶点
41 40 # undo 撤销
42 41 # unversioned 未版本控制
43 42 # versioned 受版本控制
44 43 # working copy 工作副本
45 44 # ...
46 45 #
47 46 msgid ""
48 47 msgstr ""
49 48 "Project-Id-Version: Mercurial 1.3\n"
50 49 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
51 50 "POT-Creation-Date: 2009-10-19 11:47+0800\n"
52 51 "PO-Revision-Date: 2009-03-31 20:38+0200\n"
53 52 "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
54 53 "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n"
55 54 "MIME-Version: 1.0\n"
56 55 "Content-Type: text/plain; charset=UTF-8\n"
57 56 "Content-Transfer-Encoding: 8bit\n"
57 "X-Poedit-Language: Chinese\n"
58 58 "Generated-By: pygettext.py 1.5\n"
59 "X-Poedit-Language: Chinese\n"
60 59 "X-Poedit-Country: CHINA\n"
61 60
62 61 #, python-format
63 62 msgid " (default: %s)"
64 63 msgstr " (默认: %s)"
65 64
66 65 msgid "OPTIONS"
67 66 msgstr "选项"
68 67
69 68 msgid "COMMANDS"
70 69 msgstr "命令"
71 70
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"
71 msgid " options:"
72 msgstr " 选项:"
73
74 #, python-format
75 msgid " aliases: %s"
76 msgstr " 别名: %s"
77
78 msgid "hooks for controlling repository access"
79 msgstr ""
80
81 msgid ""
90 82 "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"
83 "of a repository when receiving incoming changesets."
84 msgstr ""
85
86 msgid ""
93 87 "The authorization is matched based on the local user name on the\n"
94 88 "system where the hook runs, and not the committer of the original\n"
95 "changeset (since the latter is merely informative).\n"
96 "\n"
89 "changeset (since the latter is merely informative)."
90 msgstr ""
91
92 msgid ""
97 93 "The acl hook is best used along with a restricted shell like hgsh,\n"
98 94 "preventing authenticating users from doing anything other than\n"
99 95 "pushing or pulling. The hook is not safe to use if users have\n"
100 96 "interactive shell access, as they can then disable the hook.\n"
101 97 "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"
98 "is no way to distinguish them."
99 msgstr ""
100
101 msgid "To use this hook, configure the acl extension in your hgrc like this::"
102 msgstr ""
103
104 msgid ""
106 105 " [extensions]\n"
107 " acl =\n"
108 "\n"
106 " acl ="
107 msgstr ""
108
109 msgid ""
109 110 " [hooks]\n"
110 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
111 "\n"
111 " pretxnchangegroup.acl = python:hgext.acl.hook"
112 msgstr ""
113
114 msgid ""
112 115 " [acl]\n"
113 116 " # Check whether the source of incoming changes is in this list\n"
114 117 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
115 " sources = serve\n"
116 "\n"
118 " sources = serve"
119 msgstr ""
120
121 msgid ""
117 122 "The allow and deny sections take a subtree pattern as key (with a glob\n"
118 123 "syntax by default), and a comma separated list of users as the\n"
119 124 "corresponding value. The deny list is checked before the allow list\n"
120 "is. ::\n"
121 "\n"
125 "is. ::"
126 msgstr ""
127
128 msgid ""
122 129 " [acl.allow]\n"
123 130 " # If acl.allow is not present, all users are allowed by default.\n"
124 131 " # An empty acl.allow section means no users allowed.\n"
125 132 " docs/** = doc_writer\n"
126 " .hgtags = release_engineer\n"
127 "\n"
133 " .hgtags = release_engineer"
134 msgstr ""
135
136 msgid ""
128 137 " [acl.deny]\n"
129 138 " # If acl.deny is not present, no users are refused by default.\n"
130 139 " # An empty acl.deny section means all users allowed.\n"
131 140 " glob pattern = user4, user5\n"
132 141 " ** = user6\n"
133 142 msgstr ""
134 143
135 144 #, python-format
136 145 msgid "acl: %s not enabled\n"
137 146 msgstr "acl: 未启用 %s\n"
138 147
139 148 #, python-format
140 149 msgid "acl: %s enabled, %d entries for user %s\n"
141 150 msgstr "acl: 已启用 %s, %d 项,用户 %s\n"
142 151
143 152 #, python-format
144 153 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
145 154 msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集"
146 155
147 156 #, python-format
148 157 msgid "acl: changes have source \"%s\" - skipping\n"
149 158 msgstr "acl: 改变源 \"%s\" - 跳过\n"
150 159
151 160 #, python-format
152 161 msgid "acl: user %s denied on %s\n"
153 162 msgstr "acl: 用户 %s 被拒绝访问 %s\n"
154 163
155 164 #, python-format
156 165 msgid "acl: access denied for changeset %s"
157 166 msgstr "acl: 拒绝访问修改集 %s"
158 167
159 168 #, python-format
160 169 msgid "acl: user %s not allowed on %s\n"
161 170 msgstr "acl: 用户 %s 被拒绝访问 %s\n"
162 171
163 172 #, python-format
164 173 msgid "acl: allowing changeset %s\n"
165 174 msgstr "acl: 允许修改集 %s\n"
166 175
167 msgid ""
168 "track a line of development with movable markers\n"
169 "\n"
176 msgid "track a line of development with movable markers"
177 msgstr ""
178
179 msgid ""
170 180 "Bookmarks are local movable markers to changesets. Every bookmark\n"
171 181 "points to a changeset identified by its hash. If you commit a\n"
172 182 "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"
183 "bookmark shifts to the new changeset."
184 msgstr ""
185
186 msgid ""
175 187 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
176 "merge, hg update).\n"
177 "\n"
188 "merge, hg update)."
189 msgstr ""
190
191 msgid ""
178 192 "By default, when several bookmarks point to the same changeset, they\n"
179 193 "will all move forward together. It is possible to obtain a more\n"
180 194 "git-like experience by adding the following configuration option to\n"
181 "your .hgrc::\n"
182 "\n"
195 "your .hgrc::"
196 msgstr ""
197
198 msgid ""
183 199 " [bookmarks]\n"
184 " track.current = True\n"
185 "\n"
200 " track.current = True"
201 msgstr ""
202
203 msgid ""
186 204 "This will cause Mercurial to track the bookmark that you are currently\n"
187 205 "using, and only update it. This is similar to git's approach to\n"
188 206 "branching.\n"
189 207 msgstr ""
190 208
191 209 msgid ""
192 "track a line of development with movable markers\n"
193 "\n"
194 210 " Bookmarks are pointers to certain commits that move when\n"
195 211 " committing. Bookmarks are local. They can be renamed, copied and\n"
196 212 " 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"
213 " 'hg update' to merge and update respectively to a given bookmark."
214 msgstr ""
215
216 msgid ""
199 217 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
200 218 " directory's parent revision with the given name. If you specify\n"
201 219 " a revision using -r REV (where REV may be an existing bookmark),\n"
202 220 " the bookmark is assigned to that revision.\n"
203 221 " "
204 222 msgstr ""
205 223
206 224 msgid "a bookmark of this name does not exist"
207 225 msgstr ""
208 226
209 227 msgid "a bookmark of the same name already exists"
210 228 msgstr ""
211 229
212 230 msgid "new bookmark name required"
213 231 msgstr ""
214 232
215 233 msgid "bookmark name required"
216 234 msgstr ""
217 235
218 236 msgid "bookmark name cannot contain newlines"
219 237 msgstr ""
220 238
221 239 msgid "a bookmark cannot have the name of an existing branch"
222 240 msgstr ""
223 241
224 242 msgid "force"
225 243 msgstr "强制"
226 244
227 245 msgid "revision"
228 246 msgstr "版本"
229 247
230 248 msgid "delete a given bookmark"
231 249 msgstr "删除指定书签"
232 250
233 251 msgid "rename a given bookmark"
234 252 msgstr "改名指定书签"
235 253
236 254 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
237 255 msgstr ""
238 256
239 msgid ""
240 "hooks for integrating with the Bugzilla bug tracker\n"
241 "\n"
257 msgid "hooks for integrating with the Bugzilla bug tracker"
258 msgstr ""
259
260 msgid ""
242 261 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
243 262 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
244 "bug status.\n"
245 "\n"
263 "bug status."
264 msgstr ""
265
266 msgid ""
246 267 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
247 "installations using MySQL are supported.\n"
248 "\n"
268 "installations using MySQL are supported."
269 msgstr ""
270
271 msgid ""
249 272 "The hook relies on a Bugzilla script to send bug change notification\n"
250 273 "emails. That script changes between Bugzilla versions; the\n"
251 274 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
252 275 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
253 276 "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"
277 "ensure the Bugzilla install file permissions are set appropriately."
278 msgstr ""
279
280 msgid ""
256 281 "The extension is configured through three different configuration\n"
257 "sections. These keys are recognized in the [bugzilla] section:\n"
258 "\n"
282 "sections. These keys are recognized in the [bugzilla] section:"
283 msgstr ""
284
285 msgid ""
259 286 "host\n"
260 " Hostname of the MySQL server holding the Bugzilla database.\n"
261 "\n"
287 " Hostname of the MySQL server holding the Bugzilla database."
288 msgstr ""
289
290 msgid ""
262 291 "db\n"
263 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
264 "\n"
292 " Name of the Bugzilla database in MySQL. Default 'bugs'."
293 msgstr ""
294
295 msgid ""
265 296 "user\n"
266 " Username to use to access MySQL server. Default 'bugs'.\n"
267 "\n"
297 " Username to use to access MySQL server. Default 'bugs'."
298 msgstr ""
299
300 msgid ""
268 301 "password\n"
269 " Password to use to access MySQL server.\n"
270 "\n"
302 " Password to use to access MySQL server."
303 msgstr ""
304
305 msgid ""
271 306 "timeout\n"
272 " Database connection timeout (seconds). Default 5.\n"
273 "\n"
307 " Database connection timeout (seconds). Default 5."
308 msgstr ""
309
310 msgid ""
274 311 "version\n"
275 312 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
276 313 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
277 " to 2.18.\n"
278 "\n"
314 " to 2.18."
315 msgstr ""
316
317 msgid ""
279 318 "bzuser\n"
280 319 " Fallback Bugzilla user name to record comments with, if changeset\n"
281 " committer cannot be found as a Bugzilla user.\n"
282 "\n"
320 " committer cannot be found as a Bugzilla user."
321 msgstr ""
322
323 msgid ""
283 324 "bzdir\n"
284 325 " Bugzilla install directory. Used by default notify. Default\n"
285 " '/var/www/html/bugzilla'.\n"
286 "\n"
326 " '/var/www/html/bugzilla'."
327 msgstr ""
328
329 msgid ""
287 330 "notify\n"
288 331 " The command to run to get Bugzilla to send bug change notification\n"
289 332 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
290 333 " and 'user' (committer bugzilla email). Default depends on version;\n"
291 334 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
292 " %(id)s %(user)s\".\n"
293 "\n"
335 " %(id)s %(user)s\"."
336 msgstr ""
337
338 msgid ""
294 339 "regexp\n"
295 340 " Regular expression to match bug IDs in changeset commit message.\n"
296 341 " Must contain one \"()\" group. The default expression matches 'Bug\n"
297 342 " 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"
343 " 1234 and 5678' and variations thereof. Matching is case insensitive."
344 msgstr ""
345
346 msgid ""
300 347 "style\n"
301 " The style file to use when formatting comments.\n"
302 "\n"
348 " The style file to use when formatting comments."
349 msgstr ""
350
351 msgid ""
303 352 "template\n"
304 353 " Template to use when formatting comments. Overrides style if\n"
305 354 " specified. In addition to the usual Mercurial keywords, the\n"
306 " extension specifies::\n"
307 "\n"
355 " extension specifies::"
356 msgstr ""
357
358 msgid ""
308 359 " {bug} The Bugzilla bug ID.\n"
309 360 " {root} The full pathname of the Mercurial repository.\n"
310 361 " {webroot} Stripped pathname of the Mercurial repository.\n"
311 " {hgweb} Base URL for browsing Mercurial repositories.\n"
312 "\n"
362 " {hgweb} Base URL for browsing Mercurial repositories."
363 msgstr ""
364
365 msgid ""
313 366 " Default 'changeset {node|short} in repo {root} refers '\n"
314 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
315 "\n"
367 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
368 msgstr ""
369
370 msgid ""
316 371 "strip\n"
317 372 " The number of slashes to strip from the front of {root} to produce\n"
318 " {webroot}. Default 0.\n"
319 "\n"
373 " {webroot}. Default 0."
374 msgstr ""
375
376 msgid ""
320 377 "usermap\n"
321 378 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
322 379 " mappings. If specified, the file should contain one mapping per\n"
323 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
324 "\n"
380 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
381 msgstr ""
382
383 msgid ""
325 384 "The [usermap] section is used to specify mappings of Mercurial\n"
326 385 "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"
386 "\"committer\"=\"Bugzilla user\""
387 msgstr ""
388
389 msgid "Finally, the [web] section supports one entry:"
390 msgstr ""
391
392 msgid ""
331 393 "baseurl\n"
332 394 " Base URL for browsing Mercurial repositories. Reference from\n"
333 " templates as {hgweb}.\n"
334 "\n"
335 "Activating the extension::\n"
336 "\n"
395 " templates as {hgweb}."
396 msgstr ""
397
398 msgid "Activating the extension::"
399 msgstr ""
400
401 msgid ""
337 402 " [extensions]\n"
338 " bugzilla =\n"
339 "\n"
403 " bugzilla ="
404 msgstr ""
405
406 msgid ""
340 407 " [hooks]\n"
341 408 " # 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"
409 " incoming.bugzilla = python:hgext.bugzilla.hook"
410 msgstr ""
411
412 msgid "Example configuration:"
413 msgstr ""
414
415 msgid ""
346 416 "This example configuration is for a collection of Mercurial\n"
347 417 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
348 "installation in /opt/bugzilla-3.2. ::\n"
349 "\n"
418 "installation in /opt/bugzilla-3.2. ::"
419 msgstr ""
420
421 msgid ""
350 422 " [bugzilla]\n"
351 423 " host=localhost\n"
352 424 " password=XYZZY\n"
353 425 " version=3.0\n"
354 426 " bzuser=unknown@domain.com\n"
355 427 " bzdir=/opt/bugzilla-3.2\n"
356 428 " template=Changeset {node|short} in {root|basename}.\n"
357 429 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
358 430 " {desc}\\n\n"
359 " strip=5\n"
360 "\n"
431 " strip=5"
432 msgstr ""
433
434 msgid ""
361 435 " [web]\n"
362 " baseurl=http://dev.domain.com/hg\n"
363 "\n"
436 " baseurl=http://dev.domain.com/hg"
437 msgstr ""
438
439 msgid ""
364 440 " [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"
441 " user@emaildomain.com=user.name@bugzilladomain.com"
442 msgstr ""
443
444 msgid "Commits add a comment to the Bugzilla bug record of the form::"
445 msgstr ""
446
447 msgid ""
369 448 " 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"
449 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
450 msgstr ""
451
452 msgid " Changeset commit comment. Bug 1234.\n"
373 453 msgstr ""
374 454
375 455 #, python-format
376 456 msgid "connecting to %s:%s as %s, password %s\n"
377 457 msgstr "连接到 %s:%s as %s,密码 %s\n"
378 458
379 459 #, python-format
380 460 msgid "query: %s %s\n"
381 461 msgstr "查询: %s %s\n"
382 462
383 463 #, python-format
384 464 msgid "failed query: %s %s\n"
385 465 msgstr "查询失败: %s %s\n"
386 466
387 467 msgid "unknown database schema"
388 468 msgstr "未知的数据库方案"
389 469
390 470 #, python-format
391 471 msgid "bug %d already knows about changeset %s\n"
392 472 msgstr ""
393 473
394 474 msgid "telling bugzilla to send mail:\n"
395 475 msgstr ""
396 476
397 477 #, python-format
398 478 msgid " bug %s\n"
399 479 msgstr ""
400 480
401 481 #, python-format
402 482 msgid "running notify command %s\n"
403 483 msgstr ""
404 484
405 485 #, python-format
406 486 msgid "bugzilla notify command %s"
407 487 msgstr ""
408 488
409 489 msgid "done\n"
410 490 msgstr "完成\n"
411 491
412 492 #, python-format
413 493 msgid "looking up user %s\n"
414 494 msgstr ""
415 495
416 496 #, python-format
417 497 msgid "cannot find bugzilla user id for %s"
418 498 msgstr ""
419 499
420 500 #, python-format
421 501 msgid "cannot find bugzilla user id for %s or %s"
422 502 msgstr ""
423 503
424 504 #, python-format
425 505 msgid "bugzilla version %s not supported"
426 506 msgstr ""
427 507
428 508 msgid ""
429 509 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
430 510 "details:\n"
431 511 "\t{desc|tabindent}"
432 512 msgstr ""
433 513
434 514 #, python-format
435 515 msgid "python mysql support not available: %s"
436 516 msgstr ""
437 517
438 518 #, python-format
439 519 msgid "hook type %s does not pass a changeset id"
440 520 msgstr ""
441 521
442 522 #, python-format
443 523 msgid "database error: %s"
444 524 msgstr ""
445 525
446 526 msgid "command to display child changesets"
447 527 msgstr "列出子修改集的命令"
448 528
449 529 #, fuzzy
450 msgid ""
451 "show the children of the given or working directory revision\n"
452 "\n"
530 msgid "show the children of the given or working directory revision"
531 msgstr "显示工作目录或指定版本的父亲"
532
533 #, fuzzy
534 msgid ""
453 535 " Print the children of the working directory's revisions. If a\n"
454 536 " revision is given via -r/--rev, the children of that revision will\n"
455 537 " be printed. If a file argument is given, revision in which the\n"
456 538 " file was last changed (after the working directory revision or the\n"
457 539 " argument to --rev if given) is printed.\n"
458 540 " "
459 541 msgstr ""
460 "显示工作目录或指定版本的父亲\n"
461 "\n"
462 542 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
463 543 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
464 544 " 版本,或 '--rev' 指定的版本)。\n"
465 545 " "
466 546
467 547 msgid "show children of the specified revision"
468 548 msgstr "显示指定版本的子孙"
469 549
470 550 msgid "hg children [-r REV] [FILE]"
471 551 msgstr ""
472 552
473 553 msgid "command to display statistics about repository history"
474 554 msgstr ""
475 555
476 556 #, python-format
477 557 msgid "Revision %d is a merge, ignoring...\n"
478 558 msgstr ""
479 559
480 560 #, python-format
481 561 msgid "generating stats: %d%%"
482 562 msgstr ""
483 563
484 msgid ""
485 "histogram of changes to the repository\n"
486 "\n"
564 msgid "histogram of changes to the repository"
565 msgstr ""
566
567 msgid ""
487 568 " This command will display a histogram representing the number\n"
488 569 " of changed lines or revisions, grouped according to the given\n"
489 570 " template. The default template will group changes by author.\n"
490 571 " The --dateformat option may be used to group the results by\n"
491 " date instead.\n"
492 "\n"
572 " date instead."
573 msgstr ""
574
575 msgid ""
493 576 " Statistics are based on the number of changed lines, or\n"
494 577 " alternatively the number of matching revisions if the\n"
495 " --changesets option is specified.\n"
496 "\n"
497 " Examples::\n"
498 "\n"
578 " --changesets option is specified."
579 msgstr ""
580
581 msgid " Examples::"
582 msgstr ""
583
584 msgid ""
499 585 " # display count of changed lines for every committer\n"
500 " hg churn -t '{author|email}'\n"
501 "\n"
586 " hg churn -t '{author|email}'"
587 msgstr ""
588
589 msgid ""
502 590 " # display daily activity graph\n"
503 " hg churn -f '%H' -s -c\n"
504 "\n"
591 " hg churn -f '%H' -s -c"
592 msgstr ""
593
594 msgid ""
505 595 " # display activity of developers by month\n"
506 " hg churn -f '%Y-%m' -s -c\n"
507 "\n"
596 " hg churn -f '%Y-%m' -s -c"
597 msgstr ""
598
599 msgid ""
508 600 " # display count of lines changed in every year\n"
509 " hg churn -f '%Y' -s\n"
510 "\n"
601 " hg churn -f '%Y' -s"
602 msgstr ""
603
604 msgid ""
511 605 " 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"
606 " by providing a file using the following format::"
607 msgstr ""
608
609 msgid " <alias email> <actual email>"
610 msgstr ""
611
612 msgid ""
516 613 " Such a file may be specified with the --aliases option, otherwise\n"
517 614 " a .hgchurn file will be looked for in the working directory root.\n"
518 615 " "
519 616 msgstr ""
520 617
521 618 #, python-format
522 619 msgid "assuming %i character terminal\n"
523 620 msgstr ""
524 621
525 622 msgid "count rate for the specified revision or range"
526 623 msgstr ""
527 624
528 625 #, fuzzy
529 626 msgid "count rate for revisions matching date spec"
530 627 msgstr "显示匹配日期的版本"
531 628
532 629 msgid "template to group changesets"
533 630 msgstr ""
534 631
535 632 msgid "strftime-compatible format for grouping by date"
536 633 msgstr ""
537 634
538 635 msgid "count rate by number of changesets"
539 636 msgstr ""
540 637
541 638 msgid "sort by key (default: sort by count)"
542 639 msgstr ""
543 640
544 641 msgid "file with email aliases"
545 642 msgstr ""
546 643
547 644 msgid "show progress"
548 645 msgstr ""
549 646
550 647 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
551 648 msgstr ""
552 649
553 msgid ""
554 "colorize output from some commands\n"
555 "\n"
650 msgid "colorize output from some commands"
651 msgstr ""
652
653 msgid ""
556 654 "This extension modifies the status command to add color to its output\n"
557 655 "to reflect file status, the qseries command to add color to reflect\n"
558 656 "patch status (applied, unapplied, missing), and to diff-related\n"
559 657 "commands to highlight additions, removals, diff headers, and trailing\n"
560 "whitespace.\n"
561 "\n"
658 "whitespace."
659 msgstr ""
660
661 msgid ""
562 662 "Other effects in addition to color, like bold and underlined text, are\n"
563 663 "also available. Effects are rendered with the ECMA-48 SGR control\n"
564 664 "function (aka ANSI escape codes). This module also provides the\n"
565 "render_text function, which can be used to add effects to any text.\n"
566 "\n"
567 "Default effects may be overridden from the .hgrc file::\n"
568 "\n"
665 "render_text function, which can be used to add effects to any text."
666 msgstr ""
667
668 msgid "Default effects may be overridden from the .hgrc file::"
669 msgstr ""
670
671 msgid ""
569 672 " [color]\n"
570 673 " status.modified = blue bold underline red_background\n"
571 674 " status.added = green bold\n"
572 675 " status.removed = red bold blue_background\n"
573 676 " status.deleted = cyan bold underline\n"
574 677 " status.unknown = magenta bold underline\n"
575 " status.ignored = black bold\n"
576 "\n"
678 " status.ignored = black bold"
679 msgstr ""
680
681 msgid ""
577 682 " # 'none' turns off all effects\n"
578 683 " status.clean = none\n"
579 " status.copied = none\n"
580 "\n"
684 " status.copied = none"
685 msgstr ""
686
687 msgid ""
581 688 " qseries.applied = blue bold underline\n"
582 689 " qseries.unapplied = black bold\n"
583 " qseries.missing = red bold\n"
584 "\n"
690 " qseries.missing = red bold"
691 msgstr ""
692
693 msgid ""
585 694 " diff.diffline = bold\n"
586 695 " diff.extended = cyan bold\n"
587 696 " diff.file_a = red bold\n"
588 697 " diff.file_b = green bold\n"
589 698 " diff.hunk = magenta\n"
590 699 " diff.deleted = red\n"
591 700 " diff.inserted = green\n"
592 701 " diff.changed = white\n"
593 702 " diff.trailingwhitespace = bold red_background\n"
594 703 msgstr ""
595 704
596 705 msgid "when to colorize (always, auto, or never)"
597 706 msgstr ""
598 707
599 708 msgid "don't colorize output"
600 709 msgstr ""
601 710
602 711 #, python-format
603 712 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
604 713 msgstr ""
605 714
606 715 msgid "import revisions from foreign VCS repositories into Mercurial"
607 716 msgstr ""
608 717
609 msgid ""
610 "convert a foreign SCM repository to a Mercurial one.\n"
611 "\n"
612 " Accepted source formats [identifiers]:\n"
613 "\n"
718 msgid "convert a foreign SCM repository to a Mercurial one."
719 msgstr ""
720
721 msgid " Accepted source formats [identifiers]:"
722 msgstr ""
723
724 msgid ""
614 725 " - Mercurial [hg]\n"
615 726 " - CVS [cvs]\n"
616 727 " - Darcs [darcs]\n"
617 728 " - git [git]\n"
618 729 " - Subversion [svn]\n"
619 730 " - Monotone [mtn]\n"
620 731 " - GNU Arch [gnuarch]\n"
621 732 " - Bazaar [bzr]\n"
622 " - Perforce [p4]\n"
623 "\n"
624 " Accepted destination formats [identifiers]:\n"
625 "\n"
733 " - Perforce [p4]"
734 msgstr ""
735
736 msgid " Accepted destination formats [identifiers]:"
737 msgstr ""
738
739 msgid ""
626 740 " - Mercurial [hg]\n"
627 " - Subversion [svn] (history on branches is not preserved)\n"
628 "\n"
741 " - Subversion [svn] (history on branches is not preserved)"
742 msgstr ""
743
744 msgid ""
629 745 " If no revision is given, all revisions will be converted.\n"
630 746 " Otherwise, convert will only import up to the named revision\n"
631 " (given in a format understood by the source).\n"
632 "\n"
747 " (given in a format understood by the source)."
748 msgstr ""
749
750 msgid ""
633 751 " If no destination directory name is specified, it defaults to the\n"
634 752 " basename of the source with '-hg' appended. If the destination\n"
635 " repository doesn't exist, it will be created.\n"
636 "\n"
753 " repository doesn't exist, it will be created."
754 msgstr ""
755
756 msgid ""
637 757 " By default, all sources except Mercurial will use --branchsort.\n"
638 758 " Mercurial uses --sourcesort to preserve original revision numbers\n"
639 " order. Sort modes have the following effects:\n"
640 "\n"
759 " order. Sort modes have the following effects:"
760 msgstr ""
761
762 msgid ""
641 763 " --branchsort convert from parent to child revision when possible,\n"
642 764 " which means branches are usually converted one after\n"
643 " the other. It generates more compact repositories.\n"
644 "\n"
765 " the other. It generates more compact repositories."
766 msgstr ""
767
768 msgid ""
645 769 " --datesort sort revisions by date. Converted repositories have\n"
646 770 " good-looking changelogs but are often an order of\n"
647 771 " magnitude larger than the same ones generated by\n"
648 " --branchsort.\n"
649 "\n"
772 " --branchsort."
773 msgstr ""
774
775 msgid ""
650 776 " --sourcesort try to preserve source revisions order, only\n"
651 " supported by Mercurial sources.\n"
652 "\n"
777 " supported by Mercurial sources."
778 msgstr ""
779
780 msgid ""
653 781 " If <REVMAP> isn't given, it will be put in a default location\n"
654 782 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
655 783 " 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"
784 " revision, like so::"
785 msgstr ""
786
787 msgid " <source ID> <destination ID>"
788 msgstr ""
789
790 msgid ""
660 791 " If the file doesn't exist, it's automatically created. It's\n"
661 792 " 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"
793 " and can be run repeatedly to copy new commits."
794 msgstr ""
795
796 msgid ""
664 797 " The [username mapping] file is a simple text file that maps each\n"
665 798 " source commit author to a destination commit author. It is handy\n"
666 799 " for source SCMs that use unix logins to identify authors (eg:\n"
667 800 " CVS). One line per author mapping and the line format is:\n"
668 " srcauthor=whatever string you want\n"
669 "\n"
801 " srcauthor=whatever string you want"
802 msgstr ""
803
804 msgid ""
670 805 " The filemap is a file that allows filtering and remapping of files\n"
671 806 " 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"
807 " contain one of the following directives::"
808 msgstr ""
809
810 msgid " include path/to/file"
811 msgstr ""
812
813 msgid " exclude path/to/file"
814 msgstr ""
815
816 msgid " rename from/file to/file"
817 msgstr ""
818
819 msgid ""
680 820 " The 'include' directive causes a file, or all files under a\n"
681 821 " directory, to be included in the destination repository, and the\n"
682 822 " exclusion of all other files and directories not explicitly\n"
683 823 " included. The 'exclude' directive causes files or directories to\n"
684 824 " be omitted. The 'rename' directive renames a file or directory. To\n"
685 825 " rename from a subdirectory into the root of the repository, use\n"
686 " '.' as the path to rename to.\n"
687 "\n"
826 " '.' as the path to rename to."
827 msgstr ""
828
829 msgid ""
688 830 " The splicemap is a file that allows insertion of synthetic\n"
689 831 " history, letting you specify the parents of a revision. This is\n"
690 832 " useful if you want to e.g. give a Subversion merge two parents, or\n"
691 833 " graft two disconnected series of history together. Each entry\n"
692 834 " contains a key, followed by a space, followed by one or two\n"
693 835 " comma-separated values. The key is the revision ID in the source\n"
694 836 " revision control system whose parents should be modified (same\n"
695 837 " format as a key in .hg/shamap). The values are the revision IDs\n"
696 838 " (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"
839 " should be used as the new parents for that node."
840 msgstr ""
841
842 msgid ""
699 843 " The branchmap is a file that allows you to rename a branch when it is\n"
700 844 " being brought in from whatever external repository. When used in\n"
701 845 " conjunction with a splicemap, it allows for a powerful combination\n"
702 846 " to help fix even the most badly mismanaged repositories and turn them\n"
703 847 " into nicely structured Mercurial repositories. The branchmap contains\n"
704 848 " lines of the form \"original_branch_name new_branch_name\".\n"
705 849 " \"original_branch_name\" is the name of the branch in the source\n"
706 850 " repository, and \"new_branch_name\" is the name of the branch is the\n"
707 851 " 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"
852 " in one repository from \"default\" to a named branch."
853 msgstr ""
854
855 msgid ""
710 856 " Mercurial Source\n"
711 " ----------------\n"
712 "\n"
857 " ----------------"
858 msgstr ""
859
860 msgid ""
713 861 " --config convert.hg.ignoreerrors=False (boolean)\n"
714 862 " ignore integrity errors when reading. Use it to fix Mercurial\n"
715 863 " repositories with missing revlogs, by converting from and to\n"
716 864 " Mercurial.\n"
717 865 " --config convert.hg.saverev=False (boolean)\n"
718 866 " store original revision ID in changeset (forces target IDs to\n"
719 867 " change)\n"
720 868 " --config convert.hg.startrev=0 (hg revision identifier)\n"
721 " convert start revision and its descendants\n"
722 "\n"
869 " convert start revision and its descendants"
870 msgstr ""
871
872 msgid ""
723 873 " CVS Source\n"
724 " ----------\n"
725 "\n"
874 " ----------"
875 msgstr ""
876
877 msgid ""
726 878 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
727 879 " to indicate the starting point of what will be converted. Direct\n"
728 880 " access to the repository files is not needed, unless of course the\n"
729 881 " repository is :local:. The conversion uses the top level directory\n"
730 882 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
731 883 " commands to find files to convert. This means that unless a\n"
732 884 " filemap is given, all files under the starting directory will be\n"
733 885 " converted, and that any directory reorganization in the CVS\n"
734 " sandbox is ignored.\n"
735 "\n"
886 " sandbox is ignored."
887 msgstr ""
888
889 msgid ""
736 890 " Because CVS does not have changesets, it is necessary to collect\n"
737 891 " individual commits to CVS and merge them into changesets. CVS\n"
738 892 " 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"
893 " be configured to call the external 'cvsps' program by setting::"
894 msgstr ""
895
896 msgid " --config convert.cvsps='cvsps -A -u --cvs-direct -q'"
897 msgstr ""
898
899 msgid " This option is deprecated and will be removed in Mercurial 1.4."
900 msgstr ""
901
902 msgid " The options shown are the defaults."
903 msgstr ""
904
905 msgid " Internal cvsps is selected by setting ::"
906 msgstr ""
907
908 msgid " --config convert.cvsps=builtin"
909 msgstr ""
910
911 msgid " and has a few more configurable options:"
912 msgstr ""
913
914 msgid ""
753 915 " --config convert.cvsps.cache=True (boolean)\n"
754 916 " Set to False to disable remote log caching, for testing and\n"
755 917 " debugging purposes.\n"
756 918 " --config convert.cvsps.fuzz=60 (integer)\n"
757 919 " Specify the maximum time (in seconds) that is allowed between\n"
758 920 " commits with identical user and log message in a single\n"
759 921 " changeset. When very large files were checked in as part of a\n"
760 922 " changeset then the default may not be long enough.\n"
761 923 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
762 924 " Specify a regular expression to which commit log messages are\n"
763 925 " matched. If a match occurs, then the conversion process will\n"
764 926 " insert a dummy revision merging the branch on which this log\n"
765 927 " message occurs to the branch indicated in the regex.\n"
766 928 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
767 929 " Specify a regular expression to which commit log messages are\n"
768 930 " matched. If a match occurs, then the conversion process will\n"
769 931 " add the most recent revision on the branch indicated in the\n"
770 " regex as the second parent of the changeset.\n"
771 "\n"
932 " regex as the second parent of the changeset."
933 msgstr ""
934
935 msgid ""
772 936 " The hgext/convert/cvsps wrapper script allows the builtin\n"
773 937 " 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"
938 " parameters and output are similar to that of cvsps 2.1."
939 msgstr ""
940
941 msgid ""
776 942 " Subversion Source\n"
777 " -----------------\n"
778 "\n"
943 " -----------------"
944 msgstr ""
945
946 msgid ""
779 947 " Subversion source detects classical trunk/branches/tags layouts.\n"
780 948 " By default, the supplied \"svn://repo/path/\" source URL is\n"
781 949 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
782 950 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
783 951 " its subdirectories are listed as possible branches. If\n"
784 952 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
785 953 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
786 954 " can be overridden with following options. Set them to paths\n"
787 955 " relative to the source URL, or leave them blank to disable auto\n"
788 " detection.\n"
789 "\n"
956 " detection."
957 msgstr ""
958
959 msgid ""
790 960 " --config convert.svn.branches=branches (directory name)\n"
791 961 " specify the directory containing branches\n"
792 962 " --config convert.svn.tags=tags (directory name)\n"
793 963 " specify the directory containing tags\n"
794 964 " --config convert.svn.trunk=trunk (directory name)\n"
795 " specify the name of the trunk branch\n"
796 "\n"
965 " specify the name of the trunk branch"
966 msgstr ""
967
968 msgid ""
797 969 " Source history can be retrieved starting at a specific revision,\n"
798 970 " instead of being integrally converted. Only single branch\n"
799 " conversions are supported.\n"
800 "\n"
971 " conversions are supported."
972 msgstr ""
973
974 msgid ""
801 975 " --config convert.svn.startrev=0 (svn revision number)\n"
802 " specify start Subversion revision.\n"
803 "\n"
976 " specify start Subversion revision."
977 msgstr ""
978
979 msgid ""
804 980 " Perforce Source\n"
805 " ---------------\n"
806 "\n"
981 " ---------------"
982 msgstr ""
983
984 msgid ""
807 985 " The Perforce (P4) importer can be given a p4 depot path or a\n"
808 986 " client specification as source. It will convert all files in the\n"
809 987 " source to a flat Mercurial repository, ignoring labels, branches\n"
810 988 " and integrations. Note that when a depot path is given you then\n"
811 989 " usually should specify a target directory, because otherwise the\n"
812 " target may be named ...-hg.\n"
813 "\n"
990 " target may be named ...-hg."
991 msgstr ""
992
993 msgid ""
814 994 " It is possible to limit the amount of source history to be\n"
815 " converted by specifying an initial Perforce revision.\n"
816 "\n"
995 " converted by specifying an initial Perforce revision."
996 msgstr ""
997
998 msgid ""
817 999 " --config convert.p4.startrev=0 (perforce changelist number)\n"
818 " specify initial Perforce revision.\n"
819 "\n"
1000 " specify initial Perforce revision."
1001 msgstr ""
1002
1003 msgid ""
820 1004 " Mercurial Destination\n"
821 " ---------------------\n"
822 "\n"
1005 " ---------------------"
1006 msgstr ""
1007
1008 msgid ""
823 1009 " --config convert.hg.clonebranches=False (boolean)\n"
824 1010 " dispatch source branches in separate clones.\n"
825 1011 " --config convert.hg.tagsbranch=default (branch name)\n"
826 1012 " tag revisions branch name\n"
827 1013 " --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"
1014 " preserve branch names"
1015 msgstr ""
1016
1017 msgid " "
1018 msgstr ""
1019
1020 msgid "create changeset information from CVS"
1021 msgstr ""
1022
1023 msgid ""
836 1024 " This command is intended as a debugging tool for the CVS to\n"
837 1025 " Mercurial converter, and can be used as a direct replacement for\n"
838 " cvsps.\n"
839 "\n"
1026 " cvsps."
1027 msgstr ""
1028
1029 msgid ""
840 1030 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
841 1031 " named directory) in the CVS repository, and converts the log to a\n"
842 1032 " series of changesets based on matching commit log entries and\n"
843 1033 " dates."
844 1034 msgstr ""
845 1035
846 1036 msgid "username mapping filename"
847 1037 msgstr ""
848 1038
849 1039 msgid "destination repository type"
850 1040 msgstr ""
851 1041
852 1042 msgid "remap file names using contents of file"
853 1043 msgstr ""
854 1044
855 1045 msgid "import up to target revision REV"
856 1046 msgstr ""
857 1047
858 1048 msgid "source repository type"
859 1049 msgstr ""
860 1050
861 1051 msgid "splice synthesized history into place"
862 1052 msgstr ""
863 1053
864 1054 msgid "change branch names while converting"
865 1055 msgstr ""
866 1056
867 1057 msgid "try to sort changesets by branches"
868 1058 msgstr ""
869 1059
870 1060 msgid "try to sort changesets by date"
871 1061 msgstr ""
872 1062
873 1063 msgid "preserve source changesets order"
874 1064 msgstr ""
875 1065
876 1066 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
877 1067 msgstr ""
878 1068
879 1069 msgid "only return changes on specified branches"
880 1070 msgstr ""
881 1071
882 1072 msgid "prefix to remove from file names"
883 1073 msgstr ""
884 1074
885 1075 msgid "only return changes after or between specified tags"
886 1076 msgstr ""
887 1077
888 1078 msgid "update cvs log cache"
889 1079 msgstr ""
890 1080
891 1081 msgid "create new cvs log cache"
892 1082 msgstr ""
893 1083
894 1084 msgid "set commit time fuzz in seconds"
895 1085 msgstr ""
896 1086
897 1087 msgid "specify cvsroot"
898 1088 msgstr ""
899 1089
900 1090 msgid "show parent changesets"
901 1091 msgstr ""
902 1092
903 1093 msgid "show current changeset in ancestor branches"
904 1094 msgstr ""
905 1095
906 1096 msgid "ignored for compatibility"
907 1097 msgstr ""
908 1098
909 1099 msgid "hg debugcvsps [OPTION]... [PATH]..."
910 1100 msgstr ""
911 1101
912 msgid ""
913 "warning: lightweight checkouts may cause conversion failures, try with a "
914 "regular branch instead.\n"
1102 msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n"
915 1103 msgstr ""
916 1104
917 1105 msgid "bzr source type could not be determined\n"
918 1106 msgstr ""
919 1107
920 1108 #, python-format
921 1109 msgid "%s is not a valid revision in current branch"
922 1110 msgstr ""
923 1111
924 1112 #, python-format
925 1113 msgid "%s is not available in %s anymore"
926 1114 msgstr ""
927 1115
928 1116 #, python-format
929 1117 msgid "%s.%s symlink has no target"
930 1118 msgstr ""
931 1119
932 1120 #, python-format
933 1121 msgid "cannot find required \"%s\" tool"
934 1122 msgstr ""
935 1123
936 1124 #, python-format
937 1125 msgid "running: %s\n"
938 1126 msgstr ""
939 1127
940 1128 #, python-format
941 1129 msgid "%s error:\n"
942 1130 msgstr ""
943 1131
944 1132 #, python-format
945 1133 msgid "syntax error in %s(%d): key/value pair expected"
946 1134 msgstr ""
947 1135
948 1136 #, python-format
949 1137 msgid "could not open map file %r: %s"
950 1138 msgstr ""
951 1139
952 1140 #, python-format
953 1141 msgid "%s: missing or unsupported repository"
954 1142 msgstr ""
955 1143
956 1144 #, python-format
957 1145 msgid "convert: %s\n"
958 1146 msgstr ""
959 1147
960 1148 #, python-format
961 1149 msgid "%s: unknown repository type"
962 1150 msgstr ""
963 1151
964 1152 #, python-format
965 1153 msgid "unknown sort mode: %s"
966 1154 msgstr "未知排序方式: %s"
967 1155
968 1156 #, python-format
969 1157 msgid "cycle detected between %s and %s"
970 1158 msgstr ""
971 1159
972 1160 msgid "not all revisions were sorted"
973 1161 msgstr ""
974 1162
975 1163 #, python-format
976 1164 msgid "Writing author map file %s\n"
977 1165 msgstr ""
978 1166
979 1167 #, python-format
980 1168 msgid "Ignoring bad line in author map file %s: %s\n"
981 1169 msgstr ""
982 1170
983 1171 #, python-format
984 1172 msgid "mapping author %s to %s\n"
985 1173 msgstr ""
986 1174
987 1175 #, python-format
988 1176 msgid "overriding mapping for author %s, was %s, will be %s\n"
989 1177 msgstr ""
990 1178
991 1179 #, python-format
992 1180 msgid "spliced in %s as parents of %s\n"
993 1181 msgstr ""
994 1182
995 1183 msgid "scanning source...\n"
996 1184 msgstr ""
997 1185
998 1186 msgid "sorting...\n"
999 1187 msgstr ""
1000 1188
1001 1189 msgid "converting...\n"
1002 1190 msgstr ""
1003 1191
1004 1192 #, python-format
1005 1193 msgid "source: %s\n"
1006 1194 msgstr ""
1007 1195
1008 1196 #, python-format
1009 1197 msgid "assuming destination %s\n"
1010 1198 msgstr ""
1011 1199
1012 1200 msgid "more than one sort mode specified"
1013 1201 msgstr ""
1014 1202
1015 1203 msgid "--sourcesort is not supported by this data source"
1016 1204 msgstr ""
1017 1205
1018 msgid ""
1019 "warning: support for external cvsps is deprecated and will be removed in "
1020 "Mercurial 1.4\n"
1206 msgid "warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4\n"
1021 1207 msgstr ""
1022 1208
1023 1209 #, python-format
1024 1210 msgid "revision %s is not a patchset number or date"
1025 1211 msgstr ""
1026 1212
1027 1213 msgid "using builtin cvsps\n"
1028 1214 msgstr ""
1029 1215
1030 1216 #, python-format
1031 1217 msgid "connecting to %s\n"
1032 1218 msgstr ""
1033 1219
1034 1220 msgid "CVS pserver authentication failed"
1035 1221 msgstr ""
1036 1222
1037 1223 #, python-format
1038 msgid ""
1039 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1224 msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1040 1225 msgstr ""
1041 1226
1042 1227 #, python-format
1043 1228 msgid "%d bytes missing from remote file"
1044 1229 msgstr ""
1045 1230
1046 1231 #, python-format
1047 1232 msgid "cvs server: %s\n"
1048 1233 msgstr ""
1049 1234
1050 1235 #, python-format
1051 1236 msgid "unknown CVS response: %s"
1052 1237 msgstr ""
1053 1238
1054 1239 msgid "collecting CVS rlog\n"
1055 1240 msgstr ""
1056 1241
1057 1242 #, python-format
1058 1243 msgid "reading cvs log cache %s\n"
1059 1244 msgstr ""
1060 1245
1061 1246 #, python-format
1062 1247 msgid "cache has %d log entries\n"
1063 1248 msgstr ""
1064 1249
1065 1250 #, python-format
1066 1251 msgid "error reading cache: %r\n"
1067 1252 msgstr ""
1068 1253
1069 1254 #, python-format
1070 1255 msgid "running %s\n"
1071 1256 msgstr ""
1072 1257
1073 1258 #, python-format
1074 1259 msgid "prefix=%r directory=%r root=%r\n"
1075 1260 msgstr ""
1076 1261
1077 1262 msgid "RCS file must be followed by working file"
1078 1263 msgstr ""
1079 1264
1080 1265 msgid "must have at least some revisions"
1081 1266 msgstr ""
1082 1267
1083 1268 msgid "expected revision number"
1084 1269 msgstr ""
1085 1270
1086 1271 msgid "revision must be followed by date line"
1087 1272 msgstr ""
1088 1273
1089 1274 #, python-format
1090 1275 msgid "found synthetic revision in %s: %r\n"
1091 1276 msgstr "%s 有伪造版本: %r\n"
1092 1277
1093 1278 #, python-format
1094 1279 msgid "writing cvs log cache %s\n"
1095 1280 msgstr ""
1096 1281
1097 1282 #, python-format
1098 1283 msgid "%d log entries\n"
1099 1284 msgstr ""
1100 1285
1101 1286 msgid "creating changesets\n"
1102 1287 msgstr ""
1103 1288
1104 1289 msgid "synthetic changeset cannot have multiple parents"
1105 1290 msgstr ""
1106 1291
1107 1292 #, python-format
1108 1293 msgid ""
1109 1294 "warning: CVS commit message references non-existent branch %r:\n"
1110 1295 "%s\n"
1111 1296 msgstr ""
1112 1297
1113 1298 #, python-format
1114 1299 msgid "%d changeset entries\n"
1115 1300 msgstr ""
1116 1301
1117 1302 #, python-format
1118 1303 msgid "darcs version 2.1 or newer needed (found %r)"
1119 1304 msgstr ""
1120 1305
1121 1306 msgid "Python ElementTree module is not available"
1122 1307 msgstr ""
1123 1308
1124 1309 #, python-format
1125 1310 msgid "cleaning up %s\n"
1126 1311 msgstr ""
1127 1312
1128 1313 msgid "internal calling inconsistency"
1129 1314 msgstr ""
1130 1315
1131 1316 msgid "errors in filemap"
1132 1317 msgstr ""
1133 1318
1134 1319 #, python-format
1135 1320 msgid "%s:%d: %r already in %s list\n"
1136 1321 msgstr ""
1137 1322
1138 1323 #, python-format
1139 1324 msgid "%s:%d: unknown directive %r\n"
1140 1325 msgstr ""
1141 1326
1142 1327 msgid "source repository doesn't support --filemap"
1143 1328 msgstr ""
1144 1329
1145 1330 #, python-format
1146 1331 msgid "%s does not look like a GNU Arch repo"
1147 1332 msgstr ""
1148 1333
1149 1334 msgid "cannot find a GNU Arch tool"
1150 1335 msgstr ""
1151 1336
1152 1337 #, python-format
1153 1338 msgid "analyzing tree version %s...\n"
1154 1339 msgstr ""
1155 1340
1156 1341 #, python-format
1157 msgid ""
1158 "tree analysis stopped because it points to an unregistered archive %s...\n"
1342 msgid "tree analysis stopped because it points to an unregistered archive %s...\n"
1159 1343 msgstr ""
1160 1344
1161 1345 #, python-format
1162 1346 msgid "applying revision %s...\n"
1163 1347 msgstr ""
1164 1348
1165 1349 #, python-format
1166 1350 msgid "computing changeset between %s and %s...\n"
1167 1351 msgstr ""
1168 1352
1169 1353 #, python-format
1170 1354 msgid "obtaining revision %s...\n"
1171 1355 msgstr ""
1172 1356
1173 1357 #, python-format
1174 1358 msgid "analyzing revision %s...\n"
1175 1359 msgstr ""
1176 1360
1177 1361 #, python-format
1178 1362 msgid "could not parse cat-log of %s"
1179 1363 msgstr ""
1180 1364
1181 1365 #, python-format
1182 1366 msgid "%s is not a local Mercurial repo"
1183 1367 msgstr "%s 不是本地的水银版本库"
1184 1368
1185 1369 #, python-format
1186 1370 msgid "initializing destination %s repository\n"
1187 1371 msgstr "初始化目标版本库 %s\n"
1188 1372
1189 1373 msgid "run hg sink pre-conversion action\n"
1190 1374 msgstr "执行动作 hg sink pre-conversion\n"
1191 1375
1192 1376 msgid "run hg sink post-conversion action\n"
1193 1377 msgstr "执行动作 hg sink post-conversion action\n"
1194 1378
1195 1379 #, python-format
1196 1380 msgid "pulling from %s into %s\n"
1197 1381 msgstr "自 %s 拉到 %s\n"
1198 1382
1199 1383 msgid "filtering out empty revision\n"
1200 1384 msgstr ""
1201 1385
1202 1386 msgid "updating tags\n"
1203 1387 msgstr "正在更新标签\n"
1204 1388
1205 1389 #, python-format
1206 1390 msgid "%s is not a valid start revision"
1207 1391 msgstr "%s 不是有效的开始版本"
1208 1392
1209 1393 #, python-format
1210 1394 msgid "ignoring: %s\n"
1211 1395 msgstr "忽略: %s\n"
1212 1396
1213 1397 msgid "run hg source pre-conversion action\n"
1214 1398 msgstr "执行动作 hg source pre-conversion\n"
1215 1399
1216 1400 msgid "run hg source post-conversion action\n"
1217 1401 msgstr "执行动作 hg source post-conversion\n"
1218 1402
1219 1403 #, python-format
1220 1404 msgid "%s does not look like a monotone repo"
1221 1405 msgstr "%s 不像是单纯的 monotone 版本库"
1222 1406
1223 1407 #, python-format
1224 1408 msgid "copying file in renamed directory from '%s' to '%s'"
1225 1409 msgstr "从已改名的目录 '%s' 复制文件到 '%s'"
1226 1410
1227 1411 msgid "reading p4 views\n"
1228 1412 msgstr ""
1229 1413
1230 1414 msgid "collecting p4 changelists\n"
1231 1415 msgstr "正在搜索 p4 修改集\n"
1232 1416
1233 1417 msgid "Subversion python bindings could not be loaded"
1234 1418 msgstr "不能加载 svn 的 python 绑定"
1235 1419
1236 1420 #, python-format
1237 1421 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1238 1422 msgstr "发现 svn 的 python 绑定版本 %d.%d,需要 1.4 或更新的版本"
1239 1423
1240 1424 msgid "Subversion python bindings are too old, 1.4 or later required"
1241 1425 msgstr "svn 的 python 绑定太旧,需要 1.4 或更新的版本"
1242 1426
1243 1427 #, python-format
1244 1428 msgid "svn: revision %s is not an integer"
1245 1429 msgstr "svn: 版本 %s 不是整数"
1246 1430
1247 1431 #, python-format
1248 1432 msgid "svn: start revision %s is not an integer"
1249 1433 msgstr "svn: 开始版本 %s 不是整数"
1250 1434
1251 1435 #, python-format
1252 1436 msgid "no revision found in module %s"
1253 1437 msgstr "没有在模块 %s 中发现版本"
1254 1438
1255 1439 #, python-format
1256 1440 msgid "expected %s to be at %r, but not found"
1257 1441 msgstr "期望 %s 位于 %r,但是没有发现"
1258 1442
1259 1443 #, python-format
1260 1444 msgid "found %s at %r\n"
1261 1445 msgstr "发现 %s 位于 %r\n"
1262 1446
1263 1447 #, python-format
1264 1448 msgid "ignoring empty branch %s\n"
1265 1449 msgstr "忽略空的分支 %s\n"
1266 1450
1267 1451 #, python-format
1268 1452 msgid "found branch %s at %d\n"
1269 1453 msgstr "发现分支 %s 位于 %d\n"
1270 1454
1271 1455 msgid "svn: start revision is not supported with more than one branch"
1272 1456 msgstr "svn: 在给出多于一个分支时不支持开始版本"
1273 1457
1274 1458 #, python-format
1275 1459 msgid "svn: no revision found after start revision %d"
1276 1460 msgstr "svn: 在开始版本 %d 之后没有版本"
1277 1461
1278 1462 #, python-format
1279 1463 msgid "no tags found at revision %d\n"
1280 1464 msgstr "在版本 %d 没有发现标签\n"
1281 1465
1282 1466 #, python-format
1283 1467 msgid "ignoring foreign branch %r\n"
1284 1468 msgstr "忽略外部分支 %r\n"
1285 1469
1286 1470 #, python-format
1287 1471 msgid "%s not found up to revision %d"
1288 1472 msgstr "没有发现 %s,一直到版本 %d"
1289 1473
1290 1474 #, python-format
1291 1475 msgid "branch renamed from %s to %s at %d\n"
1292 1476 msgstr "分支从 %s 改名为 %s,在 %d\n"
1293 1477
1294 1478 #, python-format
1295 1479 msgid "reparent to %s\n"
1296 1480 msgstr ""
1297 1481
1298 1482 #, python-format
1299 1483 msgid "copied to %s from %s@%s\n"
1300 1484 msgstr "复制到 %s,自 %s@%s\n"
1301 1485
1302 1486 #, python-format
1303 1487 msgid "gone from %s\n"
1304 1488 msgstr "离开 %s\n"
1305 1489
1306 1490 #, python-format
1307 1491 msgid "entry %s\n"
1308 1492 msgstr "入口 %s\n"
1309 1493
1310 1494 #, python-format
1311 1495 msgid "unknown path in revision %d: %s\n"
1312 1496 msgstr "版本 %d 有未知路径: %s\n"
1313 1497
1314 1498 #, python-format
1315 1499 msgid "mark %s came from %s:%d\n"
1316 1500 msgstr "标记 %s 来自 %s:%d\n"
1317 1501
1318 1502 #, python-format
1319 1503 msgid "parsing revision %d (%d changes)\n"
1320 1504 msgstr "解析版本 %d (%d 个改变)\n"
1321 1505
1322 1506 #, python-format
1323 1507 msgid "found parent of branch %s at %d: %s\n"
1324 1508 msgstr "发现分支 %s 的父亲,在 %d: %s\n"
1325 1509
1326 1510 msgid "no copyfrom path, don't know what to do.\n"
1327 1511 msgstr "没有 copyfrom 路径,不知道该怎么办。\n"
1328 1512
1329 1513 #, python-format
1330 1514 msgid "fetching revision log for \"%s\" from %d to %d\n"
1331 1515 msgstr "为 \"%s\" 获取版本日志,自 %d 到 %d\n"
1332 1516
1333 1517 #, python-format
1334 1518 msgid "revision %d has no entries\n"
1335 1519 msgstr "版本 %d 没有入口\n"
1336 1520
1337 1521 #, python-format
1338 1522 msgid "svn: branch has no revision %s"
1339 1523 msgstr "svn: 分支没有版本 %s"
1340 1524
1341 1525 #, python-format
1342 1526 msgid "%r is not under %r, ignoring\n"
1343 1527 msgstr "%r 不在 %r 之下,忽略之\n"
1344 1528
1345 1529 #, python-format
1346 1530 msgid "initializing svn repo %r\n"
1347 1531 msgstr "初始化 svn 版本库 %r\n"
1348 1532
1349 1533 #, python-format
1350 1534 msgid "initializing svn wc %r\n"
1351 1535 msgstr "初始化 svn 工作副本 %r\n"
1352 1536
1353 1537 msgid "unexpected svn output:\n"
1354 1538 msgstr "意外的 svn 输出:\n"
1355 1539
1356 1540 msgid "unable to cope with svn output"
1357 1541 msgstr "不能处理 svn 的输出"
1358 1542
1359 1543 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1360 1544 msgstr ""
1361 1545
1362 msgid ""
1363 "command to allow external programs to compare revisions\n"
1364 "\n"
1546 msgid "command to allow external programs to compare revisions"
1547 msgstr ""
1548
1549 msgid ""
1365 1550 "The extdiff Mercurial extension allows you to use external programs\n"
1366 1551 "to compare revisions, or revision with working directory. The external\n"
1367 1552 "diff programs are called with a configurable set of options and two\n"
1368 1553 "non-option arguments: paths to directories containing snapshots of\n"
1369 "files to compare.\n"
1370 "\n"
1554 "files to compare."
1555 msgstr ""
1556
1557 msgid ""
1371 1558 "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"
1559 "you do not need to type \"hg extdiff -p kdiff3\" always. ::"
1560 msgstr ""
1561
1562 msgid ""
1374 1563 " [extdiff]\n"
1375 1564 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1376 1565 " cdiff = gdiff -Nprc5\n"
1377 1566 " ## or the old way:\n"
1378 1567 " #cmd.cdiff = gdiff\n"
1379 " #opts.cdiff = -Nprc5\n"
1380 "\n"
1568 " #opts.cdiff = -Nprc5"
1569 msgstr ""
1570
1571 msgid ""
1381 1572 " # add new command called vdiff, runs kdiff3\n"
1382 " vdiff = kdiff3\n"
1383 "\n"
1573 " vdiff = kdiff3"
1574 msgstr ""
1575
1576 msgid ""
1384 1577 " # add new command called meld, runs meld (no need to name twice)\n"
1385 " meld =\n"
1386 "\n"
1578 " meld ="
1579 msgstr ""
1580
1581 msgid ""
1387 1582 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1388 1583 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1389 1584 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1390 1585 " # your .vimrc\n"
1391 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1392 "\n"
1586 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
1587 msgstr ""
1588
1589 msgid ""
1393 1590 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1394 1591 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1395 1592 "files, so running the external diff program will actually be pretty\n"
1396 1593 "fast (at least faster than having to compare the entire tree).\n"
1397 1594 msgstr ""
1398 1595
1399 1596 #, python-format
1400 1597 msgid "making snapshot of %d files from rev %s\n"
1401 1598 msgstr ""
1402 1599
1403 1600 #, python-format
1404 1601 msgid "making snapshot of %d files from working directory\n"
1405 1602 msgstr ""
1406 1603
1407 1604 msgid "cannot specify --rev and --change at the same time"
1408 1605 msgstr "不能同时指定 '--rev' 和 '--change'"
1409 1606
1410 1607 #, python-format
1411 1608 msgid "running %r in %s\n"
1412 1609 msgstr ""
1413 1610
1414 1611 #, python-format
1415 1612 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1416 1613 msgstr ""
1417 1614
1418 1615 msgid "cleaning up temp directory\n"
1419 1616 msgstr ""
1420 1617
1421 msgid ""
1422 "use external program to diff repository (or selected files)\n"
1423 "\n"
1618 msgid "use external program to diff repository (or selected files)"
1619 msgstr ""
1620
1621 msgid ""
1424 1622 " Show differences between revisions for the specified files, using\n"
1425 1623 " an external program. The default program used is diff, with\n"
1426 " default options \"-Npru\".\n"
1427 "\n"
1624 " default options \"-Npru\"."
1625 msgstr ""
1626
1627 msgid ""
1428 1628 " To select a different program, use the -p/--program option. The\n"
1429 1629 " program will be passed the names of two directories to compare. To\n"
1430 1630 " 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"
1631 " will be passed before the names of the directories to compare."
1632 msgstr ""
1633
1634 msgid ""
1433 1635 " When two revision arguments are given, then changes are shown\n"
1434 1636 " between those revisions. If only one revision is specified then\n"
1435 1637 " that revision is compared to the working directory, and, when no\n"
1436 1638 " revisions are specified, the working directory files are compared\n"
1437 1639 " to its parent."
1438 1640 msgstr ""
1439 1641
1440 1642 msgid "comparison program to run"
1441 1643 msgstr ""
1442 1644
1443 1645 msgid "pass option to comparison program"
1444 1646 msgstr ""
1445 1647
1446 1648 msgid "change made by revision"
1447 1649 msgstr "此版本的修改"
1448 1650
1449 1651 msgid "hg extdiff [OPT]... [FILE]..."
1450 1652 msgstr ""
1451 1653
1452 1654 #, python-format
1453 msgid ""
1454 "use %(path)s to diff repository (or selected files)\n"
1455 "\n"
1655 msgid "use %(path)s to diff repository (or selected files)"
1656 msgstr ""
1657
1658 #, python-format
1659 msgid ""
1456 1660 " Show differences between revisions for the specified files, using the\n"
1457 " %(path)s program.\n"
1458 "\n"
1661 " %(path)s program."
1662 msgstr ""
1663
1664 #, python-format
1665 msgid ""
1459 1666 " When two revision arguments are given, then changes are shown between\n"
1460 1667 " those revisions. If only one revision is specified then that revision is\n"
1461 1668 " compared to the working directory, and, when no revisions are specified,\n"
1462 1669 " the working directory files are compared to its parent."
1463 1670 msgstr ""
1464 1671
1465 1672 #, python-format
1466 1673 msgid "hg %s [OPTION]... [FILE]..."
1467 1674 msgstr ""
1468 1675
1469 1676 msgid "pull, update and merge in one command"
1470 1677 msgstr ""
1471 1678
1472 msgid ""
1473 "pull changes from a remote repository, merge new changes if needed.\n"
1474 "\n"
1679 msgid "pull changes from a remote repository, merge new changes if needed."
1680 msgstr ""
1681
1682 msgid ""
1475 1683 " 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"
1684 " or URL and adds them to the local repository."
1685 msgstr ""
1686
1687 msgid ""
1478 1688 " If the pulled changes add a new branch head, the head is\n"
1479 1689 " automatically merged, and the result of the merge is committed.\n"
1480 1690 " Otherwise, the working directory is updated to include the new\n"
1481 " changes.\n"
1482 "\n"
1691 " changes."
1692 msgstr ""
1693
1694 msgid ""
1483 1695 " When a merge occurs, the newly pulled changes are assumed to be\n"
1484 1696 " \"authoritative\". The head of the new changes is used as the first\n"
1485 1697 " parent, with local changes as the second. To switch the merge\n"
1486 " order, use --switch-parent.\n"
1487 "\n"
1698 " order, use --switch-parent."
1699 msgstr ""
1700
1701 msgid ""
1488 1702 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1489 1703 " "
1490 1704 msgstr ""
1491 1705
1492 msgid ""
1493 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1706 msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1494 1707 msgstr ""
1495 1708
1496 1709 msgid "outstanding uncommitted merge"
1497 1710 msgstr ""
1498 1711
1499 1712 msgid "outstanding uncommitted changes"
1500 1713 msgstr ""
1501 1714
1502 1715 msgid "working directory is missing some files"
1503 1716 msgstr ""
1504 1717
1505 msgid ""
1506 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1718 msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1507 1719 msgstr ""
1508 1720
1509 1721 #, python-format
1510 1722 msgid "pulling from %s\n"
1511 1723 msgstr "正在拉自 %s\n"
1512 1724
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"
1725 msgid "Other repository doesn't support revision lookup, so a rev cannot be specified."
1726 msgstr ""
1727
1728 #, python-format
1729 msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n"
1522 1730 msgstr ""
1523 1731
1524 1732 #, python-format
1525 1733 msgid "updating to %d:%s\n"
1526 1734 msgstr ""
1527 1735
1528 1736 #, python-format
1529 1737 msgid "merging with %d:%s\n"
1530 1738 msgstr ""
1531 1739
1532 1740 #, python-format
1533 1741 msgid "new changeset %d:%s merges remote changes with local\n"
1534 1742 msgstr "新修改集 '%d:%s' 将远程修改与本地合并\n"
1535 1743
1536 1744 msgid "a specific revision you would like to pull"
1537 1745 msgstr "指定取得的版本"
1538 1746
1539 1747 msgid "edit commit message"
1540 1748 msgstr "编辑提交日志"
1541 1749
1542 1750 msgid "edit commit message (DEPRECATED)"
1543 1751 msgstr "编辑提交日志(不赞成)"
1544 1752
1545 1753 msgid "switch parents when merging"
1546 1754 msgstr "当合并时切换父亲"
1547 1755
1548 1756 msgid "hg fetch [SOURCE]"
1549 1757 msgstr "hg fetch [SOURCE]"
1550 1758
1551 1759 msgid "commands to sign and verify changesets"
1552 1760 msgstr "签署和校验修改集的命令"
1553 1761
1554 1762 msgid "error while verifying signature"
1555 1763 msgstr ""
1556 1764
1557 1765 #, python-format
1558 1766 msgid "%s Bad signature from \"%s\"\n"
1559 1767 msgstr ""
1560 1768
1561 1769 #, python-format
1562 1770 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1563 1771 msgstr ""
1564 1772
1565 1773 #, python-format
1566 1774 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1567 1775 msgstr ""
1568 1776
1569 1777 msgid "list signed changesets"
1570 1778 msgstr ""
1571 1779
1572 1780 #, python-format
1573 1781 msgid "%s:%d node does not exist\n"
1574 1782 msgstr ""
1575 1783
1576 1784 msgid "verify all the signatures there may be for a particular revision"
1577 1785 msgstr ""
1578 1786
1579 1787 #, python-format
1580 1788 msgid "No valid signature for %s\n"
1581 1789 msgstr ""
1582 1790
1583 msgid ""
1584 "add a signature for the current or given revision\n"
1585 "\n"
1791 msgid "add a signature for the current or given revision"
1792 msgstr ""
1793
1794 msgid ""
1586 1795 " 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 " "
1796 " or tip if no revision is checked out."
1591 1797 msgstr ""
1592 1798
1593 1799 msgid "uncommitted merge - please provide a specific revision"
1594 1800 msgstr ""
1595 1801
1596 1802 msgid "Error while signing"
1597 1803 msgstr ""
1598 1804
1599 msgid ""
1600 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1601 "force)"
1805 msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
1602 1806 msgstr ""
1603 1807
1604 1808 msgid "unknown signature version"
1605 1809 msgstr ""
1606 1810
1607 1811 msgid "make the signature local"
1608 1812 msgstr ""
1609 1813
1610 1814 msgid "sign even if the sigfile is modified"
1611 1815 msgstr ""
1612 1816
1613 1817 msgid "do not commit the sigfile after signing"
1614 1818 msgstr ""
1615 1819
1616 1820 msgid "the key id to sign with"
1617 1821 msgstr ""
1618 1822
1619 1823 msgid "commit message"
1620 1824 msgstr ""
1621 1825
1622 1826 msgid "hg sign [OPTION]... [REVISION]..."
1623 1827 msgstr ""
1624 1828
1625 1829 msgid "hg sigcheck REVISION"
1626 1830 msgstr ""
1627 1831
1628 1832 msgid "hg sigs"
1629 1833 msgstr ""
1630 1834
1631 msgid ""
1632 "command to view revision graphs from a shell\n"
1633 "\n"
1835 msgid "command to view revision graphs from a shell"
1836 msgstr ""
1837
1838 msgid ""
1634 1839 "This extension adds a --graph option to the incoming, outgoing and log\n"
1635 1840 "commands. When this options is given, an ASCII representation of the\n"
1636 1841 "revision graph is also shown.\n"
1637 1842 msgstr ""
1638 1843
1639 1844 #, python-format
1640 1845 msgid "--graph option is incompatible with --%s"
1641 1846 msgstr ""
1642 1847
1643 msgid ""
1644 "show revision history alongside an ASCII revision graph\n"
1645 "\n"
1848 msgid "show revision history alongside an ASCII revision graph"
1849 msgstr ""
1850
1851 msgid ""
1646 1852 " Print a revision history alongside a revision graph drawn with\n"
1647 " ASCII characters.\n"
1648 "\n"
1853 " ASCII characters."
1854 msgstr ""
1855
1856 msgid ""
1649 1857 " Nodes printed as an @ character are parents of the working\n"
1650 1858 " directory.\n"
1651 1859 " "
1652 1860 msgstr ""
1653 1861
1654 1862 #, python-format
1655 1863 msgid "comparing with %s\n"
1656 1864 msgstr ""
1657 1865
1658 1866 msgid "no changes found\n"
1659 1867 msgstr "没有发现修改\n"
1660 1868
1661 1869 msgid "show the revision DAG"
1662 1870 msgstr "显示版本分支图"
1663 1871
1664 1872 msgid "limit number of changes displayed"
1665 1873 msgstr "限制显示的修改集数量"
1666 1874
1667 1875 msgid "show patch"
1668 1876 msgstr "显示补丁"
1669 1877
1670 1878 msgid "show the specified revision or range"
1671 1879 msgstr ""
1672 1880
1673 1881 msgid "hg glog [OPTION]... [FILE]"
1674 1882 msgstr ""
1675 1883
1676 msgid ""
1677 "hooks for integrating with the CIA.vc notification service\n"
1678 "\n"
1884 msgid "hooks for integrating with the CIA.vc notification service"
1885 msgstr ""
1886
1887 msgid ""
1679 1888 "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"
1889 "configure it, set the following options in your hgrc::"
1890 msgstr ""
1891
1892 msgid ""
1682 1893 " [cia]\n"
1683 1894 " # your registered CIA user name\n"
1684 1895 " user = foo\n"
1685 1896 " # the name of the project in CIA\n"
1686 1897 " project = foo\n"
1687 1898 " # the module (subproject) (optional)\n"
1688 1899 " #module = foo\n"
1689 1900 " # Append a diffstat to the log message (optional)\n"
1690 1901 " #diffstat = False\n"
1691 1902 " # Template to use for log messages (optional)\n"
1692 1903 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1693 1904 " # Style to use (optional)\n"
1694 1905 " #style = foo\n"
1695 1906 " # The URL of the CIA notification service (optional)\n"
1696 1907 " # You can use mailto: URLs to send by email, eg\n"
1697 1908 " # mailto:cia@cia.vc\n"
1698 1909 " # Make sure to set email.from if you do this.\n"
1699 1910 " #url = http://cia.vc/\n"
1700 1911 " # print message instead of sending it (optional)\n"
1701 " #test = False\n"
1702 "\n"
1912 " #test = False"
1913 msgstr ""
1914
1915 msgid ""
1703 1916 " [hooks]\n"
1704 1917 " # one of these:\n"
1705 1918 " changegroup.cia = python:hgcia.hook\n"
1706 " #incoming.cia = python:hgcia.hook\n"
1707 "\n"
1919 " #incoming.cia = python:hgcia.hook"
1920 msgstr ""
1921
1922 msgid ""
1708 1923 " [web]\n"
1709 1924 " # If you want hyperlinks (optional)\n"
1710 1925 " baseurl = http://server/path/to/repo\n"
1711 1926 msgstr ""
1712 1927
1713 1928 #, python-format
1714 1929 msgid "hgcia: sending update to %s\n"
1715 1930 msgstr ""
1716 1931
1717 1932 msgid "email.from must be defined when sending by email"
1718 1933 msgstr ""
1719 1934
1720 1935 msgid "cia: no user specified"
1721 1936 msgstr ""
1722 1937
1723 1938 msgid "cia: no project specified"
1724 1939 msgstr ""
1725 1940
1726 msgid ""
1727 "browse the repository in a graphical way\n"
1728 "\n"
1941 msgid "browse the repository in a graphical way"
1942 msgstr ""
1943
1944 msgid ""
1729 1945 "The hgk extension allows browsing the history of a repository in a\n"
1730 1946 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1731 "distributed with Mercurial.)\n"
1732 "\n"
1947 "distributed with Mercurial.)"
1948 msgstr ""
1949
1950 msgid ""
1733 1951 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1734 1952 "querying of information, and an extension to Mercurial named hgk.py,\n"
1735 1953 "which provides hooks for hgk to get information. hgk can be found in\n"
1736 1954 "the contrib directory, and the extension is shipped in the hgext\n"
1737 "repository, and needs to be enabled.\n"
1738 "\n"
1955 "repository, and needs to be enabled."
1956 msgstr ""
1957
1958 msgid ""
1739 1959 "The hg view command will launch the hgk Tcl script. For this command\n"
1740 1960 "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"
1961 "the path to hgk in your .hgrc file::"
1962 msgstr ""
1963
1964 msgid ""
1743 1965 " [hgk]\n"
1744 " path=/location/of/hgk\n"
1745 "\n"
1966 " path=/location/of/hgk"
1967 msgstr ""
1968
1969 msgid ""
1746 1970 "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"
1971 "Assuming you had already configured extdiff vdiff command, just add::"
1972 msgstr ""
1973
1974 msgid ""
1749 1975 " [hgk]\n"
1750 " vdiff=vdiff\n"
1751 "\n"
1976 " vdiff=vdiff"
1977 msgstr ""
1978
1979 msgid ""
1752 1980 "Revisions context menu will now display additional entries to fire\n"
1753 1981 "vdiff on hovered and selected revisions.\n"
1754 1982 msgstr ""
1755 1983
1756 1984 msgid "diff trees from two commits"
1757 1985 msgstr ""
1758 1986
1759 1987 msgid "output common ancestor information"
1760 1988 msgstr ""
1761 1989
1762 1990 msgid "cat a specific revision"
1763 1991 msgstr ""
1764 1992
1765 1993 msgid "cat-file: type or revision not supplied\n"
1766 1994 msgstr ""
1767 1995
1768 1996 msgid "aborting hg cat-file only understands commits\n"
1769 1997 msgstr ""
1770 1998
1771 1999 msgid "parse given revisions"
1772 2000 msgstr ""
1773 2001
1774 2002 msgid "print revisions"
1775 2003 msgstr ""
1776 2004
1777 2005 msgid "print extension options"
1778 2006 msgstr ""
1779 2007
1780 2008 msgid "start interactive history viewer"
1781 2009 msgstr ""
1782 2010
1783 2011 msgid "hg view [-l LIMIT] [REVRANGE]"
1784 2012 msgstr ""
1785 2013
1786 2014 msgid "generate patch"
1787 2015 msgstr ""
1788 2016
1789 2017 msgid "recursive"
1790 2018 msgstr ""
1791 2019
1792 2020 msgid "pretty"
1793 2021 msgstr ""
1794 2022
1795 2023 msgid "stdin"
1796 2024 msgstr ""
1797 2025
1798 2026 msgid "detect copies"
1799 2027 msgstr ""
1800 2028
1801 2029 msgid "search"
1802 2030 msgstr ""
1803 2031
1804 2032 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1805 2033 msgstr ""
1806 2034
1807 2035 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1808 2036 msgstr ""
1809 2037
1810 2038 msgid "hg debug-config"
1811 2039 msgstr ""
1812 2040
1813 2041 msgid "hg debug-merge-base REV REV"
1814 2042 msgstr ""
1815 2043
1816 2044 msgid "ignored"
1817 2045 msgstr ""
1818 2046
1819 2047 msgid "hg debug-rev-parse REV"
1820 2048 msgstr ""
1821 2049
1822 2050 msgid "header"
1823 2051 msgstr ""
1824 2052
1825 2053 msgid "topo-order"
1826 2054 msgstr ""
1827 2055
1828 2056 msgid "parents"
1829 2057 msgstr ""
1830 2058
1831 2059 msgid "max-count"
1832 2060 msgstr ""
1833 2061
1834 2062 msgid "hg debug-rev-list [OPTION]... REV..."
1835 2063 msgstr ""
1836 2064
1837 msgid ""
1838 "syntax highlighting for hgweb (requires Pygments)\n"
1839 "\n"
2065 msgid "syntax highlighting for hgweb (requires Pygments)"
2066 msgstr ""
2067
2068 msgid ""
1840 2069 "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"
2070 "http://pygments.org/"
2071 msgstr ""
2072
2073 msgid "There is a single configuration option::"
2074 msgstr ""
2075
2076 msgid ""
1845 2077 " [web]\n"
1846 " pygments_style = <style>\n"
1847 "\n"
1848 "The default is 'colorful'.\n"
2078 " pygments_style = <style>"
2079 msgstr ""
2080
2081 msgid "The default is 'colorful'.\n"
1849 2082 msgstr ""
1850 2083
1851 2084 msgid "accelerate status report using Linux's inotify service"
1852 2085 msgstr ""
1853 2086
1854 2087 msgid "start an inotify server for this repository"
1855 2088 msgstr "为此版本库启动服务 'inotify'"
1856 2089
1857 msgid ""
1858 "debugging information for inotify extension\n"
1859 "\n"
2090 msgid "debugging information for inotify extension"
2091 msgstr ""
2092
2093 msgid ""
1860 2094 " Prints the list of directories being watched by the inotify server.\n"
1861 2095 " "
1862 2096 msgstr ""
1863 2097
1864 2098 msgid "directories being watched:\n"
1865 2099 msgstr ""
1866 2100
1867 2101 msgid "run server in background"
1868 2102 msgstr "在后台运行服务"
1869 2103
1870 2104 msgid "used internally by daemon mode"
1871 2105 msgstr "在后台服务模式内部使用"
1872 2106
1873 2107 msgid "minutes to sit idle before exiting"
1874 2108 msgstr "空闲几分钟后退出"
1875 2109
1876 2110 msgid "name of file to write process ID to"
1877 2111 msgstr "写入进程标识符的文件名称"
1878 2112
1879 2113 msgid "hg inserve [OPTION]..."
1880 2114 msgstr ""
1881 2115
1882 2116 msgid "(found dead inotify server socket; removing it)\n"
1883 2117 msgstr ""
1884 2118
1885 2119 msgid "(starting inotify server)\n"
1886 2120 msgstr ""
1887 2121
1888 2122 #, python-format
1889 2123 msgid "could not start inotify server: %s\n"
1890 2124 msgstr ""
1891 2125
1892 2126 #, python-format
1893 2127 msgid "could not talk to new inotify server: %s\n"
1894 2128 msgstr ""
1895 2129
1896 2130 msgid "(inotify server not running)\n"
1897 2131 msgstr ""
1898 2132
1899 2133 #, python-format
1900 2134 msgid "failed to contact inotify server: %s\n"
1901 2135 msgstr ""
1902 2136
1903 2137 msgid "received empty answer from inotify server"
1904 2138 msgstr ""
1905 2139
1906 2140 #, python-format
1907 2141 msgid "(inotify: received response from incompatible server version %d)\n"
1908 2142 msgstr ""
1909 2143
1910 2144 #, python-format
1911 2145 msgid "(inotify: received '%s' response when expecting '%s')\n"
1912 2146 msgstr ""
1913 2147
1914 2148 msgid "this system does not seem to support inotify"
1915 2149 msgstr ""
1916 2150
1917 2151 #, python-format
1918 2152 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1919 2153 msgstr ""
1920 2154
1921 2155 msgid "*** this limit is too low to watch every directory in this repository\n"
1922 2156 msgstr ""
1923 2157
1924 2158 msgid "*** counting directories: "
1925 2159 msgstr ""
1926 2160
1927 2161 #, python-format
1928 2162 msgid "found %d\n"
1929 2163 msgstr ""
1930 2164
1931 2165 #, python-format
1932 2166 msgid "*** to raise the limit from %d to %d (run as root):\n"
1933 2167 msgstr ""
1934 2168
1935 2169 #, python-format
1936 2170 msgid "*** echo %d > %s\n"
1937 2171 msgstr ""
1938 2172
1939 2173 #, python-format
1940 2174 msgid "cannot watch %s until inotify watch limit is raised"
1941 2175 msgstr ""
1942 2176
1943 2177 #, python-format
1944 2178 msgid "inotify service not available: %s"
1945 2179 msgstr ""
1946 2180
1947 2181 #, python-format
1948 2182 msgid "watching %r\n"
1949 2183 msgstr ""
1950 2184
1951 2185 #, python-format
1952 2186 msgid "watching directories under %r\n"
1953 2187 msgstr ""
1954 2188
1955 2189 #, python-format
1956 2190 msgid "status: %r %s -> %s\n"
1957 2191 msgstr ""
1958 2192
1959 2193 #, python-format
1960 2194 msgid "%s dirstate reload\n"
1961 2195 msgstr ""
1962 2196
1963 2197 #, python-format
1964 2198 msgid "%s end dirstate reload\n"
1965 2199 msgstr ""
1966 2200
1967 2201 msgid "rescanning due to .hgignore change\n"
1968 2202 msgstr ""
1969 2203
1970 2204 #, python-format
1971 2205 msgid "%s event: created %s\n"
1972 2206 msgstr ""
1973 2207
1974 2208 #, python-format
1975 2209 msgid "%s event: deleted %s\n"
1976 2210 msgstr ""
1977 2211
1978 2212 #, python-format
1979 2213 msgid "%s event: modified %s\n"
1980 2214 msgstr ""
1981 2215
1982 2216 #, python-format
1983 2217 msgid "filesystem containing %s was unmounted\n"
1984 2218 msgstr ""
1985 2219
1986 2220 #, python-format
1987 2221 msgid "%s readable: %d bytes\n"
1988 2222 msgstr ""
1989 2223
1990 2224 #, python-format
1991 2225 msgid "%s below threshold - unhooking\n"
1992 2226 msgstr ""
1993 2227
1994 2228 #, python-format
1995 2229 msgid "%s reading %d events\n"
1996 2230 msgstr ""
1997 2231
1998 2232 #, python-format
1999 2233 msgid "%s hooking back up with %d bytes readable\n"
2000 2234 msgstr ""
2001 2235
2002 2236 #, python-format
2003 2237 msgid "could not start server: %s"
2004 2238 msgstr ""
2005 2239
2006 2240 #, python-format
2007 2241 msgid "answering query for %r\n"
2008 2242 msgstr ""
2009 2243
2010 2244 #, python-format
2011 2245 msgid "received query from incompatible client version %d\n"
2012 2246 msgstr ""
2013 2247
2014 2248 #, python-format
2015 2249 msgid "unrecognized query type: %s\n"
2016 2250 msgstr ""
2017 2251
2018 2252 msgid "finished setup\n"
2019 2253 msgstr ""
2020 2254
2021 msgid ""
2022 "expand expressions into changelog and summaries\n"
2023 "\n"
2255 msgid "expand expressions into changelog and summaries"
2256 msgstr ""
2257
2258 msgid ""
2024 2259 "This extension allows the use of a special syntax in summaries, which\n"
2025 2260 "will be automatically expanded into links or any other arbitrary\n"
2026 "expression, much like InterWiki does.\n"
2027 "\n"
2261 "expression, much like InterWiki does."
2262 msgstr ""
2263
2264 msgid ""
2028 2265 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2029 "in your hgrc::\n"
2030 "\n"
2266 "in your hgrc::"
2267 msgstr ""
2268
2269 msgid ""
2031 2270 " [interhg]\n"
2032 2271 " 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"
2272 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n"
2035 2273 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2036 2274 msgstr ""
2037 2275
2038 2276 #, python-format
2039 2277 msgid "interhg: invalid pattern for %s: %s\n"
2040 2278 msgstr ""
2041 2279
2042 2280 #, python-format
2043 2281 msgid "interhg: invalid regexp for %s: %s\n"
2044 2282 msgstr ""
2045 2283
2046 msgid ""
2047 "expand keywords in tracked files\n"
2048 "\n"
2284 msgid "expand keywords in tracked files"
2285 msgstr ""
2286
2287 msgid ""
2049 2288 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2050 "tracked text files selected by your configuration.\n"
2051 "\n"
2289 "tracked text files selected by your configuration."
2290 msgstr ""
2291
2292 msgid ""
2052 2293 "Keywords are only expanded in local repositories and not stored in the\n"
2053 2294 "change history. The mechanism can be regarded as a convenience for the\n"
2054 "current user or for archive distribution.\n"
2055 "\n"
2295 "current user or for archive distribution."
2296 msgstr ""
2297
2298 msgid ""
2056 2299 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2057 "hgrc files.\n"
2058 "\n"
2059 "Example::\n"
2060 "\n"
2300 "hgrc files."
2301 msgstr ""
2302
2303 msgid "Example::"
2304 msgstr ""
2305
2306 msgid ""
2061 2307 " [keyword]\n"
2062 2308 " # expand keywords in every python file except those matching \"x*\"\n"
2063 2309 " **.py =\n"
2064 " x* = ignore\n"
2065 "\n"
2310 " x* = ignore"
2311 msgstr ""
2312
2313 msgid ""
2066 2314 "NOTE: the more specific you are in your filename patterns the less you\n"
2067 "lose speed in huge repositories.\n"
2068 "\n"
2315 "lose speed in huge repositories."
2316 msgstr ""
2317
2318 msgid ""
2069 2319 "For [keywordmaps] template mapping and expansion demonstration and\n"
2070 2320 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2071 "available templates and filters.\n"
2072 "\n"
2321 "available templates and filters."
2322 msgstr ""
2323
2324 msgid ""
2073 2325 "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"
2326 "returns a date like \"2006/09/18 15:13:13\"."
2327 msgstr ""
2328
2329 msgid ""
2076 2330 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2077 2331 "replaced with customized keywords and templates. Again, run \"hg\n"
2078 "kwdemo\" to control the results of your config changes.\n"
2079 "\n"
2332 "kwdemo\" to control the results of your config changes."
2333 msgstr ""
2334
2335 msgid ""
2080 2336 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2081 2337 "the risk of inadvertently storing expanded keywords in the change\n"
2082 "history.\n"
2083 "\n"
2338 "history."
2339 msgstr ""
2340
2341 msgid ""
2084 2342 "To force expansion after enabling it, or a configuration change, run\n"
2085 "\"hg kwexpand\".\n"
2086 "\n"
2343 "\"hg kwexpand\"."
2344 msgstr ""
2345
2346 msgid ""
2087 2347 "Also, when committing with the record extension or using mq's qrecord,\n"
2088 2348 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2089 2349 "the files in question to update keyword expansions after all changes\n"
2090 "have been checked in.\n"
2091 "\n"
2350 "have been checked in."
2351 msgstr ""
2352
2353 msgid ""
2092 2354 "Expansions spanning more than one line and incremental expansions,\n"
2093 2355 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2094 2356 "{desc}\" expands to the first line of the changeset description.\n"
2095 2357 msgstr ""
2096 2358
2097 2359 #, python-format
2098 2360 msgid "overwriting %s expanding keywords\n"
2099 2361 msgstr ""
2100 2362
2101 2363 #, python-format
2102 2364 msgid "overwriting %s shrinking keywords\n"
2103 2365 msgstr ""
2104 2366
2105 2367 msgid "[keyword] patterns cannot match"
2106 2368 msgstr ""
2107 2369
2108 2370 msgid "no [keyword] patterns configured"
2109 2371 msgstr ""
2110 2372
2111 msgid ""
2112 "print [keywordmaps] configuration and an expansion example\n"
2113 "\n"
2373 msgid "print [keywordmaps] configuration and an expansion example"
2374 msgstr ""
2375
2376 msgid ""
2114 2377 " Show current, custom, or default keyword template maps and their\n"
2115 " expansions.\n"
2116 "\n"
2378 " expansions."
2379 msgstr ""
2380
2381 msgid ""
2117 2382 " 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"
2383 " and using -f/--rcfile to source an external hgrc file."
2384 msgstr ""
2385
2386 msgid " Use -d/--default to disable current configuration."
2387 msgstr ""
2388
2389 msgid ""
2122 2390 " See \"hg help templates\" for information on templates and filters.\n"
2123 2391 " "
2124 2392 msgstr ""
2125 2393
2126 2394 #, python-format
2127 2395 msgid "creating temporary repository at %s\n"
2128 2396 msgstr "正在创建临时版本库 %s\n"
2129 2397
2130 2398 msgid ""
2131 2399 "\n"
2132 2400 "\tconfiguration using custom keyword template maps\n"
2133 2401 msgstr ""
2134 2402
2135 2403 msgid "\textending current template maps\n"
2136 2404 msgstr ""
2137 2405
2138 2406 msgid "\toverriding default template maps\n"
2139 2407 msgstr ""
2140 2408
2141 2409 msgid ""
2142 2410 "\n"
2143 2411 "\tconfiguration using default keyword template maps\n"
2144 2412 msgstr ""
2145 2413
2146 2414 msgid "\tdisabling current template maps\n"
2147 2415 msgstr "\t禁用当前模版映射\n"
2148 2416
2149 2417 msgid ""
2150 2418 "\n"
2151 2419 "\tconfiguration using current keyword template maps\n"
2152 2420 msgstr ""
2153 2421
2154 2422 #, python-format
2155 2423 msgid ""
2156 2424 "\n"
2157 2425 "keywords written to %s:\n"
2158 2426 msgstr ""
2159 2427
2160 2428 msgid "unhooked all commit hooks\n"
2161 2429 msgstr ""
2162 2430
2163 2431 msgid ""
2164 2432 "\n"
2165 2433 "\tkeywords expanded\n"
2166 2434 msgstr ""
2167 2435
2168 2436 #, python-format
2169 2437 msgid ""
2170 2438 "\n"
2171 2439 "removing temporary repository %s\n"
2172 2440 msgstr ""
2173 2441 "\n"
2174 2442 "正在删除临时版本库 %s\n"
2175 2443
2176 msgid ""
2177 "expand keywords in the working directory\n"
2178 "\n"
2179 " Run after (re)enabling keyword expansion.\n"
2180 "\n"
2444 msgid "expand keywords in the working directory"
2445 msgstr ""
2446
2447 msgid " Run after (re)enabling keyword expansion."
2448 msgstr ""
2449
2450 msgid ""
2181 2451 " kwexpand refuses to run if given files contain local changes.\n"
2182 2452 " "
2183 2453 msgstr ""
2184 2454
2185 msgid ""
2186 "show files configured for keyword expansion\n"
2187 "\n"
2455 msgid "show files configured for keyword expansion"
2456 msgstr ""
2457
2458 msgid ""
2188 2459 " List which files in the working directory are matched by the\n"
2189 " [keyword] configuration patterns.\n"
2190 "\n"
2460 " [keyword] configuration patterns."
2461 msgstr ""
2462
2463 msgid ""
2191 2464 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2192 2465 " execution by including only files that are actual candidates for\n"
2193 " expansion.\n"
2194 "\n"
2466 " expansion."
2467 msgstr ""
2468
2469 msgid ""
2195 2470 " 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"
2471 " inclusion and exclusion of files."
2472 msgstr ""
2473
2474 msgid " Use -u/--untracked to list untracked files as well."
2475 msgstr ""
2476
2477 msgid ""
2200 2478 " With -a/--all and -v/--verbose the codes used to show the status\n"
2201 " of files are::\n"
2202 "\n"
2479 " of files are::"
2480 msgstr ""
2481
2482 msgid ""
2203 2483 " K = keyword expansion candidate\n"
2204 2484 " k = keyword expansion candidate (untracked)\n"
2205 2485 " I = ignored\n"
2206 2486 " i = ignored (untracked)\n"
2207 2487 " "
2208 2488 msgstr ""
2209 2489
2210 msgid ""
2211 "revert expanded keywords in the working directory\n"
2212 "\n"
2490 msgid "revert expanded keywords in the working directory"
2491 msgstr ""
2492
2493 msgid ""
2213 2494 " Run before changing/disabling active keywords or if you experience\n"
2214 " problems with \"hg import\" or \"hg merge\".\n"
2215 "\n"
2495 " problems with \"hg import\" or \"hg merge\"."
2496 msgstr ""
2497
2498 msgid ""
2216 2499 " kwshrink refuses to run if given files contain local changes.\n"
2217 2500 " "
2218 2501 msgstr ""
2219 2502
2220 2503 msgid "show default keyword template maps"
2221 2504 msgstr ""
2222 2505
2223 2506 msgid "read maps from rcfile"
2224 2507 msgstr ""
2225 2508
2226 2509 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2227 2510 msgstr ""
2228 2511
2229 2512 msgid "hg kwexpand [OPTION]... [FILE]..."
2230 2513 msgstr ""
2231 2514
2232 2515 msgid "show keyword status flags of all files"
2233 2516 msgstr ""
2234 2517
2235 2518 msgid "show files excluded from expansion"
2236 2519 msgstr ""
2237 2520
2238 2521 msgid "additionally show untracked files"
2239 2522 msgstr ""
2240 2523
2241 2524 msgid "hg kwfiles [OPTION]... [FILE]..."
2242 2525 msgstr ""
2243 2526
2244 2527 msgid "hg kwshrink [OPTION]... [FILE]..."
2245 2528 msgstr ""
2246 2529
2247 msgid ""
2248 "manage a stack of patches\n"
2249 "\n"
2530 msgid "manage a stack of patches"
2531 msgstr ""
2532
2533 msgid ""
2250 2534 "This extension lets you work with a stack of patches in a Mercurial\n"
2251 2535 "repository. It manages two stacks of patches - all known patches, and\n"
2252 "applied patches (subset of known patches).\n"
2253 "\n"
2536 "applied patches (subset of known patches)."
2537 msgstr ""
2538
2539 msgid ""
2254 2540 "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"
2541 "directory. Applied patches are both patch files and changesets."
2542 msgstr ""
2543
2544 msgid "Common tasks (use \"hg help command\" for more details)::"
2545 msgstr ""
2546
2547 msgid ""
2259 2548 " prepare repository to work with patches qinit\n"
2260 2549 " create new patch qnew\n"
2261 " import existing patch qimport\n"
2262 "\n"
2550 " import existing patch qimport"
2551 msgstr ""
2552
2553 msgid ""
2263 2554 " print patch series qseries\n"
2264 " print applied patches qapplied\n"
2265 "\n"
2555 " print applied patches qapplied"
2556 msgstr ""
2557
2558 msgid ""
2266 2559 " add known patch to applied stack qpush\n"
2267 2560 " remove patch from applied stack qpop\n"
2268 2561 " refresh contents of top applied patch qrefresh\n"
2269 2562 msgstr ""
2270 2563
2271 2564 #, python-format
2272 2565 msgid "%s appears more than once in %s"
2273 2566 msgstr ""
2274 2567
2275 2568 msgid "guard cannot be an empty string"
2276 2569 msgstr ""
2277 2570
2278 2571 #, python-format
2279 2572 msgid "guard %r starts with invalid character: %r"
2280 2573 msgstr ""
2281 2574
2282 2575 #, python-format
2283 2576 msgid "invalid character in guard %r: %r"
2284 2577 msgstr ""
2285 2578
2286 2579 #, python-format
2287 2580 msgid "active guards: %s\n"
2288 2581 msgstr ""
2289 2582
2290 2583 #, python-format
2291 2584 msgid "guard %r too short"
2292 2585 msgstr ""
2293 2586
2294 2587 #, python-format
2295 2588 msgid "guard %r starts with invalid char"
2296 2589 msgstr ""
2297 2590
2298 2591 #, python-format
2299 2592 msgid "allowing %s - no guards in effect\n"
2300 2593 msgstr ""
2301 2594
2302 2595 #, python-format
2303 2596 msgid "allowing %s - no matching negative guards\n"
2304 2597 msgstr ""
2305 2598
2306 2599 #, python-format
2307 2600 msgid "allowing %s - guarded by %r\n"
2308 2601 msgstr ""
2309 2602
2310 2603 #, python-format
2311 2604 msgid "skipping %s - guarded by %r\n"
2312 2605 msgstr ""
2313 2606
2314 2607 #, python-format
2315 2608 msgid "skipping %s - no matching guards\n"
2316 2609 msgstr ""
2317 2610
2318 2611 #, python-format
2319 2612 msgid "error removing undo: %s\n"
2320 2613 msgstr ""
2321 2614
2322 2615 #, python-format
2323 2616 msgid "apply failed for patch %s"
2324 2617 msgstr ""
2325 2618
2326 2619 #, python-format
2327 2620 msgid "patch didn't work out, merging %s\n"
2328 2621 msgstr ""
2329 2622
2330 2623 #, python-format
2331 2624 msgid "update returned %d"
2332 2625 msgstr ""
2333 2626
2334 2627 msgid "repo commit failed"
2335 2628 msgstr ""
2336 2629
2337 2630 #, python-format
2338 2631 msgid "unable to read %s"
2339 2632 msgstr ""
2340 2633
2341 2634 #, python-format
2342 2635 msgid "patch %s does not exist\n"
2343 2636 msgstr ""
2344 2637
2345 2638 #, python-format
2346 2639 msgid "patch %s is not applied\n"
2347 2640 msgstr ""
2348 2641
2349 2642 msgid "patch failed, unable to continue (try -v)\n"
2350 2643 msgstr ""
2351 2644
2352 2645 #, python-format
2353 2646 msgid "applying %s\n"
2354 2647 msgstr ""
2355 2648
2356 2649 #, python-format
2357 2650 msgid "unable to read %s\n"
2358 2651 msgstr "读取 %s 失败\n"
2359 2652
2360 2653 #, python-format
2361 2654 msgid "imported patch %s\n"
2362 2655 msgstr ""
2363 2656
2364 2657 #, python-format
2365 2658 msgid ""
2366 2659 "\n"
2367 2660 "imported patch %s"
2368 2661 msgstr ""
2369 2662
2370 2663 #, python-format
2371 2664 msgid "patch %s is empty\n"
2372 2665 msgstr ""
2373 2666
2374 2667 msgid "patch failed, rejects left in working dir\n"
2375 2668 msgstr ""
2376 2669
2377 2670 msgid "fuzz found when applying patch, stopping\n"
2378 2671 msgstr ""
2379 2672
2380 2673 #, python-format
2381 2674 msgid "revision %d is not managed"
2382 2675 msgstr ""
2383 2676
2384 2677 #, python-format
2385 2678 msgid "cannot delete revision %d above applied patches"
2386 2679 msgstr ""
2387 2680
2388 2681 #, python-format
2389 2682 msgid "patch %s finalized without changeset message\n"
2390 2683 msgstr ""
2391 2684
2392 2685 msgid "qdelete requires at least one revision or patch name"
2393 2686 msgstr ""
2394 2687
2395 2688 #, python-format
2396 2689 msgid "cannot delete applied patch %s"
2397 2690 msgstr ""
2398 2691
2399 2692 #, python-format
2400 2693 msgid "patch %s not in series file"
2401 2694 msgstr ""
2402 2695
2403 2696 msgid "no patches applied"
2404 2697 msgstr ""
2405 2698
2406 2699 msgid "working directory revision is not qtip"
2407 2700 msgstr ""
2408 2701
2409 2702 msgid "local changes found, refresh first"
2410 2703 msgstr ""
2411 2704
2412 2705 msgid "local changes found"
2413 2706 msgstr ""
2414 2707
2415 2708 #, python-format
2416 2709 msgid "\"%s\" cannot be used as the name of a patch"
2417 2710 msgstr ""
2418 2711
2419 2712 #, python-format
2420 2713 msgid "patch \"%s\" already exists"
2421 2714 msgstr ""
2422 2715
2423 2716 #, python-format
2424 2717 msgid "error unlinking %s\n"
2425 2718 msgstr ""
2426 2719
2427 2720 #, python-format
2428 2721 msgid "patch name \"%s\" is ambiguous:\n"
2429 2722 msgstr ""
2430 2723
2431 2724 #, python-format
2432 2725 msgid "patch %s not in series"
2433 2726 msgstr ""
2434 2727
2435 2728 msgid "(working directory not at a head)\n"
2436 2729 msgstr ""
2437 2730
2438 2731 msgid "no patches in series\n"
2439 2732 msgstr ""
2440 2733
2441 2734 #, python-format
2442 2735 msgid "cannot push to a previous patch: %s"
2443 2736 msgstr ""
2444 2737
2445 2738 #, python-format
2446 2739 msgid "qpush: %s is already at the top\n"
2447 2740 msgstr ""
2448 2741
2449 2742 #, python-format
2450 2743 msgid "guarded by %r"
2451 2744 msgstr ""
2452 2745
2453 2746 msgid "no matching guards"
2454 2747 msgstr ""
2455 2748
2456 2749 #, python-format
2457 2750 msgid "cannot push '%s' - %s\n"
2458 2751 msgstr ""
2459 2752
2460 2753 msgid "all patches are currently applied\n"
2461 2754 msgstr ""
2462 2755
2463 2756 msgid "patch series already fully applied\n"
2464 2757 msgstr ""
2465 2758
2466 2759 msgid "cleaning up working directory..."
2467 2760 msgstr ""
2468 2761
2469 2762 #, python-format
2470 2763 msgid "errors during apply, please fix and refresh %s\n"
2471 2764 msgstr ""
2472 2765
2473 2766 #, python-format
2474 2767 msgid "now at: %s\n"
2475 2768 msgstr ""
2476 2769
2477 2770 #, python-format
2478 2771 msgid "patch %s is not applied"
2479 2772 msgstr ""
2480 2773
2481 2774 msgid "no patches applied\n"
2482 2775 msgstr ""
2483 2776
2484 2777 #, python-format
2485 2778 msgid "qpop: %s is already at the top\n"
2486 2779 msgstr ""
2487 2780
2488 2781 msgid "qpop: forcing dirstate update\n"
2489 2782 msgstr ""
2490 2783
2491 2784 #, python-format
2492 2785 msgid "trying to pop unknown node %s"
2493 2786 msgstr ""
2494 2787
2495 2788 msgid "popping would remove a revision not managed by this patch queue"
2496 2789 msgstr ""
2497 2790
2498 2791 msgid "deletions found between repo revs"
2499 2792 msgstr ""
2500 2793
2501 2794 #, python-format
2502 2795 msgid "popping %s\n"
2503 2796 msgstr ""
2504 2797
2505 2798 msgid "patch queue now empty\n"
2506 2799 msgstr ""
2507 2800
2508 2801 msgid "cannot refresh a revision with children"
2509 2802 msgstr ""
2510 2803
2511 msgid ""
2512 "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
2804 msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
2513 2805 msgstr ""
2514 2806
2515 2807 msgid "patch queue directory already exists"
2516 2808 msgstr ""
2517 2809
2518 2810 #, python-format
2519 2811 msgid "patch %s is not in series file"
2520 2812 msgstr ""
2521 2813
2522 2814 msgid "No saved patch data found\n"
2523 2815 msgstr ""
2524 2816
2525 2817 #, python-format
2526 2818 msgid "restoring status: %s\n"
2527 2819 msgstr ""
2528 2820
2529 2821 msgid "save entry has children, leaving it alone\n"
2530 2822 msgstr ""
2531 2823
2532 2824 #, python-format
2533 2825 msgid "removing save entry %s\n"
2534 2826 msgstr ""
2535 2827
2536 2828 #, python-format
2537 2829 msgid "saved queue repository parents: %s %s\n"
2538 2830 msgstr ""
2539 2831
2540 2832 msgid "queue directory updating\n"
2541 2833 msgstr ""
2542 2834
2543 2835 msgid "Unable to load queue repository\n"
2544 2836 msgstr ""
2545 2837
2546 2838 msgid "save: no patches applied, exiting\n"
2547 2839 msgstr ""
2548 2840
2549 2841 msgid "status is already saved\n"
2550 2842 msgstr ""
2551 2843
2552 2844 msgid "hg patches saved state"
2553 2845 msgstr ""
2554 2846
2555 2847 msgid "repo commit failed\n"
2556 2848 msgstr ""
2557 2849
2558 2850 #, python-format
2559 2851 msgid "patch %s is already in the series file"
2560 2852 msgstr ""
2561 2853
2562 2854 msgid "option \"-r\" not valid when importing files"
2563 2855 msgstr ""
2564 2856
2565 2857 msgid "option \"-n\" not valid when importing multiple patches"
2566 2858 msgstr ""
2567 2859
2568 2860 #, python-format
2569 2861 msgid "revision %d is the root of more than one branch"
2570 2862 msgstr ""
2571 2863
2572 2864 #, python-format
2573 2865 msgid "revision %d is already managed"
2574 2866 msgstr ""
2575 2867
2576 2868 #, python-format
2577 2869 msgid "revision %d is not the parent of the queue"
2578 2870 msgstr ""
2579 2871
2580 2872 #, python-format
2581 2873 msgid "revision %d has unmanaged children"
2582 2874 msgstr ""
2583 2875
2584 2876 #, python-format
2585 2877 msgid "cannot import merge revision %d"
2586 2878 msgstr ""
2587 2879
2588 2880 #, python-format
2589 2881 msgid "revision %d is not the parent of %d"
2590 2882 msgstr ""
2591 2883
2592 2884 msgid "-e is incompatible with import from -"
2593 2885 msgstr ""
2594 2886
2595 2887 #, python-format
2596 2888 msgid "patch %s does not exist"
2597 2889 msgstr ""
2598 2890
2599 2891 msgid "need --name to import a patch from -"
2600 2892 msgstr ""
2601 2893
2602 2894 #, python-format
2603 2895 msgid "adding %s to series file\n"
2604 2896 msgstr ""
2605 2897
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"
2898 msgid "remove patches from queue"
2899 msgstr ""
2900
2901 msgid ""
2902 " The patches must not be applied, and at least one patch is required. With\n"
2903 " -k/--keep, the patch files are preserved in the patch directory."
2904 msgstr ""
2905
2906 msgid ""
2613 2907 " To stop managing a patch and move it into permanent history,\n"
2614 2908 " use the qfinish command."
2615 2909 msgstr ""
2616 2910
2617 2911 msgid "print the patches already applied"
2618 2912 msgstr ""
2619 2913
2620 2914 msgid "only one patch applied\n"
2621 2915 msgstr ""
2622 2916
2623 2917 msgid "print the patches not yet applied"
2624 2918 msgstr ""
2625 2919
2626 2920 msgid "all patches applied\n"
2627 2921 msgstr ""
2628 2922
2629 2923 #, fuzzy
2630 msgid ""
2631 "import a patch\n"
2632 "\n"
2924 msgid "import a patch"
2925 msgstr ""
2926 "导入补丁\n"
2927 "\n"
2928 " 此补丁插入到最近一次应用的补丁序列中。\n"
2929 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2930 "\n"
2931 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2932 "\n"
2933 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
2934 "\n"
2935 " 使用 '--force' 会覆盖已有的补丁。\n"
2936 "\n"
2937 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2938 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2939 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2940 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2941 " "
2942
2943 #, fuzzy
2944 msgid ""
2633 2945 " The patch is inserted into the series after the last applied\n"
2634 2946 " patch. If no patches have been applied, qimport prepends the patch\n"
2635 " to the series.\n"
2636 "\n"
2947 " to the series."
2948 msgstr ""
2949 "导入补丁\n"
2950 "\n"
2951 " 此补丁插入到最近一次应用的补丁序列中。\n"
2952 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2953 "\n"
2954 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2955 "\n"
2956 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
2957 "\n"
2958 " 使用 '--force' 会覆盖已有的补丁。\n"
2959 "\n"
2960 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2961 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2962 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2963 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2964 " "
2965
2966 #, fuzzy
2967 msgid ""
2637 2968 " 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"
2969 " give it a new one with -n/--name."
2970 msgstr ""
2971 "导入补丁\n"
2972 "\n"
2973 " 此补丁插入到最近一次应用的补丁序列中。\n"
2974 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2975 "\n"
2976 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2977 "\n"
2978 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
2979 "\n"
2980 " 使用 '--force' 会覆盖已有的补丁。\n"
2981 "\n"
2982 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2983 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2984 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2985 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2986 " "
2987
2988 #, fuzzy
2989 msgid ""
2640 2990 " You can register an existing patch inside the patch directory with\n"
2641 " the -e/--existing flag.\n"
2642 "\n"
2991 " the -e/--existing flag."
2992 msgstr ""
2993 "导入补丁\n"
2994 "\n"
2995 " 此补丁插入到最近一次应用的补丁序列中。\n"
2996 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2997 "\n"
2998 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2999 "\n"
3000 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
3001 "\n"
3002 " 使用 '--force' 会覆盖已有的补丁。\n"
3003 "\n"
3004 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
3005 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
3006 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
3007 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
3008 " "
3009
3010 #, fuzzy
3011 msgid ""
2643 3012 " With -f/--force, an existing patch of the same name will be\n"
2644 " overwritten.\n"
2645 "\n"
3013 " overwritten."
3014 msgstr ""
3015 "导入补丁\n"
3016 "\n"
3017 " 此补丁插入到最近一次应用的补丁序列中。\n"
3018 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
3019 "\n"
3020 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
3021 "\n"
3022 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
3023 "\n"
3024 " 使用 '--force' 会覆盖已有的补丁。\n"
3025 "\n"
3026 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
3027 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
3028 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
3029 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
3030 " "
3031
3032 #, fuzzy
3033 msgid ""
2646 3034 " An existing changeset may be placed under mq control with -r/--rev\n"
2647 3035 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2648 3036 " With -g/--git, patches imported with --rev will use the git diff\n"
2649 3037 " format. See the diffs help topic for information on why this is\n"
2650 3038 " important for preserving rename/copy information and permission\n"
2651 " changes.\n"
2652 "\n"
3039 " changes."
3040 msgstr ""
3041 "导入补丁\n"
3042 "\n"
3043 " 此补丁插入到最近一次应用的补丁序列中。\n"
3044 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
3045 "\n"
3046 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
3047 "\n"
3048 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
3049 "\n"
3050 " 使用 '--force' 会覆盖已有的补丁。\n"
3051 "\n"
3052 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
3053 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
3054 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
3055 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
3056 " "
3057
3058 #, fuzzy
3059 msgid ""
2653 3060 " To import a patch from standard input, pass - as the patch file.\n"
2654 3061 " When importing from standard input, a patch name must be specified\n"
2655 3062 " using the --name flag.\n"
2656 3063 " "
2657 3064 msgstr ""
2658 3065 "导入补丁\n"
2659 3066 "\n"
2660 3067 " 此补丁插入到最近一次应用的补丁序列中。\n"
2661 3068 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2662 3069 "\n"
2663 3070 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2664 3071 "\n"
2665 3072 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
2666 3073 "\n"
2667 3074 " 使用 '--force' 会覆盖已有的补丁。\n"
2668 3075 "\n"
2669 3076 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2670 3077 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2671 3078 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2672 3079 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2673 3080 " "
2674 3081
2675 3082 #, fuzzy
2676 msgid ""
2677 "init a new queue repository\n"
2678 "\n"
3083 msgid "init a new queue repository"
3084 msgstr "初始化队列仓库"
3085
3086 #, fuzzy
3087 msgid ""
2679 3088 " The queue repository is unversioned by default. If\n"
2680 3089 " -c/--create-repo is specified, qinit will create a separate nested\n"
2681 3090 " repository for patches (qinit -c may also be run later to convert\n"
2682 3091 " an unversioned patch repository into a versioned one). You can use\n"
2683 3092 " qcommit to commit changes to this queue repository."
2684 3093 msgstr ""
2685 "初始化队列仓库\n"
2686 "\n"
2687 3094 " 默认队列仓库不受版本控制。如果指定了 '-c',那么 qinit 会为补丁创建一个\n"
2688 3095 " 单独的嵌套版本库(也可以稍后运行 'qinit -c' 来将不受版本控制的补丁仓库\n"
2689 3096 " 转换成受版本控制)。你可以使用 'qcommit' 提交改变到此队列版本库。"
2690 3097
2691 msgid ""
2692 "clone main and patch repository at same time\n"
2693 "\n"
3098 msgid "clone main and patch repository at same time"
3099 msgstr ""
3100
3101 msgid ""
2694 3102 " If source is local, destination will have no patches applied. If\n"
2695 3103 " source is remote, this command can not check if patches are\n"
2696 3104 " applied in source, so cannot guarantee that patches are not\n"
2697 3105 " applied in destination. If you clone remote repository, be sure\n"
2698 " before that it has no patches applied.\n"
2699 "\n"
3106 " before that it has no patches applied."
3107 msgstr ""
3108
3109 msgid ""
2700 3110 " Source patch repository is looked for in <src>/.hg/patches by\n"
2701 " default. Use -p <url> to change.\n"
2702 "\n"
3111 " default. Use -p <url> to change."
3112 msgstr ""
3113
3114 msgid ""
2703 3115 " The patch directory must be a nested Mercurial repository, as\n"
2704 3116 " would be created by qinit -c.\n"
2705 3117 " "
2706 3118 msgstr ""
2707 3119
2708 3120 msgid "versioned patch repository not found (see qinit -c)"
2709 3121 msgstr ""
2710 3122
2711 3123 #, fuzzy
2712 3124 msgid "cloning main repository\n"
2713 3125 msgstr "初始化目标版本库 %s\n"
2714 3126
2715 3127 msgid "cloning patch repository\n"
2716 3128 msgstr ""
2717 3129
2718 3130 #, fuzzy
2719 3131 msgid "stripping applied patches from destination repository\n"
2720 3132 msgstr "初始化目标版本库 %s\n"
2721 3133
2722 3134 #, fuzzy
2723 3135 msgid "updating destination repository\n"
2724 3136 msgstr "初始化目标版本库 %s\n"
2725 3137
2726 3138 msgid "commit changes in the queue repository"
2727 3139 msgstr ""
2728 3140
2729 3141 msgid "print the entire series file"
2730 3142 msgstr ""
2731 3143
2732 3144 msgid "print the name of the current patch"
2733 3145 msgstr ""
2734 3146
2735 3147 msgid "print the name of the next patch"
2736 3148 msgstr ""
2737 3149
2738 3150 msgid "print the name of the previous patch"
2739 3151 msgstr ""
2740 3152
2741 msgid ""
2742 "create a new patch\n"
2743 "\n"
3153 msgid "create a new patch"
3154 msgstr ""
3155
3156 msgid ""
2744 3157 " qnew creates a new patch on top of the currently-applied patch (if\n"
2745 3158 " any). It will refuse to run if there are any outstanding changes\n"
2746 3159 " unless -f/--force is specified, in which case the patch will be\n"
2747 3160 " initialized with them. You may also use -I/--include,\n"
2748 3161 " -X/--exclude, and/or a list of files after the patch name to add\n"
2749 3162 " only changes to matching files to the new patch, leaving the rest\n"
2750 " as uncommitted modifications.\n"
2751 "\n"
3163 " as uncommitted modifications."
3164 msgstr ""
3165
3166 msgid ""
2752 3167 " -u/--user and -d/--date can be used to set the (given) user and\n"
2753 3168 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2754 " to current user and date to current date.\n"
2755 "\n"
3169 " to current user and date to current date."
3170 msgstr ""
3171
3172 msgid ""
2756 3173 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2757 3174 " 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"
3175 " empty and the commit message is '[mq]: PATCH'."
3176 msgstr ""
3177
3178 msgid ""
2760 3179 " Use the -g/--git option to keep the patch in the git extended diff\n"
2761 3180 " format. Read the diffs help topic for more information on why this\n"
2762 3181 " is important for preserving permission changes and copy/rename\n"
2763 3182 " information.\n"
2764 3183 " "
2765 3184 msgstr ""
2766 3185
2767 3186 #, fuzzy
2768 msgid ""
2769 "update the current patch\n"
2770 "\n"
3187 msgid "update the current patch"
3188 msgstr "更新当前补丁"
3189
3190 #, fuzzy
3191 msgid ""
2771 3192 " If any file patterns are provided, the refreshed patch will\n"
2772 3193 " contain only the modifications that match those patterns; the\n"
2773 " remaining modifications will remain in the working directory.\n"
2774 "\n"
3194 " remaining modifications will remain in the working directory."
3195 msgstr ""
3196 " 如果提供了文件匹配模式,更新后的补丁只包含匹配这些模式的修改,其它\n"
3197 " 的修改仍旧在工作目录中。"
3198
3199 #, fuzzy
3200 msgid ""
2775 3201 " 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"
3202 " will be refreshed just like matched files and remain in the patch."
3203 msgstr " 如果指定了 '--short',只更新已经在补丁中的文件,与文件匹配模式类似。"
3204
3205 #, fuzzy
3206 msgid ""
2778 3207 " hg add/remove/copy/rename work as usual, though you might want to\n"
2779 3208 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2780 3209 " and renames. See the diffs help topic for more information on the\n"
2781 3210 " git diff format.\n"
2782 3211 " "
2783 3212 msgstr ""
2784 "更新当前补丁\n"
2785 "\n"
2786 " 如果提供了文件匹配模式,更新后的补丁只包含匹配这些模式的修改,其它\n"
2787 " 的修改仍旧在工作目录中。\n"
2788 "\n"
2789 " 如果指定了 '--short',只更新已经在补丁中的文件,与文件匹配模式类似。\n"
2790 "\n"
2791 3213 " 'hg add/remove/copy/rename' 如常工作,你可能想使用 git 格式补丁(使\n"
2792 3214 " 用选项 '--git' 或在配置文件的 [diff] 区中设置 git=1)以跟踪复制和改\n"
2793 3215 " 名。请参见差异帮助主题,以了解关于 git 差异格式的更多信息。\n"
2794 3216 " "
2795 3217
2796 3218 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2797 3219 msgstr ""
2798 3220
2799 3221 #, fuzzy
2800 msgid ""
2801 "diff of the current patch and subsequent modifications\n"
2802 "\n"
3222 msgid "diff of the current patch and subsequent modifications"
3223 msgstr "显式当前的补丁和后续的修改"
3224
3225 #, fuzzy
3226 msgid ""
2803 3227 " Shows a diff which includes the current patch as well as any\n"
2804 3228 " changes which have been made in the working directory since the\n"
2805 3229 " last refresh (thus showing what the current patch would become\n"
2806 " after a qrefresh).\n"
2807 "\n"
3230 " after a qrefresh)."
3231 msgstr ""
3232 " 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n"
3233 " 显示当前的补丁)。"
3234
3235 #, fuzzy
3236 msgid ""
2808 3237 " Use 'hg diff' if you only want to see the changes made since the\n"
2809 3238 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2810 3239 " by the current patch without including changes made since the\n"
2811 3240 " qrefresh.\n"
2812 3241 " "
2813 3242 msgstr ""
2814 "显式当前的补丁和后续的修改\n"
2815 "\n"
2816 " 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n"
2817 " 显示当前的补丁)。\n"
2818 "\n"
2819 3243 " 如果你只想看到最近一次刷新之后的修改请使用 'hg diff',如果你只想看到当\n"
2820 3244 " 前的补丁请使用 'hg export qtip'。\n"
2821 3245 " "
2822 3246
2823 msgid ""
2824 "fold the named patches into the current patch\n"
2825 "\n"
3247 msgid "fold the named patches into the current patch"
3248 msgstr ""
3249
3250 msgid ""
2826 3251 " Patches must not yet be applied. Each patch will be successively\n"
2827 3252 " applied to the current patch in the order given. If all the\n"
2828 3253 " patches apply successfully, the current patch will be refreshed\n"
2829 3254 " with the new cumulative patch, and the folded patches will be\n"
2830 3255 " deleted. With -k/--keep, the folded patch files will not be\n"
2831 " removed afterwards.\n"
2832 "\n"
3256 " removed afterwards."
3257 msgstr ""
3258
3259 msgid ""
2833 3260 " The header for each folded patch will be concatenated with the\n"
2834 3261 " current patch header, separated by a line of '* * *'."
2835 3262 msgstr ""
2836 3263
2837 3264 msgid "qfold requires at least one patch name"
2838 3265 msgstr ""
2839 3266
2840 3267 msgid "No patches applied"
2841 3268 msgstr ""
2842 3269
2843 3270 #, python-format
2844 3271 msgid "Skipping already folded patch %s"
2845 3272 msgstr ""
2846 3273
2847 3274 #, python-format
2848 3275 msgid "qfold cannot fold already applied patch %s"
2849 3276 msgstr ""
2850 3277
2851 3278 #, python-format
2852 3279 msgid "Error folding patch %s"
2853 3280 msgstr ""
2854 3281
2855 3282 msgid "push or pop patches until named patch is at top of stack"
2856 3283 msgstr ""
2857 3284
2858 msgid ""
2859 "set or print guards for a patch\n"
2860 "\n"
3285 msgid "set or print guards for a patch"
3286 msgstr ""
3287
3288 msgid ""
2861 3289 " Guards control whether a patch can be pushed. A patch with no\n"
2862 3290 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2863 3291 " pushed only if the qselect command has activated it. A patch with\n"
2864 3292 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2865 " has activated it.\n"
2866 "\n"
3293 " has activated it."
3294 msgstr ""
3295
3296 msgid ""
2867 3297 " With no arguments, print the currently active guards.\n"
2868 3298 " With arguments, set guards for the named patch.\n"
2869 " NOTE: Specifying negative guards now requires '--'.\n"
2870 "\n"
3299 " NOTE: Specifying negative guards now requires '--'."
3300 msgstr ""
3301
3302 msgid ""
2871 3303 " To set guards on another patch:\n"
2872 3304 " hg qguard -- other.patch +2.6.17 -stable\n"
2873 3305 " "
2874 3306 msgstr ""
2875 3307
2876 3308 msgid "cannot mix -l/--list with options or arguments"
2877 3309 msgstr ""
2878 3310
2879 3311 msgid "no patch to work with"
2880 3312 msgstr ""
2881 3313
2882 3314 #, python-format
2883 3315 msgid "no patch named %s"
2884 3316 msgstr ""
2885 3317
2886 3318 msgid "print the header of the topmost or specified patch"
2887 3319 msgstr ""
2888 3320
2889 3321 #, fuzzy
2890 msgid ""
2891 "push the next patch onto the stack\n"
2892 "\n"
3322 msgid "push the next patch onto the stack"
3323 msgstr "将下个补丁压入堆栈"
3324
3325 #, fuzzy
3326 msgid ""
2893 3327 " When -f/--force is applied, all local changes in patched files\n"
2894 3328 " will be lost.\n"
2895 3329 " "
2896 3330 msgstr ""
2897 "将下个补丁压入堆栈\n"
2898 "\n"
2899 3331 " 当指定 '--force' 时,所有在补丁文件中的本地修改都会丢失。\n"
2900 3332 " "
2901 3333
2902 3334 msgid "no saved queues found, please use -n\n"
2903 3335 msgstr ""
2904 3336
2905 3337 #, python-format
2906 3338 msgid "merging with queue at: %s\n"
2907 3339 msgstr ""
2908 3340
2909 3341 #, fuzzy
2910 msgid ""
2911 "pop the current patch off the stack\n"
2912 "\n"
3342 msgid "pop the current patch off the stack"
3343 msgstr "将当前补丁弹出堆栈"
3344
3345 #, fuzzy
3346 msgid ""
2913 3347 " By default, pops off the top of the patch stack. If given a patch\n"
2914 3348 " name, keeps popping off patches until the named patch is at the\n"
2915 3349 " top of the stack.\n"
2916 3350 " "
2917 3351 msgstr ""
2918 "将当前补丁弹出堆栈\n"
2919 "\n"
2920 3352 " 默认将补丁堆栈的顶部弹出。如果指定了补丁名称,那么就会一直弹出,直到此\n"
2921 3353 " 补丁位于堆栈顶部。\n"
2922 3354 " "
2923 3355
2924 3356 #, python-format
2925 3357 msgid "using patch queue: %s\n"
2926 3358 msgstr ""
2927 3359
2928 msgid ""
2929 "rename a patch\n"
2930 "\n"
3360 msgid "rename a patch"
3361 msgstr ""
3362
3363 msgid ""
2931 3364 " With one argument, renames the current patch to PATCH1.\n"
2932 3365 " With two arguments, renames PATCH1 to PATCH2."
2933 3366 msgstr ""
2934 3367
2935 3368 #, python-format
2936 3369 msgid "%s already exists"
2937 3370 msgstr ""
2938 3371
2939 3372 #, python-format
2940 3373 msgid "A patch named %s already exists in the series file"
2941 3374 msgstr ""
2942 3375
2943 3376 msgid "restore the queue state saved by a revision"
2944 3377 msgstr ""
2945 3378
2946 3379 msgid "save current queue state"
2947 3380 msgstr ""
2948 3381
2949 3382 #, python-format
2950 3383 msgid "destination %s exists and is not a directory"
2951 3384 msgstr ""
2952 3385
2953 3386 #, python-format
2954 3387 msgid "destination %s exists, use -f to force"
2955 3388 msgstr ""
2956 3389
2957 3390 #, python-format
2958 3391 msgid "copy %s to %s\n"
2959 3392 msgstr ""
2960 3393
2961 3394 #, fuzzy
2962 msgid ""
2963 "strip a revision and all its descendants from the repository\n"
2964 "\n"
3395 msgid "strip a revision and all its descendants from the repository"
3396 msgstr "从版本库删除一个版本以及它的子孙"
3397
3398 #, fuzzy
3399 msgid ""
2965 3400 " If one of the working directory's parent revisions is stripped, the\n"
2966 3401 " working directory will be updated to the parent of the stripped\n"
2967 3402 " revision.\n"
2968 3403 " "
2969 3404 msgstr ""
2970 "从版本库删除一个版本以及它的子孙\n"
2971 "\n"
2972 3405 " 如果有工作目录的父版本被删除,那么此目录会被更新到已删除版本的父版本。\n"
2973 3406 " "
2974 3407
2975 msgid ""
2976 "set or print guarded patches to push\n"
2977 "\n"
3408 msgid "set or print guarded patches to push"
3409 msgstr ""
3410
3411 msgid ""
2978 3412 " Use the qguard command to set or print guards on patch, then use\n"
2979 3413 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2980 3414 " it has no guards or any positive guards match the currently\n"
2981 3415 " selected guard, but will not be pushed if any negative guards\n"
2982 " match the current guard. For example:\n"
2983 "\n"
3416 " match the current guard. For example:"
3417 msgstr ""
3418
3419 msgid ""
2984 3420 " qguard foo.patch -stable (negative guard)\n"
2985 3421 " qguard bar.patch +stable (positive guard)\n"
2986 " qselect stable\n"
2987 "\n"
3422 " qselect stable"
3423 msgstr ""
3424
3425 msgid ""
2988 3426 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2989 3427 " it has a negative match) but push bar.patch (because it has a\n"
2990 " positive match).\n"
2991 "\n"
3428 " positive match)."
3429 msgstr ""
3430
3431 msgid ""
2992 3432 " With no arguments, prints the currently active guards.\n"
2993 " With one argument, sets the active guard.\n"
2994 "\n"
3433 " With one argument, sets the active guard."
3434 msgstr ""
3435
3436 msgid ""
2995 3437 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2996 3438 " When no guards are active, patches with positive guards are\n"
2997 " skipped and patches with negative guards are pushed.\n"
2998 "\n"
3439 " skipped and patches with negative guards are pushed."
3440 msgstr ""
3441
3442 msgid ""
2999 3443 " qselect can change the guards on applied patches. It does not pop\n"
3000 3444 " guarded patches by default. Use --pop to pop back to the last\n"
3001 3445 " applied patch that is not guarded. Use --reapply (which implies\n"
3002 3446 " --pop) to push back to the current patch afterwards, but skip\n"
3003 " guarded patches.\n"
3004 "\n"
3447 " guarded patches."
3448 msgstr ""
3449
3450 msgid ""
3005 3451 " Use -s/--series to print a list of all guards in the series file\n"
3006 3452 " (no other arguments needed). Use -v for more information."
3007 3453 msgstr ""
3008 3454
3009 3455 msgid "guards deactivated\n"
3010 3456 msgstr ""
3011 3457
3012 3458 #, python-format
3013 3459 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3014 3460 msgstr ""
3015 3461
3016 3462 #, python-format
3017 3463 msgid "number of guarded, applied patches has changed from %d to %d\n"
3018 3464 msgstr ""
3019 3465
3020 3466 msgid "guards in series file:\n"
3021 3467 msgstr ""
3022 3468
3023 3469 msgid "no guards in series file\n"
3024 3470 msgstr ""
3025 3471
3026 3472 msgid "active guards:\n"
3027 3473 msgstr ""
3028 3474
3029 3475 msgid "no active guards\n"
3030 3476 msgstr ""
3031 3477
3032 3478 msgid "popping guarded patches\n"
3033 3479 msgstr ""
3034 3480
3035 3481 msgid "reapplying unguarded patches\n"
3036 3482 msgstr ""
3037 3483
3038 msgid ""
3039 "move applied patches into repository history\n"
3040 "\n"
3484 msgid "move applied patches into repository history"
3485 msgstr ""
3486
3487 msgid ""
3041 3488 " Finishes the specified revisions (corresponding to applied\n"
3042 3489 " patches) by moving them out of mq control into regular repository\n"
3043 " history.\n"
3044 "\n"
3490 " history."
3491 msgstr ""
3492
3493 msgid ""
3045 3494 " Accepts a revision range or the -a/--applied option. If --applied\n"
3046 3495 " is specified, all applied mq revisions are removed from mq\n"
3047 3496 " control. Otherwise, the given revisions must be at the base of the\n"
3048 " stack of applied patches.\n"
3049 "\n"
3497 " stack of applied patches."
3498 msgstr ""
3499
3500 msgid ""
3050 3501 " This can be especially useful if your changes have been applied to\n"
3051 3502 " an upstream repository, or if you are about to push your changes\n"
3052 3503 " to upstream.\n"
3053 3504 " "
3054 3505 msgstr ""
3055 3506
3056 3507 msgid "no revisions specified"
3057 3508 msgstr ""
3058 3509
3059 3510 msgid "cannot commit over an applied mq patch"
3060 3511 msgstr ""
3061 3512
3062 3513 msgid "source has mq patches applied"
3063 3514 msgstr ""
3064 3515
3065 3516 #, python-format
3066 3517 msgid "mq status file refers to unknown node %s\n"
3067 3518 msgstr ""
3068 3519
3069 3520 #, python-format
3070 3521 msgid "Tag %s overrides mq patch of the same name\n"
3071 3522 msgstr ""
3072 3523
3073 3524 msgid "cannot import over an applied patch"
3074 3525 msgstr ""
3075 3526
3076 3527 msgid "print first line of patch header"
3077 3528 msgstr ""
3078 3529
3079 3530 #, fuzzy
3080 3531 msgid "show only the last patch"
3081 3532 msgstr "只显示已增加文件的状态"
3082 3533
3083 3534 msgid "hg qapplied [-1] [-s] [PATCH]"
3084 3535 msgstr ""
3085 3536
3086 3537 msgid "use pull protocol to copy metadata"
3087 3538 msgstr "数用协议 'pull' 来复制元数据"
3088 3539
3089 3540 msgid "do not update the new working directories"
3090 3541 msgstr ""
3091 3542
3092 3543 msgid "use uncompressed transfer (fast over LAN)"
3093 3544 msgstr "使用不压缩的传输(在局域网更快)"
3094 3545
3095 3546 #, fuzzy
3096 3547 msgid "location of source patch repository"
3097 3548 msgstr "为此版本库启动服务 'inotify'"
3098 3549
3099 3550 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3100 3551 msgstr ""
3101 3552
3102 3553 msgid "hg qcommit [OPTION]... [FILE]..."
3103 3554 msgstr ""
3104 3555
3105 3556 msgid "hg qdiff [OPTION]... [FILE]..."
3106 3557 msgstr ""
3107 3558
3108 3559 msgid "keep patch file"
3109 3560 msgstr ""
3110 3561
3111 3562 msgid "stop managing a revision (DEPRECATED)"
3112 3563 msgstr ""
3113 3564
3114 3565 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3115 3566 msgstr ""
3116 3567
3117 3568 msgid "edit patch header"
3118 3569 msgstr ""
3119 3570
3120 3571 msgid "keep folded patch files"
3121 3572 msgstr ""
3122 3573
3123 3574 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3124 3575 msgstr ""
3125 3576
3126 3577 msgid "overwrite any local changes"
3127 3578 msgstr ""
3128 3579
3129 3580 msgid "hg qgoto [OPTION]... PATCH"
3130 3581 msgstr ""
3131 3582
3132 3583 msgid "list all patches and guards"
3133 3584 msgstr ""
3134 3585
3135 3586 msgid "drop all guards"
3136 3587 msgstr ""
3137 3588
3138 3589 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3139 3590 msgstr ""
3140 3591
3141 3592 msgid "hg qheader [PATCH]"
3142 3593 msgstr ""
3143 3594
3144 3595 #, fuzzy
3145 3596 msgid "import file in patch directory"
3146 3597 msgstr "从补丁目录导入文件"
3147 3598
3148 3599 #, fuzzy
3149 3600 msgid "name of patch file"
3150 3601 msgstr "补丁文件名称"
3151 3602
3152 3603 msgid "overwrite existing files"
3153 3604 msgstr "覆盖已有文件"
3154 3605
3155 3606 msgid "place existing revisions under mq control"
3156 3607 msgstr "将现有的版本置于 mq 控制下"
3157 3608
3158 3609 msgid "use git extended diff format"
3159 3610 msgstr "使用 git 扩展差异格式"
3160 3611
3161 3612 msgid "qpush after importing"
3162 3613 msgstr ""
3163 3614
3164 3615 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3165 3616 msgstr ""
3166 3617
3167 3618 msgid "create queue repository"
3168 3619 msgstr "创建队列版本库"
3169 3620
3170 3621 msgid "hg qinit [-c]"
3171 3622 msgstr ""
3172 3623
3173 3624 msgid "import uncommitted changes into patch"
3174 3625 msgstr ""
3175 3626
3176 3627 msgid "add \"From: <current user>\" to patch"
3177 3628 msgstr ""
3178 3629
3179 3630 msgid "add \"From: <given user>\" to patch"
3180 3631 msgstr ""
3181 3632
3182 3633 msgid "add \"Date: <current date>\" to patch"
3183 3634 msgstr ""
3184 3635
3185 3636 msgid "add \"Date: <given date>\" to patch"
3186 3637 msgstr ""
3187 3638
3188 3639 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3189 3640 msgstr ""
3190 3641
3191 3642 msgid "hg qnext [-s]"
3192 3643 msgstr ""
3193 3644
3194 3645 msgid "hg qprev [-s]"
3195 3646 msgstr ""
3196 3647
3197 3648 msgid "pop all patches"
3198 3649 msgstr "弹出全部补丁"
3199 3650
3200 3651 msgid "queue name to pop"
3201 3652 msgstr "操作的队列名称"
3202 3653
3203 3654 msgid "forget any local changes"
3204 3655 msgstr "丢弃本地修改"
3205 3656
3206 3657 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3207 3658 msgstr ""
3208 3659
3209 3660 msgid "apply if the patch has rejects"
3210 3661 msgstr "强制应用补丁"
3211 3662
3212 3663 msgid "list patch name in commit text"
3213 3664 msgstr "在提交日志中列出补丁名称"
3214 3665
3215 3666 msgid "apply all patches"
3216 3667 msgstr "应用所有补丁"
3217 3668
3218 3669 msgid "merge from another queue"
3219 3670 msgstr "从其它队列合并"
3220 3671
3221 3672 msgid "merge queue name"
3222 3673 msgstr "合并队列的名称"
3223 3674
3224 3675 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3225 3676 msgstr ""
3226 3677
3227 3678 msgid "refresh only files already in the patch and specified files"
3228 3679 msgstr "仅当文件已经在补丁或指定文件中时才更新"
3229 3680
3230 3681 msgid "add/update author field in patch with current user"
3231 3682 msgstr ""
3232 3683
3233 3684 msgid "add/update author field in patch with given user"
3234 3685 msgstr ""
3235 3686
3236 3687 #, fuzzy
3237 3688 msgid "add/update date field in patch with current date"
3238 3689 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3239 3690
3240 3691 #, fuzzy
3241 3692 msgid "add/update date field in patch with given date"
3242 3693 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3243 3694
3244 3695 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3245 3696 msgstr ""
3246 3697
3247 3698 msgid "hg qrename PATCH1 [PATCH2]"
3248 3699 msgstr ""
3249 3700
3250 3701 msgid "delete save entry"
3251 3702 msgstr ""
3252 3703
3253 3704 #, fuzzy
3254 3705 msgid "update queue working directory"
3255 3706 msgstr "正在更新工作目录\n"
3256 3707
3257 3708 msgid "hg qrestore [-d] [-u] REV"
3258 3709 msgstr ""
3259 3710
3260 3711 msgid "copy patch directory"
3261 3712 msgstr ""
3262 3713
3263 3714 msgid "copy directory name"
3264 3715 msgstr ""
3265 3716
3266 3717 msgid "clear queue status file"
3267 3718 msgstr ""
3268 3719
3269 3720 msgid "force copy"
3270 3721 msgstr ""
3271 3722
3272 3723 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3273 3724 msgstr ""
3274 3725
3275 3726 msgid "disable all guards"
3276 3727 msgstr ""
3277 3728
3278 3729 msgid "list all guards in series file"
3279 3730 msgstr ""
3280 3731
3281 3732 msgid "pop to before first guarded applied patch"
3282 3733 msgstr ""
3283 3734
3284 3735 msgid "pop, then reapply patches"
3285 3736 msgstr ""
3286 3737
3287 3738 msgid "hg qselect [OPTION]... [GUARD]..."
3288 3739 msgstr ""
3289 3740
3290 3741 msgid "print patches not in series"
3291 3742 msgstr ""
3292 3743
3293 3744 msgid "hg qseries [-ms]"
3294 3745 msgstr ""
3295 3746
3296 3747 msgid "force removal with local changes"
3297 3748 msgstr "强制删除,纵然有本地修改"
3298 3749
3299 3750 msgid "bundle unrelated changesets"
3300 3751 msgstr "打包不相关的修改集"
3301 3752
3302 3753 msgid "no backups"
3303 3754 msgstr "不备份"
3304 3755
3305 3756 msgid "hg strip [-f] [-b] [-n] REV"
3306 3757 msgstr ""
3307 3758
3308 3759 msgid "hg qtop [-s]"
3309 3760 msgstr ""
3310 3761
3311 3762 #, fuzzy
3312 3763 msgid "show only the first patch"
3313 3764 msgstr "只显示已增加文件的状态"
3314 3765
3315 3766 msgid "hg qunapplied [-1] [-s] [PATCH]"
3316 3767 msgstr ""
3317 3768
3318 3769 msgid "finish all applied changesets"
3319 3770 msgstr ""
3320 3771
3321 3772 msgid "hg qfinish [-a] [REV]..."
3322 3773 msgstr ""
3323 3774
3324 msgid ""
3325 "hooks for sending email notifications at commit/push time\n"
3326 "\n"
3775 msgid "hooks for sending email notifications at commit/push time"
3776 msgstr ""
3777
3778 msgid ""
3327 3779 "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"
3780 "print messages to stdout, for testing and configuring."
3781 msgstr ""
3782
3783 msgid ""
3330 3784 "To use, configure the notify extension and enable it in hgrc like\n"
3331 "this::\n"
3332 "\n"
3785 "this::"
3786 msgstr ""
3787
3788 msgid ""
3333 3789 " [extensions]\n"
3334 " notify =\n"
3335 "\n"
3790 " notify ="
3791 msgstr ""
3792
3793 msgid ""
3336 3794 " [hooks]\n"
3337 3795 " # one email for each incoming changeset\n"
3338 3796 " incoming.notify = python:hgext.notify.hook\n"
3339 3797 " # batch emails when many changesets incoming at one time\n"
3340 " changegroup.notify = python:hgext.notify.hook\n"
3341 "\n"
3798 " changegroup.notify = python:hgext.notify.hook"
3799 msgstr ""
3800
3801 msgid ""
3342 3802 " [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"
3803 " # config items go here"
3804 msgstr ""
3805
3806 msgid "Required configuration items::"
3807 msgstr ""
3808
3809 msgid " config = /path/to/file # file containing subscriptions"
3810 msgstr ""
3811
3812 msgid "Optional configuration items::"
3813 msgstr ""
3814
3815 msgid ""
3351 3816 " test = True # print messages to stdout for testing\n"
3352 3817 " strip = 3 # number of slashes to strip for url paths\n"
3353 3818 " domain = example.com # domain to use if committer missing domain\n"
3354 3819 " style = ... # style file to use when formatting email\n"
3355 3820 " template = ... # template to use when formatting email\n"
3356 3821 " incoming = ... # template to use when run as incoming hook\n"
3357 3822 " changegroup = ... # template when run as changegroup hook\n"
3358 3823 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3359 3824 " maxsubject = 67 # truncate subject line longer than this\n"
3360 3825 " diffstat = True # add a diffstat before the diff content\n"
3361 3826 " sources = serve # notify if source of incoming changes in this list\n"
3362 3827 " # (serve == ssh or http, push, pull, bundle)\n"
3363 3828 " [email]\n"
3364 3829 " from = user@host.com # email address to send as if none given\n"
3365 3830 " [web]\n"
3366 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3367 "\n"
3831 " baseurl = http://hgserver/... # root of hg web site for browsing commits"
3832 msgstr ""
3833
3834 msgid ""
3368 3835 "The notify config file has same format as a regular hgrc file. It has\n"
3369 3836 "two sections so you can express subscriptions in whatever way is\n"
3370 "handier for you.\n"
3371 "\n"
3372 "::\n"
3373 "\n"
3837 "handier for you."
3838 msgstr ""
3839
3840 msgid "::"
3841 msgstr ""
3842
3843 msgid ""
3374 3844 " [usersubs]\n"
3375 3845 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3376 " user@host = pattern\n"
3377 "\n"
3846 " user@host = pattern"
3847 msgstr ""
3848
3849 msgid ""
3378 3850 " [reposubs]\n"
3379 3851 " # 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"
3852 " pattern = user@host"
3853 msgstr ""
3854
3855 msgid "Glob patterns are matched against path to repository root."
3856 msgstr ""
3857
3858 msgid ""
3384 3859 "If you like, you can put notify config file in repository that users\n"
3385 3860 "can push changes to, they can manage their own subscriptions.\n"
3386 3861 msgstr ""
3387 3862
3388 3863 #, python-format
3389 3864 msgid "%s: %d new changesets"
3390 3865 msgstr ""
3391 3866
3392 3867 #, python-format
3393 3868 msgid "notify: sending %d subscribers %d changes\n"
3394 3869 msgstr ""
3395 3870
3396 3871 #, python-format
3397 3872 msgid ""
3398 3873 "\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"
3874 "diffs (truncated from %d to %d lines):"
3875 msgstr ""
3876
3877 #, python-format
3878 msgid ""
3879 "\n"
3880 "diffs (%d lines):"
3408 3881 msgstr ""
3409 3882
3410 3883 #, python-format
3411 3884 msgid "notify: no subscribers to repository %s\n"
3412 3885 msgstr ""
3413 3886
3414 3887 #, python-format
3415 3888 msgid "notify: changes have source \"%s\" - skipping\n"
3416 3889 msgstr ""
3417 3890
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"
3891 msgid "browse command output with an external pager"
3892 msgstr ""
3893
3894 msgid "To set the pager that should be used, set the application variable::"
3895 msgstr ""
3896
3897 msgid ""
3423 3898 " [pager]\n"
3424 " pager = LESS='FSRX' less\n"
3425 "\n"
3899 " pager = LESS='FSRX' less"
3900 msgstr ""
3901
3902 msgid ""
3426 3903 "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"
3904 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used."
3905 msgstr ""
3906
3907 msgid ""
3429 3908 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3430 "setting::\n"
3431 "\n"
3909 "setting::"
3910 msgstr ""
3911
3912 msgid ""
3432 3913 " [pager]\n"
3433 " quiet = True\n"
3434 "\n"
3914 " quiet = True"
3915 msgstr ""
3916
3917 msgid ""
3435 3918 "You can disable the pager for certain commands by adding them to the\n"
3436 "pager.ignore list::\n"
3437 "\n"
3919 "pager.ignore list::"
3920 msgstr ""
3921
3922 msgid ""
3438 3923 " [pager]\n"
3439 " ignore = version, help, update\n"
3440 "\n"
3924 " ignore = version, help, update"
3925 msgstr ""
3926
3927 msgid ""
3441 3928 "You can also enable the pager only for certain commands using\n"
3442 "pager.attend::\n"
3443 "\n"
3929 "pager.attend::"
3930 msgstr ""
3931
3932 msgid ""
3444 3933 " [pager]\n"
3445 " attend = log\n"
3446 "\n"
3447 "If pager.attend is present, pager.ignore will be ignored.\n"
3448 "\n"
3934 " attend = log"
3935 msgstr ""
3936
3937 msgid "If pager.attend is present, pager.ignore will be ignored."
3938 msgstr ""
3939
3940 msgid ""
3449 3941 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3450 3942 "specify them in the global .hgrc\n"
3451 3943 msgstr ""
3452 3944
3453 msgid ""
3454 "interpret suffixes to refer to ancestor revisions\n"
3455 "\n"
3945 msgid "interpret suffixes to refer to ancestor revisions"
3946 msgstr ""
3947
3948 msgid ""
3456 3949 "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"
3950 "ancestors of a specific revision."
3951 msgstr ""
3952
3953 msgid "For example, if you can refer to a revision as \"foo\", then::"
3954 msgstr ""
3955
3956 msgid ""
3461 3957 " foo^N = Nth parent of foo\n"
3462 3958 " foo^0 = foo\n"
3463 3959 " foo^1 = first parent of foo\n"
3464 3960 " foo^2 = second parent of foo\n"
3465 " foo^ = foo^1\n"
3466 "\n"
3961 " foo^ = foo^1"
3962 msgstr ""
3963
3964 msgid ""
3467 3965 " foo~N = Nth first grandparent of foo\n"
3468 3966 " foo~0 = foo\n"
3469 3967 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3470 3968 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3471 3969 msgstr ""
3472 3970
3473 msgid ""
3474 "command to send changesets as (a series of) patch emails\n"
3475 "\n"
3971 msgid "command to send changesets as (a series of) patch emails"
3972 msgstr ""
3973
3974 msgid ""
3476 3975 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3477 "describes the series as a whole.\n"
3478 "\n"
3976 "describes the series as a whole."
3977 msgstr ""
3978
3979 msgid ""
3479 3980 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3480 3981 "first line of the changeset description as the subject text. The\n"
3481 "message contains two or three body parts:\n"
3482 "\n"
3982 "message contains two or three body parts:"
3983 msgstr ""
3984
3985 msgid ""
3483 3986 "- The changeset description.\n"
3484 3987 "- [Optional] The result of running diffstat on the patch.\n"
3485 "- The patch itself, as generated by \"hg export\".\n"
3486 "\n"
3988 "- The patch itself, as generated by \"hg export\"."
3989 msgstr ""
3990
3991 msgid ""
3487 3992 "Each message refers to the first in the series using the In-Reply-To\n"
3488 3993 "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"
3994 "mail and news readers, and in mail archives."
3995 msgstr ""
3996
3997 msgid ""
3491 3998 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3492 3999 "with a diffstat summary and the changeset summary, so you can be sure\n"
3493 "you are sending the right changes.\n"
3494 "\n"
4000 "you are sending the right changes."
4001 msgstr ""
4002
4003 msgid ""
3495 4004 "To configure other defaults, add a section like this to your hgrc\n"
3496 "file::\n"
3497 "\n"
4005 "file::"
4006 msgstr ""
4007
4008 msgid ""
3498 4009 " [email]\n"
3499 4010 " from = My Name <my@email>\n"
3500 4011 " to = recipient1, recipient2, ...\n"
3501 4012 " cc = cc1, cc2, ...\n"
3502 " bcc = bcc1, bcc2, ...\n"
3503 "\n"
4013 " bcc = bcc1, bcc2, ..."
4014 msgstr ""
4015
4016 msgid ""
3504 4017 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3505 "as a patchbomb.\n"
3506 "\n"
4018 "as a patchbomb."
4019 msgstr ""
4020
4021 msgid ""
3507 4022 "To avoid sending patches prematurely, it is a good idea to first run\n"
3508 4023 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3509 4024 "prompted for an email recipient address, a subject and an introductory\n"
3510 4025 "message describing the patches of your patchbomb. Then when all is\n"
3511 4026 "done, patchbomb messages are displayed. If the PAGER environment\n"
3512 4027 "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"
4028 "message, so you can verify everything is alright."
4029 msgstr ""
4030
4031 msgid ""
3515 4032 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3516 4033 "patchbomb message in a pager or sending the messages directly, it will\n"
3517 4034 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3518 4035 "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"
4036 "files, e.g. with mutt::"
4037 msgstr ""
4038
4039 msgid " % mutt -R -f mbox"
4040 msgstr ""
4041
4042 msgid ""
3523 4043 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3524 4044 "(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"
4045 "package), to send each message out::"
4046 msgstr ""
4047
4048 msgid " % formail -s sendmail -bm -t < mbox"
4049 msgstr ""
4050
4051 msgid "That should be all. Now your patchbomb is on its way out."
4052 msgstr ""
4053
4054 msgid ""
3531 4055 "You can also either configure the method option in the email section\n"
3532 4056 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3533 4057 "that the patchbomb extension can automatically send patchbombs\n"
3534 4058 "directly from the commandline. See the [email] and [smtp] sections in\n"
3535 4059 "hgrc(5) for details.\n"
3536 4060 msgstr ""
3537 4061
3538 4062 msgid "Please enter a valid value.\n"
3539 4063 msgstr ""
3540 4064
3541 4065 msgid "does the diffstat above look okay? "
3542 4066 msgstr ""
3543 4067
3544 4068 msgid "diffstat rejected"
3545 4069 msgstr ""
3546 4070
3547 msgid ""
3548 "send changesets by email\n"
3549 "\n"
4071 msgid "send changesets by email"
4072 msgstr ""
4073
4074 msgid ""
3550 4075 " By default, diffs are sent in the format generated by hg export,\n"
3551 4076 " 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"
4077 " introduction, which describes the series as a whole."
4078 msgstr ""
4079
4080 msgid ""
3554 4081 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3555 4082 " the first line of the changeset description as the subject text.\n"
3556 4083 " The message contains two or three parts. First, the changeset\n"
3557 4084 " description. Next, (optionally) if the diffstat program is\n"
3558 4085 " installed and -d/--diffstat is used, the result of running\n"
3559 4086 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3560 " \"hg export\".\n"
3561 "\n"
4087 " \"hg export\"."
4088 msgstr ""
4089
4090 msgid ""
3562 4091 " By default the patch is included as text in the email body for\n"
3563 4092 " easy reviewing. Using the -a/--attach option will instead create\n"
3564 4093 " an attachment for the patch. With -i/--inline an inline attachment\n"
3565 " will be created.\n"
3566 "\n"
4094 " will be created."
4095 msgstr ""
4096
4097 msgid ""
3567 4098 " With -o/--outgoing, emails will be generated for patches not found\n"
3568 4099 " in the destination repository (or only those which are ancestors\n"
3569 " of the specified revisions if any are provided)\n"
3570 "\n"
4100 " of the specified revisions if any are provided)"
4101 msgstr ""
4102
4103 msgid ""
3571 4104 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3572 4105 " single email containing a binary Mercurial bundle as an attachment\n"
3573 " will be sent.\n"
3574 "\n"
3575 " Examples::\n"
3576 "\n"
4106 " will be sent."
4107 msgstr ""
4108
4109 msgid ""
3577 4110 " hg email -r 3000 # send patch 3000 only\n"
3578 4111 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3579 4112 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3580 " hg email 3000 # send patch 3000 (deprecated)\n"
3581 "\n"
4113 " hg email 3000 # send patch 3000 (deprecated)"
4114 msgstr ""
4115
4116 msgid ""
3582 4117 " hg email -o # send all patches not in default\n"
3583 4118 " hg email -o DEST # send all patches not in DEST\n"
3584 4119 " 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"
4120 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST"
4121 msgstr ""
4122
4123 msgid ""
3587 4124 " hg email -b # send bundle of all patches not in default\n"
3588 4125 " 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"
4126 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n"
4127 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST"
4128 msgstr ""
4129
4130 msgid ""
3594 4131 " Before using this command, you will need to enable email in your\n"
3595 4132 " hgrc. See the [email] section in hgrc(5) for details.\n"
3596 4133 " "
3597 4134 msgstr ""
3598 4135
3599 4136 msgid "specify at least one changeset with -r or -o"
3600 4137 msgstr ""
3601 4138
3602 4139 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3603 4140 msgstr ""
3604 4141
3605 4142 msgid "too many destinations"
3606 4143 msgstr ""
3607 4144
3608 4145 msgid "use only one form to specify the revision"
3609 4146 msgstr ""
3610 4147
3611 4148 msgid ""
3612 4149 "\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"
4150 "Write the introductory message for the patch series."
4151 msgstr ""
4152
4153 #, python-format
4154 msgid "This patch series consists of %d patches."
3621 4155 msgstr ""
3622 4156
3623 4157 msgid "Final summary:\n"
3624 4158 msgstr ""
3625 4159
3626 4160 msgid "Displaying "
3627 4161 msgstr ""
3628 4162
3629 4163 msgid "Writing "
3630 4164 msgstr ""
3631 4165
3632 4166 msgid "Sending "
3633 4167 msgstr ""
3634 4168
3635 4169 msgid "send patches as attachments"
3636 4170 msgstr ""
3637 4171
3638 4172 msgid "send patches as inline attachments"
3639 4173 msgstr ""
3640 4174
3641 4175 msgid "email addresses of blind carbon copy recipients"
3642 4176 msgstr ""
3643 4177
3644 4178 msgid "email addresses of copy recipients"
3645 4179 msgstr ""
3646 4180
3647 4181 msgid "add diffstat output to messages"
3648 4182 msgstr ""
3649 4183
3650 4184 msgid "use the given date as the sending date"
3651 4185 msgstr ""
3652 4186
3653 4187 msgid "use the given file as the series description"
3654 4188 msgstr ""
3655 4189
3656 4190 msgid "email address of sender"
3657 4191 msgstr ""
3658 4192
3659 4193 msgid "print messages that would be sent"
3660 4194 msgstr ""
3661 4195
3662 4196 msgid "write messages to mbox file instead of sending them"
3663 4197 msgstr ""
3664 4198
3665 4199 msgid "subject of first message (intro or single patch)"
3666 4200 msgstr ""
3667 4201
3668 4202 msgid "message identifier to reply to"
3669 4203 msgstr ""
3670 4204
3671 4205 msgid "flags to add in subject prefixes"
3672 4206 msgstr ""
3673 4207
3674 4208 msgid "email addresses of recipients"
3675 4209 msgstr ""
3676 4210
3677 4211 msgid "omit hg patch header"
3678 4212 msgstr ""
3679 4213
3680 4214 msgid "send changes not found in the target repository"
3681 4215 msgstr ""
3682 4216
3683 4217 msgid "send changes not in target as a binary bundle"
3684 4218 msgstr ""
3685 4219
3686 4220 msgid "name of the bundle attachment file"
3687 4221 msgstr ""
3688 4222
3689 4223 msgid "a revision to send"
3690 4224 msgstr ""
3691 4225
3692 4226 #, fuzzy
3693 4227 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3694 4228 msgstr "纵然远程版本库是无关的也要执行"
3695 4229
3696 4230 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3697 4231 msgstr ""
3698 4232
3699 4233 msgid "send an introduction email for a single patch"
3700 4234 msgstr ""
3701 4235
3702 4236 msgid "hg email [OPTION]... [DEST]..."
3703 4237 msgstr ""
3704 4238
3705 4239 msgid "command to delete untracked files from the working directory"
3706 4240 msgstr ""
3707 4241
3708 msgid ""
3709 "removes files not tracked by Mercurial\n"
3710 "\n"
4242 msgid "removes files not tracked by Mercurial"
4243 msgstr ""
4244
4245 msgid ""
3711 4246 " 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"
4247 " and uncommitted changes in an otherwise-clean source tree."
4248 msgstr ""
4249
4250 msgid " This means that purge will delete:"
4251 msgstr ""
4252
4253 msgid ""
3716 4254 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3717 4255 " - 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"
4256 " they contain files under source control management"
4257 msgstr ""
4258
4259 msgid " But it will leave untouched:"
4260 msgstr ""
4261
4262 msgid ""
3722 4263 " - Modified and unmodified tracked files\n"
3723 4264 " - Ignored files (unless --all is specified)\n"
3724 " - New files added to the repository (with \"hg add\")\n"
3725 "\n"
4265 " - New files added to the repository (with \"hg add\")"
4266 msgstr ""
4267
4268 msgid ""
3726 4269 " If directories are given on the command line, only files in these\n"
3727 " directories are considered.\n"
3728 "\n"
4270 " directories are considered."
4271 msgstr ""
4272
4273 msgid ""
3729 4274 " Be careful with purge, as you could irreversibly delete some files\n"
3730 4275 " you forgot to add to the repository. If you only want to print the\n"
3731 4276 " list of files that this program would delete, use the --print\n"
3732 4277 " option.\n"
3733 4278 " "
3734 4279 msgstr ""
3735 4280
3736 4281 #, python-format
3737 4282 msgid "%s cannot be removed"
3738 4283 msgstr ""
3739 4284
3740 4285 #, python-format
3741 4286 msgid "warning: %s\n"
3742 4287 msgstr ""
3743 4288
3744 4289 #, python-format
3745 4290 msgid "Removing file %s\n"
3746 4291 msgstr "正在删除文件 %s\n"
3747 4292
3748 4293 #, python-format
3749 4294 msgid "Removing directory %s\n"
3750 4295 msgstr "正在删除目录 %s\n"
3751 4296
3752 4297 msgid "abort if an error occurs"
3753 4298 msgstr ""
3754 4299
3755 4300 msgid "purge ignored files too"
3756 4301 msgstr ""
3757 4302
3758 4303 msgid "print filenames instead of deleting them"
3759 4304 msgstr ""
3760 4305
3761 4306 #, fuzzy
3762 4307 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3763 4308 msgstr "在文件名称结尾增加 NUL,用于 xargs"
3764 4309
3765 4310 msgid "hg purge [OPTION]... [DIR]..."
3766 4311 msgstr ""
3767 4312
3768 msgid ""
3769 "command to move sets of revisions to a different ancestor\n"
3770 "\n"
4313 msgid "command to move sets of revisions to a different ancestor"
4314 msgstr ""
4315
4316 msgid ""
3771 4317 "This extension lets you rebase changesets in an existing Mercurial\n"
3772 "repository.\n"
3773 "\n"
4318 "repository."
4319 msgstr ""
4320
4321 msgid ""
3774 4322 "For more information:\n"
3775 4323 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
3776 4324 msgstr ""
3777 4325
3778 4326 msgid "first revision, do not change ancestor\n"
3779 4327 msgstr ""
3780 4328
3781 msgid ""
3782 "move changeset (and descendants) to a different branch\n"
3783 "\n"
4329 msgid "move changeset (and descendants) to a different branch"
4330 msgstr ""
4331
4332 msgid ""
3784 4333 " Rebase uses repeated merging to graft changesets from one part of\n"
3785 4334 " history onto another. This can be useful for linearizing local\n"
3786 " changes relative to a master development tree.\n"
3787 "\n"
4335 " changes relative to a master development tree."
4336 msgstr ""
4337
4338 msgid ""
3788 4339 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3789 4340 " continued with --continue/-c or aborted with --abort/-a.\n"
3790 4341 " "
3791 4342 msgstr ""
3792 4343
3793 4344 msgid "cannot use both abort and continue"
3794 4345 msgstr ""
3795 4346
3796 4347 msgid "cannot use collapse with continue or abort"
3797 4348 msgstr ""
3798 4349
3799 4350 msgid "abort and continue do not allow specifying revisions"
3800 4351 msgstr ""
3801 4352
3802 4353 msgid "cannot specify both a revision and a base"
3803 4354 msgstr ""
3804 4355
3805 4356 msgid "nothing to rebase\n"
3806 4357 msgstr ""
3807 4358
3808 4359 msgid "cannot use both keepbranches and extrafn"
3809 4360 msgstr ""
3810 4361
3811 4362 msgid "rebase merging completed\n"
3812 4363 msgstr ""
3813 4364
3814 4365 msgid "warning: new changesets detected on source branch, not stripping\n"
3815 4366 msgstr ""
3816 4367
3817 4368 msgid "rebase completed\n"
3818 4369 msgstr ""
3819 4370
3820 4371 #, python-format
3821 4372 msgid "%d revisions have been skipped\n"
3822 4373 msgstr ""
3823 4374
3824 4375 msgid " set parents\n"
3825 4376 msgstr ""
3826 4377
3827 4378 #, python-format
3828 4379 msgid "rebasing %d:%s\n"
3829 4380 msgstr ""
3830 4381
3831 4382 #, python-format
3832 4383 msgid " future parents are %d and %d\n"
3833 4384 msgstr ""
3834 4385
3835 4386 #, python-format
3836 4387 msgid " update to %d:%s\n"
3837 4388 msgstr ""
3838 4389
3839 4390 msgid " already in target\n"
3840 4391 msgstr ""
3841 4392
3842 4393 #, python-format
3843 4394 msgid " merge against %d:%s\n"
3844 4395 msgstr ""
3845 4396
3846 4397 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3847 4398 msgstr ""
3848 4399
3849 4400 msgid "resuming interrupted rebase\n"
3850 4401 msgstr ""
3851 4402
3852 4403 #, python-format
3853 4404 msgid "no changes, revision %d skipped\n"
3854 4405 msgstr ""
3855 4406
3856 4407 #, python-format
3857 4408 msgid "next revision set to %s\n"
3858 4409 msgstr ""
3859 4410
3860 4411 #, python-format
3861 4412 msgid "cannot use revision %d as base, result would have 3 parents"
3862 4413 msgstr ""
3863 4414
3864 4415 #, python-format
3865 4416 msgid "revision %d is an mq patch (%s), finalize it.\n"
3866 4417 msgstr ""
3867 4418
3868 4419 #, python-format
3869 4420 msgid "import mq patch %d (%s)\n"
3870 4421 msgstr ""
3871 4422
3872 4423 msgid "rebase status stored\n"
3873 4424 msgstr ""
3874 4425
3875 4426 msgid "rebase status resumed\n"
3876 4427 msgstr ""
3877 4428
3878 4429 msgid "no rebase in progress"
3879 4430 msgstr ""
3880 4431
3881 4432 msgid "warning: new changesets detected on target branch, not stripping\n"
3882 4433 msgstr ""
3883 4434
3884 4435 msgid "rebase aborted\n"
3885 4436 msgstr ""
3886 4437
3887 4438 msgid "cannot rebase onto an applied mq patch"
3888 4439 msgstr ""
3889 4440
3890 4441 msgid "cannot rebase an ancestor"
3891 4442 msgstr ""
3892 4443
3893 4444 msgid "cannot rebase a descendant"
3894 4445 msgstr ""
3895 4446
3896 4447 msgid "already working on current\n"
3897 4448 msgstr ""
3898 4449
3899 4450 msgid "already working on the current branch\n"
3900 4451 msgstr ""
3901 4452
3902 4453 #, python-format
3903 4454 msgid "rebase onto %d starting from %d\n"
3904 4455 msgstr ""
3905 4456
3906 4457 msgid "unable to collapse, there is more than one external parent"
3907 4458 msgstr ""
3908 4459
3909 4460 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3910 4461 msgstr ""
3911 4462
3912 4463 msgid "rebase working directory to branch head"
3913 4464 msgstr ""
3914 4465
3915 4466 msgid "rebase from a given revision"
3916 4467 msgstr ""
3917 4468
3918 4469 msgid "rebase from the base of a given revision"
3919 4470 msgstr ""
3920 4471
3921 4472 msgid "rebase onto a given revision"
3922 4473 msgstr ""
3923 4474
3924 4475 msgid "collapse the rebased revisions"
3925 4476 msgstr ""
3926 4477
3927 4478 msgid "keep original revisions"
3928 4479 msgstr ""
3929 4480
3930 4481 msgid "keep original branches"
3931 4482 msgstr ""
3932 4483
3933 4484 msgid "continue an interrupted rebase"
3934 4485 msgstr ""
3935 4486
3936 4487 msgid "abort an interrupted rebase"
3937 4488 msgstr ""
3938 4489
3939 msgid ""
3940 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | "
3941 "[-c] | [-a]"
4490 msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]"
3942 4491 msgstr ""
3943 4492
3944 4493 msgid "commands to interactively select changes for commit/qrefresh"
3945 4494 msgstr ""
3946 4495
3947 4496 msgid "this modifies a binary file (all or nothing)\n"
3948 4497 msgstr ""
3949 4498
3950 4499 msgid "this is a binary file\n"
3951 4500 msgstr ""
3952 4501
3953 4502 #, python-format
3954 4503 msgid "%d hunks, %d lines changed\n"
3955 4504 msgstr ""
3956 4505
3957 4506 msgid "[Ynsfdaq?]"
3958 4507 msgstr ""
3959 4508
3960 4509 msgid "&Yes, record this change"
3961 4510 msgstr ""
3962 4511
3963 4512 msgid "&No, skip this change"
3964 4513 msgstr ""
3965 4514
3966 4515 msgid "&Skip remaining changes to this file"
3967 4516 msgstr ""
3968 4517
3969 4518 msgid "Record remaining changes to this &file"
3970 4519 msgstr ""
3971 4520
3972 4521 msgid "&Done, skip remaining changes and files"
3973 4522 msgstr ""
3974 4523
3975 4524 #, fuzzy
3976 4525 msgid "Record &all changes to all remaining files"
3977 4526 msgstr "将丢失的文件视为删除"
3978 4527
3979 4528 #, fuzzy
3980 4529 msgid "&Quit, recording no changes"
3981 4530 msgstr "正在搜索修改\n"
3982 4531
3983 4532 msgid "&?"
3984 4533 msgstr ""
3985 4534
3986 4535 msgid "y - record this change"
3987 4536 msgstr ""
3988 4537
3989 4538 msgid "user quit"
3990 4539 msgstr "用户退出"
3991 4540
3992 4541 #, python-format
3993 4542 msgid "examine changes to %s?"
3994 4543 msgstr ""
3995 4544
3996 4545 msgid " and "
3997 4546 msgstr ""
3998 4547
3999 4548 msgid "y"
4000 4549 msgstr ""
4001 4550
4002 4551 #, python-format
4003 4552 msgid "record this change to %r?"
4004 4553 msgstr ""
4005 4554
4006 4555 #, fuzzy, python-format
4007 4556 msgid "record change %d/%d to %r?"
4008 4557 msgstr "不需要改变 %s\n"
4009 4558
4010 msgid ""
4011 "interactively select changes to commit\n"
4012 "\n"
4559 msgid "interactively select changes to commit"
4560 msgstr ""
4561
4562 msgid ""
4013 4563 " 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"
4564 " will be candidates for recording."
4565 msgstr ""
4566
4567 msgid " See 'hg help dates' for a list of formats valid for -d/--date."
4568 msgstr ""
4569
4570 msgid ""
4018 4571 " You will be prompted for whether to record changes to each\n"
4019 4572 " modified file, and for files with multiple changes, for each\n"
4020 4573 " change to use. For each query, the following responses are\n"
4021 " possible::\n"
4022 "\n"
4574 " possible::"
4575 msgstr ""
4576
4577 msgid ""
4023 4578 " y - record this change\n"
4024 " n - skip this change\n"
4025 "\n"
4579 " n - skip this change"
4580 msgstr ""
4581
4582 msgid ""
4026 4583 " s - skip remaining changes to this file\n"
4027 " f - record remaining changes to this file\n"
4028 "\n"
4584 " f - record remaining changes to this file"
4585 msgstr ""
4586
4587 msgid ""
4029 4588 " d - done, skip remaining changes and files\n"
4030 4589 " a - record all changes to all remaining files\n"
4031 " q - quit, recording no changes\n"
4032 "\n"
4033 " ? - display help"
4590 " q - quit, recording no changes"
4591 msgstr ""
4592
4593 msgid " ? - display help"
4034 4594 msgstr ""
4035 4595
4036 4596 msgid "'mq' extension not loaded"
4037 4597 msgstr ""
4038 4598
4039 4599 msgid "running non-interactively, use commit instead"
4040 4600 msgstr ""
4041 4601
4042 4602 msgid "no changes to record\n"
4043 4603 msgstr ""
4044 4604
4045 4605 #, python-format
4046 4606 msgid "backup %r as %r\n"
4047 4607 msgstr ""
4048 4608
4049 4609 msgid "applying patch\n"
4050 4610 msgstr ""
4051 4611
4052 4612 msgid "patch failed to apply"
4053 4613 msgstr ""
4054 4614
4055 4615 #, python-format
4056 4616 msgid "restoring %r to %r\n"
4057 4617 msgstr ""
4058 4618
4059 4619 msgid "hg record [OPTION]... [FILE]..."
4060 4620 msgstr ""
4061 4621
4062 4622 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4063 4623 msgstr ""
4064 4624
4065 4625 msgid "share a common history between several working directories"
4066 4626 msgstr ""
4067 4627
4068 msgid ""
4069 "create a new shared repository (experimental)\n"
4070 "\n"
4628 msgid "create a new shared repository (experimental)"
4629 msgstr ""
4630
4631 msgid ""
4071 4632 " Initialize a new repository and working directory that shares its\n"
4072 " history with another repository.\n"
4073 "\n"
4633 " history with another repository."
4634 msgstr ""
4635
4636 msgid ""
4074 4637 " NOTE: actions that change history such as rollback or moving the\n"
4075 4638 " source may confuse sharers.\n"
4076 4639 " "
4077 4640 msgstr ""
4078 4641
4079 4642 msgid "do not create a working copy"
4080 4643 msgstr ""
4081 4644
4082 4645 msgid "[-U] SOURCE [DEST]"
4083 4646 msgstr ""
4084 4647
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"
4648 msgid "command to transplant changesets from another branch"
4649 msgstr ""
4650
4651 msgid "This extension allows you to transplant patches from another branch."
4652 msgstr ""
4653
4654 msgid ""
4090 4655 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4091 4656 "map from a changeset hash to its hash in the source repository.\n"
4092 4657 msgstr ""
4093 4658
4094 4659 #, python-format
4095 4660 msgid "skipping already applied revision %s\n"
4096 4661 msgstr ""
4097 4662
4098 4663 #, python-format
4099 4664 msgid "skipping merge changeset %s:%s\n"
4100 4665 msgstr ""
4101 4666
4102 4667 #, python-format
4103 4668 msgid "%s merged at %s\n"
4104 4669 msgstr ""
4105 4670
4106 4671 #, python-format
4107 4672 msgid "%s transplanted to %s\n"
4108 4673 msgstr ""
4109 4674
4110 4675 #, python-format
4111 4676 msgid "filtering %s\n"
4112 4677 msgstr ""
4113 4678
4114 4679 msgid "filter failed"
4115 4680 msgstr ""
4116 4681
4117 4682 msgid "can only omit patchfile if merging"
4118 4683 msgstr ""
4119 4684
4120 4685 #, python-format
4121 4686 msgid "%s: empty changeset"
4122 4687 msgstr ""
4123 4688
4124 4689 msgid "Fix up the merge and run hg transplant --continue"
4125 4690 msgstr ""
4126 4691
4127 4692 #, python-format
4128 4693 msgid "%s transplanted as %s\n"
4129 4694 msgstr ""
4130 4695
4131 4696 msgid "transplant log file is corrupt"
4132 4697 msgstr ""
4133 4698
4134 4699 #, python-format
4135 4700 msgid "working dir not at transplant parent %s"
4136 4701 msgstr ""
4137 4702
4138 4703 msgid "commit failed"
4139 4704 msgstr ""
4140 4705
4141 4706 msgid "apply changeset? [ynmpcq?]:"
4142 4707 msgstr ""
4143 4708
4144 msgid ""
4145 "transplant changesets from another branch\n"
4146 "\n"
4709 msgid "transplant changesets from another branch"
4710 msgstr ""
4711
4712 msgid ""
4147 4713 " Selected changesets will be applied on top of the current working\n"
4148 4714 " 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"
4715 " specified, log messages will have a comment appended of the form::"
4716 msgstr ""
4717
4718 msgid " (transplanted from CHANGESETHASH)"
4719 msgstr ""
4720
4721 msgid ""
4153 4722 " You can rewrite the changelog message with the --filter option.\n"
4154 4723 " Its argument will be invoked with the current changelog message as\n"
4155 " $1 and the patch as $2.\n"
4156 "\n"
4724 " $1 and the patch as $2."
4725 msgstr ""
4726
4727 msgid ""
4157 4728 " If --source/-s is specified, selects changesets from the named\n"
4158 4729 " repository. If --branch/-b is specified, selects changesets from\n"
4159 4730 " the branch holding the named revision, up to that revision. If\n"
4160 4731 " --all/-a is specified, all changesets on the branch will be\n"
4161 4732 " transplanted, otherwise you will be prompted to select the\n"
4162 " changesets you want.\n"
4163 "\n"
4733 " changesets you want."
4734 msgstr ""
4735
4736 msgid ""
4164 4737 " hg transplant --branch REVISION --all will rebase the selected\n"
4165 4738 " branch (up to the named revision) onto your current working\n"
4166 " directory.\n"
4167 "\n"
4739 " directory."
4740 msgstr ""
4741
4742 msgid ""
4168 4743 " You can optionally mark selected transplanted changesets as merge\n"
4169 4744 " changesets. You will not be prompted to transplant any ancestors\n"
4170 4745 " of a merged transplant, and you can merge descendants of them\n"
4171 " normally instead of transplanting them.\n"
4172 "\n"
4746 " normally instead of transplanting them."
4747 msgstr ""
4748
4749 msgid ""
4173 4750 " If no merges or revisions are provided, hg transplant will start\n"
4174 " an interactive changeset browser.\n"
4175 "\n"
4751 " an interactive changeset browser."
4752 msgstr ""
4753
4754 msgid ""
4176 4755 " If a changeset application fails, you can fix the merge by hand\n"
4177 4756 " and then resume where you left off by calling hg transplant\n"
4178 4757 " --continue/-c.\n"
4179 4758 " "
4180 4759 msgstr ""
4181 4760
4182 4761 msgid "--continue is incompatible with branch, all or merge"
4183 4762 msgstr ""
4184 4763
4185 4764 msgid "no source URL, branch tag or revision list provided"
4186 4765 msgstr ""
4187 4766
4188 4767 msgid "--all requires a branch revision"
4189 4768 msgstr ""
4190 4769
4191 4770 msgid "--all is incompatible with a revision list"
4192 4771 msgstr ""
4193 4772
4194 4773 msgid "no revision checked out"
4195 4774 msgstr ""
4196 4775
4197 4776 msgid "outstanding uncommitted merges"
4198 4777 msgstr ""
4199 4778
4200 4779 msgid "outstanding local changes"
4201 4780 msgstr ""
4202 4781
4203 4782 msgid "pull patches from REPOSITORY"
4204 4783 msgstr ""
4205 4784
4206 4785 msgid "pull patches from branch BRANCH"
4207 4786 msgstr ""
4208 4787
4209 4788 msgid "pull all changesets up to BRANCH"
4210 4789 msgstr ""
4211 4790
4212 4791 msgid "skip over REV"
4213 4792 msgstr ""
4214 4793
4215 4794 msgid "merge at REV"
4216 4795 msgstr ""
4217 4796
4218 4797 msgid "append transplant info to log message"
4219 4798 msgstr ""
4220 4799
4221 4800 msgid "continue last transplant session after repair"
4222 4801 msgstr ""
4223 4802
4224 4803 msgid "filter changesets through FILTER"
4225 4804 msgstr ""
4226 4805
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"
4806 msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4807 msgstr ""
4808
4809 msgid "allow the use of MBCS paths with problematic encodings"
4810 msgstr ""
4811
4812 msgid ""
4234 4813 "Some MBCS encodings are not good for some path operations (i.e.\n"
4235 4814 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4236 4815 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4237 4816 "This extension can be used to fix the issue with those encodings by\n"
4238 4817 "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"
4818 "operation."
4819 msgstr ""
4820
4821 msgid "This extension is useful for:"
4822 msgstr ""
4823
4824 msgid ""
4243 4825 "- Japanese Windows users using shift_jis encoding.\n"
4244 4826 "- Chinese Windows users using big5 encoding.\n"
4245 4827 "- 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"
4828 " case-insensitive file system."
4829 msgstr ""
4830
4831 msgid "This extension is not needed for:"
4832 msgstr ""
4833
4834 msgid ""
4250 4835 "- 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"
4836 "- Any user who do not use any of problematic encodings."
4837 msgstr ""
4838
4839 msgid "Note that there are some limitations on using this extension:"
4840 msgstr ""
4841
4842 msgid ""
4255 4843 "- You should use single encoding in one repository.\n"
4256 4844 "- You should set same encoding for the repository by locale or\n"
4257 " HGENCODING.\n"
4258 "\n"
4845 " HGENCODING."
4846 msgstr ""
4847
4848 msgid ""
4259 4849 "Path encoding conversion are done between Unicode and\n"
4260 4850 "encoding.encoding which is decided by Mercurial from current locale\n"
4261 4851 "setting or HGENCODING.\n"
4262 4852 msgstr ""
4263 4853
4264 4854 #, python-format
4265 4855 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4266 4856 msgstr ""
4267 4857
4268 4858 msgid "[win32mbcs] cannot activate on this platform.\n"
4269 4859 msgstr ""
4270 4860
4271 4861 #, python-format
4272 4862 msgid "[win32mbcs] activated with encoding: %s\n"
4273 4863 msgstr ""
4274 4864
4275 msgid ""
4276 "perform automatic newline conversion\n"
4277 "\n"
4278 "To perform automatic newline conversion, use::\n"
4279 "\n"
4865 msgid "perform automatic newline conversion"
4866 msgstr ""
4867
4868 msgid "To perform automatic newline conversion, use::"
4869 msgstr ""
4870
4871 msgid ""
4280 4872 " [extensions]\n"
4281 4873 " win32text =\n"
4282 4874 " [encode]\n"
4283 4875 " ** = cleverencode:\n"
4284 " # or ** = macencode:\n"
4285 "\n"
4876 " # or ** = macencode:"
4877 msgstr ""
4878
4879 msgid ""
4286 4880 " [decode]\n"
4287 4881 " ** = 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"
4882 " # or ** = macdecode:"
4883 msgstr ""
4884
4885 msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
4886 msgstr ""
4887
4888 msgid ""
4293 4889 " [hooks]\n"
4294 4890 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4295 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4296 "\n"
4891 " # or pretxncommit.cr = python:hgext.win32text.forbidcr"
4892 msgstr ""
4893
4894 msgid ""
4297 4895 "To do the same check on a server to prevent CRLF/CR from being\n"
4298 "pushed or pulled::\n"
4299 "\n"
4896 "pushed or pulled::"
4897 msgstr ""
4898
4899 msgid ""
4300 4900 " [hooks]\n"
4301 4901 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4302 4902 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4303 4903 msgstr ""
4304 4904
4305 4905 #, python-format
4306 4906 msgid ""
4307 4907 "WARNING: %s already has %s line endings\n"
4308 4908 "and does not need EOL conversion by the win32text plugin.\n"
4309 4909 "Before your next commit, please reconsider your encode/decode settings in \n"
4310 4910 "Mercurial.ini or %s.\n"
4311 4911 msgstr ""
4312 4912
4313 4913 #, python-format
4314 4914 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4315 4915 msgstr ""
4316 4916
4317 4917 #, python-format
4318 4918 msgid "in %s: %s\n"
4319 4919 msgstr ""
4320 4920
4321 4921 #, python-format
4322 4922 msgid ""
4323 4923 "\n"
4324 4924 "To prevent this mistake in your local repository,\n"
4325 "add to Mercurial.ini or .hg/hgrc:\n"
4326 "\n"
4925 "add to Mercurial.ini or .hg/hgrc:"
4926 msgstr ""
4927
4928 #, python-format
4929 msgid ""
4327 4930 "[hooks]\n"
4328 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4329 "\n"
4330 "and also consider adding:\n"
4331 "\n"
4931 "pretxncommit.%s = python:hgext.win32text.forbid%s"
4932 msgstr ""
4933
4934 #, python-format
4935 msgid "and also consider adding:"
4936 msgstr ""
4937
4938 #, python-format
4939 msgid ""
4332 4940 "[extensions]\n"
4333 4941 "win32text =\n"
4334 4942 "[encode]\n"
4335 4943 "** = %sencode:\n"
4336 4944 "[decode]\n"
4337 4945 "** = %sdecode:\n"
4338 4946 msgstr ""
4339 4947
4340 msgid ""
4341 "discover and advertise repositories on the local network\n"
4342 "\n"
4948 msgid "discover and advertise repositories on the local network"
4949 msgstr ""
4950
4951 msgid ""
4343 4952 "Zeroconf enabled repositories will be announced in a network without\n"
4344 4953 "the need to configure a server or a service. They can be discovered\n"
4345 "without knowing their actual IP address.\n"
4346 "\n"
4954 "without knowing their actual IP address."
4955 msgstr ""
4956
4957 msgid ""
4347 4958 "To allow other people to discover your repository using run \"hg serve\"\n"
4348 "in your repository::\n"
4349 "\n"
4959 "in your repository::"
4960 msgstr ""
4961
4962 msgid ""
4350 4963 " $ cd test\n"
4351 " $ hg serve\n"
4352 "\n"
4353 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4354 "\n"
4964 " $ hg serve"
4965 msgstr ""
4966
4967 msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::"
4968 msgstr ""
4969
4970 msgid ""
4355 4971 " $ hg paths\n"
4356 4972 " zc-test = http://example.com:8000/test\n"
4357 4973 msgstr ""
4358 4974
4359 4975 msgid "archive prefix contains illegal components"
4360 4976 msgstr ""
4361 4977
4362 4978 msgid "cannot give prefix when archiving to files"
4363 4979 msgstr ""
4364 4980
4365 4981 #, python-format
4366 4982 msgid "unknown archive type '%s'"
4367 4983 msgstr ""
4368 4984
4369 4985 msgid "invalid changegroup"
4370 4986 msgstr ""
4371 4987
4372 4988 msgid "unknown parent"
4373 4989 msgstr ""
4374 4990
4375 4991 #, python-format
4376 4992 msgid "integrity check failed on %s:%d"
4377 4993 msgstr ""
4378 4994
4379 4995 #, python-format
4380 4996 msgid "%s: not a Mercurial bundle file"
4381 4997 msgstr ""
4382 4998
4383 4999 #, python-format
4384 5000 msgid "%s: unknown bundle version"
4385 5001 msgstr ""
4386 5002
4387 5003 #, python-format
4388 5004 msgid "%s: unknown bundle compression type"
4389 5005 msgstr ""
4390 5006
4391 5007 msgid "cannot create new bundle repository"
4392 5008 msgstr ""
4393 5009
4394 5010 #, python-format
4395 5011 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4396 5012 msgstr ""
4397 5013
4398 5014 msgid "empty username"
4399 5015 msgstr ""
4400 5016
4401 5017 #, python-format
4402 5018 msgid "username %s contains a newline"
4403 5019 msgstr ""
4404 5020
4405 5021 msgid "options --message and --logfile are mutually exclusive"
4406 5022 msgstr ""
4407 5023
4408 5024 #, python-format
4409 5025 msgid "can't read commit message '%s': %s"
4410 5026 msgstr ""
4411 5027
4412 5028 msgid "limit must be a positive integer"
4413 5029 msgstr ""
4414 5030
4415 5031 msgid "limit must be positive"
4416 5032 msgstr ""
4417 5033
4418 5034 msgid "too many revisions specified"
4419 5035 msgstr ""
4420 5036
4421 5037 #, python-format
4422 5038 msgid "invalid format spec '%%%s' in output filename"
4423 5039 msgstr ""
4424 5040
4425 5041 #, python-format
4426 5042 msgid "adding %s\n"
4427 5043 msgstr ""
4428 5044
4429 5045 #, python-format
4430 5046 msgid "removing %s\n"
4431 5047 msgstr "正在删除 %s\n"
4432 5048
4433 5049 #, python-format
4434 5050 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4435 5051 msgstr ""
4436 5052
4437 5053 #, python-format
4438 5054 msgid "%s: not copying - file is not managed\n"
4439 5055 msgstr ""
4440 5056
4441 5057 #, python-format
4442 5058 msgid "%s: not copying - file has been marked for remove\n"
4443 5059 msgstr ""
4444 5060
4445 5061 #, python-format
4446 5062 msgid "%s: not overwriting - %s collides with %s\n"
4447 5063 msgstr ""
4448 5064
4449 5065 #, python-format
4450 5066 msgid "%s: not overwriting - file exists\n"
4451 5067 msgstr ""
4452 5068
4453 5069 #, python-format
4454 5070 msgid "%s: deleted in working copy\n"
4455 5071 msgstr ""
4456 5072
4457 5073 #, python-format
4458 5074 msgid "%s: cannot copy - %s\n"
4459 5075 msgstr ""
4460 5076
4461 5077 #, python-format
4462 5078 msgid "moving %s to %s\n"
4463 5079 msgstr ""
4464 5080
4465 5081 #, fuzzy, python-format
4466 5082 msgid "copying %s to %s\n"
4467 5083 msgstr "正在推到 %s\n"
4468 5084
4469 5085 #, python-format
4470 5086 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4471 5087 msgstr ""
4472 5088
4473 5089 msgid "no source or destination specified"
4474 5090 msgstr ""
4475 5091
4476 5092 msgid "no destination specified"
4477 5093 msgstr ""
4478 5094
4479 5095 msgid "with multiple sources, destination must be an existing directory"
4480 5096 msgstr ""
4481 5097
4482 5098 #, python-format
4483 5099 msgid "destination %s is not a directory"
4484 5100 msgstr ""
4485 5101
4486 5102 msgid "no files to copy"
4487 5103 msgstr ""
4488 5104
4489 5105 msgid "(consider using --after)\n"
4490 5106 msgstr "(考虑使用 --after)\n"
4491 5107
4492 5108 #, python-format
4493 5109 msgid "changeset: %d:%s\n"
4494 5110 msgstr "修改集: %d:%s\n"
4495 5111
4496 5112 #, python-format
4497 5113 msgid "branch: %s\n"
4498 5114 msgstr "分支: %s\n"
4499 5115
4500 5116 #, python-format
4501 5117 msgid "tag: %s\n"
4502 5118 msgstr "标签: %s\n"
4503 5119
4504 5120 #, python-format
4505 5121 msgid "parent: %d:%s\n"
4506 5122 msgstr "父亲: %d:%s\n"
4507 5123
4508 5124 #, python-format
4509 5125 msgid "manifest: %d:%s\n"
4510 5126 msgstr "清单: %d:%s\n"
4511 5127
4512 5128 #, python-format
4513 5129 msgid "user: %s\n"
4514 5130 msgstr "用户: %s\n"
4515 5131
4516 5132 #, python-format
4517 5133 msgid "date: %s\n"
4518 5134 msgstr "日期: %s\n"
4519 5135
4520 5136 msgid "files+:"
4521 5137 msgstr "文件+:"
4522 5138
4523 5139 msgid "files-:"
4524 5140 msgstr "文件-:"
4525 5141
4526 5142 msgid "files:"
4527 5143 msgstr "文件:"
4528 5144
4529 5145 #, python-format
4530 5146 msgid "files: %s\n"
4531 5147 msgstr "文件: %s\n"
4532 5148
4533 5149 #, python-format
4534 5150 msgid "copies: %s\n"
4535 5151 msgstr "复制: %s\n"
4536 5152
4537 5153 #, python-format
4538 5154 msgid "extra: %s=%s\n"
4539 5155 msgstr "额外: %s=%s\n"
4540 5156
4541 5157 msgid "description:\n"
4542 5158 msgstr "描述:\n"
4543 5159
4544 5160 #, python-format
4545 5161 msgid "summary: %s\n"
4546 5162 msgstr "摘要: %s\n"
4547 5163
4548 5164 #, python-format
4549 5165 msgid "%s: no key named '%s'"
4550 5166 msgstr ""
4551 5167
4552 5168 #, python-format
4553 5169 msgid "%s: %s"
4554 5170 msgstr ""
4555 5171
4556 5172 #, python-format
4557 5173 msgid "Found revision %s from %s\n"
4558 5174 msgstr ""
4559 5175
4560 5176 msgid "revision matching date not found"
4561 5177 msgstr ""
4562 5178
4563 5179 #, python-format
4564 5180 msgid "cannot follow nonexistent file: \"%s\""
4565 5181 msgstr ""
4566 5182
4567 5183 #, python-format
4568 5184 msgid "%s:%s copy source revision cannot be found!\n"
4569 5185 msgstr ""
4570 5186
4571 5187 msgid "can only follow copies/renames for explicit filenames"
4572 5188 msgstr ""
4573 5189
4574 5190 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4575 5191 msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。"
4576 5192
4577 5193 msgid "HG: Leave message empty to abort commit."
4578 5194 msgstr ""
4579 5195
4580 5196 #, fuzzy, python-format
4581 5197 msgid "HG: user: %s"
4582 5198 msgstr "用户: %s\n"
4583 5199
4584 5200 msgid "HG: branch merge"
4585 5201 msgstr ""
4586 5202
4587 5203 #, python-format
4588 5204 msgid "HG: branch '%s'"
4589 5205 msgstr ""
4590 5206
4591 5207 #, fuzzy, python-format
4592 5208 msgid "HG: subrepo %s"
4593 5209 msgstr "已删除"
4594 5210
4595 5211 #, python-format
4596 5212 msgid "HG: added %s"
4597 5213 msgstr ""
4598 5214
4599 5215 #, python-format
4600 5216 msgid "HG: changed %s"
4601 5217 msgstr ""
4602 5218
4603 5219 #, fuzzy, python-format
4604 5220 msgid "HG: removed %s"
4605 5221 msgstr "已删除"
4606 5222
4607 5223 #, fuzzy
4608 5224 msgid "HG: no files changed"
4609 5225 msgstr "正在增加文件改变\n"
4610 5226
4611 5227 msgid "empty commit message"
4612 5228 msgstr "空的提交日志"
4613 5229
4614 5230 #, fuzzy
4615 msgid ""
4616 "add the specified files on the next commit\n"
4617 "\n"
5231 msgid "add the specified files on the next commit"
5232 msgstr "增加指定文件用于下次提交"
5233
5234 #, fuzzy
5235 msgid ""
4618 5236 " Schedule files to be version controlled and added to the\n"
4619 " repository.\n"
4620 "\n"
5237 " repository."
5238 msgstr " 调度文件受版本控制,增加到版本库。"
5239
5240 #, fuzzy
5241 msgid ""
4621 5242 " 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"
5243 " undo an add before that, see hg forget."
5244 msgstr ""
5245 " 这些文件将于下次提交时增加到版本库。需要在提交前撤销增加,\n"
5246 " 参见 'hg revert'。"
5247
5248 #, fuzzy
5249 msgid ""
4624 5250 " If no names are given, add all files to the repository.\n"
4625 5251 " "
4626 5252 msgstr ""
4627 "增加指定文件用于下次提交\n"
4628 "\n"
4629 " 调度文件受版本控制,增加到版本库。\n"
4630 "\n"
4631 " 这些文件将于下次提交时增加到版本库。需要在提交前撤销增加,\n"
4632 " 参见 'hg revert'。\n"
4633 "\n"
4634 5253 " 如果没有给出文件名称,就增加所有文件到版本库。\n"
4635 5254 " "
4636 5255
4637 msgid ""
4638 "add all new files, delete all missing files\n"
4639 "\n"
5256 msgid "add all new files, delete all missing files"
5257 msgstr ""
5258
5259 msgid ""
4640 5260 " Add all new files and remove all missing files from the\n"
4641 " repository.\n"
4642 "\n"
5261 " repository."
5262 msgstr ""
5263
5264 msgid ""
4643 5265 " New files are ignored if they match any of the patterns in\n"
4644 5266 " .hgignore. As with add, these changes take effect at the next\n"
4645 " commit.\n"
4646 "\n"
5267 " commit."
5268 msgstr ""
5269
5270 msgid ""
4647 5271 " Use the -s/--similarity option to detect renamed files. With a\n"
4648 5272 " parameter greater than 0, this compares every removed file with\n"
4649 5273 " every added file and records those similar enough as renames. This\n"
4650 5274 " option takes a percentage between 0 (disabled) and 100 (files must\n"
4651 5275 " be identical) as its parameter. Detecting renamed files this way\n"
4652 5276 " can be expensive.\n"
4653 5277 " "
4654 5278 msgstr ""
4655 5279
4656 5280 msgid "similarity must be a number"
4657 5281 msgstr ""
4658 5282
4659 5283 msgid "similarity must be between 0 and 100"
4660 5284 msgstr ""
4661 5285
4662 5286 #, fuzzy
4663 msgid ""
4664 "show changeset information by line for each file\n"
4665 "\n"
5287 msgid "show changeset information by line for each file"
5288 msgstr "显示指定文件每行的修改集信息"
5289
5290 #, fuzzy
5291 msgid ""
4666 5292 " List changes in files, showing the revision id responsible for\n"
4667 " each line\n"
4668 "\n"
5293 " each line"
5294 msgstr " 列出文件中的修改,为每行显示版本标识"
5295
5296 #, fuzzy
5297 msgid ""
4669 5298 " This command is useful for discovering when a change was made and\n"
4670 " by whom.\n"
4671 "\n"
5299 " by whom."
5300 msgstr " 此命令用于查找谁做出的修改,或者什么时候发生的修改"
5301
5302 #, fuzzy
5303 msgid ""
4672 5304 " Without the -a/--text option, annotate will avoid processing files\n"
4673 5305 " it detects as binary. With -a, annotate will annotate the file\n"
4674 5306 " anyway, although the results will probably be neither useful\n"
4675 5307 " nor desirable.\n"
4676 5308 " "
4677 5309 msgstr ""
4678 "显示指定文件每行的修改集信息\n"
4679 "\n"
4680 " 列出文件中的修改,为每行显示版本标识\n"
4681 "\n"
4682 " 此命令用于查找谁做出的修改,或者什么时候发生的修改\n"
4683 "\n"
4684 5310 " 当没有选项 '-a' 时,annotate 会避免处理检测为二进制的文件\n"
4685 5311 " 当使用选项 '-a' 时,annotate 会直接产生追溯,可能会有不合需要的结果\n"
4686 5312 " "
4687 5313
4688 5314 msgid "at least one filename or pattern is required"
4689 5315 msgstr ""
4690 5316
4691 5317 msgid "at least one of -n/-c is required for -l"
4692 5318 msgstr ""
4693 5319
4694 5320 #, python-format
4695 5321 msgid "%s: binary file\n"
4696 5322 msgstr ""
4697 5323
4698 msgid ""
4699 "create an unversioned archive of a repository revision\n"
4700 "\n"
5324 msgid "create an unversioned archive of a repository revision"
5325 msgstr ""
5326
5327 msgid ""
4701 5328 " 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"
5329 " directory; use -r/--rev to specify a different revision."
5330 msgstr ""
5331
5332 msgid ""
4704 5333 " To specify the type of archive to create, use -t/--type. Valid\n"
4705 " types are::\n"
4706 "\n"
5334 " types are::"
5335 msgstr ""
5336
5337 msgid ""
4707 5338 " \"files\" (default): a directory full of files\n"
4708 5339 " \"tar\": tar archive, uncompressed\n"
4709 5340 " \"tbz2\": tar archive, compressed using bzip2\n"
4710 5341 " \"tgz\": tar archive, compressed using gzip\n"
4711 5342 " \"uzip\": zip archive, uncompressed\n"
4712 " \"zip\": zip archive, compressed using deflate\n"
4713 "\n"
5343 " \"zip\": zip archive, compressed using deflate"
5344 msgstr ""
5345
5346 msgid ""
4714 5347 " 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"
5348 " using a format string; see 'hg help export' for details."
5349 msgstr ""
5350
5351 msgid ""
4717 5352 " Each member added to an archive file has a directory prefix\n"
4718 5353 " prepended. Use -p/--prefix to specify a format string for the\n"
4719 5354 " prefix. The default is the basename of the archive, with suffixes\n"
4720 5355 " removed.\n"
4721 5356 " "
4722 5357 msgstr ""
4723 5358
4724 5359 msgid "no working directory: please specify a revision"
4725 5360 msgstr ""
4726 5361
4727 5362 msgid "repository root cannot be destination"
4728 5363 msgstr ""
4729 5364
4730 5365 msgid "cannot archive plain files to stdout"
4731 5366 msgstr ""
4732 5367
4733 msgid ""
4734 "reverse effect of earlier changeset\n"
4735 "\n"
5368 msgid "reverse effect of earlier changeset"
5369 msgstr ""
5370
5371 msgid ""
4736 5372 " 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"
5373 " changeset is a child of the backed out changeset."
5374 msgstr ""
5375
5376 msgid ""
4739 5377 " If you backout a changeset other than the tip, a new head is\n"
4740 5378 " created. This head will be the new tip and you should merge this\n"
4741 " backout changeset with another head.\n"
4742 "\n"
5379 " backout changeset with another head."
5380 msgstr ""
5381
5382 msgid ""
4743 5383 " The --merge option remembers the parent of the working directory\n"
4744 5384 " before starting the backout, then merges the new head with that\n"
4745 5385 " 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 " "
5386 " The result of this merge is not committed, as with a normal merge."
4750 5387 msgstr ""
4751 5388
4752 5389 msgid "please specify just one revision"
4753 5390 msgstr ""
4754 5391
4755 5392 msgid "please specify a revision to backout"
4756 5393 msgstr ""
4757 5394
4758 5395 msgid "cannot backout change on a different branch"
4759 5396 msgstr ""
4760 5397
4761 5398 msgid "cannot backout a change with no parents"
4762 5399 msgstr ""
4763 5400
4764 5401 msgid "cannot backout a merge changeset without --parent"
4765 5402 msgstr ""
4766 5403
4767 5404 #, python-format
4768 5405 msgid "%s is not a parent of %s"
4769 5406 msgstr ""
4770 5407
4771 5408 msgid "cannot use --parent on non-merge changeset"
4772 5409 msgstr ""
4773 5410
4774 5411 #, python-format
4775 5412 msgid "changeset %s backs out changeset %s\n"
4776 5413 msgstr ""
4777 5414
4778 5415 #, python-format
4779 5416 msgid "merging with changeset %s\n"
4780 5417 msgstr ""
4781 5418
4782 5419 msgid "the backout changeset is a new head - do not forget to merge\n"
4783 5420 msgstr ""
4784 5421
4785 5422 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4786 5423 msgstr ""
4787 5424
4788 msgid ""
4789 "subdivision search of changesets\n"
4790 "\n"
5425 msgid "subdivision search of changesets"
5426 msgstr ""
5427
5428 msgid ""
4791 5429 " This command helps to find changesets which introduce problems. To\n"
4792 5430 " use, mark the earliest changeset you know exhibits the problem as\n"
4793 5431 " bad, then mark the latest changeset which is free from the problem\n"
4794 5432 " as good. Bisect will update your working directory to a revision\n"
4795 5433 " for testing (unless the -U/--noupdate option is specified). Once\n"
4796 5434 " you have performed tests, mark the working directory as good or\n"
4797 5435 " bad, and bisect will either update to another candidate changeset\n"
4798 " or announce that it has found the bad revision.\n"
4799 "\n"
5436 " or announce that it has found the bad revision."
5437 msgstr ""
5438
5439 msgid ""
4800 5440 " 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"
5441 " revision as good or bad without checking it out first."
5442 msgstr ""
5443
5444 msgid ""
4803 5445 " If you supply a command, it will be used for automatic bisection.\n"
4804 5446 " Its exit status will be used to mark revisions as good or bad:\n"
4805 5447 " status 0 means good, 125 means to skip the revision, 127\n"
4806 5448 " (command not found) will abort the bisection, and any other\n"
4807 5449 " non-zero exit status means the revision is bad.\n"
4808 5450 " "
4809 5451 msgstr ""
4810 5452
4811 5453 msgid "The first good revision is:\n"
4812 5454 msgstr ""
4813 5455
4814 5456 msgid "The first bad revision is:\n"
4815 5457 msgstr ""
4816 5458
4817 5459 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4818 5460 msgstr ""
4819 5461
4820 5462 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4821 5463 msgstr ""
4822 5464
4823 5465 msgid "cannot bisect (no known good revisions)"
4824 5466 msgstr ""
4825 5467
4826 5468 msgid "cannot bisect (no known bad revisions)"
4827 5469 msgstr ""
4828 5470
4829 5471 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4830 5472 msgstr ""
4831 5473
4832 5474 msgid "incompatible arguments"
4833 5475 msgstr ""
4834 5476
4835 5477 #, python-format
4836 5478 msgid "cannot find executable: %s"
4837 5479 msgstr ""
4838 5480
4839 5481 #, python-format
4840 5482 msgid "failed to execute %s"
4841 5483 msgstr ""
4842 5484
4843 5485 #, python-format
4844 5486 msgid "%s killed"
4845 5487 msgstr ""
4846 5488
4847 5489 #, fuzzy, python-format
4848 5490 msgid "Changeset %d:%s: %s\n"
4849 5491 msgstr "修改集: %d:%s\n"
4850 5492
4851 5493 #, python-format
4852 5494 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
4853 5495 msgstr ""
4854 5496
4855 msgid ""
4856 "set or show the current branch name\n"
4857 "\n"
5497 msgid "set or show the current branch name"
5498 msgstr ""
5499
5500 msgid ""
4858 5501 " With no argument, show the current branch name. With one argument,\n"
4859 5502 " set the working directory branch name (the branch will not exist\n"
4860 5503 " in the repository until the next commit). Standard practice\n"
4861 5504 " recommends that primary development take place on the 'default'\n"
4862 " branch.\n"
4863 "\n"
5505 " branch."
5506 msgstr ""
5507
5508 msgid ""
4864 5509 " 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"
5510 " branch name that already exists, even if it's inactive."
5511 msgstr ""
5512
5513 msgid ""
4867 5514 " Use -C/--clean to reset the working directory branch to that of\n"
4868 5515 " the parent of the working directory, negating a previous branch\n"
4869 " change.\n"
4870 "\n"
5516 " change."
5517 msgstr ""
5518
5519 msgid ""
4871 5520 " Use the command 'hg update' to switch to an existing branch. Use\n"
4872 5521 " 'hg commit --close-branch' to mark this branch as closed.\n"
4873 5522 " "
4874 5523 msgstr ""
4875 5524
4876 5525 #, python-format
4877 5526 msgid "reset working directory to branch %s\n"
4878 5527 msgstr ""
4879 5528
4880 5529 msgid "a branch of the same name already exists (use --force to override)"
4881 5530 msgstr ""
4882 5531
4883 5532 #, python-format
4884 5533 msgid "marked working directory as branch %s\n"
4885 5534 msgstr ""
4886 5535
4887 msgid ""
4888 "list repository named branches\n"
4889 "\n"
5536 msgid "list repository named branches"
5537 msgstr ""
5538
5539 msgid ""
4890 5540 " List the repository's named branches, indicating which ones are\n"
4891 5541 " inactive. If -c/--closed is specified, also list branches which have\n"
4892 " been marked closed (see hg commit --close-branch).\n"
4893 "\n"
5542 " been marked closed (see hg commit --close-branch)."
5543 msgstr ""
5544
5545 msgid ""
4894 5546 " If -a/--active is specified, only show active branches. A branch\n"
4895 " is considered active if it contains repository heads.\n"
4896 "\n"
5547 " is considered active if it contains repository heads."
5548 msgstr ""
5549
5550 msgid ""
4897 5551 " Use the command 'hg update' to switch to an existing branch.\n"
4898 5552 " "
4899 5553 msgstr ""
4900 5554
4901 msgid ""
4902 "create a changegroup file\n"
4903 "\n"
5555 msgid "create a changegroup file"
5556 msgstr ""
5557
5558 msgid ""
4904 5559 " Generate a compressed changegroup file collecting changesets not\n"
4905 " known to be in another repository.\n"
4906 "\n"
5560 " known to be in another repository."
5561 msgstr ""
5562
5563 msgid ""
4907 5564 " If no destination repository is specified the destination is\n"
4908 5565 " assumed to have all the nodes specified by one or more --base\n"
4909 5566 " parameters. To create a bundle containing all changesets, use\n"
4910 " -a/--all (or --base null).\n"
4911 "\n"
5567 " -a/--all (or --base null)."
5568 msgstr ""
5569
5570 msgid ""
4912 5571 " You can change compression method with the -t/--type option.\n"
4913 5572 " The available compression methods are: none, bzip2, and\n"
4914 " gzip (by default, bundles are compressed using bzip2).\n"
4915 "\n"
5573 " gzip (by default, bundles are compressed using bzip2)."
5574 msgstr ""
5575
5576 msgid ""
4916 5577 " The bundle file can then be transferred using conventional means\n"
4917 5578 " and applied to another repository with the unbundle or pull\n"
4918 5579 " 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"
5580 " available or when exporting an entire repository is undesirable."
5581 msgstr ""
5582
5583 msgid ""
4921 5584 " Applying bundles preserves all changeset contents including\n"
4922 5585 " permissions, copy/rename information, and revision history.\n"
4923 5586 " "
4924 5587 msgstr ""
4925 5588
4926 5589 msgid "--base is incompatible with specifying a destination"
4927 5590 msgstr ""
4928 5591
4929 5592 msgid "unknown bundle type specified with --type"
4930 5593 msgstr ""
4931 5594
4932 msgid ""
4933 "output the current or given revision of files\n"
4934 "\n"
5595 msgid "output the current or given revision of files"
5596 msgstr ""
5597
5598 msgid ""
4935 5599 " Print the specified files as they were at the given revision. If\n"
4936 5600 " 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"
5601 " or tip if no revision is checked out."
5602 msgstr ""
5603
5604 msgid ""
4939 5605 " Output may be to a file, in which case the name of the file is\n"
4940 5606 " 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"
5607 " for the export command, with the following additions::"
5608 msgstr ""
5609
5610 msgid ""
4943 5611 " %s basename of file being printed\n"
4944 5612 " %d dirname of file being printed, or '.' if in repository root\n"
4945 5613 " %p root-relative path name of file being printed\n"
4946 5614 " "
4947 5615 msgstr ""
4948 5616
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"
5617 msgid "make a copy of an existing repository"
5618 msgstr ""
5619
5620 msgid " Create a copy of an existing repository in a new directory."
5621 msgstr ""
5622
5623 msgid ""
4954 5624 " If no destination directory name is specified, it defaults to the\n"
4955 " basename of the source.\n"
4956 "\n"
5625 " basename of the source."
5626 msgstr ""
5627
5628 msgid ""
4957 5629 " 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"
5630 " .hg/hgrc file, as the default to be used for future pulls."
5631 msgstr ""
5632
5633 msgid ""
4960 5634 " If you use the -r/--rev option to clone up to a specific revision,\n"
4961 5635 " no subsequent revisions (including subsequent tags) will be\n"
4962 5636 " present in the cloned repository. This option implies --pull, even\n"
4963 " on local repositories.\n"
4964 "\n"
5637 " on local repositories."
5638 msgstr ""
5639
5640 msgid ""
4965 5641 " By default, clone will check out the head of the 'default' branch.\n"
4966 5642 " If the -U/--noupdate option is used, the new clone will contain\n"
4967 5643 " 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"
5644 " parent is the null revision)."
5645 msgstr ""
5646
5647 msgid " See 'hg help urls' for valid source format details."
5648 msgstr ""
5649
5650 msgid ""
4972 5651 " It is possible to specify an ssh:// URL as the destination, but no\n"
4973 5652 " .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"
5653 " Please see 'hg help urls' for important details about ssh:// URLs."
5654 msgstr ""
5655
5656 msgid ""
4976 5657 " For efficiency, hardlinks are used for cloning whenever the source\n"
4977 5658 " and destination are on the same filesystem (note this applies only\n"
4978 5659 " to the repository data, not to the checked out files). Some\n"
4979 5660 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
4980 5661 " do not report errors. In these cases, use the --pull option to\n"
4981 " avoid hardlinking.\n"
4982 "\n"
5662 " avoid hardlinking."
5663 msgstr ""
5664
5665 msgid ""
4983 5666 " 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"
5667 " using full hardlinks with ::"
5668 msgstr ""
5669
5670 msgid " $ cp -al REPO REPOCLONE"
5671 msgstr ""
5672
5673 msgid ""
4988 5674 " This is the fastest way to clone, but it is not always safe. The\n"
4989 5675 " operation is not atomic (making sure REPO is not modified during\n"
4990 5676 " the operation is up to you) and you have to make sure your editor\n"
4991 5677 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
4992 5678 " this is not compatible with certain extensions that place their\n"
4993 5679 " metadata under the .hg directory, such as mq.\n"
4994 5680 " "
4995 5681 msgstr ""
4996 5682
4997 5683 #, fuzzy
4998 msgid ""
4999 "commit the specified files or all outstanding changes\n"
5000 "\n"
5684 msgid "commit the specified files or all outstanding changes"
5685 msgstr "提交指定文件的修改或全部修改"
5686
5687 #, fuzzy
5688 msgid ""
5001 5689 " Commit changes to the given files into the repository. Unlike a\n"
5002 5690 " centralized RCS, this operation is a local operation. See hg push\n"
5003 " for a way to actively distribute your changes.\n"
5004 "\n"
5691 " for a way to actively distribute your changes."
5692 msgstr " 将指定文件的修改提交到版本库。"
5693
5694 #, fuzzy
5695 msgid ""
5005 5696 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5006 " will be committed.\n"
5007 "\n"
5697 " will be committed."
5698 msgstr " 如果省略了文件列表,那么 \"hg status\" 报告的所有修改都被提交。"
5699
5700 #, fuzzy
5701 msgid ""
5008 5702 " If you are committing the result of a merge, do not provide any\n"
5009 " filenames or -I/-X filters.\n"
5010 "\n"
5703 " filenames or -I/-X filters."
5704 msgstr " 如果你要提交合并结果,请不要提供任何文件名称或过滤器 '-I/-X'。"
5705
5706 #, fuzzy
5707 msgid ""
5011 5708 " 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 " "
5709 " started to prompt you for a message."
5710 msgstr " 如果没有指定提交日志,将会启动配置的编辑器,让你输入信息。"
5029 5711
5030 5712 msgid "nothing changed\n"
5031 5713 msgstr "没有改变\n"
5032 5714
5033 5715 msgid "created new head\n"
5034 5716 msgstr "已经创建新顶点\n"
5035 5717
5036 5718 #, python-format
5037 5719 msgid "committed changeset %d:%s\n"
5038 5720 msgstr "提交修改集 %d:%s\n"
5039 5721
5040 msgid ""
5041 "mark files as copied for the next commit\n"
5042 "\n"
5722 msgid "mark files as copied for the next commit"
5723 msgstr ""
5724
5725 msgid ""
5043 5726 " Mark dest as having copies of source files. If dest is a\n"
5044 5727 " directory, copies are put in that directory. If dest is a file,\n"
5045 " the source must be a single file.\n"
5046 "\n"
5728 " the source must be a single file."
5729 msgstr ""
5730
5731 msgid ""
5047 5732 " By default, this command copies the contents of files as they\n"
5048 5733 " exist in the working directory. If invoked with -A/--after, the\n"
5049 " operation is recorded, but no copying is performed.\n"
5050 "\n"
5734 " operation is recorded, but no copying is performed."
5735 msgstr ""
5736
5737 msgid ""
5051 5738 " This command takes effect with the next commit. To undo a copy\n"
5052 5739 " before that, see hg revert.\n"
5053 5740 " "
5054 5741 msgstr ""
5055 5742
5056 5743 msgid "find the ancestor revision of two revisions in a given index"
5057 5744 msgstr ""
5058 5745
5059 5746 msgid "There is no Mercurial repository here (.hg not found)"
5060 5747 msgstr "此处没有水银版本库(没有找到 .hg)"
5061 5748
5062 5749 msgid "either two or three arguments required"
5063 5750 msgstr "需要两个或三个参数"
5064 5751
5065 5752 msgid "returns the completion list associated with the given command"
5066 5753 msgstr ""
5067 5754
5068 5755 msgid "rebuild the dirstate as it would look like for the given revision"
5069 5756 msgstr ""
5070 5757
5071 5758 msgid "validate the correctness of the current dirstate"
5072 5759 msgstr ""
5073 5760
5074 5761 #, python-format
5075 5762 msgid "%s in state %s, but not in manifest1\n"
5076 5763 msgstr ""
5077 5764
5078 5765 #, python-format
5079 5766 msgid "%s in state %s, but also in manifest1\n"
5080 5767 msgstr ""
5081 5768
5082 5769 #, python-format
5083 5770 msgid "%s in state %s, but not in either manifest\n"
5084 5771 msgstr ""
5085 5772
5086 5773 #, python-format
5087 5774 msgid "%s in manifest1, but listed as state %s"
5088 5775 msgstr ""
5089 5776
5090 5777 msgid ".hg/dirstate inconsistent with current parent's manifest"
5091 5778 msgstr ""
5092 5779
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"
5780 msgid "show combined config settings from all hgrc files"
5781 msgstr ""
5782
5783 msgid " With no arguments, print names and values of all config items."
5784 msgstr ""
5785
5786 msgid ""
5098 5787 " With one argument of the form section.name, print just the value\n"
5099 " of that config item.\n"
5100 "\n"
5788 " of that config item."
5789 msgstr ""
5790
5791 msgid ""
5101 5792 " With multiple arguments, print names and values of all config\n"
5102 " items with matching section names.\n"
5103 "\n"
5793 " items with matching section names."
5794 msgstr ""
5795
5796 msgid ""
5104 5797 " With --debug, the source (filename and line number) is printed\n"
5105 5798 " for each config item.\n"
5106 5799 " "
5107 5800 msgstr ""
5108 5801
5109 5802 msgid "only one config item permitted"
5110 5803 msgstr ""
5111 5804
5112 msgid ""
5113 "manually set the parents of the current working directory\n"
5114 "\n"
5805 msgid "manually set the parents of the current working directory"
5806 msgstr ""
5807
5808 msgid ""
5115 5809 " This is useful for writing repository conversion tools, but should\n"
5116 5810 " be used with care.\n"
5117 5811 " "
5118 5812 msgstr ""
5119 5813
5120 5814 msgid "show the contents of the current dirstate"
5121 5815 msgstr ""
5122 5816
5123 5817 #, python-format
5124 5818 msgid "copy: %s -> %s\n"
5125 5819 msgstr ""
5126 5820
5127 5821 msgid "dump the contents of a data file revision"
5128 5822 msgstr ""
5129 5823
5130 5824 #, python-format
5131 5825 msgid "invalid revision identifier %s"
5132 5826 msgstr ""
5133 5827
5134 5828 msgid "parse and display a date"
5135 5829 msgstr ""
5136 5830
5137 5831 msgid "dump the contents of an index file"
5138 5832 msgstr ""
5139 5833
5140 5834 msgid "dump an index DAG as a graphviz dot file"
5141 5835 msgstr ""
5142 5836
5143 5837 msgid "test Mercurial installation"
5144 5838 msgstr ""
5145 5839
5146 5840 #, python-format
5147 5841 msgid "Checking encoding (%s)...\n"
5148 5842 msgstr ""
5149 5843
5150 5844 msgid " (check that your locale is properly set)\n"
5151 5845 msgstr ""
5152 5846
5153 5847 msgid "Checking extensions...\n"
5154 5848 msgstr ""
5155 5849
5156 5850 msgid " One or more extensions could not be found"
5157 5851 msgstr ""
5158 5852
5159 5853 msgid " (check that you compiled the extensions)\n"
5160 5854 msgstr ""
5161 5855
5162 5856 msgid "Checking templates...\n"
5163 5857 msgstr ""
5164 5858
5165 5859 msgid " (templates seem to have been installed incorrectly)\n"
5166 5860 msgstr ""
5167 5861
5168 5862 msgid "Checking patch...\n"
5169 5863 msgstr ""
5170 5864
5171 5865 msgid " patch call failed:\n"
5172 5866 msgstr ""
5173 5867
5174 5868 msgid " unexpected patch output!\n"
5175 5869 msgstr ""
5176 5870
5177 5871 msgid " patch test failed!\n"
5178 5872 msgstr ""
5179 5873
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"
5874 msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
5875 msgstr ""
5876
5877 msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
5188 5878 msgstr ""
5189 5879
5190 5880 msgid "Checking commit editor...\n"
5191 5881 msgstr ""
5192 5882
5193 5883 msgid " No commit editor set and can't find vi in PATH\n"
5194 5884 msgstr ""
5195 5885
5196 5886 msgid " (specify a commit editor in your .hgrc file)\n"
5197 5887 msgstr ""
5198 5888
5199 5889 #, python-format
5200 5890 msgid " Can't find editor '%s' in PATH\n"
5201 5891 msgstr ""
5202 5892
5203 5893 msgid "Checking username...\n"
5204 5894 msgstr ""
5205 5895
5206 5896 msgid " (specify a username in your .hgrc file)\n"
5207 5897 msgstr ""
5208 5898
5209 5899 msgid "No problems detected\n"
5210 5900 msgstr ""
5211 5901
5212 5902 #, python-format
5213 5903 msgid "%s problems detected, please check your install!\n"
5214 5904 msgstr ""
5215 5905
5216 5906 msgid "dump rename information"
5217 5907 msgstr ""
5218 5908
5219 5909 #, python-format
5220 5910 msgid "%s renamed from %s:%s\n"
5221 5911 msgstr ""
5222 5912
5223 5913 #, python-format
5224 5914 msgid "%s not renamed\n"
5225 5915 msgstr ""
5226 5916
5227 5917 msgid "show how files match on given patterns"
5228 5918 msgstr ""
5229 5919
5230 5920 #, 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"
5921 msgid "diff repository (or selected files)"
5922 msgstr "在版本库中比较(指定的文件)"
5923
5924 #, fuzzy
5925 msgid " Show differences between revisions for the specified files."
5926 msgstr " 显示指定文件在版本间的差异。"
5927
5928 #, fuzzy
5929 msgid " Differences between files are shown using the unified diff format."
5930 msgstr " 文件间的差异使用同一差异格式显示。"
5931
5932 #, fuzzy
5933 msgid ""
5238 5934 " NOTE: diff may generate unexpected results for merges, as it will\n"
5239 5935 " 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"
5936 " changeset if no revisions are specified."
5937 msgstr ""
5938 " 注意: 对合并的比较可能会产生不期望的结果,因为没有指定版本时,默认\n"
5939 " 与工作目录的直接父亲比较。"
5940
5941 #, fuzzy
5942 msgid ""
5248 5943 " Without the -a/--text option, diff will avoid generating diffs of\n"
5249 5944 " files it detects as binary. With -a, diff will generate a diff\n"
5250 " anyway, probably with undesirable results.\n"
5251 "\n"
5945 " anyway, probably with undesirable results."
5946 msgstr ""
5947 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5948 " 时,可能会有不合需要的结果。"
5949
5950 #, fuzzy
5951 msgid ""
5252 5952 " Use the -g/--git option to generate diffs in the git extended diff\n"
5253 5953 " format. For more information, read 'hg help diffs'.\n"
5254 5954 " "
5255 5955 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 5956 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读 'hg help diffs' 以\n"
5273 5957 " 了解更多信息。\n"
5274 5958 " "
5275 5959
5276 5960 #, 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"
5961 msgid "dump the header and diffs for one or more changesets"
5962 msgstr "为一个或多个修改集输出标题和差异"
5963
5964 #, fuzzy
5965 msgid " Print the changeset header and diffs for one or more revisions."
5966 msgstr " 为一个或多个版本输出标题和差异。"
5967
5968 #, fuzzy
5969 msgid ""
5282 5970 " The information shown in the changeset header is: author,\n"
5283 " changeset hash, parent(s) and commit comment.\n"
5284 "\n"
5971 " changeset hash, parent(s) and commit comment."
5972 msgstr " 在修改集标题中显示的信息是: 作者,修改集哈希,父亲和提交日志。"
5973
5974 #, fuzzy
5975 msgid ""
5285 5976 " NOTE: export may generate unexpected diff output for merge\n"
5286 5977 " changesets, as it will compare the merge changeset against its\n"
5287 " first parent only.\n"
5288 "\n"
5978 " first parent only."
5979 msgstr ""
5980 " 注意: 对于合并修改集,导出可能产生不期望的差异输出,因为它只会将合并\n"
5981 " 修改集与其第一个父亲比较。"
5982
5983 #, fuzzy
5984 msgid ""
5289 5985 " 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"
5986 " given using a format string. The formatting rules are as follows::"
5987 msgstr ""
5988 " 可以输出到文件,这时会使用指定的格式化字符串构造文件名称。格式化规则\n"
5989 " 如下:"
5990
5991 #, fuzzy
5992 msgid ""
5292 5993 " %% literal \"%\" character\n"
5293 5994 " %H changeset hash (40 bytes of hexadecimal)\n"
5294 5995 " %N number of patches being generated\n"
5295 5996 " %R changeset revision number\n"
5296 5997 " %b basename of the exporting repository\n"
5297 5998 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5298 5999 " %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"
6000 " %r zero-padded changeset revision number"
6001 msgstr ""
5324 6002 " %% 字符 \"%\"\n"
5325 6003 " %H 修改集哈希 (40 位十六进制数字)\n"
5326 6004 " %N 产生的补丁号\n"
5327 6005 " %R 修改集版本号\n"
5328 6006 " %b 待导出的版本库的基本名称\n"
5329 6007 " %h 短修改集哈希(12 位十六进制数字)\n"
5330 6008 " %n 从 1 开始补 0 的序列号\n"
5331 " %r 补 0 的修改集版本号\n"
5332 "\n"
6009 " %r 补 0 的修改集版本号"
6010
6011 #, fuzzy
6012 msgid ""
6013 " Without the -a/--text option, export will avoid generating diffs\n"
6014 " of files it detects as binary. With -a, export will generate a\n"
6015 " diff anyway, probably with undesirable results."
6016 msgstr ""
5333 6017 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5334 " 时,可能会有不合需要的结果。\n"
5335 "\n"
6018 " 时,可能会有不合需要的结果。"
6019
6020 #, fuzzy
6021 msgid ""
6022 " Use the -g/--git option to generate diffs in the git extended diff\n"
6023 " format. See 'hg help diffs' for more information."
6024 msgstr ""
5336 6025 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n"
5337 " 更多信息。\n"
5338 "\n"
6026 " 更多信息。"
6027
6028 #, fuzzy
6029 msgid ""
6030 " With the --switch-parent option, the diff will be against the\n"
6031 " second parent. It can be useful to review a merge.\n"
6032 " "
6033 msgstr ""
5339 6034 " 使用选项 '--switch-parent',将会与第二个父亲比较。对于复审合并很有用。\n"
5340 6035 " "
5341 6036
5342 6037 msgid "export requires at least one changeset"
5343 6038 msgstr ""
5344 6039
5345 6040 msgid "exporting patches:\n"
5346 6041 msgstr ""
5347 6042
5348 6043 msgid "exporting patch:\n"
5349 6044 msgstr ""
5350 6045
5351 msgid ""
5352 "forget the specified files on the next commit\n"
5353 "\n"
6046 msgid "forget the specified files on the next commit"
6047 msgstr ""
6048
6049 msgid ""
5354 6050 " Mark the specified files so they will no longer be tracked\n"
5355 " after the next commit.\n"
5356 "\n"
6051 " after the next commit."
6052 msgstr ""
6053
6054 msgid ""
5357 6055 " This only removes files from the current branch, not from the\n"
5358 6056 " entire project history, and it does not delete them from the\n"
5359 " working directory.\n"
5360 "\n"
6057 " working directory."
6058 msgstr ""
6059
6060 msgid ""
5361 6061 " To undo a forget before the next commit, see hg add.\n"
5362 6062 " "
5363 6063 msgstr ""
5364 6064
5365 6065 msgid "no files specified"
5366 6066 msgstr ""
5367 6067
5368 6068 #, python-format
5369 6069 msgid "not removing %s: file is already untracked\n"
5370 6070 msgstr ""
5371 6071
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"
6072 msgid "search for a pattern in specified files and revisions"
6073 msgstr ""
6074
6075 msgid " Search revisions of files for a regular expression."
6076 msgstr ""
6077
6078 msgid ""
5377 6079 " This command behaves differently than Unix grep. It only accepts\n"
5378 6080 " Python/Perl regexps. It searches repository history, not the\n"
5379 6081 " working directory. It always prints the revision number in which a\n"
5380 " match appears.\n"
5381 "\n"
6082 " match appears."
6083 msgstr ""
6084
6085 msgid ""
5382 6086 " By default, grep only prints output for the first revision of a\n"
5383 6087 " file in which it finds a match. To get it to print every revision\n"
5384 6088 " that contains a change in match status (\"-\" for a match that\n"
5385 6089 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5386 6090 " use the --all flag.\n"
5387 6091 " "
5388 6092 msgstr ""
5389 6093
5390 6094 #, python-format
5391 6095 msgid "grep: invalid match pattern: %s\n"
5392 6096 msgstr ""
5393 6097
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"
6098 msgid "show current repository heads or show branch heads"
6099 msgstr ""
6100
6101 msgid " With no arguments, show all repository head changesets."
6102 msgstr ""
6103
6104 msgid ""
5399 6105 " Repository \"heads\" are changesets with no child changesets. They are\n"
5400 6106 " where development generally takes place and are the usual targets\n"
5401 " for update and merge operations.\n"
5402 "\n"
6107 " for update and merge operations."
6108 msgstr ""
6109
6110 msgid ""
5403 6111 " 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"
6112 " the named branch associated with the specified changeset(s)."
6113 msgstr ""
6114
6115 msgid ""
5406 6116 " Branch heads are changesets on a named branch with no descendants on\n"
5407 6117 " the same branch. A branch head could be a \"true\" (repository) head,\n"
5408 6118 " or it could be the last changeset on that branch before it was\n"
5409 6119 " merged into another branch, or it could be the last changeset on the\n"
5410 6120 " 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"
6121 " are true heads, the branch is considered inactive."
6122 msgstr ""
6123
6124 msgid ""
5413 6125 " If -c/--closed is specified, also show branch heads marked closed\n"
5414 " (see hg commit --close-branch).\n"
5415 "\n"
6126 " (see hg commit --close-branch)."
6127 msgstr ""
6128
6129 msgid ""
5416 6130 " If STARTREV is specified, only those heads that are descendants of\n"
5417 6131 " STARTREV will be displayed.\n"
5418 6132 " "
5419 6133 msgstr ""
5420 6134
5421 6135 msgid "you must specify a branch to use --closed"
5422 6136 msgstr ""
5423 6137
5424 6138 #, fuzzy, python-format
5425 6139 msgid "no open branch heads on branch %s\n"
5426 6140 msgstr "svn: 分支没有版本 %s"
5427 6141
5428 6142 #, python-format
5429 6143 msgid "no changes on branch %s containing %s are reachable from %s\n"
5430 6144 msgstr ""
5431 6145
5432 6146 #, python-format
5433 6147 msgid "no changes on branch %s are reachable from %s\n"
5434 6148 msgstr ""
5435 6149
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"
6150 msgid "show help for a given topic or a help overview"
6151 msgstr ""
6152
6153 msgid " With no arguments, print a list of commands with short help messages."
6154 msgstr ""
6155
6156 msgid ""
5441 6157 " Given a topic, extension, or command name, print help for that\n"
5442 6158 " topic."
5443 6159 msgstr ""
5444 6160
5445 6161 msgid "global options:"
5446 6162 msgstr "全局选项:"
5447 6163
5448 6164 msgid "use \"hg help\" for the full list of commands"
5449 6165 msgstr "使用 \"hg help\" 获得全部命令的列表"
5450 6166
5451 6167 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5452 6168 msgstr "使用 \"hg help\" 获得全部命令的列表,或 \"hg -v\" 获得详细信息"
5453 6169
5454 6170 #, python-format
5455 6171 msgid "use \"hg -v help%s\" to show aliases and global options"
5456 6172 msgstr "使用 \"hg -v help%s\" 显示别名和全局选项"
5457 6173
5458 6174 #, python-format
5459 6175 msgid "use \"hg -v help %s\" to show global options"
5460 6176 msgstr "使用 \"hg -v help %s\" 显示全局选项"
5461 6177
5462 msgid ""
5463 "list of commands:\n"
5464 "\n"
5465 msgstr ""
5466 "命令列表:\n"
5467 "\n"
6178 msgid "list of commands:"
6179 msgstr "命令列表:"
5468 6180
5469 6181 #, python-format
5470 6182 msgid ""
5471 6183 "\n"
5472 6184 "aliases: %s\n"
5473 6185 msgstr ""
5474 6186 "\n"
5475 6187 "别名: %s\n"
5476 6188
5477 6189 msgid "(no help text available)"
5478 6190 msgstr "(没有可用的帮助信息)"
5479 6191
5480 6192 msgid "options:\n"
5481 6193 msgstr "选项:\n"
5482 6194
5483 6195 msgid "no commands defined\n"
5484 6196 msgstr ""
5485 6197
5486 6198 #, fuzzy
5487 6199 msgid "enabled extensions:"
5488 6200 msgstr ""
5489 6201 "\n"
5490 6202 "启用的扩展:\n"
5491 6203 "\n"
5492 6204
5493 6205 msgid "no help text available"
5494 6206 msgstr "没有可用的帮助信息"
5495 6207
5496 6208 #, fuzzy, python-format
5497 msgid ""
5498 "%s extension - %s\n"
5499 "\n"
6209 msgid "%s extension - %s"
5500 6210 msgstr "** 已加载的扩展: %s\n"
5501 6211
5502 6212 msgid "Mercurial Distributed SCM\n"
5503 6213 msgstr "分布式软件配置管理工具 - 水银\n"
5504 6214
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"
6215 msgid "basic commands:"
6216 msgstr "基本命令:"
6217
6218 msgid ""
6219 "\n"
6220 "additional help topics:"
6221 msgstr ""
6222 "\n"
6223 "额外的帮助主题:"
6224
6225 msgid "identify the working copy or specified revision"
6226 msgstr ""
6227
6228 msgid ""
5524 6229 " With no revision, print a summary of the current state of the\n"
5525 " repository.\n"
5526 "\n"
6230 " repository."
6231 msgstr ""
6232
6233 msgid ""
5527 6234 " Specifying a path to a repository root or Mercurial bundle will\n"
5528 " cause lookup to operate on that repository/bundle.\n"
5529 "\n"
6235 " cause lookup to operate on that repository/bundle."
6236 msgstr ""
6237
6238 msgid ""
5530 6239 " This summary identifies the repository state using one or two\n"
5531 6240 " parent hash identifiers, followed by a \"+\" if there are\n"
5532 6241 " uncommitted changes in the working directory, a list of tags for\n"
5533 6242 " this revision and a branch name for non-default branches.\n"
5534 6243 " "
5535 6244 msgstr ""
5536 6245
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"
6246 msgid "import an ordered set of patches"
6247 msgstr ""
6248
6249 msgid " Import a list of patches and commit them individually."
6250 msgstr ""
6251
6252 msgid ""
5542 6253 " If there are outstanding changes in the working directory, import\n"
5543 " will abort unless given the -f/--force flag.\n"
5544 "\n"
6254 " will abort unless given the -f/--force flag."
6255 msgstr ""
6256
6257 msgid ""
5545 6258 " You can import a patch straight from a mail message. Even patches\n"
5546 6259 " as attachments work (to use the body part, it must have type\n"
5547 6260 " text/plain or text/x-patch). From and Subject headers of email\n"
5548 6261 " message are used as default committer and commit message. All\n"
5549 6262 " text/plain body parts before first diff are added to commit\n"
5550 " message.\n"
5551 "\n"
6263 " message."
6264 msgstr ""
6265
6266 msgid ""
5552 6267 " If the imported patch was generated by hg export, user and\n"
5553 6268 " description from patch override values from message headers and\n"
5554 6269 " body. Values given on command line with -m/--message and -u/--user\n"
5555 " override these.\n"
5556 "\n"
6270 " override these."
6271 msgstr ""
6272
6273 msgid ""
5557 6274 " If --exact is specified, import will set the working directory to\n"
5558 6275 " the parent of each patch before applying it, and will abort if the\n"
5559 6276 " resulting changeset has a different ID than the one recorded in\n"
5560 6277 " the patch. This may happen due to character set problems or other\n"
5561 " deficiencies in the text patch format.\n"
5562 "\n"
6278 " deficiencies in the text patch format."
6279 msgstr ""
6280
6281 msgid ""
5563 6282 " 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"
6283 " copies in the patch in the same way as 'addremove'."
6284 msgstr ""
6285
6286 msgid ""
5566 6287 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5567 6288 " a URL is specified, the patch will be downloaded from it.\n"
5568 6289 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5569 6290 " "
5570 6291 msgstr ""
5571 6292
5572 6293 msgid "applying patch from stdin\n"
5573 6294 msgstr ""
5574 6295
5575 6296 msgid "no diffs found"
5576 6297 msgstr ""
5577 6298
5578 6299 #, python-format
5579 6300 msgid ""
5580 6301 "message:\n"
5581 6302 "%s\n"
5582 6303 msgstr ""
5583 6304
5584 6305 #, fuzzy
5585 6306 msgid "not a Mercurial patch"
5586 6307 msgstr "%s 不是本地的水银版本库"
5587 6308
5588 6309 msgid "patch is damaged or loses information"
5589 6310 msgstr ""
5590 6311
5591 msgid ""
5592 "show new changesets found in source\n"
5593 "\n"
6312 msgid "show new changesets found in source"
6313 msgstr ""
6314
6315 msgid ""
5594 6316 " Show new changesets found in the specified path/URL or the default\n"
5595 6317 " 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"
6318 " if a pull at the time you issued this command."
6319 msgstr ""
6320
6321 msgid ""
5598 6322 " For remote repository, using --bundle avoids downloading the\n"
5599 " changesets twice if the incoming is followed by a pull.\n"
5600 "\n"
6323 " changesets twice if the incoming is followed by a pull."
6324 msgstr ""
6325
6326 msgid ""
5601 6327 " See pull for valid source format details.\n"
5602 6328 " "
5603 6329 msgstr ""
5604 6330
5605 6331 #, fuzzy
5606 msgid ""
5607 "create a new repository in the given directory\n"
5608 "\n"
6332 msgid "create a new repository in the given directory"
6333 msgstr "在指定目录创建新版本库"
6334
6335 #, fuzzy
6336 msgid ""
5609 6337 " 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"
6338 " directory does not exist, it will be created."
6339 msgstr " 在指定目录初始化新版本库。如果指定的目录不存在,那么会被创建。"
6340
6341 #, fuzzy
6342 msgid " If no directory is given, the current directory is used."
6343 msgstr " 如果没有指定目录,就使用当前目录。"
6344
6345 #, fuzzy
6346 msgid ""
5614 6347 " It is possible to specify an ssh:// URL as the destination.\n"
5615 6348 " See 'hg help urls' for more information.\n"
5616 6349 " "
5617 6350 msgstr ""
5618 "在指定目录创建新版本库\n"
5619 "\n"
5620 " 在指定目录初始化新版本库。如果指定的目录不存在,那么会被创建。\n"
5621 "\n"
5622 " 如果没有指定目录,就使用当前目录。\n"
5623 "\n"
5624 6351 " 可以指定位置 'ssh://' 作为目标。参见命令 'hg help urls' 的帮助信息,\n"
5625 6352 " 以了解位置 'ssh://' 的重要详情。\n"
5626 6353 " "
5627 6354
5628 msgid ""
5629 "locate files matching specific patterns\n"
5630 "\n"
6355 msgid "locate files matching specific patterns"
6356 msgstr ""
6357
6358 msgid ""
5631 6359 " Print files under Mercurial control in the working directory whose\n"
5632 " names match the given patterns.\n"
5633 "\n"
6360 " names match the given patterns."
6361 msgstr ""
6362
6363 msgid ""
5634 6364 " By default, this command searches all directories in the working\n"
5635 6365 " directory. To search just the current directory and its\n"
5636 " subdirectories, use \"--include .\".\n"
5637 "\n"
6366 " subdirectories, use \"--include .\"."
6367 msgstr ""
6368
6369 msgid ""
5638 6370 " 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"
6371 " of all files under Mercurial control in the working directory."
6372 msgstr ""
6373
6374 msgid ""
5641 6375 " If you want to feed the output of this command into the \"xargs\"\n"
5642 6376 " command, use the -0 option to both this command and \"xargs\". This\n"
5643 6377 " will avoid the problem of \"xargs\" treating single filenames that\n"
5644 6378 " contain whitespace as multiple filenames.\n"
5645 6379 " "
5646 6380 msgstr ""
5647 6381
5648 6382 #, fuzzy
5649 msgid ""
5650 "show revision history of entire repository or files\n"
5651 "\n"
6383 msgid "show revision history of entire repository or files"
6384 msgstr ""
6385 "显示全部版本库或指定文件的版本历史\n"
6386 "\n"
6387 " 显示全部版本库或指定文件的版本历史。\n"
6388 "\n"
6389 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6390 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6391 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6392 " 个父亲。\n"
6393 "\n"
6394 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6395 " 工作目录的父亲作为开始版本。\n"
6396 "\n"
6397 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6398 "\n"
6399 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6400 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6401 " 变更列表和完整的提交信息。\n"
6402 "\n"
6403 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6404 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6405 " 文件列表。\n"
6406 "\n"
6407 " "
6408
6409 #, fuzzy
6410 msgid ""
5652 6411 " Print the revision history of the specified files or the entire\n"
5653 " project.\n"
5654 "\n"
6412 " project."
6413 msgstr ""
6414 "显示全部版本库或指定文件的版本历史\n"
6415 "\n"
6416 " 显示全部版本库或指定文件的版本历史。\n"
6417 "\n"
6418 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6419 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6420 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6421 " 个父亲。\n"
6422 "\n"
6423 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6424 " 工作目录的父亲作为开始版本。\n"
6425 "\n"
6426 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6427 "\n"
6428 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6429 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6430 " 变更列表和完整的提交信息。\n"
6431 "\n"
6432 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6433 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6434 " 文件列表。\n"
6435 "\n"
6436 " "
6437
6438 #, fuzzy
6439 msgid ""
5655 6440 " File history is shown without following rename or copy history of\n"
5656 6441 " files. Use -f/--follow with a filename to follow history across\n"
5657 6442 " renames and copies. --follow without a filename will only show\n"
5658 6443 " ancestors or descendants of the starting revision. --follow-first\n"
5659 " only follows the first parent of merge revisions.\n"
5660 "\n"
6444 " only follows the first parent of merge revisions."
6445 msgstr ""
6446 "显示全部版本库或指定文件的版本历史\n"
6447 "\n"
6448 " 显示全部版本库或指定文件的版本历史。\n"
6449 "\n"
6450 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6451 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6452 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6453 " 个父亲。\n"
6454 "\n"
6455 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6456 " 工作目录的父亲作为开始版本。\n"
6457 "\n"
6458 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6459 "\n"
6460 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6461 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6462 " 变更列表和完整的提交信息。\n"
6463 "\n"
6464 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6465 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6466 " 文件列表。\n"
6467 "\n"
6468 " "
6469
6470 #, fuzzy
6471 msgid ""
5661 6472 " If no revision range is specified, the default is tip:0 unless\n"
5662 6473 " --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"
6474 " used as the starting revision."
6475 msgstr ""
6476 "显示全部版本库或指定文件的版本历史\n"
6477 "\n"
6478 " 显示全部版本库或指定文件的版本历史。\n"
6479 "\n"
6480 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6481 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6482 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6483 " 个父亲。\n"
6484 "\n"
6485 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6486 " 工作目录的父亲作为开始版本。\n"
6487 "\n"
6488 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6489 "\n"
6490 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6491 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6492 " 变更列表和完整的提交信息。\n"
6493 "\n"
6494 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6495 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6496 " 文件列表。\n"
6497 "\n"
6498 " "
6499
6500 #, fuzzy
6501 msgid ""
5667 6502 " By default this command prints revision number and changeset id,\n"
5668 6503 " tags, non-trivial parents, user, date and time, and a summary for\n"
5669 6504 " 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"
6505 " changed files and full commit message are shown."
6506 msgstr ""
6507 "显示全部版本库或指定文件的版本历史\n"
6508 "\n"
6509 " 显示全部版本库或指定文件的版本历史。\n"
6510 "\n"
6511 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6512 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6513 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6514 " 个父亲。\n"
6515 "\n"
6516 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6517 " 工作目录的父亲作为开始版本。\n"
6518 "\n"
6519 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6520 "\n"
6521 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6522 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6523 " 变更列表和完整的提交信息。\n"
6524 "\n"
6525 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6526 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6527 " 文件列表。\n"
6528 "\n"
6529 " "
6530
6531 #, fuzzy
6532 msgid ""
5672 6533 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5673 6534 " changesets, as it will only compare the merge changeset against\n"
5674 6535 " its first parent. Also, only files different from BOTH parents\n"
5675 6536 " will appear in files:.\n"
5676 6537 " "
5677 6538 msgstr ""
5678 6539 "显示全部版本库或指定文件的版本历史\n"
5679 6540 "\n"
5680 6541 " 显示全部版本库或指定文件的版本历史。\n"
5681 6542 "\n"
5682 6543 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
5683 6544 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
5684 6545 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
5685 6546 " 个父亲。\n"
5686 6547 "\n"
5687 6548 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
5688 6549 " 工作目录的父亲作为开始版本。\n"
5689 6550 "\n"
5690 6551 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
5691 6552 "\n"
5692 6553 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
5693 6554 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
5694 6555 " 变更列表和完整的提交信息。\n"
5695 6556 "\n"
5696 6557 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
5697 6558 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
5698 6559 " 文件列表。\n"
5699 6560 "\n"
5700 6561 " "
5701 6562
5702 msgid ""
5703 "output the current or given revision of the project manifest\n"
5704 "\n"
6563 msgid "output the current or given revision of the project manifest"
6564 msgstr ""
6565
6566 msgid ""
5705 6567 " Print a list of version controlled files for the given revision.\n"
5706 6568 " 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"
6569 " is used, or the null revision if no revision is checked out."
6570 msgstr ""
6571
6572 msgid ""
5709 6573 " With -v, print file permissions, symlink and executable bits.\n"
5710 6574 " With --debug, print file revision hashes.\n"
5711 6575 " "
5712 6576 msgstr ""
5713 6577
5714 6578 #, fuzzy
5715 msgid ""
5716 "merge working directory with another revision\n"
5717 "\n"
6579 msgid "merge working directory with another revision"
6580 msgstr ""
6581 "将工作目录与其它版本合并\n"
6582 "\n"
6583 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6584 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6585 "\n"
6586 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6587 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6588 " "
6589
6590 #, fuzzy
6591 msgid ""
5718 6592 " 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"
6593 " the requested revision since the last common predecessor revision."
6594 msgstr ""
6595 "将工作目录与其它版本合并\n"
6596 "\n"
6597 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6598 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6599 "\n"
6600 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6601 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6602 " "
6603
6604 #, fuzzy
6605 msgid ""
5721 6606 " Files that changed between either parent are marked as changed for\n"
5722 6607 " the next commit and a commit must be performed before any further\n"
5723 6608 " updates to the repository are allowed. The next commit will have\n"
5724 " two parents.\n"
5725 "\n"
6609 " two parents."
6610 msgstr ""
6611 "将工作目录与其它版本合并\n"
6612 "\n"
6613 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6614 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6615 "\n"
6616 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6617 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6618 " "
6619
6620 #, fuzzy
6621 msgid ""
5726 6622 " If no revision is specified, the working directory's parent is a\n"
5727 6623 " head revision, and the current branch contains exactly one other\n"
5728 6624 " head, the other head is merged with by default. Otherwise, an\n"
5729 6625 " explicit revision with which to merge with must be provided.\n"
5730 6626 " "
5731 6627 msgstr ""
5732 6628 "将工作目录与其它版本合并\n"
5733 6629 "\n"
5734 6630 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
5735 6631 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
5736 6632 "\n"
5737 6633 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
5738 6634 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
5739 6635 " "
5740 6636
5741 6637 #, python-format
5742 6638 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5743 6639 msgstr ""
5744 6640
5745 6641 #, python-format
5746 6642 msgid "branch '%s' has one head - please merge with an explicit rev"
5747 6643 msgstr ""
5748 6644
5749 6645 msgid "there is nothing to merge"
5750 6646 msgstr ""
5751 6647
5752 6648 #, python-format
5753 6649 msgid "%s - use \"hg update\" instead"
5754 6650 msgstr ""
5755 6651
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"
6652 msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
6653 msgstr ""
6654
6655 msgid "show changesets not found in destination"
6656 msgstr ""
6657
6658 msgid ""
5764 6659 " Show changesets not found in the specified destination repository\n"
5765 6660 " or the default push location. These are the changesets that would\n"
5766 " be pushed if a push was requested.\n"
5767 "\n"
6661 " be pushed if a push was requested."
6662 msgstr ""
6663
6664 msgid ""
5768 6665 " See pull for valid destination format details.\n"
5769 6666 " "
5770 6667 msgstr ""
5771 6668
5772 6669 #, fuzzy
5773 msgid ""
5774 "show the parents of the working directory or revision\n"
5775 "\n"
6670 msgid "show the parents of the working directory or revision"
6671 msgstr "显示工作目录或指定版本的父亲"
6672
6673 #, fuzzy
6674 msgid ""
5776 6675 " Print the working directory's parent revisions. If a revision is\n"
5777 6676 " given via -r/--rev, the parent of that revision will be printed.\n"
5778 6677 " If a file argument is given, the revision in which the file was\n"
5779 6678 " last changed (before the working directory revision or the\n"
5780 6679 " argument to --rev if given) is printed.\n"
5781 6680 " "
5782 6681 msgstr ""
5783 "显示工作目录或指定版本的父亲\n"
5784 "\n"
5785 6682 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
5786 6683 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
5787 6684 " 版本,或 '--rev' 指定的版本)。\n"
5788 6685 " "
5789 6686
5790 6687 msgid "can only specify an explicit filename"
5791 6688 msgstr ""
5792 6689
5793 6690 #, python-format
5794 6691 msgid "'%s' not found in manifest!"
5795 6692 msgstr ""
5796 6693
5797 msgid ""
5798 "show aliases for remote repositories\n"
5799 "\n"
6694 msgid "show aliases for remote repositories"
6695 msgstr ""
6696
6697 msgid ""
5800 6698 " Show definition of symbolic path name NAME. If no name is given,\n"
5801 " show definition of all available names.\n"
5802 "\n"
6699 " show definition of all available names."
6700 msgstr ""
6701
6702 msgid ""
5803 6703 " 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"
6704 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
6705 msgstr ""
6706
6707 msgid ""
5806 6708 " See 'hg help urls' for more information.\n"
5807 6709 " "
5808 6710 msgstr ""
5809 6711
5810 6712 msgid "not found!\n"
5811 6713 msgstr ""
5812 6714
5813 6715 msgid "not updating, since new heads added\n"
5814 6716 msgstr ""
5815 6717
5816 6718 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5817 6719 msgstr ""
5818 6720
5819 6721 msgid "(run 'hg update' to get a working copy)\n"
5820 6722 msgstr ""
5821 6723
5822 6724 #, 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"
6725 msgid "pull changes from the specified source"
6726 msgstr ""
6727 "从指定版本库取得修改集\n"
6728 "\n"
6729 " 从远程版本库取得修改集到本地版本库。\n"
6730 "\n"
6731 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6732 " 更新工作目录。\n"
6733 "\n"
6734 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6735 " 更多信息。\n"
6736 " "
6737
6738 #, fuzzy
6739 msgid " Pull changes from a remote repository to a local one."
6740 msgstr ""
6741 "从指定版本库取得修改集\n"
6742 "\n"
6743 " 从远程版本库取得修改集到本地版本库。\n"
6744 "\n"
6745 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6746 " 更新工作目录。\n"
6747 "\n"
6748 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6749 " 更多信息。\n"
6750 " "
6751
6752 #, fuzzy
6753 msgid ""
5828 6754 " This finds all changes from the repository at the specified path\n"
5829 6755 " or URL and adds them to a local repository (the current one unless\n"
5830 6756 " -R is specified). By default, this does not update the copy of the\n"
5831 " project in the working directory.\n"
5832 "\n"
6757 " project in the working directory."
6758 msgstr ""
6759 "从指定版本库取得修改集\n"
6760 "\n"
6761 " 从远程版本库取得修改集到本地版本库。\n"
6762 "\n"
6763 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6764 " 更新工作目录。\n"
6765 "\n"
6766 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6767 " 更多信息。\n"
6768 " "
6769
6770 #, fuzzy
6771 msgid ""
5833 6772 " Use hg incoming if you want to see what would have been added by a\n"
5834 6773 " pull at the time you issued this command. If you then decide to\n"
5835 6774 " 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"
6775 " where X is the last changeset listed by hg incoming."
6776 msgstr ""
6777 "从指定版本库取得修改集\n"
6778 "\n"
6779 " 从远程版本库取得修改集到本地版本库。\n"
6780 "\n"
6781 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6782 " 更新工作目录。\n"
6783 "\n"
6784 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6785 " 更多信息。\n"
6786 " "
6787
6788 #, fuzzy
6789 msgid ""
5838 6790 " If SOURCE is omitted, the 'default' path will be used.\n"
5839 6791 " See 'hg help urls' for more information.\n"
5840 6792 " "
5841 6793 msgstr ""
5842 6794 "从指定版本库取得修改集\n"
5843 6795 "\n"
5844 6796 " 从远程版本库取得修改集到本地版本库。\n"
5845 6797 "\n"
5846 6798 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
5847 6799 " 更新工作目录。\n"
5848 6800 "\n"
5849 6801 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
5850 6802 " 更多信息。\n"
5851 6803 " "
5852 6804
5853 6805 #, 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"
6806 msgid "push changes to the specified destination"
6807 msgstr "推送改变到指定位置"
6808
6809 #, fuzzy
6810 msgid " Push changes from the local repository to the given destination."
6811 msgstr " 从本地版本库推送改变到指定位置。"
6812
6813 #, fuzzy
6814 msgid ""
5859 6815 " This is the symmetrical operation for pull. It moves changes from\n"
5860 6816 " the current repository to a different one. If the destination is\n"
5861 6817 " local this is identical to a pull in that directory from the\n"
5862 " current one.\n"
5863 "\n"
6818 " current one."
6819 msgstr ""
6820 " 这是 'pull' 的对称操作。它从当前版本库推送改变到其它版本库。如果目标\n"
6821 " 是本地版本库,那么此操作与在目标版本库从当前版本库执行 'pull' 操作等\n"
6822 " 同。"
6823
6824 #, fuzzy
6825 msgid ""
5864 6826 " By default, push will refuse to run if it detects the result would\n"
5865 6827 " increase the number of remote heads. This generally indicates the\n"
5866 " user forgot to pull and merge before pushing.\n"
5867 "\n"
6828 " user forgot to pull and merge before pushing."
6829 msgstr ""
6830 " 推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n"
6831 " 之前忘记取得远程版本库的修改,并且合并。"
6832
6833 #, fuzzy
6834 msgid ""
5868 6835 " If -r/--rev is used, the named revision and all its ancestors will\n"
5869 " be pushed to the remote repository.\n"
5870 "\n"
6836 " be pushed to the remote repository."
6837 msgstr ""
6838 " 如果使用了选项 '-r',此命名修改集以及其祖先都会被推送到远程版本库。\n"
6839 " "
6840
6841 #, fuzzy
6842 msgid ""
5871 6843 " Please see 'hg help urls' for important details about ssh://\n"
5872 6844 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5873 6845 " "
5874 6846 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 6847 " 参见主题 'urls' 的帮助信息,以了解位置 'ssh://' 的重要详情。如果没有\n"
5890 6848 " 给出目标位置,那么使用默认路径。参见 'hg help urls' 以了解更多信息。\n"
5891 6849 " "
5892 6850
5893 6851 #, python-format
5894 6852 msgid "pushing to %s\n"
5895 6853 msgstr "正在推到 %s\n"
5896 6854
5897 msgid ""
5898 "roll back an interrupted transaction\n"
5899 "\n"
5900 " Recover from an interrupted commit or pull.\n"
5901 "\n"
6855 msgid "roll back an interrupted transaction"
6856 msgstr ""
6857
6858 msgid " Recover from an interrupted commit or pull."
6859 msgstr ""
6860
6861 msgid ""
5902 6862 " This command tries to fix the repository status after an\n"
5903 6863 " interrupted operation. It should only be necessary when Mercurial\n"
5904 6864 " suggests it.\n"
5905 6865 " "
5906 6866 msgstr ""
5907 6867
5908 6868 #, 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"
6869 msgid "remove the specified files on the next commit"
6870 msgstr "在下次提交时删除指定文件"
6871
6872 #, fuzzy
6873 msgid " Schedule the indicated files for removal from the repository."
6874 msgstr " 调度从版本库删除指定文件。"
6875
6876 #, fuzzy
6877 msgid ""
5914 6878 " This only removes files from the current branch, not from the\n"
5915 6879 " entire project history. -A/--after can be used to remove only\n"
5916 6880 " files that have already been deleted, -f/--force can be used to\n"
5917 6881 " 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"
6882 " revision without deleting them from the working directory."
6883 msgstr ""
6884 " 它只从当前分支删除文件,不删除历史。'-A' 用于只移除已经删除的文\n"
6885 " 件,'-f' 用于强制删除,'-Af' 用于从下个版本移除文件,但是不删除\n"
6886 " 它们。"
6887
6888 #, fuzzy
6889 msgid ""
5920 6890 " The following table details the behavior of remove for different\n"
5921 6891 " file states (columns) and option combinations (rows). The file\n"
5922 6892 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
5923 6893 " reported by hg status). The actions are Warn, Remove (from branch)\n"
5924 " and Delete (from disk)::\n"
5925 "\n"
6894 " and Delete (from disk)::"
6895 msgstr ""
6896 " 下表给出了删除不同状态(列)文件的行为和可选的组合(行)。文件状态\n"
6897 " ('hg status' 报告的状态)是增加(A),干净(C),已修改(M),丢失(!)。\n"
6898 " 动作是警告(W),移除(R,从分支),以及删除(D,从磁盘)。"
6899
6900 #, fuzzy
6901 msgid ""
5926 6902 " A C M !\n"
5927 6903 " none W RD W R\n"
5928 6904 " -f R RD RD R\n"
5929 6905 " -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"
6906 " -Af R R R R"
6907 msgstr ""
5948 6908 " A C M !\n"
5949 6909 " none W RD W R\n"
5950 6910 " -f R RD RD R\n"
5951 6911 " -A W W W R\n"
5952 " -Af R R R R\n"
5953 "\n"
6912 " -Af R R R R"
6913
6914 #, fuzzy
6915 msgid ""
6916 " This command schedules the files to be removed at the next commit.\n"
6917 " To undo a remove before that, see hg revert.\n"
6918 " "
6919 msgstr ""
5954 6920 " 此命令调度下次提交时删除文件。\n"
5955 6921 " 要在此之前撤销删除,请参见 'hg revert'。\n"
5956 6922 " "
5957 6923
5958 6924 #, python-format
5959 6925 msgid "not removing %s: file is untracked\n"
5960 6926 msgstr ""
5961 6927
5962 6928 #, python-format
5963 6929 msgid "not removing %s: file %s (use -f to force removal)\n"
5964 6930 msgstr ""
5965 6931
5966 6932 msgid "still exists"
5967 6933 msgstr ""
5968 6934
5969 6935 msgid "is modified"
5970 6936 msgstr ""
5971 6937
5972 6938 msgid "has been marked for add"
5973 6939 msgstr ""
5974 6940
5975 msgid ""
5976 "rename files; equivalent of copy + remove\n"
5977 "\n"
6941 msgid "rename files; equivalent of copy + remove"
6942 msgstr ""
6943
6944 msgid ""
5978 6945 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5979 6946 " 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"
6947 " file, there can only be one source."
6948 msgstr ""
6949
6950 msgid ""
5986 6951 " This command takes effect at the next commit. To undo a rename\n"
5987 6952 " before that, see hg revert.\n"
5988 6953 " "
5989 6954 msgstr ""
5990 6955
5991 msgid ""
5992 "retry file merges from a merge or update\n"
5993 "\n"
6956 msgid "retry file merges from a merge or update"
6957 msgstr ""
6958
6959 msgid ""
5994 6960 " This command will cleanly retry unresolved file merges using file\n"
5995 6961 " 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"
6962 " resolve all unresolved files, use the -a/--all switch."
6963 msgstr ""
6964
6965 msgid ""
5998 6966 " If a conflict is resolved manually, please note that the changes\n"
5999 6967 " 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"
6968 " -m/--mark switch should be used to mark the file as resolved."
6969 msgstr ""
6970
6971 msgid ""
6002 6972 " This command also allows listing resolved files and manually\n"
6003 6973 " 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"
6974 " marked as resolved before a commit is permitted."
6975 msgstr ""
6976
6977 msgid " The codes used to show the status of files are::"
6978 msgstr ""
6979
6980 msgid ""
6008 6981 " U = unresolved\n"
6009 6982 " R = resolved\n"
6010 6983 " "
6011 6984 msgstr ""
6012 6985
6013 6986 msgid "too many options specified"
6014 6987 msgstr ""
6015 6988
6016 6989 msgid "can't specify --all and patterns"
6017 6990 msgstr ""
6018 6991
6019 6992 msgid "no files or directories specified; use --all to remerge all files"
6020 6993 msgstr ""
6021 6994
6022 msgid ""
6023 "restore individual files or directories to an earlier state\n"
6024 "\n"
6995 msgid "restore individual files or directories to an earlier state"
6996 msgstr ""
6997
6998 msgid ""
6025 6999 " (Use update -r to check out earlier revisions, revert does not\n"
6026 " change the working directory parents.)\n"
6027 "\n"
7000 " change the working directory parents.)"
7001 msgstr ""
7002
7003 msgid ""
6028 7004 " With no revision specified, revert the named files or directories\n"
6029 7005 " to the contents they had in the parent of the working directory.\n"
6030 7006 " This restores the contents of the affected files to an unmodified\n"
6031 7007 " state and unschedules adds, removes, copies, and renames. If the\n"
6032 7008 " working directory has two parents, you must explicitly specify the\n"
6033 " revision to revert to.\n"
6034 "\n"
7009 " revision to revert to."
7010 msgstr ""
7011
7012 msgid ""
6035 7013 " Using the -r/--rev option, revert the given files or directories\n"
6036 7014 " to their contents as of a specific revision. This can be helpful\n"
6037 7015 " 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"
7016 " dates' for a list of formats valid for -d/--date."
7017 msgstr ""
7018
7019 msgid ""
6040 7020 " Revert modifies the working directory. It does not commit any\n"
6041 7021 " changes, or change the parent of the working directory. If you\n"
6042 7022 " revert to a revision other than the parent of the working\n"
6043 7023 " directory, the reverted files will thus appear modified\n"
6044 " afterwards.\n"
6045 "\n"
7024 " afterwards."
7025 msgstr ""
7026
7027 msgid ""
6046 7028 " 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"
7029 " of a file was changed, it is reset."
7030 msgstr ""
7031
7032 msgid ""
6049 7033 " 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"
7034 " If no arguments are given, no files are reverted."
7035 msgstr ""
7036
7037 msgid ""
6052 7038 " Modified files are saved with a .orig suffix before reverting.\n"
6053 7039 " To disable these backups, use --no-backup.\n"
6054 7040 " "
6055 7041 msgstr ""
6056 7042
6057 7043 msgid "you can't specify a revision and a date"
6058 7044 msgstr ""
6059 7045
6060 7046 msgid "no files or directories specified; use --all to revert the whole repo"
6061 7047 msgstr ""
6062 7048
6063 7049 #, python-format
6064 7050 msgid "forgetting %s\n"
6065 7051 msgstr ""
6066 7052
6067 7053 #, python-format
6068 7054 msgid "reverting %s\n"
6069 7055 msgstr "正在恢复 %s\n"
6070 7056
6071 7057 #, python-format
6072 7058 msgid "undeleting %s\n"
6073 7059 msgstr "正在撤销删除 %s\n"
6074 7060
6075 7061 #, python-format
6076 7062 msgid "saving current version of %s as %s\n"
6077 7063 msgstr "保存当前版本的 %s 为 %s\n"
6078 7064
6079 7065 #, python-format
6080 7066 msgid "file not managed: %s\n"
6081 7067 msgstr "文件未被控制: %s\n"
6082 7068
6083 7069 #, python-format
6084 7070 msgid "no changes needed to %s\n"
6085 7071 msgstr "不需要改变 %s\n"
6086 7072
6087 msgid ""
6088 "roll back the last transaction\n"
6089 "\n"
7073 msgid "roll back the last transaction"
7074 msgstr ""
7075
7076 msgid ""
6090 7077 " This command should be used with care. There is only one level of\n"
6091 7078 " rollback, and there is no way to undo a rollback. It will also\n"
6092 7079 " restore the dirstate at the time of the last transaction, losing\n"
6093 7080 " any dirstate changes since that time. This command does not alter\n"
6094 " the working directory.\n"
6095 "\n"
7081 " the working directory."
7082 msgstr ""
7083
7084 msgid ""
6096 7085 " Transactions are used to encapsulate the effects of all commands\n"
6097 7086 " that create new changesets or propagate existing changesets into a\n"
6098 7087 " repository. For example, the following commands are transactional,\n"
6099 " and their effects can be rolled back::\n"
6100 "\n"
7088 " and their effects can be rolled back::"
7089 msgstr ""
7090
7091 msgid ""
6101 7092 " commit\n"
6102 7093 " import\n"
6103 7094 " pull\n"
6104 7095 " push (with this repository as destination)\n"
6105 " unbundle\n"
6106 "\n"
7096 " unbundle"
7097 msgstr ""
7098
7099 msgid ""
6107 7100 " This command is not intended for use on public repositories. Once\n"
6108 7101 " changes are visible for pull by other users, rolling a transaction\n"
6109 7102 " back locally is ineffective (someone else may already have pulled\n"
6110 7103 " the changes). Furthermore, a race is possible with readers of the\n"
6111 7104 " repository; for example an in-progress pull from the repository\n"
6112 7105 " may fail if a rollback is performed.\n"
6113 7106 " "
6114 7107 msgstr ""
6115 7108
6116 msgid ""
6117 "print the root (top) of the current working directory\n"
6118 "\n"
7109 msgid "print the root (top) of the current working directory"
7110 msgstr ""
7111
7112 msgid ""
6119 7113 " Print the root directory of the current repository.\n"
6120 7114 " "
6121 7115 msgstr ""
6122 7116
6123 7117 #, 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"
7118 msgid "export the repository via HTTP"
7119 msgstr "通过 HTTP 发布版本库"
7120
7121 #, fuzzy
7122 msgid " Start a local HTTP repository browser and pull server."
7123 msgstr " 启动本地 HTTP 版本库浏览器和发布服务器。"
7124
7125 #, fuzzy
7126 msgid ""
6129 7127 " By default, the server logs accesses to stdout and errors to\n"
6130 7128 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6131 7129 " files.\n"
6132 7130 " "
6133 7131 msgstr ""
6134 "通过 HTTP 发布版本库\n"
6135 "\n"
6136 " 启动本地 HTTP 版本库浏览器和发布服务器。\n"
6137 "\n"
6138 7132 " 默认服务器访问日志输出到 stdout,错误日志输出到 stderr。\n"
6139 7133 " 可以使用选项 \"-A\" 和 \"-E\",将这些日志输出到文件。\n"
6140 7134 " "
6141 7135
6142 7136 #, python-format
6143 7137 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6144 7138 msgstr ""
6145 7139
6146 7140 #, fuzzy
6147 msgid ""
6148 "show changed files in the working directory\n"
6149 "\n"
7141 msgid "show changed files in the working directory"
7142 msgstr ""
7143 "显示工作目录中已改变的文件\n"
7144 "\n"
7145 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7146 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7147 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7148 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7149 "\n"
7150 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7151 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7152 "\n"
7153 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7154 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7155 " 父亲的改变。\n"
7156 "\n"
7157 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7158 "\n"
7159 " 显示文件状态的代码是:\n"
7160 " M = 已修改\n"
7161 " A = 已增加\n"
7162 " R = 已移除\n"
7163 " C = 干净的\n"
7164 " ! = 已删除,仍旧被跟踪\n"
7165 " ? = 未跟踪\n"
7166 " I = 已忽略\n"
7167 " = 早先增加的文件自此复制\n"
7168 " "
7169
7170 #, fuzzy
7171 msgid ""
6150 7172 " Show status of files in the repository. If names are given, only\n"
6151 7173 " files that match are shown. Files that are clean or ignored or\n"
6152 7174 " the source of a copy/move operation, are not listed unless\n"
6153 7175 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6154 7176 " Unless options described with \"show only ...\" are given, the\n"
6155 " options -mardu are used.\n"
6156 "\n"
7177 " options -mardu are used."
7178 msgstr ""
7179 "显示工作目录中已改变的文件\n"
7180 "\n"
7181 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7182 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7183 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7184 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7185 "\n"
7186 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7187 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7188 "\n"
7189 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7190 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7191 " 父亲的改变。\n"
7192 "\n"
7193 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7194 "\n"
7195 " 显示文件状态的代码是:\n"
7196 " M = 已修改\n"
7197 " A = 已增加\n"
7198 " R = 已移除\n"
7199 " C = 干净的\n"
7200 " ! = 已删除,仍旧被跟踪\n"
7201 " ? = 未跟踪\n"
7202 " I = 已忽略\n"
7203 " = 早先增加的文件自此复制\n"
7204 " "
7205
7206 #, fuzzy
7207 msgid ""
6157 7208 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6158 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6159 "\n"
7209 " unless explicitly requested with -u/--unknown or -i/--ignored."
7210 msgstr ""
7211 "显示工作目录中已改变的文件\n"
7212 "\n"
7213 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7214 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7215 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7216 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7217 "\n"
7218 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7219 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7220 "\n"
7221 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7222 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7223 " 父亲的改变。\n"
7224 "\n"
7225 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7226 "\n"
7227 " 显示文件状态的代码是:\n"
7228 " M = 已修改\n"
7229 " A = 已增加\n"
7230 " R = 已移除\n"
7231 " C = 干净的\n"
7232 " ! = 已删除,仍旧被跟踪\n"
7233 " ? = 未跟踪\n"
7234 " I = 已忽略\n"
7235 " = 早先增加的文件自此复制\n"
7236 " "
7237
7238 #, fuzzy
7239 msgid ""
6160 7240 " NOTE: status may appear to disagree with diff if permissions have\n"
6161 7241 " changed or a merge has occurred. The standard diff format does not\n"
6162 7242 " report permission changes and diff only reports changes relative\n"
6163 " to one merge parent.\n"
6164 "\n"
7243 " to one merge parent."
7244 msgstr ""
7245 "显示工作目录中已改变的文件\n"
7246 "\n"
7247 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7248 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7249 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7250 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7251 "\n"
7252 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7253 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7254 "\n"
7255 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7256 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7257 " 父亲的改变。\n"
7258 "\n"
7259 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7260 "\n"
7261 " 显示文件状态的代码是:\n"
7262 " M = 已修改\n"
7263 " A = 已增加\n"
7264 " R = 已移除\n"
7265 " C = 干净的\n"
7266 " ! = 已删除,仍旧被跟踪\n"
7267 " ? = 未跟踪\n"
7268 " I = 已忽略\n"
7269 " = 早先增加的文件自此复制\n"
7270 " "
7271
7272 #, fuzzy
7273 msgid ""
6165 7274 " If one revision is given, it is used as the base revision.\n"
6166 7275 " 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"
7276 " shown."
7277 msgstr ""
7278 "显示工作目录中已改变的文件\n"
7279 "\n"
7280 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7281 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7282 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7283 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7284 "\n"
7285 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7286 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7287 "\n"
7288 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7289 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7290 " 父亲的改变。\n"
7291 "\n"
7292 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7293 "\n"
7294 " 显示文件状态的代码是:\n"
7295 " M = 已修改\n"
7296 " A = 已增加\n"
7297 " R = 已移除\n"
7298 " C = 干净的\n"
7299 " ! = 已删除,仍旧被跟踪\n"
7300 " ? = 未跟踪\n"
7301 " I = 已忽略\n"
7302 " = 早先增加的文件自此复制\n"
7303 " "
7304
7305 #, fuzzy
7306 msgid ""
6171 7307 " M = modified\n"
6172 7308 " A = added\n"
6173 7309 " R = removed\n"
6174 7310 " C = clean\n"
6175 7311 " ! = missing (deleted by non-hg command, but still tracked)\n"
6176 7312 " ? = not tracked\n"
6177 7313 " I = ignored\n"
6178 7314 " = origin of the previous file listed as A (added)\n"
6179 7315 " "
6180 7316 msgstr ""
6181 7317 "显示工作目录中已改变的文件\n"
6182 7318 "\n"
6183 7319 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
6184 7320 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
6185 7321 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
6186 7322 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
6187 7323 "\n"
6188 7324 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
6189 7325 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
6190 7326 "\n"
6191 7327 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
6192 7328 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
6193 7329 " 父亲的改变。\n"
6194 7330 "\n"
6195 7331 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
6196 7332 "\n"
6197 7333 " 显示文件状态的代码是:\n"
6198 7334 " M = 已修改\n"
6199 7335 " A = 已增加\n"
6200 7336 " R = 已移除\n"
6201 7337 " C = 干净的\n"
6202 7338 " ! = 已删除,仍旧被跟踪\n"
6203 7339 " ? = 未跟踪\n"
6204 7340 " I = 已忽略\n"
6205 7341 " = 早先增加的文件自此复制\n"
6206 7342 " "
6207 7343
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"
7344 msgid "add one or more tags for the current or given revision"
7345 msgstr ""
7346
7347 msgid " Name a particular revision using <name>."
7348 msgstr ""
7349
7350 msgid ""
6213 7351 " Tags are used to name particular revisions of the repository and are\n"
6214 7352 " 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"
7353 " earlier versions or to mark branch points as releases, etc."
7354 msgstr ""
7355
7356 msgid ""
6217 7357 " 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"
7358 " used, or tip if no revision is checked out."
7359 msgstr ""
7360
7361 msgid ""
6220 7362 " To facilitate version control, distribution, and merging of tags,\n"
6221 7363 " they are stored as a file named \".hgtags\" which is managed\n"
6222 7364 " similarly to other project files and can be hand-edited if\n"
6223 7365 " 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 " "
7366 " shared among repositories)."
6228 7367 msgstr ""
6229 7368
6230 7369 msgid "tag names must be unique"
6231 7370 msgstr ""
6232 7371
6233 7372 #, python-format
6234 7373 msgid "the name '%s' is reserved"
6235 7374 msgstr ""
6236 7375
6237 7376 msgid "--rev and --remove are incompatible"
6238 7377 msgstr ""
6239 7378
6240 7379 #, python-format
6241 7380 msgid "tag '%s' does not exist"
6242 7381 msgstr ""
6243 7382
6244 7383 #, fuzzy, python-format
6245 7384 msgid "tag '%s' is not a global tag"
6246 7385 msgstr "非本地版本库 '%s'"
6247 7386
6248 7387 #, fuzzy, python-format
6249 7388 msgid "tag '%s' is not a local tag"
6250 7389 msgstr "非本地版本库 '%s'"
6251 7390
6252 7391 #, python-format
6253 7392 msgid "tag '%s' already exists (use -f to force)"
6254 7393 msgstr ""
6255 7394
6256 msgid ""
6257 "list repository tags\n"
6258 "\n"
7395 msgid "list repository tags"
7396 msgstr ""
7397
7398 msgid ""
6259 7399 " This lists both regular and local tags. When the -v/--verbose\n"
6260 7400 " switch is used, a third column \"local\" is printed for local tags.\n"
6261 7401 " "
6262 7402 msgstr ""
6263 7403
6264 msgid ""
6265 "show the tip revision\n"
6266 "\n"
7404 msgid "show the tip revision"
7405 msgstr ""
7406
7407 msgid ""
6267 7408 " The tip revision (usually just called the tip) is the changeset\n"
6268 7409 " most recently added to the repository (and therefore the most\n"
6269 " recently changed head).\n"
6270 "\n"
7410 " recently changed head)."
7411 msgstr ""
7412
7413 msgid ""
6271 7414 " If you have just made a commit, that commit will be the tip. If\n"
6272 7415 " you have just pulled changes from another repository, the tip of\n"
6273 7416 " that repository becomes the current tip. The \"tip\" tag is special\n"
6274 7417 " and cannot be renamed or assigned to a different changeset.\n"
6275 7418 " "
6276 7419 msgstr ""
6277 7420
6278 msgid ""
6279 "apply one or more changegroup files\n"
6280 "\n"
7421 msgid "apply one or more changegroup files"
7422 msgstr ""
7423
7424 msgid ""
6281 7425 " Apply one or more compressed changegroup files generated by the\n"
6282 7426 " bundle command.\n"
6283 7427 " "
6284 7428 msgstr ""
6285 7429
6286 7430 #, fuzzy
6287 msgid ""
6288 "update working directory\n"
6289 "\n"
7431 msgid "update working directory"
7432 msgstr "更新工作目录"
7433
7434 #, fuzzy
7435 msgid ""
6290 7436 " Update the repository's working directory to the specified\n"
6291 7437 " revision, or the tip of the current branch if none is specified.\n"
6292 7438 " Use null as the revision to remove the working copy (like 'hg\n"
6293 " clone -U').\n"
6294 "\n"
7439 " clone -U')."
7440 msgstr ""
7441 " 更新工作目录到指定版本,或者到当前分支的顶点。使用 'null' 作为版本可以\n"
7442 " 删除工作副本(类似于 'hg clone -U')。"
7443
7444 #, fuzzy
7445 msgid ""
6295 7446 " When the working directory contains no uncommitted changes, it\n"
6296 7447 " will be replaced by the state of the requested revision from the\n"
6297 7448 " repository. When the requested revision is on a different branch,\n"
6298 7449 " the working directory will additionally be switched to that\n"
6299 " branch.\n"
6300 "\n"
7450 " branch."
7451 msgstr ""
7452 " 当工作目录包含未提交的修改时,它会被版本库中指定版本的状态替换。当请求\n"
7453 " 的版本位于不同分支时,工作目录会被切换到此分支。"
7454
7455 #, fuzzy
7456 msgid ""
6301 7457 " When there are uncommitted changes, use option -C/--clean to\n"
6302 7458 " discard them, forcibly replacing the state of the working\n"
6303 7459 " directory with the requested revision. Alternately, use -c/--check\n"
6304 " to abort.\n"
6305 "\n"
7460 " to abort."
7461 msgstr ""
7462 " 可以使用选项 '-C' 来丢弃未提交的修改,强制使用请求的版本替换工作目录的\n"
7463 " 状态。"
7464
7465 #, fuzzy
7466 msgid ""
6306 7467 " When there are uncommitted changes and option -C/--clean is not\n"
6307 7468 " used, and the parent revision and requested revision are on the\n"
6308 7469 " same branch, and one of them is an ancestor of the other, then the\n"
6309 7470 " new working directory will contain the requested revision merged\n"
6310 7471 " 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"
7472 " a suggestion to use 'merge' or 'update -C' instead."
7473 msgstr ""
6330 7474 " 当有未提交的修改,没有使用选项 '-C',父版本和请求版本位于不同分支,并且\n"
6331 7475 " 其中一个是另一个的祖先时,那么新的工作目录包含请求版本与未提交的修改的\n"
6332 " 合并结果。否则,更新会失败,建议使用 'merge' 或 'update -C'。\n"
6333 "\n"
6334 " 如果你只想更新一个文件到旧版本,请使用 'revert'。\n"
6335 "\n"
6336 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6337 " "
7476 " 合并结果。否则,更新会失败,建议使用 'merge' 或 'update -C'。"
7477
7478 #, fuzzy
7479 msgid ""
7480 " If you want to update just one file to an older revision, use\n"
7481 " revert."
7482 msgstr " 如果你只想更新一个文件到旧版本,请使用 'revert'。"
6338 7483
6339 7484 msgid "cannot specify both -c/--check and -C/--clean"
6340 7485 msgstr ""
6341 7486
6342 7487 #, fuzzy
6343 7488 msgid "uncommitted local changes"
6344 7489 msgstr "提交修改集 %d:%s\n"
6345 7490
6346 msgid ""
6347 "verify the integrity of the repository\n"
6348 "\n"
6349 " Verify the integrity of the current repository.\n"
6350 "\n"
7491 msgid "verify the integrity of the repository"
7492 msgstr ""
7493
7494 msgid " Verify the integrity of the current repository."
7495 msgstr ""
7496
7497 msgid ""
6351 7498 " This will perform an extensive check of the repository's\n"
6352 7499 " integrity, validating the hashes and checksums of each entry in\n"
6353 7500 " the changelog, manifest, and tracked files, as well as the\n"
6354 7501 " integrity of their crosslinks and indices.\n"
6355 7502 " "
6356 7503 msgstr ""
6357 7504
6358 7505 msgid "output version and copyright information"
6359 7506 msgstr "输出版本和版权信息"
6360 7507
6361 7508 #, python-format
6362 7509 msgid "Mercurial Distributed SCM (version %s)\n"
6363 7510 msgstr "分布式软件配置管理工具 - 水银 (版本 %s)\n"
6364 7511
6365 7512 msgid ""
6366 7513 "\n"
6367 7514 "Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
6368 7515 "This is free software; see the source for copying conditions. There is NO\n"
6369 7516 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6370 7517 msgstr ""
6371 7518 "\n"
6372 7519 "版权所有 (C) 2005-2010 Matt Mackall <mpm@selenic.com> 和其他人。\n"
6373 7520 "这是自由软件,具体参见版权条款。这里没有任何担保,甚至没有适合\n"
6374 7521 "特定目的的隐含的担保。\n"
6375 7522
6376 7523 msgid "repository root directory or symbolic path name"
6377 7524 msgstr "版本库的根目录或符号路径名称"
6378 7525
6379 7526 msgid "change working directory"
6380 7527 msgstr "改变工作目录"
6381 7528
6382 7529 msgid "do not prompt, assume 'yes' for any required answers"
6383 7530 msgstr "不再询问,假定所有答案都是 'yes'"
6384 7531
6385 7532 msgid "suppress output"
6386 7533 msgstr "抑制输出"
6387 7534
6388 7535 msgid "enable additional output"
6389 7536 msgstr "启用额外的输出"
6390 7537
6391 7538 msgid "set/override config option"
6392 7539 msgstr "设置/覆盖配置选项"
6393 7540
6394 7541 msgid "enable debugging output"
6395 7542 msgstr "启用调试输出"
6396 7543
6397 7544 msgid "start debugger"
6398 7545 msgstr "启动调试器"
6399 7546
6400 7547 msgid "set the charset encoding"
6401 7548 msgstr "设置字符集编码"
6402 7549
6403 7550 msgid "set the charset encoding mode"
6404 7551 msgstr "设置字符集编码模式"
6405 7552
6406 7553 msgid "print traceback on exception"
6407 7554 msgstr "显示异常的跟踪"
6408 7555
6409 7556 msgid "time how long the command takes"
6410 7557 msgstr "为命令计时"
6411 7558
6412 7559 msgid "print command execution profile"
6413 7560 msgstr "显示命令执行的剖析"
6414 7561
6415 7562 msgid "output version information and exit"
6416 7563 msgstr "显示版本信息后退出"
6417 7564
6418 7565 msgid "display help and exit"
6419 7566 msgstr "显示帮助后退出"
6420 7567
6421 7568 msgid "do not perform actions, just print output"
6422 7569 msgstr "不执行操作,只打印输出"
6423 7570
6424 7571 msgid "specify ssh command to use"
6425 7572 msgstr "指定要使用的 'ssh' 命令"
6426 7573
6427 7574 msgid "specify hg command to run on the remote side"
6428 7575 msgstr "指定要在远程运行的 'hg' 命令"
6429 7576
6430 7577 msgid "include names matching the given patterns"
6431 7578 msgstr "包含匹配指定模式的名称"
6432 7579
6433 7580 msgid "exclude names matching the given patterns"
6434 7581 msgstr "拒绝匹配指定模式的名称"
6435 7582
6436 7583 msgid "use <text> as commit message"
6437 7584 msgstr "使用 <text> 作为提交日志"
6438 7585
6439 7586 msgid "read commit message from <file>"
6440 7587 msgstr "从 <file> 读取提交日志"
6441 7588
6442 7589 msgid "record datecode as commit date"
6443 7590 msgstr "将提供的日期作为提交日期"
6444 7591
6445 7592 #, fuzzy
6446 7593 msgid "record the specified user as committer"
6447 7594 msgstr "将提供的用户作为提交者"
6448 7595
6449 7596 msgid "display using template map file"
6450 7597 msgstr "使用指定的样式显示"
6451 7598
6452 7599 msgid "display with template"
6453 7600 msgstr "使用指定的模板显示"
6454 7601
6455 7602 msgid "do not show merges"
6456 7603 msgstr "不显示合并"
6457 7604
6458 7605 msgid "treat all files as text"
6459 7606 msgstr "将所有文件视为文本文件"
6460 7607
6461 7608 msgid "don't include dates in diff headers"
6462 7609 msgstr "不要的差异头中包含日期"
6463 7610
6464 7611 msgid "show which function each change is in"
6465 7612 msgstr "为每个修改显示在什么函数中"
6466 7613
6467 7614 msgid "ignore white space when comparing lines"
6468 7615 msgstr "当比较行时忽略空白"
6469 7616
6470 7617 msgid "ignore changes in the amount of white space"
6471 7618 msgstr "忽略空白数量的改变"
6472 7619
6473 7620 msgid "ignore changes whose lines are all blank"
6474 7621 msgstr "忽略空行的改变"
6475 7622
6476 7623 msgid "number of lines of context to show"
6477 7624 msgstr "显示几行上下文"
6478 7625
6479 7626 msgid "guess renamed files by similarity (0<=s<=100)"
6480 7627 msgstr ""
6481 7628
6482 7629 msgid "[OPTION]... [FILE]..."
6483 7630 msgstr ""
6484 7631
6485 7632 msgid "annotate the specified revision"
6486 7633 msgstr "追溯指定版本"
6487 7634
6488 7635 msgid "follow file copies and renames"
6489 7636 msgstr "处理文件复制与改名"
6490 7637
6491 7638 msgid "list the author (long with -v)"
6492 7639 msgstr "列出作者 (增加 '-v' 会以长格式显示)"
6493 7640
6494 7641 msgid "list the date (short with -q)"
6495 7642 msgstr "列出日期 (增加 '-q' 会以短格式显示)"
6496 7643
6497 7644 msgid "list the revision number (default)"
6498 7645 msgstr "列出版本号 (默认)"
6499 7646
6500 7647 msgid "list the changeset"
6501 7648 msgstr "列出修改集"
6502 7649
6503 7650 msgid "show line number at the first appearance"
6504 7651 msgstr "列出首次出现时的行号"
6505 7652
6506 7653 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6507 7654 msgstr ""
6508 7655
6509 7656 msgid "do not pass files through decoders"
6510 7657 msgstr ""
6511 7658
6512 7659 msgid "directory prefix for files in archive"
6513 7660 msgstr ""
6514 7661
6515 7662 msgid "revision to distribute"
6516 7663 msgstr ""
6517 7664
6518 7665 msgid "type of distribution to create"
6519 7666 msgstr ""
6520 7667
6521 7668 msgid "[OPTION]... DEST"
6522 7669 msgstr ""
6523 7670
6524 7671 msgid "merge with old dirstate parent after backout"
6525 7672 msgstr ""
6526 7673
6527 7674 msgid "parent to choose when backing out merge"
6528 7675 msgstr ""
6529 7676
6530 7677 msgid "revision to backout"
6531 7678 msgstr ""
6532 7679
6533 7680 msgid "[OPTION]... [-r] REV"
6534 7681 msgstr ""
6535 7682
6536 7683 msgid "reset bisect state"
6537 7684 msgstr ""
6538 7685
6539 7686 msgid "mark changeset good"
6540 7687 msgstr ""
6541 7688
6542 7689 msgid "mark changeset bad"
6543 7690 msgstr ""
6544 7691
6545 7692 msgid "skip testing changeset"
6546 7693 msgstr ""
6547 7694
6548 7695 msgid "use command to check changeset state"
6549 7696 msgstr ""
6550 7697
6551 7698 msgid "do not update to target"
6552 7699 msgstr ""
6553 7700
6554 7701 msgid "[-gbsr] [-c CMD] [REV]"
6555 7702 msgstr ""
6556 7703
6557 7704 msgid "set branch name even if it shadows an existing branch"
6558 7705 msgstr ""
6559 7706
6560 7707 msgid "reset branch name to parent branch name"
6561 7708 msgstr ""
6562 7709
6563 7710 msgid "[-fC] [NAME]"
6564 7711 msgstr ""
6565 7712
6566 7713 msgid "show only branches that have unmerged heads"
6567 7714 msgstr ""
6568 7715
6569 7716 #, fuzzy
6570 7717 msgid "show normal and closed branches"
6571 7718 msgstr "只显示已增加文件的状态"
6572 7719
6573 7720 msgid "[-a]"
6574 7721 msgstr ""
6575 7722
6576 7723 msgid "run even when remote repository is unrelated"
6577 7724 msgstr "纵然远程版本库是无关的也要执行"
6578 7725
6579 7726 msgid "a changeset up to which you would like to bundle"
6580 7727 msgstr ""
6581 7728
6582 7729 msgid "a base changeset to specify instead of a destination"
6583 7730 msgstr ""
6584 7731
6585 7732 msgid "bundle all changesets in the repository"
6586 7733 msgstr ""
6587 7734
6588 7735 msgid "bundle compression type to use"
6589 7736 msgstr ""
6590 7737
6591 7738 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6592 7739 msgstr ""
6593 7740
6594 7741 msgid "print output to file with formatted name"
6595 7742 msgstr "输出到使用格式化名称的文件中"
6596 7743
6597 7744 msgid "print the given revision"
6598 7745 msgstr ""
6599 7746
6600 7747 msgid "apply any matching decode filter"
6601 7748 msgstr ""
6602 7749
6603 7750 msgid "[OPTION]... FILE..."
6604 7751 msgstr ""
6605 7752
6606 7753 msgid "the clone will only contain a repository (no working copy)"
6607 7754 msgstr "只复制版本库(没有工作副本)"
6608 7755
6609 7756 msgid "a changeset you would like to have after cloning"
6610 7757 msgstr "复制后你期望有的修改集"
6611 7758
6612 7759 msgid "[OPTION]... SOURCE [DEST]"
6613 7760 msgstr ""
6614 7761
6615 7762 msgid "mark new/missing files as added/removed before committing"
6616 7763 msgstr "在提交之前将'新的/丢失的'文件标记为'已增加/已删除'"
6617 7764
6618 7765 msgid "mark a branch as closed, hiding it from the branch list"
6619 7766 msgstr "标记一个分支已关闭,不在分支列表中显示"
6620 7767
6621 7768 msgid "record a copy that has already occurred"
6622 7769 msgstr ""
6623 7770
6624 7771 msgid "forcibly copy over an existing managed file"
6625 7772 msgstr ""
6626 7773
6627 7774 msgid "[OPTION]... [SOURCE]... DEST"
6628 7775 msgstr ""
6629 7776
6630 7777 msgid "[INDEX] REV1 REV2"
6631 7778 msgstr ""
6632 7779
6633 7780 #, fuzzy
6634 7781 msgid "[COMMAND]"
6635 7782 msgstr "命令"
6636 7783
6637 7784 msgid "show the command options"
6638 7785 msgstr ""
6639 7786
6640 7787 msgid "[-o] CMD"
6641 7788 msgstr ""
6642 7789
6643 7790 msgid "try extended date formats"
6644 7791 msgstr ""
6645 7792
6646 7793 msgid "[-e] DATE [RANGE]"
6647 7794 msgstr ""
6648 7795
6649 7796 msgid "FILE REV"
6650 7797 msgstr ""
6651 7798
6652 7799 msgid "[PATH]"
6653 7800 msgstr ""
6654 7801
6655 7802 msgid "FILE"
6656 7803 msgstr ""
6657 7804
6658 7805 msgid "revision to rebuild to"
6659 7806 msgstr ""
6660 7807
6661 7808 msgid "[-r REV] [REV]"
6662 7809 msgstr ""
6663 7810
6664 7811 msgid "revision to debug"
6665 7812 msgstr ""
6666 7813
6667 7814 msgid "[-r REV] FILE"
6668 7815 msgstr ""
6669 7816
6670 7817 msgid "REV1 [REV2]"
6671 7818 msgstr ""
6672 7819
6673 7820 msgid "do not display the saved mtime"
6674 7821 msgstr ""
6675 7822
6676 7823 msgid "[OPTION]..."
6677 7824 msgstr ""
6678 7825
6679 7826 #, fuzzy
6680 7827 msgid "revision to check"
6681 7828 msgstr "要合并的版本"
6682 7829
6683 7830 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6684 7831 msgstr ""
6685 7832
6686 7833 msgid "diff against the second parent"
6687 7834 msgstr "与第二个父亲比较"
6688 7835
6689 7836 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6690 7837 msgstr ""
6691 7838
6692 7839 msgid "end fields with NUL"
6693 7840 msgstr ""
6694 7841
6695 7842 msgid "print all revisions that match"
6696 7843 msgstr ""
6697 7844
6698 7845 msgid "follow changeset history, or file history across copies and renames"
6699 7846 msgstr "跟踪修改集历史,或者跟踪文件的复制与改名操作"
6700 7847
6701 7848 msgid "ignore case when matching"
6702 7849 msgstr ""
6703 7850
6704 7851 msgid "print only filenames and revisions that match"
6705 7852 msgstr ""
6706 7853
6707 7854 msgid "print matching line numbers"
6708 7855 msgstr ""
6709 7856
6710 7857 msgid "search in given revision range"
6711 7858 msgstr ""
6712 7859
6713 7860 msgid "[OPTION]... PATTERN [FILE]..."
6714 7861 msgstr ""
6715 7862
6716 7863 msgid "show only heads which are descendants of REV"
6717 7864 msgstr ""
6718 7865
6719 7866 #, fuzzy
6720 7867 msgid "show only the active branch heads from open branches"
6721 7868 msgstr "svn: 分支没有版本 %s"
6722 7869
6723 7870 #, fuzzy
6724 7871 msgid "show normal and closed branch heads"
6725 7872 msgstr "只显示已增加文件的状态"
6726 7873
6727 7874 msgid "[-r STARTREV] [REV]..."
6728 7875 msgstr ""
6729 7876
6730 7877 msgid "[TOPIC]"
6731 7878 msgstr ""
6732 7879
6733 7880 #, fuzzy
6734 7881 msgid "identify the specified revision"
6735 7882 msgstr "追溯指定版本"
6736 7883
6737 7884 msgid "show local revision number"
6738 7885 msgstr ""
6739 7886
6740 7887 msgid "show global revision id"
6741 7888 msgstr ""
6742 7889
6743 7890 msgid "show branch"
6744 7891 msgstr ""
6745 7892
6746 7893 msgid "show tags"
6747 7894 msgstr ""
6748 7895
6749 7896 msgid "[-nibt] [-r REV] [SOURCE]"
6750 7897 msgstr ""
6751 7898
6752 msgid ""
6753 "directory strip option for patch. This has the same meaning as the "
6754 "corresponding patch option"
7899 msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
6755 7900 msgstr ""
6756 7901
6757 7902 msgid "base path"
6758 7903 msgstr ""
6759 7904
6760 7905 msgid "skip check for outstanding uncommitted changes"
6761 7906 msgstr ""
6762 7907
6763 7908 msgid "don't commit, just update the working directory"
6764 7909 msgstr ""
6765 7910
6766 7911 msgid "apply patch to the nodes from which it was generated"
6767 7912 msgstr ""
6768 7913
6769 7914 msgid "use any branch information in patch (implied by --exact)"
6770 7915 msgstr ""
6771 7916
6772 7917 msgid "[OPTION]... PATCH..."
6773 7918 msgstr ""
6774 7919
6775 7920 msgid "show newest record first"
6776 7921 msgstr ""
6777 7922
6778 7923 msgid "file to store the bundles into"
6779 7924 msgstr ""
6780 7925
6781 7926 msgid "a specific revision up to which you would like to pull"
6782 7927 msgstr "指定要取得的最高版本"
6783 7928
6784 7929 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6785 7930 msgstr ""
6786 7931
6787 7932 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6788 7933 msgstr ""
6789 7934
6790 7935 msgid "search the repository as it stood at REV"
6791 7936 msgstr ""
6792 7937
6793 7938 msgid "end filenames with NUL, for use with xargs"
6794 7939 msgstr "在文件名称结尾增加 NUL,用于 xargs"
6795 7940
6796 7941 msgid "print complete paths from the filesystem root"
6797 7942 msgstr ""
6798 7943
6799 7944 msgid "[OPTION]... [PATTERN]..."
6800 7945 msgstr ""
6801 7946
6802 7947 msgid "only follow the first parent of merge changesets"
6803 7948 msgstr "只跟踪修改集的第一个父亲"
6804 7949
6805 7950 #, fuzzy
6806 7951 msgid "show revisions matching date spec"
6807 7952 msgstr "显示匹配日期的版本"
6808 7953
6809 7954 msgid "show copied files"
6810 7955 msgstr "显示复制的文件"
6811 7956
6812 7957 msgid "do case-insensitive search for a keyword"
6813 7958 msgstr "对关键字执行不区分大小写的搜索"
6814 7959
6815 7960 #, fuzzy
6816 7961 msgid "include revisions where files were removed"
6817 7962 msgstr "包含删除文件的版本"
6818 7963
6819 7964 msgid "show only merges"
6820 7965 msgstr "只显示合并"
6821 7966
6822 7967 #, fuzzy
6823 7968 msgid "revisions committed by user"
6824 7969 msgstr "指定用户提交的版本"
6825 7970
6826 7971 msgid "show only changesets within the given named branch"
6827 7972 msgstr "只显示位于指定命名分支中的修改集"
6828 7973
6829 7974 msgid "do not display revision or any of its ancestors"
6830 7975 msgstr "不显示指定版本或其祖先"
6831 7976
6832 7977 msgid "[OPTION]... [FILE]"
6833 7978 msgstr ""
6834 7979
6835 7980 msgid "revision to display"
6836 7981 msgstr ""
6837 7982
6838 7983 msgid "[-r REV]"
6839 7984 msgstr ""
6840 7985
6841 7986 msgid "force a merge with outstanding changes"
6842 7987 msgstr "强制与已有修改合并"
6843 7988
6844 7989 msgid "revision to merge"
6845 7990 msgstr "要合并的版本"
6846 7991
6847 7992 msgid "review revisions to merge (no merge is performed)"
6848 7993 msgstr ""
6849 7994
6850 7995 msgid "[-f] [[-r] REV]"
6851 7996 msgstr ""
6852 7997
6853 7998 msgid "a specific revision up to which you would like to push"
6854 7999 msgstr "指定你要推送的最高版本"
6855 8000
6856 8001 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6857 8002 msgstr ""
6858 8003
6859 8004 #, fuzzy
6860 8005 msgid "show parents from the specified revision"
6861 8006 msgstr "从指定的版本显示父亲"
6862 8007
6863 8008 msgid "[-r REV] [FILE]"
6864 8009 msgstr ""
6865 8010
6866 8011 msgid "[NAME]"
6867 8012 msgstr ""
6868 8013
6869 8014 msgid "update to new tip if changesets were pulled"
6870 8015 msgstr "如果有新的修改集,就更新到最新版本"
6871 8016
6872 8017 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6873 8018 msgstr ""
6874 8019
6875 8020 msgid "force push"
6876 8021 msgstr "强制推送"
6877 8022
6878 8023 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6879 8024 msgstr ""
6880 8025
6881 8026 msgid "record delete for missing files"
6882 8027 msgstr "将丢失的文件视为删除"
6883 8028
6884 8029 msgid "remove (and delete) file even if added or modified"
6885 8030 msgstr "删除文件,纵然它已被增加或修改"
6886 8031
6887 8032 msgid "record a rename that has already occurred"
6888 8033 msgstr "记录已经发生的改名"
6889 8034
6890 8035 msgid "[OPTION]... SOURCE... DEST"
6891 8036 msgstr ""
6892 8037
6893 8038 msgid "remerge all unresolved files"
6894 8039 msgstr ""
6895 8040
6896 8041 msgid "list state of files needing merge"
6897 8042 msgstr ""
6898 8043
6899 8044 msgid "mark files as resolved"
6900 8045 msgstr ""
6901 8046
6902 8047 msgid "unmark files as resolved"
6903 8048 msgstr ""
6904 8049
6905 8050 msgid "revert all changes when no arguments given"
6906 8051 msgstr ""
6907 8052
6908 8053 msgid "tipmost revision matching date"
6909 8054 msgstr "匹配最接近顶点的日期"
6910 8055
6911 8056 msgid "revision to revert to"
6912 8057 msgstr ""
6913 8058
6914 8059 msgid "do not save backup copies of files"
6915 8060 msgstr ""
6916 8061
6917 8062 msgid "[OPTION]... [-r REV] [NAME]..."
6918 8063 msgstr ""
6919 8064
6920 8065 msgid "name of access log file to write to"
6921 8066 msgstr "记录访问日志的文件名称"
6922 8067
6923 8068 msgid "name of error log file to write to"
6924 8069 msgstr "记录错误日志的文件名称"
6925 8070
6926 8071 msgid "port to listen on (default: 8000)"
6927 8072 msgstr "监听的端口(默认: 8000)"
6928 8073
6929 8074 msgid "address to listen on (default: all interfaces)"
6930 8075 msgstr "监听地址(默认: 所有地址)"
6931 8076
6932 8077 msgid "prefix path to serve from (default: server root)"
6933 8078 msgstr "服务路径前缀(默认: 服务器根)"
6934 8079
6935 8080 #, fuzzy
6936 8081 msgid "name to show in web pages (default: working directory)"
6937 8082 msgstr "在 WEB 页面中显示的名称(默认: 工作目录)"
6938 8083
6939 8084 #, fuzzy
6940 8085 msgid "name of the webdir config file (serve more than one repository)"
6941 8086 msgstr "webdir 配置文件的名称(发布多个版本库)"
6942 8087
6943 8088 msgid "for remote clients"
6944 8089 msgstr "针对远程客户端"
6945 8090
6946 8091 msgid "web templates to use"
6947 8092 msgstr "使用的 WEB 模板"
6948 8093
6949 8094 msgid "template style to use"
6950 8095 msgstr "使用的显示样式"
6951 8096
6952 8097 msgid "use IPv6 in addition to IPv4"
6953 8098 msgstr "同时使用 IPv6 和 IPv4"
6954 8099
6955 8100 msgid "SSL certificate file"
6956 8101 msgstr "SSL 证书文件"
6957 8102
6958 8103 msgid "show untrusted configuration options"
6959 8104 msgstr "显示不能信赖的配置选项"
6960 8105
6961 8106 msgid "[-u] [NAME]..."
6962 8107 msgstr ""
6963 8108
6964 8109 msgid "show status of all files"
6965 8110 msgstr "显示全部文件的状态"
6966 8111
6967 8112 msgid "show only modified files"
6968 8113 msgstr "只显示已修改文件的状态"
6969 8114
6970 8115 msgid "show only added files"
6971 8116 msgstr "只显示已增加文件的状态"
6972 8117
6973 8118 msgid "show only removed files"
6974 8119 msgstr "只显示已移除文件的状态"
6975 8120
6976 8121 msgid "show only deleted (but tracked) files"
6977 8122 msgstr "只显示已删除(但被跟踪)文件的状态"
6978 8123
6979 8124 msgid "show only files without changes"
6980 8125 msgstr "只显示无改动文件的状态"
6981 8126
6982 8127 msgid "show only unknown (not tracked) files"
6983 8128 msgstr "只显示未知(未被跟踪)文件的状态"
6984 8129
6985 8130 msgid "show only ignored files"
6986 8131 msgstr "只显示被忽略文件的状态"
6987 8132
6988 8133 msgid "hide status prefix"
6989 8134 msgstr "隐藏状态前缀"
6990 8135
6991 8136 msgid "show source of copied files"
6992 8137 msgstr "显示文件的复制源"
6993 8138
6994 8139 msgid "show difference from revision"
6995 8140 msgstr "显示版本差异"
6996 8141
6997 8142 msgid "replace existing tag"
6998 8143 msgstr "替换已有的标签"
6999 8144
7000 8145 msgid "make the tag local"
7001 8146 msgstr "标记标签为本地"
7002 8147
7003 8148 msgid "revision to tag"
7004 8149 msgstr "标签对应的版本"
7005 8150
7006 8151 msgid "remove a tag"
7007 8152 msgstr "删除标签"
7008 8153
7009 8154 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7010 8155 msgstr ""
7011 8156
7012 8157 msgid "[-p]"
7013 8158 msgstr ""
7014 8159
7015 8160 msgid "update to new tip if changesets were unbundled"
7016 8161 msgstr ""
7017 8162
7018 8163 msgid "[-u] FILE..."
7019 8164 msgstr ""
7020 8165
7021 8166 msgid "overwrite locally modified files (no backup)"
7022 8167 msgstr "覆盖本地修改的文件(不备份)"
7023 8168
7024 8169 #, fuzzy
7025 8170 msgid "check for uncommitted changes"
7026 8171 msgstr "提交修改集 %d:%s\n"
7027 8172
7028 8173 msgid "[-C] [-d DATE] [[-r] REV]"
7029 8174 msgstr ""
7030 8175
7031 8176 #, python-format
7032 8177 msgid "config error at %s:%d: '%s'"
7033 8178 msgstr ""
7034 8179
7035 8180 msgid "not found in manifest"
7036 8181 msgstr ""
7037 8182
7038 8183 msgid "branch name not in UTF-8!"
7039 8184 msgstr ""
7040 8185
7041 8186 #, python-format
7042 8187 msgid " searching for copies back to rev %d\n"
7043 8188 msgstr ""
7044 8189
7045 8190 #, python-format
7046 8191 msgid ""
7047 8192 " unmatched files in local:\n"
7048 8193 " %s\n"
7049 8194 msgstr ""
7050 8195
7051 8196 #, python-format
7052 8197 msgid ""
7053 8198 " unmatched files in other:\n"
7054 8199 " %s\n"
7055 8200 msgstr ""
7056 8201
7057 8202 msgid " all copies found (* = to merge, ! = divergent):\n"
7058 8203 msgstr ""
7059 8204
7060 8205 msgid " checking for directory renames\n"
7061 8206 msgstr ""
7062 8207
7063 8208 #, python-format
7064 8209 msgid " dir %s -> %s\n"
7065 8210 msgstr ""
7066 8211
7067 8212 #, python-format
7068 8213 msgid " file %s -> %s\n"
7069 8214 msgstr ""
7070 8215
7071 8216 msgid "working directory state appears damaged!"
7072 8217 msgstr ""
7073 8218
7074 8219 #, python-format
7075 8220 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7076 8221 msgstr ""
7077 8222
7078 8223 #, python-format
7079 8224 msgid "directory %r already in dirstate"
7080 8225 msgstr ""
7081 8226
7082 8227 #, python-format
7083 8228 msgid "file %r in dirstate clashes with %r"
7084 8229 msgstr ""
7085 8230
7086 8231 #, python-format
7087 8232 msgid "not in dirstate: %s\n"
7088 8233 msgstr ""
7089 8234
7090 8235 msgid "unknown"
7091 8236 msgstr ""
7092 8237
7093 8238 msgid "character device"
7094 8239 msgstr ""
7095 8240
7096 8241 msgid "block device"
7097 8242 msgstr ""
7098 8243
7099 8244 msgid "fifo"
7100 8245 msgstr ""
7101 8246
7102 8247 msgid "socket"
7103 8248 msgstr ""
7104 8249
7105 8250 msgid "directory"
7106 8251 msgstr ""
7107 8252
7108 8253 #, python-format
7109 8254 msgid "unsupported file type (type is %s)"
7110 8255 msgstr ""
7111 8256
7112 8257 #, python-format
7113 8258 msgid "abort: %s\n"
7114 8259 msgstr "中止: %s\n"
7115 8260
7116 8261 #, python-format
7117 8262 msgid "hg: %s\n"
7118 8263 msgstr ""
7119 8264
7120 8265 #, python-format
7121 8266 msgid ""
7122 8267 "hg: command '%s' is ambiguous:\n"
7123 8268 " %s\n"
7124 8269 msgstr ""
7125 8270
7126 8271 #, python-format
7127 8272 msgid "timed out waiting for lock held by %s"
7128 8273 msgstr ""
7129 8274
7130 8275 #, python-format
7131 8276 msgid "lock held by %s"
7132 8277 msgstr ""
7133 8278
7134 8279 #, python-format
7135 8280 msgid "abort: %s: %s\n"
7136 8281 msgstr "中止: %s: %s\n"
7137 8282
7138 8283 #, python-format
7139 8284 msgid "abort: could not lock %s: %s\n"
7140 8285 msgstr "中止: 不能锁定 %s: %s\n"
7141 8286
7142 8287 #, python-format
7143 8288 msgid "hg %s: %s\n"
7144 8289 msgstr ""
7145 8290
7146 8291 #, python-format
7147 8292 msgid "abort: %s!\n"
7148 8293 msgstr "中止: %s!\n"
7149 8294
7150 8295 #, python-format
7151 8296 msgid "abort: %s"
7152 8297 msgstr "中止: %s"
7153 8298
7154 8299 msgid " empty string\n"
7155 8300 msgstr ""
7156 8301
7157 8302 msgid "killed!\n"
7158 8303 msgstr ""
7159 8304
7160 8305 #, python-format
7161 8306 msgid "hg: unknown command '%s'\n"
7162 8307 msgstr "hg: 未知命令 '%s'\n"
7163 8308
7164 8309 #, python-format
7165 8310 msgid "abort: could not import module %s!\n"
7166 8311 msgstr "中止: 不能导入模块 %s!\n"
7167 8312
7168 8313 msgid "(did you forget to compile extensions?)\n"
7169 8314 msgstr "(你是否忘记了编译扩展?)\n"
7170 8315
7171 8316 msgid "(is your Python install correct?)\n"
7172 8317 msgstr "(你的 Python 安装正确吗?)\n"
7173 8318
7174 8319 #, python-format
7175 8320 msgid "abort: error: %s\n"
7176 8321 msgstr "中止: 失败: %s\n"
7177 8322
7178 8323 msgid "broken pipe\n"
7179 8324 msgstr "坏掉的管道\n"
7180 8325
7181 8326 msgid "interrupted!\n"
7182 8327 msgstr "中断!\n"
7183 8328
7184 8329 msgid ""
7185 8330 "\n"
7186 8331 "broken pipe\n"
7187 8332 msgstr ""
7188 8333 "\n"
7189 8334 "坏掉的管道\n"
7190 8335
7191 8336 msgid "abort: out of memory\n"
7192 8337 msgstr "中止: 内存不足\n"
7193 8338
7194 8339 msgid "** unknown exception encountered, details follow\n"
7195 8340 msgstr "** 遇到了未知异常,详细信息如下\n"
7196 8341
7197 8342 #, fuzzy
7198 8343 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7199 8344 msgstr "** 报告问题详情到 http://www.selenic.com/mercurial/bts\n"
7200 8345
7201 8346 msgid "** or mercurial@selenic.com\n"
7202 8347 msgstr "** 或 mercurial@selenic.com\n"
7203 8348
7204 8349 #, python-format
7205 8350 msgid "** Mercurial Distributed SCM (version %s)\n"
7206 8351 msgstr "** 分布式软件配置管理工具 - 水银 (版本 %s)\n"
7207 8352
7208 8353 #, python-format
7209 8354 msgid "** Extensions loaded: %s\n"
7210 8355 msgstr "** 已加载的扩展: %s\n"
7211 8356
7212 8357 #, python-format
7213 8358 msgid "no definition for alias '%s'\n"
7214 8359 msgstr ""
7215 8360
7216 8361 #, fuzzy, python-format
7217 8362 msgid "alias '%s' resolves to unknown command '%s'\n"
7218 8363 msgstr "hg: 未知命令 '%s'\n"
7219 8364
7220 8365 #, python-format
7221 8366 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7222 8367 msgstr ""
7223 8368
7224 8369 #, fuzzy, python-format
7225 8370 msgid "alias '%s' shadows command\n"
7226 8371 msgstr ""
7227 8372 "命令列表:\n"
7228 8373 "\n"
7229 8374
7230 8375 #, python-format
7231 8376 msgid "malformed --config option: %s"
7232 8377 msgstr "非法 '--config' 选项: %s"
7233 8378
7234 8379 #, python-format
7235 8380 msgid "extension '%s' overrides commands: %s\n"
7236 8381 msgstr "扩展 '%s' 覆盖了命令: %s\n"
7237 8382
7238 8383 msgid "Option --config may not be abbreviated!"
7239 8384 msgstr "选项 '--config' 不能简短!"
7240 8385
7241 8386 msgid "Option --cwd may not be abbreviated!"
7242 8387 msgstr "选项 '--cwd' 不能简短!"
7243 8388
7244 8389 #, 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!"
8390 msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
8391 msgstr "选项 -R 必须隔离使用(也就是不能 -qR),并且 --repository 只能简短为 --repo!"
7250 8392
7251 8393 #, python-format
7252 8394 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7253 8395 msgstr "时间: 实际 %.3f 秒(用户 %.3f+%.3f 系统 %.3f+%.3f)\n"
7254 8396
7255 8397 #, python-format
7256 8398 msgid "repository '%s' is not local"
7257 8399 msgstr "非本地版本库 '%s'"
7258 8400
7259 8401 msgid "invalid arguments"
7260 8402 msgstr "非法参数"
7261 8403
7262 8404 #, python-format
7263 8405 msgid "unrecognized profiling format '%s' - Ignored\n"
7264 8406 msgstr ""
7265 8407
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/ 安装"
8408 msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
8409 msgstr "lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装"
7271 8410
7272 8411 #, python-format
7273 8412 msgid "*** failed to import extension %s from %s: %s\n"
7274 8413 msgstr "*** 加载扩展 '%s',自 '%s': %s\n"
7275 8414
7276 8415 #, python-format
7277 8416 msgid "*** failed to import extension %s: %s\n"
7278 8417 msgstr "*** 加载扩展 '%s' 失败: %s\n"
7279 8418
7280 8419 #, python-format
7281 8420 msgid "couldn't find merge tool %s\n"
7282 8421 msgstr "不能找到合并工具 '%s'\n"
7283 8422
7284 8423 #, python-format
7285 8424 msgid "tool %s can't handle symlinks\n"
7286 8425 msgstr "工具 '%s' 不能处理符号链接\n"
7287 8426
7288 8427 #, python-format
7289 8428 msgid "tool %s can't handle binary\n"
7290 8429 msgstr "工具 '%s' 不能处理二进制\n"
7291 8430
7292 8431 #, python-format
7293 8432 msgid "tool %s requires a GUI\n"
7294 8433 msgstr "工具 '%s' 需要 GUI\n"
7295 8434
7296 8435 #, python-format
7297 8436 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7298 8437 msgstr "选择工具 '%s',用于 %s(二进制 %s 符号链接 %s)\n"
7299 8438
7300 8439 #, python-format
7301 8440 msgid ""
7302 8441 " no tool found to merge %s\n"
7303 8442 "keep (l)ocal or take (o)ther?"
7304 8443 msgstr ""
7305 8444 " 没有找到工具合并 %s\n"
7306 8445 "使用本地(l)或者他人(o)的内容?"
7307 8446
7308 8447 msgid "&Local"
7309 8448 msgstr ""
7310 8449
7311 8450 msgid "&Other"
7312 8451 msgstr ""
7313 8452
7314 8453 #, python-format
7315 8454 msgid "merging %s and %s to %s\n"
7316 8455 msgstr ""
7317 8456
7318 8457 #, python-format
7319 8458 msgid "merging %s\n"
7320 8459 msgstr ""
7321 8460
7322 8461 #, python-format
7323 8462 msgid "my %s other %s ancestor %s\n"
7324 8463 msgstr ""
7325 8464
7326 8465 msgid " premerge successful\n"
7327 8466 msgstr ""
7328 8467
7329 8468 #, python-format
7330 8469 msgid ""
7331 8470 " output file %s appears unchanged\n"
7332 8471 "was merge successful (yn)?"
7333 8472 msgstr ""
7334 8473
7335 8474 msgid "&No"
7336 8475 msgstr ""
7337 8476
7338 8477 msgid "&Yes"
7339 8478 msgstr ""
7340 8479
7341 8480 #, python-format
7342 8481 msgid "merging %s failed!\n"
7343 8482 msgstr ""
7344 8483
7345 8484 #, python-format
7346 8485 msgid "Inconsistent state, %s:%s is good and bad"
7347 8486 msgstr ""
7348 8487
7349 8488 #, python-format
7350 8489 msgid "unknown bisect kind %s"
7351 8490 msgstr ""
7352 8491
7353 8492 msgid ""
7354 8493 "\n"
7355 8494 " Mercurial has the ability to add new features through the use of\n"
7356 8495 " extensions. Extensions may add new commands, add options to\n"
7357 8496 " existing commands, change the default behavior of commands, or\n"
7358 " implement hooks.\n"
7359 "\n"
8497 " implement hooks."
8498 msgstr ""
8499
8500 msgid ""
7360 8501 " Extensions are not loaded by default for a variety of reasons:\n"
7361 8502 " they can increase startup overhead; they may be meant for advanced\n"
7362 8503 " usage only; they may provide potentially dangerous abilities (such\n"
7363 8504 " as letting you destroy or modify history); they might not be ready\n"
7364 8505 " for prime time; or they may alter some usual behaviors of stock\n"
7365 8506 " Mercurial. It is thus up to the user to activate extensions as\n"
7366 " needed.\n"
7367 "\n"
8507 " needed."
8508 msgstr ""
8509
8510 msgid ""
7368 8511 " To enable the \"foo\" extension, either shipped with Mercurial or in\n"
7369 8512 " the Python search path, create an entry for it in your hgrc, like\n"
7370 " this::\n"
7371 "\n"
8513 " this::"
8514 msgstr ""
8515
8516 msgid ""
7372 8517 " [extensions]\n"
7373 " foo =\n"
7374 "\n"
7375 " You may also specify the full path to an extension::\n"
7376 "\n"
8518 " foo ="
8519 msgstr ""
8520
8521 msgid " You may also specify the full path to an extension::"
8522 msgstr ""
8523
8524 msgid ""
7377 8525 " [extensions]\n"
7378 " myfeature = ~/.hgext/myfeature.py\n"
7379 "\n"
8526 " myfeature = ~/.hgext/myfeature.py"
8527 msgstr ""
8528
8529 msgid ""
7380 8530 " To explicitly disable an extension enabled in an hgrc of broader\n"
7381 " scope, prepend its path with !::\n"
7382 "\n"
8531 " scope, prepend its path with !::"
8532 msgstr ""
8533
8534 msgid ""
7383 8535 " [extensions]\n"
7384 8536 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7385 8537 " bar = !/path/to/extension/bar.py\n"
7386 8538 " # ditto, but no path was supplied for extension baz\n"
7387 8539 " baz = !\n"
7388 8540 " "
7389 8541 msgstr ""
7390 8542
7391 8543 #, fuzzy
7392 8544 msgid "disabled extensions:"
7393 8545 msgstr ""
7394 8546 "\n"
7395 8547 "启用的扩展:\n"
7396 8548 "\n"
7397 8549
7398 8550 msgid "Date Formats"
7399 8551 msgstr ""
7400 8552
7401 8553 msgid ""
7402 8554 "\n"
7403 " Some commands allow the user to specify a date, e.g.:\n"
7404 "\n"
8555 " Some commands allow the user to specify a date, e.g.:"
8556 msgstr ""
8557
8558 msgid ""
7405 8559 " - 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"
8560 " - log, revert, update: Select revision(s) by date."
8561 msgstr ""
8562
8563 msgid " Many date formats are valid. Here are some examples::"
8564 msgstr ""
8565
8566 msgid ""
7410 8567 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7411 8568 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7412 8569 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7413 8570 " \"Dec 6\" (midnight)\n"
7414 8571 " \"13:18\" (today assumed)\n"
7415 8572 " \"3:39\" (3:39AM assumed)\n"
7416 8573 " \"3:39pm\" (15:39)\n"
7417 8574 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7418 8575 " \"2006-12-6 13:18\"\n"
7419 8576 " \"2006-12-6\"\n"
7420 8577 " \"12-6\"\n"
7421 8578 " \"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"
8579 " \"12/6/6\" (Dec 6 2006)"
8580 msgstr ""
8581
8582 msgid " Lastly, there is Mercurial's internal format::"
8583 msgstr ""
8584
8585 msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)"
8586 msgstr ""
8587
8588 msgid ""
7428 8589 " This is the internal representation format for dates. unixtime is\n"
7429 8590 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7430 8591 " 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"
8592 " (negative if the timezone is east of UTC)."
8593 msgstr ""
8594
8595 msgid " The log command also accepts date ranges::"
8596 msgstr ""
8597
8598 msgid ""
7435 8599 " \"<{datetime}\" - at or before a given date/time\n"
7436 8600 " \">{datetime}\" - on or after a given date/time\n"
7437 8601 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7438 8602 " \"-{days}\" - within a given number of days of today\n"
7439 8603 " "
7440 8604 msgstr ""
7441 8605
7442 8606 msgid "File Name Patterns"
7443 8607 msgstr ""
7444 8608
7445 8609 msgid ""
7446 8610 "\n"
7447 8611 " Mercurial accepts several notations for identifying one or more\n"
7448 " files at a time.\n"
7449 "\n"
8612 " files at a time."
8613 msgstr ""
8614
8615 msgid ""
7450 8616 " 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"
8617 " glob patterns."
8618 msgstr ""
8619
8620 msgid " Alternate pattern notations must be specified explicitly."
8621 msgstr ""
8622
8623 msgid ""
7455 8624 " To use a plain path name without any pattern matching, start it\n"
7456 8625 " with \"path:\". These path names must completely match starting at\n"
7457 " the current repository root.\n"
7458 "\n"
8626 " the current repository root."
8627 msgstr ""
8628
8629 msgid ""
7459 8630 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7460 8631 " 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"
8632 " only match files in the current directory ending with \".c\"."
8633 msgstr ""
8634
8635 msgid ""
7463 8636 " 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"
8637 " string across path separators and \"{a,b}\" to mean \"a or b\"."
8638 msgstr ""
8639
8640 msgid ""
7466 8641 " 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"
8642 " Regexp pattern matching is anchored at the root of the repository."
8643 msgstr ""
8644
8645 msgid " Plain examples::"
8646 msgstr ""
8647
8648 msgid ""
7471 8649 " path:foo/bar a name bar in a directory named foo in the root\n"
7472 8650 " of the repository\n"
7473 " path:path:name a file or directory named \"path:name\"\n"
7474 "\n"
7475 " Glob examples::\n"
7476 "\n"
8651 " path:path:name a file or directory named \"path:name\""
8652 msgstr ""
8653
8654 msgid " Glob examples::"
8655 msgstr ""
8656
8657 msgid ""
7477 8658 " glob:*.c any name ending in \".c\" in the current directory\n"
7478 8659 " *.c any name ending in \".c\" in the current directory\n"
7479 8660 " **.c any name ending in \".c\" in any subdirectory of the\n"
7480 8661 " current directory including itself.\n"
7481 8662 " foo/*.c any name ending in \".c\" in the directory foo\n"
7482 8663 " 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 " "
8664 " including itself."
8665 msgstr ""
8666
8667 msgid " Regexp examples::"
8668 msgstr ""
8669
8670 msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository"
7490 8671 msgstr ""
7491 8672
7492 8673 msgid "Environment Variables"
7493 8674 msgstr ""
7494 8675
7495 8676 msgid ""
7496 8677 "\n"
7497 8678 "HG\n"
7498 8679 " Path to the 'hg' executable, automatically passed when running\n"
7499 8680 " hooks, extensions or external tools. If unset or empty, this is\n"
7500 8681 " the hg executable's name if it's frozen, or an executable named\n"
7501 8682 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7502 " Windows) is searched.\n"
7503 "\n"
8683 " Windows) is searched."
8684 msgstr ""
8685
8686 msgid ""
7504 8687 "HGEDITOR\n"
7505 " This is the name of the editor to run when committing. See EDITOR.\n"
7506 "\n"
7507 " (deprecated, use .hgrc)\n"
7508 "\n"
8688 " This is the name of the editor to run when committing. See EDITOR."
8689 msgstr ""
8690
8691 msgid " (deprecated, use .hgrc)"
8692 msgstr ""
8693
8694 msgid ""
7509 8695 "HGENCODING\n"
7510 8696 " This overrides the default locale setting detected by Mercurial.\n"
7511 8697 " This setting is used to convert data including usernames,\n"
7512 8698 " changeset descriptions, tag names, and branches. This setting can\n"
7513 " be overridden with the --encoding command-line option.\n"
7514 "\n"
8699 " be overridden with the --encoding command-line option."
8700 msgstr ""
8701
8702 msgid ""
7515 8703 "HGENCODINGMODE\n"
7516 8704 " This sets Mercurial's behavior for handling unknown characters\n"
7517 8705 " while transcoding user input. The default is \"strict\", which\n"
7518 8706 " causes Mercurial to abort if it can't map a character. Other\n"
7519 8707 " settings include \"replace\", which replaces unknown characters, and\n"
7520 8708 " \"ignore\", which drops them. This setting can be overridden with\n"
7521 " the --encodingmode command-line option.\n"
7522 "\n"
8709 " the --encodingmode command-line option."
8710 msgstr ""
8711
8712 msgid ""
7523 8713 "HGMERGE\n"
7524 8714 " An executable to use for resolving merge conflicts. The program\n"
7525 8715 " will be executed with three arguments: local file, remote file,\n"
7526 " ancestor file.\n"
7527 "\n"
7528 " (deprecated, use .hgrc)\n"
7529 "\n"
8716 " ancestor file."
8717 msgstr ""
8718
8719 msgid ""
7530 8720 "HGRCPATH\n"
7531 8721 " A list of files or directories to search for hgrc files. Item\n"
7532 8722 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7533 8723 " platform default search path is used. If empty, only the .hg/hgrc\n"
7534 " from the current repository is read.\n"
7535 "\n"
7536 " For each element in HGRCPATH:\n"
7537 "\n"
8724 " from the current repository is read."
8725 msgstr ""
8726
8727 msgid " For each element in HGRCPATH:"
8728 msgstr ""
8729
8730 msgid ""
7538 8731 " - if it's a directory, all files ending with .rc are added\n"
7539 " - otherwise, the file itself will be added\n"
7540 "\n"
8732 " - otherwise, the file itself will be added"
8733 msgstr ""
8734
8735 msgid ""
7541 8736 "HGUSER\n"
7542 8737 " This is the string used as the author of a commit. If not set,\n"
7543 " available values will be considered in this order:\n"
7544 "\n"
8738 " available values will be considered in this order:"
8739 msgstr ""
8740
8741 msgid ""
7545 8742 " - HGUSER (deprecated)\n"
7546 8743 " - hgrc files from the HGRCPATH\n"
7547 8744 " - EMAIL\n"
7548 8745 " - interactive prompt\n"
7549 " - LOGNAME (with '@hostname' appended)\n"
7550 "\n"
7551 " (deprecated, use .hgrc)\n"
7552 "\n"
8746 " - LOGNAME (with '@hostname' appended)"
8747 msgstr ""
8748
8749 msgid ""
7553 8750 "EMAIL\n"
7554 " May be used as the author of a commit; see HGUSER.\n"
7555 "\n"
8751 " May be used as the author of a commit; see HGUSER."
8752 msgstr ""
8753
8754 msgid ""
7556 8755 "LOGNAME\n"
7557 " May be used as the author of a commit; see HGUSER.\n"
7558 "\n"
8756 " May be used as the author of a commit; see HGUSER."
8757 msgstr ""
8758
8759 msgid ""
7559 8760 "VISUAL\n"
7560 " This is the name of the editor to use when committing. See EDITOR.\n"
7561 "\n"
8761 " This is the name of the editor to use when committing. See EDITOR."
8762 msgstr ""
8763
8764 msgid ""
7562 8765 "EDITOR\n"
7563 8766 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7564 8767 " user to modify, for example when writing commit messages. The\n"
7565 8768 " editor it uses is determined by looking at the environment\n"
7566 8769 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7567 8770 " non-empty one is chosen. If all of them are empty, the editor\n"
7568 " defaults to 'vi'.\n"
7569 "\n"
8771 " defaults to 'vi'."
8772 msgstr ""
8773
8774 msgid ""
7570 8775 "PYTHONPATH\n"
7571 8776 " This is used by Python to find imported modules and may need to be\n"
7572 8777 " set appropriately if this Mercurial is not installed system-wide.\n"
7573 8778 " "
7574 8779 msgstr ""
7575 8780
7576 8781 msgid "Specifying Single Revisions"
7577 8782 msgstr ""
7578 8783
7579 8784 msgid ""
7580 8785 "\n"
7581 " Mercurial supports several ways to specify individual revisions.\n"
7582 "\n"
8786 " Mercurial supports several ways to specify individual revisions."
8787 msgstr ""
8788
8789 msgid ""
7583 8790 " A plain integer is treated as a revision number. Negative integers\n"
7584 8791 " are treated as sequential offsets from the tip, with -1 denoting\n"
7585 " the tip, -2 denoting the revision prior to the tip, and so forth.\n"
7586 "\n"
8792 " the tip, -2 denoting the revision prior to the tip, and so forth."
8793 msgstr ""
8794
8795 msgid ""
7587 8796 " A 40-digit hexadecimal string is treated as a unique revision\n"
7588 " identifier.\n"
7589 "\n"
8797 " identifier."
8798 msgstr ""
8799
8800 msgid ""
7590 8801 " A hexadecimal string less than 40 characters long is treated as a\n"
7591 8802 " unique revision identifier and is referred to as a short-form\n"
7592 8803 " identifier. A short-form identifier is only valid if it is the\n"
7593 " prefix of exactly one full-length identifier.\n"
7594 "\n"
8804 " prefix of exactly one full-length identifier."
8805 msgstr ""
8806
8807 msgid ""
7595 8808 " Any other string is treated as a tag or branch name. A tag name is\n"
7596 8809 " a symbolic name associated with a revision identifier. A branch\n"
7597 8810 " name denotes the tipmost revision of that branch. Tag and branch\n"
7598 " names must not contain the \":\" character.\n"
7599 "\n"
8811 " names must not contain the \":\" character."
8812 msgstr ""
8813
8814 msgid ""
7600 8815 " The reserved name \"tip\" is a special tag that always identifies\n"
7601 " the most recent revision.\n"
7602 "\n"
8816 " the most recent revision."
8817 msgstr ""
8818
8819 msgid ""
7603 8820 " The reserved name \"null\" indicates the null revision. This is the\n"
7604 " revision of an empty repository, and the parent of revision 0.\n"
7605 "\n"
8821 " revision of an empty repository, and the parent of revision 0."
8822 msgstr ""
8823
8824 msgid ""
7606 8825 " The reserved name \".\" indicates the working directory parent. If\n"
7607 8826 " no working directory is checked out, it is equivalent to null. If\n"
7608 8827 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7609 8828 " first parent.\n"
7610 8829 " "
7611 8830 msgstr ""
7612 8831
7613 8832 msgid "Specifying Multiple Revisions"
7614 8833 msgstr "指定多个版本"
7615 8834
7616 8835 #, fuzzy
7617 8836 msgid ""
7618 8837 "\n"
7619 8838 " When Mercurial accepts more than one revision, they may be\n"
7620 8839 " specified individually, or provided as a topologically continuous\n"
7621 " range, separated by the \":\" character.\n"
7622 "\n"
8840 " range, separated by the \":\" character."
8841 msgstr ""
8842 "\n"
8843 " 当水银接受多个版本时,它们可以单独给出,或者以字符 \":\" 分割的拓扑连续\n"
8844 " 范围格式提供。"
8845
8846 #, fuzzy
8847 msgid ""
7623 8848 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7624 8849 " are revision identifiers. Both BEGIN and END are optional. If\n"
7625 8850 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7626 8851 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7627 " \"all revisions\".\n"
7628 "\n"
8852 " \"all revisions\"."
8853 msgstr ""
8854 " 范围的语法是 '[BEGIN]:[END]',其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n"
8855 " 和 'END' 都是可选的。'BEGIN' 默认是 0,'END' 默认是 'tip'。因此范围 \":\"\n"
8856 " 意味着全部版本。"
8857
8858 #, fuzzy
8859 msgid ""
7629 8860 " If BEGIN is greater than END, revisions are treated in reverse\n"
7630 " order.\n"
7631 "\n"
8861 " order."
8862 msgstr " 如果 'BEGIN' 大于 'END',版本视为反序。"
8863
8864 #, fuzzy
8865 msgid ""
7632 8866 " A range acts as a closed interval. This means that a range of 3:5\n"
7633 8867 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7634 8868 " "
7635 8869 msgstr ""
7636 "\n"
7637 " 当水银接受多个版本时,它们可以单独给出,或者以字符 \":\" 分割的拓扑连续\n"
7638 " 范围格式提供。\n"
7639 "\n"
7640 " 范围的语法是 '[BEGIN]:[END]',其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n"
7641 " 和 'END' 都是可选的。'BEGIN' 默认是 0,'END' 默认是 'tip'。因此范围 \":"
7642 "\"\n"
7643 " 意味着全部版本。\n"
7644 "\n"
7645 " 如果 'BEGIN' 大于 'END',版本视为反序。\n"
7646 "\n"
7647 8870 " 范围是闭区间。即范围 '3:5' 是 '3','4','5'。同样,范围 '9:6' 是 '9',\n"
7648 8871 " '8','7' 和 '6'。\n"
7649 8872 " "
7650 8873
7651 8874 msgid "Diff Formats"
7652 8875 msgstr "差异格式"
7653 8876
7654 8877 #, fuzzy
7655 8878 msgid ""
7656 8879 "\n"
7657 8880 " Mercurial's default format for showing changes between two\n"
7658 8881 " versions of a file is compatible with the unified format of GNU\n"
7659 8882 " diff, which can be used by GNU patch and many other standard\n"
7660 " tools.\n"
7661 "\n"
8883 " tools."
8884 msgstr ""
8885 "\n"
8886 " 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容,可用于\n"
8887 " GNU patch 和许多标准工具。"
8888
8889 #, fuzzy
8890 msgid ""
7662 8891 " While this standard format is often enough, it does not encode the\n"
7663 " following information:\n"
7664 "\n"
8892 " following information:"
8893 msgstr " 虽然标准格式在大多数情况下都能满足要求,但是它不包含下述信息:"
8894
8895 #, fuzzy
8896 msgid ""
7665 8897 " - executable status and other permission bits\n"
7666 8898 " - copy or rename information\n"
7667 8899 " - changes in binary files\n"
7668 " - creation or deletion of empty files\n"
7669 "\n"
8900 " - creation or deletion of empty files"
8901 msgstr ""
8902 " - 可执行状态和其它权限位\n"
8903 " - 复制或改名信息\n"
8904 " - 二进制文件的修改\n"
8905 " - 创建或删除空文件"
8906
8907 #, fuzzy
8908 msgid ""
7670 8909 " Mercurial also supports the extended diff format from the git VCS\n"
7671 8910 " which addresses these limitations. The git diff format is not\n"
7672 8911 " produced by default because a few widespread tools still do not\n"
7673 " understand this format.\n"
7674 "\n"
8912 " understand this format."
8913 msgstr ""
8914 " 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n"
8915 " 此格式,所以它不是默认格式。"
8916
8917 #, fuzzy
8918 msgid ""
7675 8919 " This means that when generating diffs from a Mercurial repository\n"
7676 8920 " (e.g. with \"hg export\"), you should be careful about things like\n"
7677 8921 " file copies and renames or other things mentioned above, because\n"
7678 8922 " when applying a standard diff to a different repository, this\n"
7679 8923 " extra information is lost. Mercurial's internal operations (like\n"
7680 8924 " push and pull) are not affected by this, because they use an\n"
7681 " internal binary format for communicating changes.\n"
7682 "\n"
8925 " internal binary format for communicating changes."
8926 msgstr ""
8927 " 这意味着当从水银版本库(例如 \"hg export\")产生差异时,在其它版本库应用标\n"
8928 " 准差异时,会丢失文件复制或改名等额外信息,所以你要小心处理。水银的内部\n"
8929 " 操作(例如 push 和 pull)在传达改变时,使用内部的二进制格式,所以不受影\n"
8930 " 响。"
8931
8932 #, fuzzy
8933 msgid ""
7683 8934 " To make Mercurial produce the git extended diff format, use the\n"
7684 8935 " --git option available for many commands, or set 'git = True' in\n"
7685 8936 " the [diff] section of your hgrc. You do not need to set this\n"
7686 8937 " option when importing diffs in this format or using them in the mq\n"
7687 8938 " extension.\n"
7688 8939 " "
7689 8940 msgstr ""
7690 "\n"
7691 " 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容,可用于\n"
7692 " GNU patch 和许多标准工具。\n"
7693 "\n"
7694 " 虽然标准格式在大多数情况下都能满足要求,但是它不包含下述信息:\n"
7695 "\n"
7696 " - 可执行状态和其它权限位\n"
7697 " - 复制或改名信息\n"
7698 " - 二进制文件的修改\n"
7699 " - 创建或删除空文件\n"
7700 "\n"
7701 " 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n"
7702 " 此格式,所以它不是默认格式。\n"
7703 "\n"
7704 " 这意味着当从水银版本库(例如 \"hg export\")产生差异时,在其它版本库应用标\n"
7705 " 准差异时,会丢失文件复制或改名等额外信息,所以你要小心处理。水银的内部\n"
7706 " 操作(例如 push 和 pull)在传达改变时,使用内部的二进制格式,所以不受影\n"
7707 " 响。\n"
7708 "\n"
7709 8941 " 要让水银产生 git 扩展差异格式,可以对许多命令使用选项 '--git',或者在\n"
7710 8942 " 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时,\n"
7711 8943 " 或在 mq 扩展中使用时,不需要设置此选项。\n"
7712 8944 " "
7713 8945
7714 8946 msgid "Template Usage"
7715 8947 msgstr "模版用法"
7716 8948
7717 8949 #, fuzzy
7718 8950 msgid ""
7719 8951 "\n"
7720 8952 " Mercurial allows you to customize output of commands through\n"
7721 8953 " templates. You can either pass in a template from the command\n"
7722 8954 " line, via the --template option, or select an existing\n"
7723 " template-style (--style).\n"
7724 "\n"
8955 " template-style (--style)."
8956 msgstr ""
8957 "\n"
8958 " 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n"
8959 " 来使用模版,或者选择已有的模版样式(--style)。"
8960
8961 #, fuzzy
8962 msgid ""
7725 8963 " You can customize output for any \"log-like\" command: log,\n"
7726 " outgoing, incoming, tip, parents, heads and glog.\n"
7727 "\n"
8964 " outgoing, incoming, tip, parents, heads and glog."
8965 msgstr ""
8966 " 你可以定制任意输出与日志信息类似的命令,即: log,outgoing,incoming,\n"
8967 " tip,parents,heads 和 glog。"
8968
8969 #, fuzzy
8970 msgid ""
7728 8971 " Three styles are packaged with Mercurial: default (the style used\n"
7729 8972 " when no explicit preference is passed), compact and changelog.\n"
7730 " Usage::\n"
7731 "\n"
7732 " $ hg log -r1 --style changelog\n"
7733 "\n"
8973 " Usage::"
8974 msgstr " 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:"
8975
8976 #, fuzzy
8977 msgid " $ hg log -r1 --style changelog"
8978 msgstr " $ hg log -r1 --style changelog"
8979
8980 #, fuzzy
8981 msgid ""
7734 8982 " A template is a piece of text, with markup to invoke variable\n"
7735 " expansion::\n"
7736 "\n"
8983 " expansion::"
8984 msgstr " 模版是文本片断,其中的标记用于变量扩展:"
8985
8986 #, fuzzy
8987 msgid ""
7737 8988 " $ hg log -r1 --template \"{node}\\n\"\n"
7738 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7739 "\n"
8989 " b56ce7b07c52de7d5fd79fb89701ea538af65746"
8990 msgstr ""
8991 " $ hg log -r1 --template \"{node}\\n\"\n"
8992 " b56ce7b07c52de7d5fd79fb89701ea538af65746"
8993
8994 #, fuzzy
8995 msgid ""
7740 8996 " Strings in curly braces are called keywords. The availability of\n"
7741 8997 " keywords depends on the exact context of the templater. These\n"
7742 " keywords are usually available for templating a log-like command:\n"
7743 "\n"
8998 " keywords are usually available for templating a log-like command:"
8999 msgstr ""
9000 " 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n"
9001 " 可用于输出与日志信息类似的命令:"
9002
9003 #, fuzzy
9004 msgid ""
7744 9005 " :author: String. The unmodified author of the changeset.\n"
7745 9006 " :branches: String. The name of the branch on which the changeset\n"
7746 9007 " was committed. Will be empty if the branch name was\n"
7747 9008 " default.\n"
7748 9009 " :date: Date information. The date when the changeset was\n"
7749 9010 " committed.\n"
7750 9011 " :desc: String. The text of the changeset description.\n"
7751 9012 " :diffstat: String. Statistics of changes with the following\n"
7752 9013 " format: \"modified files: +added/-removed lines\"\n"
7753 9014 " :files: List of strings. All files modified, added, or removed\n"
7754 9015 " by this changeset.\n"
7755 9016 " :file_adds: List of strings. Files added by this changeset.\n"
7756 9017 " :file_mods: List of strings. Files modified by this changeset.\n"
7757 9018 " :file_dels: List of strings. Files removed by this changeset.\n"
7758 9019 " :node: String. The changeset identification hash, as a\n"
7759 9020 " 40-character hexadecimal string.\n"
7760 9021 " :parents: List of strings. The parents of the changeset.\n"
7761 9022 " :rev: Integer. The repository-local changeset revision\n"
7762 9023 " number.\n"
7763 9024 " :tags: List of strings. Any tags associated with the\n"
7764 " changeset.\n"
7765 "\n"
9025 " changeset."
9026 msgstr ""
9027 " - author: 字符串。修改集的作者。\n"
9028 " - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n"
9029 " - date: 日期信息。修改集的日期。\n"
9030 " - desc: 字符串。修改集的描述。\n"
9031 " - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n"
9032 " - file_adds: 字符串列表。修改集中被增加的文件。\n"
9033 " - file_mods: 字符串列表。修改集中被修改的文件\n"
9034 " - file_dels: 字符串列表。修改集中被删除的文件\n"
9035 " - node: 字符串。修改集的哈系标识,40 个字符的 16 进制字符串。\n"
9036 " - parents: 字符串列表。修改集的父亲。\n"
9037 " - rev: 整数。本地版本库的修改集的版本号。\n"
9038 " - tags: 字符串列表。修改集的标签。"
9039
9040 #, fuzzy
9041 msgid ""
7766 9042 " The \"date\" keyword does not produce human-readable output. If you\n"
7767 9043 " want to use a date in your output, you can use a filter to process\n"
7768 9044 " it. Filters are functions which return a string based on the input\n"
7769 9045 " variable. You can also use a chain of filters to get the desired\n"
7770 " output::\n"
7771 "\n"
9046 " output::"
9047 msgstr ""
9048 " 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期,可以使用\n"
9049 " 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n"
9050 " 链来产生理想的输出:"
9051
9052 #, fuzzy
9053 msgid ""
7772 9054 " $ hg tip --template \"{date|isodate}\\n\"\n"
7773 " 2008-08-21 18:22 +0000\n"
7774 "\n"
7775 " List of filters:\n"
7776 "\n"
9055 " 2008-08-21 18:22 +0000"
9056 msgstr ""
9057 " $ hg tip --template \"{date|isodate}\\n\"\n"
9058 " 2008-08-21 18:22 +0000"
9059
9060 #, fuzzy
9061 msgid " List of filters:"
9062 msgstr " 过滤器列表:"
9063
9064 #, fuzzy
9065 msgid ""
7777 9066 " :addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7778 9067 " every line except the last.\n"
7779 9068 " :age: Date. Returns a human-readable date/time difference\n"
7780 9069 " between the given date/time and the current\n"
7781 9070 " date/time.\n"
7782 9071 " :basename: Any text. Treats the text as a path, and returns the\n"
7783 9072 " last component of the path after splitting by the\n"
7784 9073 " path separator (ignoring trailing separators). For\n"
7785 9074 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
7786 9075 " becomes \"bar\".\n"
7787 9076 " :stripdir: Treat the text as path and strip a directory level,\n"
7788 9077 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
7789 9078 " \"foo\".\n"
7790 9079 " :date: Date. Returns a date in a Unix date format, including\n"
7791 9080 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7792 9081 " :domain: Any text. Finds the first string that looks like an\n"
7793 9082 " email address, and extracts just the domain\n"
7794 9083 " component. Example: 'User <user@example.com>' becomes\n"
7795 9084 " 'example.com'.\n"
7796 9085 " :email: Any text. Extracts the first string that looks like\n"
7797 9086 " an email address. Example: 'User <user@example.com>'\n"
7798 9087 " becomes 'user@example.com'.\n"
7799 9088 " :escape: Any text. Replaces the special XML/XHTML characters\n"
7800 9089 " \"&\", \"<\" and \">\" with XML entities.\n"
7801 9090 " :fill68: Any text. Wraps the text to fit in 68 columns.\n"
7802 9091 " :fill76: Any text. Wraps the text to fit in 76 columns.\n"
7803 9092 " :firstline: Any text. Returns the first line of text.\n"
7804 9093 " :nonempty: Any text. Returns '(none)' if the string is empty.\n"
7805 9094 " :hgdate: Date. Returns the date as a pair of numbers:\n"
7806 9095 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7807 9096 " :isodate: Date. Returns the date in ISO 8601 format:\n"
7808 9097 " \"2009-08-18 13:00 +0200\".\n"
7809 9098 " :isodatesec: Date. Returns the date in ISO 8601 format, including\n"
7810 9099 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
7811 9100 " rfc3339date filter.\n"
7812 9101 " :localdate: Date. Converts a date to local date.\n"
7813 9102 " :obfuscate: Any text. Returns the input text rendered as a\n"
7814 9103 " sequence of XML entities.\n"
7815 9104 " :person: Any text. Returns the text before an email address.\n"
7816 9105 " :rfc822date: Date. Returns a date using the same format used in\n"
7817 9106 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
7818 9107 " :rfc3339date: Date. Returns a date using the Internet date format\n"
7819 9108 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
7820 9109 " :short: Changeset hash. Returns the short form of a changeset\n"
7821 9110 " hash, i.e. a 12-byte hexadecimal string.\n"
7822 9111 " :shortdate: Date. Returns a date like \"2006-09-18\".\n"
7823 9112 " :strip: Any text. Strips all leading and trailing whitespace.\n"
7824 9113 " :tabindent: Any text. Returns the text, with every line except\n"
7825 9114 " the first starting with a tab character.\n"
7826 9115 " :urlescape: Any text. Escapes all \"special\" characters. For\n"
7827 9116 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7828 9117 " :user: Any text. Returns the user portion of an email\n"
7829 9118 " address.\n"
7830 9119 " "
7831 9120 msgstr ""
7832 "\n"
7833 " 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n"
7834 " 来使用模版,或者选择已有的模版样式(--style)。\n"
7835 "\n"
7836 " 你可以定制任意输出与日志信息类似的命令,即: log,outgoing,incoming,\n"
7837 " tip,parents,heads 和 glog。\n"
7838 "\n"
7839 " 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:\n"
7840 "\n"
7841 " $ hg log -r1 --style changelog\n"
7842 "\n"
7843 " 模版是文本片断,其中的标记用于变量扩展:\n"
7844 "\n"
7845 " $ hg log -r1 --template \"{node}\\n\"\n"
7846 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7847 "\n"
7848 " 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n"
7849 " 可用于输出与日志信息类似的命令:\n"
7850 "\n"
7851 " - author: 字符串。修改集的作者。\n"
7852 " - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n"
7853 " - date: 日期信息。修改集的日期。\n"
7854 " - desc: 字符串。修改集的描述。\n"
7855 " - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n"
7856 " - file_adds: 字符串列表。修改集中被增加的文件。\n"
7857 " - file_mods: 字符串列表。修改集中被修改的文件\n"
7858 " - file_dels: 字符串列表。修改集中被删除的文件\n"
7859 " - node: 字符串。修改集的哈系标识,40 个字符的 16 进制字符串。\n"
7860 " - parents: 字符串列表。修改集的父亲。\n"
7861 " - rev: 整数。本地版本库的修改集的版本号。\n"
7862 " - tags: 字符串列表。修改集的标签。\n"
7863 "\n"
7864 " 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期,可以使用\n"
7865 " 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n"
7866 " 链来产生理想的输出:\n"
7867 "\n"
7868 " $ hg tip --template \"{date|isodate}\\n\"\n"
7869 " 2008-08-21 18:22 +0000\n"
7870 "\n"
7871 " 过滤器列表:\n"
7872 "\n"
7873 9121 " - addbreaks: 输入任意文本。除了最后一行,在每行的结尾增加 XHTML 标签\n"
7874 9122 " \"<br />\"。\n"
7875 9123 " - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n"
7876 9124 " - basename: 输入任意文本。将输入视为路径,返回被路径分隔符隔开的最后\n"
7877 " 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz"
7878 "\",\n"
9125 " 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz\",\n"
7879 9126 " \"foo/bar//\" 成为 \"bar\"。\n"
7880 9127 " - date: 输入日期。返回指定日期的 Unix 日期格式字符串,包含时区,例如: \n"
7881 9128 " \"Mon Sep 04 15:13:13 2006 0700\"。\n"
7882 9129 " - domain: 输入任意文本。找到第一个 email 地址,返回其域名。例如: \n"
7883 9130 " 'User <user@example.com>' 成为 'example.com'。\n"
7884 9131 " - email: 输入任意文本。返回第一个 email 地址。例如: \n"
7885 9132 " 'User <user@example.com>' 成为 'user@example.com'。\n"
7886 9133 " - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\",\n"
7887 9134 " \"<\" 和 \">\"。\n"
7888 9135 " - fill68: 输入任意文本。格式化为 68 列文本。\n"
7889 9136 " - fill76: 输入任意文本。格式化为 76 列文本。\n"
7890 9137 " - firstline: 输入任意文本。返回首行。\n"
7891 9138 " - hgdate: 输入日期。返回一对数字:\n"
7892 9139 " \"1157407993 25200\" (Unix 时戳,时区偏移)。\n"
7893 9140 " - isodate: 输入日期。返回 ISO 8601 格式的日期。\n"
7894 9141 " - obfuscate: 输入任意文本。返回其 XML 实体序列。\n"
7895 9142 " - person: 输入任意文本。返回 email 地址前的文本。\n"
7896 9143 " - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n"
7897 9144 " - short: 修改集哈系。返回修改集哈系的短格式。例如 12 字符的 16 进制\n"
7898 9145 " 字符串。\n"
7899 9146 " - shortdate: 输入日期。返回格式类似于 \"2006-09-18\"。\n"
7900 9147 " - strip: 输入任意文本。删除全部行首与行尾空白。\n"
7901 9148 " - tabindent: 输入任意文本。除了首行,在每行的开始增加制表符号。\n"
7902 9149 " - urlescape: 输入任意文本。封装全部特殊字符。例如\n"
7903 9150 " \"foo bar\" 成为 \"foo%20bar\"。\n"
7904 9151 " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n"
7905 9152 " "
7906 9153
7907 9154 #, fuzzy
7908 9155 msgid "URL Paths"
7909 9156 msgstr "统一资源定位路径"
7910 9157
7911 9158 #, fuzzy
7912 9159 msgid ""
7913 9160 "\n"
7914 " Valid URLs are of the form::\n"
7915 "\n"
9161 " Valid URLs are of the form::"
9162 msgstr ""
9163 "\n"
9164 " 有效的位置格式:\n"
9165 "\n"
9166 " local/filesystem/path (or file://local/filesystem/path)\n"
9167 " http://[user[:pass]@]host[:port]/[path]\n"
9168 " https://[user[:pass]@]host[:port]/[path]\n"
9169 " ssh://[user[:pass]@]host[:port]/[path]\n"
9170 "\n"
9171 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9172 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9173 "\n"
9174 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9175 " 修改集。\n"
9176 "\n"
9177 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9178 "\n"
9179 " 在水银中使用 SSH 的一些提示:\n"
9180 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9181 " hg,或者有指定的远程命令。\n"
9182 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9183 " 可以在路径前增加一个斜线指定绝对路径:\n"
9184 " ssh://example.com//tmp/repository\n"
9185 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9186 " SSH 执行压缩,例如:\n"
9187 " Host *.mylocalnetwork.example.com\n"
9188 " Compression no\n"
9189 " Host *\n"
9190 " Compression yes\n"
9191 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9192 " 用于命令行参数 '--ssh' 中。\n"
9193 "\n"
9194 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9195 " [paths]\n"
9196 " alias1 = URL1\n"
9197 " alias2 = URL2\n"
9198 " ...\n"
9199 "\n"
9200 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9201 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9202 "\n"
9203 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9204 "\n"
9205 " default:\n"
9206 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9207 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9208 " 的命令省略路径(包含进和出)。\n"
9209 "\n"
9210 " default-push:\n"
9211 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9212 " "
9213
9214 #, fuzzy
9215 msgid ""
7916 9216 " local/filesystem/path[#revision]\n"
7917 9217 " file://local/filesystem/path[#revision]\n"
7918 9218 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
7919 9219 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
7920 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
7921 "\n"
9220 " ssh://[user[:pass]@]host[:port]/[path][#revision]"
9221 msgstr ""
9222 "\n"
9223 " 有效的位置格式:\n"
9224 "\n"
9225 " local/filesystem/path (or file://local/filesystem/path)\n"
9226 " http://[user[:pass]@]host[:port]/[path]\n"
9227 " https://[user[:pass]@]host[:port]/[path]\n"
9228 " ssh://[user[:pass]@]host[:port]/[path]\n"
9229 "\n"
9230 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9231 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9232 "\n"
9233 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9234 " 修改集。\n"
9235 "\n"
9236 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9237 "\n"
9238 " 在水银中使用 SSH 的一些提示:\n"
9239 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9240 " hg,或者有指定的远程命令。\n"
9241 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9242 " 可以在路径前增加一个斜线指定绝对路径:\n"
9243 " ssh://example.com//tmp/repository\n"
9244 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9245 " SSH 执行压缩,例如:\n"
9246 " Host *.mylocalnetwork.example.com\n"
9247 " Compression no\n"
9248 " Host *\n"
9249 " Compression yes\n"
9250 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9251 " 用于命令行参数 '--ssh' 中。\n"
9252 "\n"
9253 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9254 " [paths]\n"
9255 " alias1 = URL1\n"
9256 " alias2 = URL2\n"
9257 " ...\n"
9258 "\n"
9259 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9260 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9261 "\n"
9262 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9263 "\n"
9264 " default:\n"
9265 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9266 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9267 " 的命令省略路径(包含进和出)。\n"
9268 "\n"
9269 " default-push:\n"
9270 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9271 " "
9272
9273 #, fuzzy
9274 msgid ""
7922 9275 " Paths in the local filesystem can either point to Mercurial\n"
7923 9276 " repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
7924 " incoming --bundle').\n"
7925 "\n"
9277 " incoming --bundle')."
9278 msgstr ""
9279 "\n"
9280 " 有效的位置格式:\n"
9281 "\n"
9282 " local/filesystem/path (or file://local/filesystem/path)\n"
9283 " http://[user[:pass]@]host[:port]/[path]\n"
9284 " https://[user[:pass]@]host[:port]/[path]\n"
9285 " ssh://[user[:pass]@]host[:port]/[path]\n"
9286 "\n"
9287 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9288 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9289 "\n"
9290 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9291 " 修改集。\n"
9292 "\n"
9293 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9294 "\n"
9295 " 在水银中使用 SSH 的一些提示:\n"
9296 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9297 " hg,或者有指定的远程命令。\n"
9298 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9299 " 可以在路径前增加一个斜线指定绝对路径:\n"
9300 " ssh://example.com//tmp/repository\n"
9301 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9302 " SSH 执行压缩,例如:\n"
9303 " Host *.mylocalnetwork.example.com\n"
9304 " Compression no\n"
9305 " Host *\n"
9306 " Compression yes\n"
9307 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9308 " 用于命令行参数 '--ssh' 中。\n"
9309 "\n"
9310 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9311 " [paths]\n"
9312 " alias1 = URL1\n"
9313 " alias2 = URL2\n"
9314 " ...\n"
9315 "\n"
9316 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9317 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9318 "\n"
9319 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9320 "\n"
9321 " default:\n"
9322 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9323 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9324 " 的命令省略路径(包含进和出)。\n"
9325 "\n"
9326 " default-push:\n"
9327 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9328 " "
9329
9330 #, fuzzy
9331 msgid ""
7926 9332 " An optional identifier after # indicates a particular branch, tag,\n"
7927 9333 " or changeset to use from the remote repository. See also 'hg help\n"
7928 " revisions'.\n"
7929 "\n"
9334 " revisions'."
9335 msgstr ""
9336 "\n"
9337 " 有效的位置格式:\n"
9338 "\n"
9339 " local/filesystem/path (or file://local/filesystem/path)\n"
9340 " http://[user[:pass]@]host[:port]/[path]\n"
9341 " https://[user[:pass]@]host[:port]/[path]\n"
9342 " ssh://[user[:pass]@]host[:port]/[path]\n"
9343 "\n"
9344 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9345 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9346 "\n"
9347 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9348 " 修改集。\n"
9349 "\n"
9350 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9351 "\n"
9352 " 在水银中使用 SSH 的一些提示:\n"
9353 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9354 " hg,或者有指定的远程命令。\n"
9355 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9356 " 可以在路径前增加一个斜线指定绝对路径:\n"
9357 " ssh://example.com//tmp/repository\n"
9358 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9359 " SSH 执行压缩,例如:\n"
9360 " Host *.mylocalnetwork.example.com\n"
9361 " Compression no\n"
9362 " Host *\n"
9363 " Compression yes\n"
9364 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9365 " 用于命令行参数 '--ssh' 中。\n"
9366 "\n"
9367 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9368 " [paths]\n"
9369 " alias1 = URL1\n"
9370 " alias2 = URL2\n"
9371 " ...\n"
9372 "\n"
9373 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9374 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9375 "\n"
9376 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9377 "\n"
9378 " default:\n"
9379 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9380 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9381 " 的命令省略路径(包含进和出)。\n"
9382 "\n"
9383 " default-push:\n"
9384 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9385 " "
9386
9387 #, fuzzy
9388 msgid ""
7930 9389 " Some features, such as pushing to http:// and https:// URLs are\n"
7931 9390 " only possible if the feature is explicitly enabled on the remote\n"
7932 " Mercurial server.\n"
7933 "\n"
7934 " Some notes about using SSH with Mercurial:\n"
7935 "\n"
9391 " Mercurial server."
9392 msgstr ""
9393 "\n"
9394 " 有效的位置格式:\n"
9395 "\n"
9396 " local/filesystem/path (or file://local/filesystem/path)\n"
9397 " http://[user[:pass]@]host[:port]/[path]\n"
9398 " https://[user[:pass]@]host[:port]/[path]\n"
9399 " ssh://[user[:pass]@]host[:port]/[path]\n"
9400 "\n"
9401 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9402 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9403 "\n"
9404 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9405 " 修改集。\n"
9406 "\n"
9407 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9408 "\n"
9409 " 在水银中使用 SSH 的一些提示:\n"
9410 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9411 " hg,或者有指定的远程命令。\n"
9412 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9413 " 可以在路径前增加一个斜线指定绝对路径:\n"
9414 " ssh://example.com//tmp/repository\n"
9415 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9416 " SSH 执行压缩,例如:\n"
9417 " Host *.mylocalnetwork.example.com\n"
9418 " Compression no\n"
9419 " Host *\n"
9420 " Compression yes\n"
9421 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9422 " 用于命令行参数 '--ssh' 中。\n"
9423 "\n"
9424 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9425 " [paths]\n"
9426 " alias1 = URL1\n"
9427 " alias2 = URL2\n"
9428 " ...\n"
9429 "\n"
9430 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9431 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9432 "\n"
9433 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9434 "\n"
9435 " default:\n"
9436 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9437 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9438 " 的命令省略路径(包含进和出)。\n"
9439 "\n"
9440 " default-push:\n"
9441 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9442 " "
9443
9444 #, fuzzy
9445 msgid " Some notes about using SSH with Mercurial:"
9446 msgstr ""
9447 "\n"
9448 " 有效的位置格式:\n"
9449 "\n"
9450 " local/filesystem/path (or file://local/filesystem/path)\n"
9451 " http://[user[:pass]@]host[:port]/[path]\n"
9452 " https://[user[:pass]@]host[:port]/[path]\n"
9453 " ssh://[user[:pass]@]host[:port]/[path]\n"
9454 "\n"
9455 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9456 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9457 "\n"
9458 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9459 " 修改集。\n"
9460 "\n"
9461 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9462 "\n"
9463 " 在水银中使用 SSH 的一些提示:\n"
9464 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9465 " hg,或者有指定的远程命令。\n"
9466 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9467 " 可以在路径前增加一个斜线指定绝对路径:\n"
9468 " ssh://example.com//tmp/repository\n"
9469 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9470 " SSH 执行压缩,例如:\n"
9471 " Host *.mylocalnetwork.example.com\n"
9472 " Compression no\n"
9473 " Host *\n"
9474 " Compression yes\n"
9475 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9476 " 用于命令行参数 '--ssh' 中。\n"
9477 "\n"
9478 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9479 " [paths]\n"
9480 " alias1 = URL1\n"
9481 " alias2 = URL2\n"
9482 " ...\n"
9483 "\n"
9484 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9485 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9486 "\n"
9487 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9488 "\n"
9489 " default:\n"
9490 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9491 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9492 " 的命令省略路径(包含进和出)。\n"
9493 "\n"
9494 " default-push:\n"
9495 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9496 " "
9497
9498 #, fuzzy
9499 msgid ""
7936 9500 " - SSH requires an accessible shell account on the destination\n"
7937 9501 " machine and a copy of hg in the remote path or specified with as\n"
7938 9502 " remotecmd.\n"
7939 9503 " - path is relative to the remote user's home directory by default.\n"
7940 9504 " Use an extra slash at the start of a path to specify an absolute\n"
7941 " path::\n"
7942 "\n"
9505 " path::"
9506 msgstr ""
9507 "\n"
9508 " 有效的位置格式:\n"
9509 "\n"
9510 " local/filesystem/path (or file://local/filesystem/path)\n"
9511 " http://[user[:pass]@]host[:port]/[path]\n"
9512 " https://[user[:pass]@]host[:port]/[path]\n"
9513 " ssh://[user[:pass]@]host[:port]/[path]\n"
9514 "\n"
9515 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9516 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9517 "\n"
9518 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9519 " 修改集。\n"
9520 "\n"
9521 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9522 "\n"
9523 " 在水银中使用 SSH 的一些提示:\n"
9524 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9525 " hg,或者有指定的远程命令。\n"
9526 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9527 " 可以在路径前增加一个斜线指定绝对路径:\n"
9528 " ssh://example.com//tmp/repository\n"
9529 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9530 " SSH 执行压缩,例如:\n"
9531 " Host *.mylocalnetwork.example.com\n"
9532 " Compression no\n"
9533 " Host *\n"
9534 " Compression yes\n"
9535 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9536 " 用于命令行参数 '--ssh' 中。\n"
9537 "\n"
9538 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9539 " [paths]\n"
9540 " alias1 = URL1\n"
9541 " alias2 = URL2\n"
9542 " ...\n"
9543 "\n"
9544 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9545 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9546 "\n"
9547 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9548 "\n"
9549 " default:\n"
9550 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9551 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9552 " 的命令省略路径(包含进和出)。\n"
9553 "\n"
9554 " default-push:\n"
9555 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9556 " "
9557
9558 #, fuzzy
9559 msgid " ssh://example.com//tmp/repository"
9560 msgstr ""
9561 "\n"
9562 " 有效的位置格式:\n"
9563 "\n"
9564 " local/filesystem/path (or file://local/filesystem/path)\n"
9565 " http://[user[:pass]@]host[:port]/[path]\n"
9566 " https://[user[:pass]@]host[:port]/[path]\n"
9567 " ssh://[user[:pass]@]host[:port]/[path]\n"
9568 "\n"
9569 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9570 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9571 "\n"
9572 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9573 " 修改集。\n"
9574 "\n"
9575 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9576 "\n"
9577 " 在水银中使用 SSH 的一些提示:\n"
9578 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9579 " hg,或者有指定的远程命令。\n"
9580 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9581 " 可以在路径前增加一个斜线指定绝对路径:\n"
7943 9582 " ssh://example.com//tmp/repository\n"
7944 "\n"
9583 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9584 " SSH 执行压缩,例如:\n"
9585 " Host *.mylocalnetwork.example.com\n"
9586 " Compression no\n"
9587 " Host *\n"
9588 " Compression yes\n"
9589 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9590 " 用于命令行参数 '--ssh' 中。\n"
9591 "\n"
9592 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9593 " [paths]\n"
9594 " alias1 = URL1\n"
9595 " alias2 = URL2\n"
9596 " ...\n"
9597 "\n"
9598 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9599 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9600 "\n"
9601 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9602 "\n"
9603 " default:\n"
9604 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9605 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9606 " 的命令省略路径(包含进和出)。\n"
9607 "\n"
9608 " default-push:\n"
9609 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9610 " "
9611
9612 #, fuzzy
9613 msgid ""
7945 9614 " - Mercurial doesn't use its own compression via SSH; the right\n"
7946 " thing to do is to configure it in your ~/.ssh/config, e.g.::\n"
7947 "\n"
9615 " thing to do is to configure it in your ~/.ssh/config, e.g.::"
9616 msgstr ""
9617 "\n"
9618 " 有效的位置格式:\n"
9619 "\n"
9620 " local/filesystem/path (or file://local/filesystem/path)\n"
9621 " http://[user[:pass]@]host[:port]/[path]\n"
9622 " https://[user[:pass]@]host[:port]/[path]\n"
9623 " ssh://[user[:pass]@]host[:port]/[path]\n"
9624 "\n"
9625 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9626 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9627 "\n"
9628 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9629 " 修改集。\n"
9630 "\n"
9631 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9632 "\n"
9633 " 在水银中使用 SSH 的一些提示:\n"
9634 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9635 " hg,或者有指定的远程命令。\n"
9636 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9637 " 可以在路径前增加一个斜线指定绝对路径:\n"
9638 " ssh://example.com//tmp/repository\n"
9639 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9640 " SSH 执行压缩,例如:\n"
9641 " Host *.mylocalnetwork.example.com\n"
9642 " Compression no\n"
9643 " Host *\n"
9644 " Compression yes\n"
9645 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9646 " 用于命令行参数 '--ssh' 中。\n"
9647 "\n"
9648 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9649 " [paths]\n"
9650 " alias1 = URL1\n"
9651 " alias2 = URL2\n"
9652 " ...\n"
9653 "\n"
9654 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9655 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9656 "\n"
9657 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9658 "\n"
9659 " default:\n"
9660 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9661 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9662 " 的命令省略路径(包含进和出)。\n"
9663 "\n"
9664 " default-push:\n"
9665 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9666 " "
9667
9668 #, fuzzy
9669 msgid ""
9670 " Host *.mylocalnetwork.example.com\n"
9671 " Compression no\n"
9672 " Host *\n"
9673 " Compression yes"
9674 msgstr ""
9675 "\n"
9676 " 有效的位置格式:\n"
9677 "\n"
9678 " local/filesystem/path (or file://local/filesystem/path)\n"
9679 " http://[user[:pass]@]host[:port]/[path]\n"
9680 " https://[user[:pass]@]host[:port]/[path]\n"
9681 " ssh://[user[:pass]@]host[:port]/[path]\n"
9682 "\n"
9683 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9684 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9685 "\n"
9686 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9687 " 修改集。\n"
9688 "\n"
9689 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9690 "\n"
9691 " 在水银中使用 SSH 的一些提示:\n"
9692 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9693 " hg,或者有指定的远程命令。\n"
9694 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9695 " 可以在路径前增加一个斜线指定绝对路径:\n"
9696 " ssh://example.com//tmp/repository\n"
9697 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9698 " SSH 执行压缩,例如:\n"
7948 9699 " Host *.mylocalnetwork.example.com\n"
7949 9700 " Compression no\n"
7950 9701 " Host *\n"
7951 9702 " Compression yes\n"
7952 "\n"
9703 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9704 " 用于命令行参数 '--ssh' 中。\n"
9705 "\n"
9706 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9707 " [paths]\n"
9708 " alias1 = URL1\n"
9709 " alias2 = URL2\n"
9710 " ...\n"
9711 "\n"
9712 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9713 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9714 "\n"
9715 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9716 "\n"
9717 " default:\n"
9718 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9719 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9720 " 的命令省略路径(包含进和出)。\n"
9721 "\n"
9722 " default-push:\n"
9723 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9724 " "
9725
9726 #, fuzzy
9727 msgid ""
7953 9728 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7954 " or with the --ssh command line option.\n"
7955 "\n"
9729 " or with the --ssh command line option."
9730 msgstr ""
9731 "\n"
9732 " 有效的位置格式:\n"
9733 "\n"
9734 " local/filesystem/path (or file://local/filesystem/path)\n"
9735 " http://[user[:pass]@]host[:port]/[path]\n"
9736 " https://[user[:pass]@]host[:port]/[path]\n"
9737 " ssh://[user[:pass]@]host[:port]/[path]\n"
9738 "\n"
9739 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9740 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9741 "\n"
9742 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9743 " 修改集。\n"
9744 "\n"
9745 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9746 "\n"
9747 " 在水银中使用 SSH 的一些提示:\n"
9748 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9749 " hg,或者有指定的远程命令。\n"
9750 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9751 " 可以在路径前增加一个斜线指定绝对路径:\n"
9752 " ssh://example.com//tmp/repository\n"
9753 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9754 " SSH 执行压缩,例如:\n"
9755 " Host *.mylocalnetwork.example.com\n"
9756 " Compression no\n"
9757 " Host *\n"
9758 " Compression yes\n"
9759 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9760 " 用于命令行参数 '--ssh' 中。\n"
9761 "\n"
9762 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9763 " [paths]\n"
9764 " alias1 = URL1\n"
9765 " alias2 = URL2\n"
9766 " ...\n"
9767 "\n"
9768 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9769 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9770 "\n"
9771 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9772 "\n"
9773 " default:\n"
9774 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9775 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9776 " 的命令省略路径(包含进和出)。\n"
9777 "\n"
9778 " default-push:\n"
9779 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9780 " "
9781
9782 #, fuzzy
9783 msgid ""
7956 9784 " These URLs can all be stored in your hgrc with path aliases under\n"
7957 " the [paths] section like so::\n"
7958 "\n"
9785 " the [paths] section like so::"
9786 msgstr ""
9787 "\n"
9788 " 有效的位置格式:\n"
9789 "\n"
9790 " local/filesystem/path (or file://local/filesystem/path)\n"
9791 " http://[user[:pass]@]host[:port]/[path]\n"
9792 " https://[user[:pass]@]host[:port]/[path]\n"
9793 " ssh://[user[:pass]@]host[:port]/[path]\n"
9794 "\n"
9795 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9796 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9797 "\n"
9798 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9799 " 修改集。\n"
9800 "\n"
9801 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9802 "\n"
9803 " 在水银中使用 SSH 的一些提示:\n"
9804 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9805 " hg,或者有指定的远程命令。\n"
9806 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9807 " 可以在路径前增加一个斜线指定绝对路径:\n"
9808 " ssh://example.com//tmp/repository\n"
9809 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9810 " SSH 执行压缩,例如:\n"
9811 " Host *.mylocalnetwork.example.com\n"
9812 " Compression no\n"
9813 " Host *\n"
9814 " Compression yes\n"
9815 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9816 " 用于命令行参数 '--ssh' 中。\n"
9817 "\n"
9818 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
7959 9819 " [paths]\n"
7960 9820 " alias1 = URL1\n"
7961 9821 " alias2 = URL2\n"
7962 9822 " ...\n"
7963 9823 "\n"
9824 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9825 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9826 "\n"
9827 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9828 "\n"
9829 " default:\n"
9830 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9831 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9832 " 的命令省略路径(包含进和出)。\n"
9833 "\n"
9834 " default-push:\n"
9835 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9836 " "
9837
9838 #, fuzzy
9839 msgid ""
9840 " [paths]\n"
9841 " alias1 = URL1\n"
9842 " alias2 = URL2\n"
9843 " ..."
9844 msgstr ""
9845 "\n"
9846 " 有效的位置格式:\n"
9847 "\n"
9848 " local/filesystem/path (or file://local/filesystem/path)\n"
9849 " http://[user[:pass]@]host[:port]/[path]\n"
9850 " https://[user[:pass]@]host[:port]/[path]\n"
9851 " ssh://[user[:pass]@]host[:port]/[path]\n"
9852 "\n"
9853 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9854 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9855 "\n"
9856 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9857 " 修改集。\n"
9858 "\n"
9859 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9860 "\n"
9861 " 在水银中使用 SSH 的一些提示:\n"
9862 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9863 " hg,或者有指定的远程命令。\n"
9864 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9865 " 可以在路径前增加一个斜线指定绝对路径:\n"
9866 " ssh://example.com//tmp/repository\n"
9867 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9868 " SSH 执行压缩,例如:\n"
9869 " Host *.mylocalnetwork.example.com\n"
9870 " Compression no\n"
9871 " Host *\n"
9872 " Compression yes\n"
9873 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9874 " 用于命令行参数 '--ssh' 中。\n"
9875 "\n"
9876 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9877 " [paths]\n"
9878 " alias1 = URL1\n"
9879 " alias2 = URL2\n"
9880 " ...\n"
9881 "\n"
9882 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9883 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9884 "\n"
9885 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9886 "\n"
9887 " default:\n"
9888 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9889 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9890 " 的命令省略路径(包含进和出)。\n"
9891 "\n"
9892 " default-push:\n"
9893 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9894 " "
9895
9896 #, fuzzy
9897 msgid ""
7964 9898 " You can then use the alias for any command that uses a URL (for\n"
7965 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7966 "\n"
9899 " example 'hg pull alias1' would pull from the 'alias1' path)."
9900 msgstr ""
9901 "\n"
9902 " 有效的位置格式:\n"
9903 "\n"
9904 " local/filesystem/path (or file://local/filesystem/path)\n"
9905 " http://[user[:pass]@]host[:port]/[path]\n"
9906 " https://[user[:pass]@]host[:port]/[path]\n"
9907 " ssh://[user[:pass]@]host[:port]/[path]\n"
9908 "\n"
9909 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9910 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9911 "\n"
9912 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9913 " 修改集。\n"
9914 "\n"
9915 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9916 "\n"
9917 " 在水银中使用 SSH 的一些提示:\n"
9918 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9919 " hg,或者有指定的远程命令。\n"
9920 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9921 " 可以在路径前增加一个斜线指定绝对路径:\n"
9922 " ssh://example.com//tmp/repository\n"
9923 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9924 " SSH 执行压缩,例如:\n"
9925 " Host *.mylocalnetwork.example.com\n"
9926 " Compression no\n"
9927 " Host *\n"
9928 " Compression yes\n"
9929 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9930 " 用于命令行参数 '--ssh' 中。\n"
9931 "\n"
9932 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9933 " [paths]\n"
9934 " alias1 = URL1\n"
9935 " alias2 = URL2\n"
9936 " ...\n"
9937 "\n"
9938 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9939 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9940 "\n"
9941 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9942 "\n"
9943 " default:\n"
9944 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9945 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9946 " 的命令省略路径(包含进和出)。\n"
9947 "\n"
9948 " default-push:\n"
9949 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9950 " "
9951
9952 #, fuzzy
9953 msgid ""
7967 9954 " Two path aliases are special because they are used as defaults\n"
7968 " when you do not provide the URL to a command:\n"
7969 "\n"
9955 " when you do not provide the URL to a command:"
9956 msgstr ""
9957 "\n"
9958 " 有效的位置格式:\n"
9959 "\n"
9960 " local/filesystem/path (or file://local/filesystem/path)\n"
9961 " http://[user[:pass]@]host[:port]/[path]\n"
9962 " https://[user[:pass]@]host[:port]/[path]\n"
9963 " ssh://[user[:pass]@]host[:port]/[path]\n"
9964 "\n"
9965 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9966 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
9967 "\n"
9968 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9969 " 修改集。\n"
9970 "\n"
9971 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
9972 "\n"
9973 " 在水银中使用 SSH 的一些提示:\n"
9974 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9975 " hg,或者有指定的远程命令。\n"
9976 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9977 " 可以在路径前增加一个斜线指定绝对路径:\n"
9978 " ssh://example.com//tmp/repository\n"
9979 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9980 " SSH 执行压缩,例如:\n"
9981 " Host *.mylocalnetwork.example.com\n"
9982 " Compression no\n"
9983 " Host *\n"
9984 " Compression yes\n"
9985 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9986 " 用于命令行参数 '--ssh' 中。\n"
9987 "\n"
9988 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
9989 " [paths]\n"
9990 " alias1 = URL1\n"
9991 " alias2 = URL2\n"
9992 " ...\n"
9993 "\n"
9994 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9995 " 会从 'alias1' 定义的路径取得指定版本)。\n"
9996 "\n"
9997 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
9998 "\n"
9999 " default:\n"
10000 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
10001 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
10002 " 的命令省略路径(包含进和出)。\n"
10003 "\n"
10004 " default-push:\n"
10005 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
10006 " "
10007
10008 #, fuzzy
10009 msgid ""
7970 10010 " default:\n"
7971 10011 " When you create a repository with hg clone, the clone command\n"
7972 10012 " saves the location of the source repository as the new\n"
7973 10013 " repository's 'default' path. This is then used when you omit\n"
7974 10014 " path from push- and pull-like commands (including incoming and\n"
7975 " outgoing).\n"
7976 "\n"
10015 " outgoing)."
10016 msgstr ""
10017 "\n"
10018 " 有效的位置格式:\n"
10019 "\n"
10020 " local/filesystem/path (or file://local/filesystem/path)\n"
10021 " http://[user[:pass]@]host[:port]/[path]\n"
10022 " https://[user[:pass]@]host[:port]/[path]\n"
10023 " ssh://[user[:pass]@]host[:port]/[path]\n"
10024 "\n"
10025 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
10026 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
10027 "\n"
10028 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
10029 " 修改集。\n"
10030 "\n"
10031 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
10032 "\n"
10033 " 在水银中使用 SSH 的一些提示:\n"
10034 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
10035 " hg,或者有指定的远程命令。\n"
10036 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
10037 " 可以在路径前增加一个斜线指定绝对路径:\n"
10038 " ssh://example.com//tmp/repository\n"
10039 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
10040 " SSH 执行压缩,例如:\n"
10041 " Host *.mylocalnetwork.example.com\n"
10042 " Compression no\n"
10043 " Host *\n"
10044 " Compression yes\n"
10045 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
10046 " 用于命令行参数 '--ssh' 中。\n"
10047 "\n"
10048 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
10049 " [paths]\n"
10050 " alias1 = URL1\n"
10051 " alias2 = URL2\n"
10052 " ...\n"
10053 "\n"
10054 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
10055 " 会从 'alias1' 定义的路径取得指定版本)。\n"
10056 "\n"
10057 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
10058 "\n"
10059 " default:\n"
10060 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
10061 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
10062 " 的命令省略路径(包含进和出)。\n"
10063 "\n"
10064 " default-push:\n"
10065 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
10066 " "
10067
10068 #, fuzzy
10069 msgid ""
7977 10070 " default-push:\n"
7978 10071 " The push command will look for a path named 'default-push', and\n"
7979 10072 " prefer it over 'default' if both are defined.\n"
7980 10073 " "
7981 10074 msgstr ""
7982 10075 "\n"
7983 10076 " 有效的位置格式:\n"
7984 10077 "\n"
7985 10078 " local/filesystem/path (or file://local/filesystem/path)\n"
7986 10079 " http://[user[:pass]@]host[:port]/[path]\n"
7987 10080 " https://[user[:pass]@]host[:port]/[path]\n"
7988 10081 " ssh://[user[:pass]@]host[:port]/[path]\n"
7989 10082 "\n"
7990 10083 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
7991 10084 " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
7992 10085 "\n"
7993 10086 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
7994 10087 " 修改集。\n"
7995 10088 "\n"
7996 10089 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n"
7997 10090 "\n"
7998 10091 " 在水银中使用 SSH 的一些提示:\n"
7999 10092 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
8000 10093 " hg,或者有指定的远程命令。\n"
8001 10094 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
8002 10095 " 可以在路径前增加一个斜线指定绝对路径:\n"
8003 10096 " ssh://example.com//tmp/repository\n"
8004 10097 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
8005 10098 " SSH 执行压缩,例如:\n"
8006 10099 " Host *.mylocalnetwork.example.com\n"
8007 10100 " Compression no\n"
8008 10101 " Host *\n"
8009 10102 " Compression yes\n"
8010 10103 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
8011 10104 " 用于命令行参数 '--ssh' 中。\n"
8012 10105 "\n"
8013 10106 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n"
8014 10107 " [paths]\n"
8015 10108 " alias1 = URL1\n"
8016 10109 " alias2 = URL2\n"
8017 10110 " ...\n"
8018 10111 "\n"
8019 10112 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
8020 10113 " 会从 'alias1' 定义的路径取得指定版本)。\n"
8021 10114 "\n"
8022 10115 " 因为用于默认路径,所以这 2 个路径别名比较特殊:\n"
8023 10116 "\n"
8024 10117 " default:\n"
8025 10118 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
8026 10119 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
8027 10120 " 的命令省略路径(包含进和出)。\n"
8028 10121 "\n"
8029 10122 " default-push:\n"
8030 10123 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
8031 10124 " "
8032 10125
8033 10126 #, fuzzy
8034 10127 msgid "Using additional features"
8035 10128 msgstr "启用额外的输出"
8036 10129
8037 10130 #, fuzzy
8038 10131 msgid "can only share local repositories"
8039 10132 msgstr "为此版本库启动服务 'inotify'"
8040 10133
8041 10134 #, fuzzy
8042 10135 msgid "destination already exists"
8043 10136 msgstr "版本库 %s 已存在"
8044 10137
8045 10138 msgid "updating working directory\n"
8046 10139 msgstr "正在更新工作目录\n"
8047 10140
8048 10141 #, python-format
8049 10142 msgid "destination directory: %s\n"
8050 10143 msgstr "目标目录: %s\n"
8051 10144
8052 10145 #, python-format
8053 10146 msgid "destination '%s' already exists"
8054 10147 msgstr ""
8055 10148
8056 10149 #, fuzzy, python-format
8057 10150 msgid "destination '%s' is not empty"
8058 10151 msgstr "非本地版本库 '%s'"
8059 10152
8060 msgid ""
8061 "src repository does not support revision lookup and so doesn't support clone "
8062 "by revision"
10153 msgid "src repository does not support revision lookup and so doesn't support clone by revision"
8063 10154 msgstr ""
8064 10155
8065 10156 msgid "clone from remote to remote not supported"
8066 10157 msgstr ""
8067 10158
8068 10159 msgid "updated"
8069 10160 msgstr "已更新"
8070 10161
8071 10162 msgid "merged"
8072 10163 msgstr "已合并"
8073 10164
8074 10165 msgid "removed"
8075 10166 msgstr "已删除"
8076 10167
8077 10168 msgid "unresolved"
8078 10169 msgstr "未解决"
8079 10170
8080 10171 #, python-format
8081 10172 msgid "%d files %s"
8082 10173 msgstr "%d 个文件%s"
8083 10174
8084 10175 msgid "use 'hg resolve' to retry unresolved file merges\n"
8085 10176 msgstr ""
8086 10177
8087 msgid ""
8088 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
8089 "abandon\n"
10178 msgid "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon\n"
8090 10179 msgstr ""
8091 10180
8092 10181 msgid "(branch merge, don't forget to commit)\n"
8093 10182 msgstr ""
8094 10183
8095 10184 #, python-format
8096 10185 msgid "error reading %s/.hg/hgrc: %s\n"
8097 10186 msgstr ""
8098 10187
8099 10188 msgid "SSL support is unavailable"
8100 10189 msgstr ""
8101 10190
8102 10191 msgid "IPv6 is not available on this system"
8103 10192 msgstr ""
8104 10193
8105 10194 #, python-format
8106 10195 msgid "cannot start server at '%s:%d': %s"
8107 10196 msgstr ""
8108 10197
8109 10198 #, python-format
8110 10199 msgid "calling hook %s: %s\n"
8111 10200 msgstr ""
8112 10201
8113 10202 #, python-format
8114 10203 msgid "%s hook is invalid (\"%s\" not in a module)"
8115 10204 msgstr ""
8116 10205
8117 10206 #, python-format
8118 10207 msgid "%s hook is invalid (import of \"%s\" failed)"
8119 10208 msgstr ""
8120 10209
8121 10210 #, python-format
8122 10211 msgid "%s hook is invalid (\"%s\" is not defined)"
8123 10212 msgstr ""
8124 10213
8125 10214 #, python-format
8126 10215 msgid "%s hook is invalid (\"%s\" is not callable)"
8127 10216 msgstr ""
8128 10217
8129 10218 #, python-format
8130 10219 msgid "error: %s hook failed: %s\n"
8131 10220 msgstr ""
8132 10221
8133 10222 #, python-format
8134 10223 msgid "error: %s hook raised an exception: %s\n"
8135 10224 msgstr ""
8136 10225
8137 10226 #, python-format
8138 10227 msgid "%s hook failed"
8139 10228 msgstr ""
8140 10229
8141 10230 #, python-format
8142 10231 msgid "warning: %s hook failed\n"
8143 10232 msgstr ""
8144 10233
8145 10234 #, python-format
8146 10235 msgid "running hook %s: %s\n"
8147 10236 msgstr ""
8148 10237
8149 10238 #, python-format
8150 10239 msgid "%s hook %s"
8151 10240 msgstr ""
8152 10241
8153 10242 #, python-format
8154 10243 msgid "warning: %s hook %s\n"
8155 10244 msgstr ""
8156 10245
8157 10246 msgid "connection ended unexpectedly"
8158 10247 msgstr ""
8159 10248
8160 10249 #, python-format
8161 10250 msgid "unsupported URL component: \"%s\""
8162 10251 msgstr ""
8163 10252
8164 10253 #, python-format
8165 10254 msgid "using %s\n"
8166 10255 msgstr "使用 %s\n"
8167 10256
8168 10257 #, python-format
8169 10258 msgid "capabilities: %s\n"
8170 10259 msgstr ""
8171 10260
8172 10261 msgid "operation not supported over http"
8173 10262 msgstr ""
8174 10263
8175 10264 #, python-format
8176 10265 msgid "sending %s command\n"
8177 10266 msgstr "发送命令 '%s'\n"
8178 10267
8179 10268 #, python-format
8180 10269 msgid "sending %s bytes\n"
8181 10270 msgstr "发送 %s 字节\n"
8182 10271
8183 10272 msgid "authorization failed"
8184 10273 msgstr "授权失败"
8185 10274
8186 10275 #, python-format
8187 10276 msgid "http error while sending %s command\n"
8188 10277 msgstr ""
8189 10278
8190 10279 msgid "http error, possibly caused by proxy setting"
8191 10280 msgstr ""
8192 10281
8193 10282 #, python-format
8194 10283 msgid "real URL is %s\n"
8195 10284 msgstr "实际 URL 是 '%s'\n"
8196 10285
8197 10286 #, fuzzy, python-format
8198 10287 msgid "requested URL: '%s'\n"
8199 10288 msgstr "请求的 URL: '%s'\n"
8200 10289
8201 10290 #, python-format
8202 10291 msgid "'%s' does not appear to be an hg repository"
8203 10292 msgstr "'%s' 似乎不是水银版本库"
8204 10293
8205 10294 #, python-format
8206 10295 msgid "'%s' sent a broken Content-Type header (%s)"
8207 10296 msgstr ""
8208 10297
8209 10298 #, python-format
8210 10299 msgid "'%s' uses newer protocol %s"
8211 10300 msgstr ""
8212 10301
8213 10302 msgid "look up remote revision"
8214 10303 msgstr ""
8215 10304
8216 10305 msgid "unexpected response:"
8217 10306 msgstr ""
8218 10307
8219 10308 msgid "look up remote changes"
8220 10309 msgstr ""
8221 10310
8222 10311 msgid "push failed (unexpected response):"
8223 10312 msgstr ""
8224 10313
8225 10314 #, python-format
8226 10315 msgid "push failed: %s"
8227 10316 msgstr ""
8228 10317
8229 10318 msgid "Python support for SSL and HTTPS is not installed"
8230 10319 msgstr ""
8231 10320
8232 10321 msgid "cannot create new http repository"
8233 10322 msgstr ""
8234 10323
8235 10324 #, python-format
8236 10325 msgid "ignoring invalid syntax '%s'"
8237 10326 msgstr ""
8238 10327
8239 10328 #, python-format
8240 10329 msgid "skipping unreadable ignore file '%s': %s\n"
8241 10330 msgstr ""
8242 10331
8243 10332 #, python-format
8244 10333 msgid "repository %s not found"
8245 10334 msgstr ""
8246 10335
8247 10336 #, python-format
8248 10337 msgid "repository %s already exists"
8249 10338 msgstr "版本库 %s 已存在"
8250 10339
8251 10340 #, python-format
8252 10341 msgid "requirement '%s' not supported"
8253 10342 msgstr ""
8254 10343
8255 10344 #, python-format
8256 10345 msgid ".hg/sharedpath points to nonexistent directory %s"
8257 10346 msgstr ""
8258 10347
8259 10348 #, python-format
8260 10349 msgid "%r cannot be used in a tag name"
8261 10350 msgstr ""
8262 10351
8263 10352 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8264 10353 msgstr ""
8265 10354
8266 10355 #, python-format
8267 10356 msgid "working directory has unknown parent '%s'!"
8268 10357 msgstr ""
8269 10358
8270 10359 #, python-format
8271 10360 msgid "unknown revision '%s'"
8272 10361 msgstr ""
8273 10362
8274 10363 #, python-format
8275 10364 msgid "filtering %s through %s\n"
8276 10365 msgstr ""
8277 10366
8278 10367 msgid "journal already exists - run hg recover"
8279 10368 msgstr ""
8280 10369
8281 10370 msgid "rolling back interrupted transaction\n"
8282 10371 msgstr "回滚中断的事务\n"
8283 10372
8284 10373 msgid "no interrupted transaction available\n"
8285 10374 msgstr ""
8286 10375
8287 10376 msgid "rolling back last transaction\n"
8288 10377 msgstr "回滚最近的事务\n"
8289 10378
8290 10379 #, python-format
8291 10380 msgid "Named branch could not be reset, current branch still is: %s\n"
8292 10381 msgstr ""
8293 10382
8294 10383 msgid "no rollback information available\n"
8295 10384 msgstr "没有回滚信息可用\n"
8296 10385
8297 10386 #, python-format
8298 10387 msgid "waiting for lock on %s held by %r\n"
8299 10388 msgstr ""
8300 10389
8301 10390 #, python-format
8302 10391 msgid "repository %s"
8303 10392 msgstr ""
8304 10393
8305 10394 #, python-format
8306 10395 msgid "working directory of %s"
8307 10396 msgstr ""
8308 10397
8309 10398 #, python-format
8310 10399 msgid " %s: searching for copy revision for %s\n"
8311 10400 msgstr ""
8312 10401
8313 10402 #, python-format
8314 10403 msgid " %s: copy %s:%s\n"
8315 10404 msgstr ""
8316 10405
8317 10406 msgid "cannot partially commit a merge (do not specify files or patterns)"
8318 10407 msgstr ""
8319 10408
8320 10409 #, fuzzy
8321 10410 msgid "file not found!"
8322 10411 msgstr "没有找到样式: %s"
8323 10412
8324 10413 #, fuzzy
8325 10414 msgid "no match under directory!"
8326 10415 msgstr "改变工作目录"
8327 10416
8328 10417 #, fuzzy
8329 10418 msgid "file not tracked!"
8330 10419 msgstr "%s 没有被跟踪!\n"
8331 10420
8332 10421 msgid "unresolved merge conflicts (see hg resolve)"
8333 10422 msgstr "未解决的合并冲突(参见 'hg resolve')"
8334 10423
8335 10424 #, fuzzy, python-format
8336 10425 msgid "committing subrepository %s\n"
8337 10426 msgstr "初始化目标版本库 %s\n"
8338 10427
8339 10428 #, python-format
8340 10429 msgid "trouble committing %s!\n"
8341 10430 msgstr "提交 '%s' 出错!\n"
8342 10431
8343 10432 #, python-format
8344 10433 msgid "%s does not exist!\n"
8345 10434 msgstr "%s 不存在!\n"
8346 10435
8347 10436 #, python-format
8348 10437 msgid ""
8349 10438 "%s: files over 10MB may cause memory and performance problems\n"
8350 10439 "(use 'hg revert %s' to unadd the file)\n"
8351 10440 msgstr ""
8352 10441
8353 10442 #, python-format
8354 10443 msgid "%s not added: only files and symlinks supported currently\n"
8355 10444 msgstr ""
8356 10445
8357 10446 #, python-format
8358 10447 msgid "%s already tracked!\n"
8359 10448 msgstr ""
8360 10449
8361 10450 #, python-format
8362 10451 msgid "%s not added!\n"
8363 10452 msgstr ""
8364 10453
8365 10454 #, python-format
8366 10455 msgid "%s still exists!\n"
8367 10456 msgstr ""
8368 10457
8369 10458 #, python-format
8370 10459 msgid "%s not tracked!\n"
8371 10460 msgstr "%s 没有被跟踪!\n"
8372 10461
8373 10462 #, python-format
8374 10463 msgid "%s not removed!\n"
8375 10464 msgstr ""
8376 10465
8377 10466 #, python-format
8378 10467 msgid "copy failed: %s is not a file or a symbolic link\n"
8379 10468 msgstr ""
8380 10469
8381 10470 msgid "searching for changes\n"
8382 10471 msgstr "正在搜索修改\n"
8383 10472
8384 10473 #, python-format
8385 10474 msgid "examining %s:%s\n"
8386 10475 msgstr ""
8387 10476
8388 10477 msgid "branch already found\n"
8389 10478 msgstr ""
8390 10479
8391 10480 #, python-format
8392 10481 msgid "found incomplete branch %s:%s\n"
8393 10482 msgstr ""
8394 10483
8395 10484 #, python-format
8396 10485 msgid "found new changeset %s\n"
8397 10486 msgstr ""
8398 10487
8399 10488 #, python-format
8400 10489 msgid "request %d: %s\n"
8401 10490 msgstr ""
8402 10491
8403 10492 #, python-format
8404 10493 msgid "received %s:%s\n"
8405 10494 msgstr ""
8406 10495
8407 10496 #, python-format
8408 10497 msgid "narrowing %d:%d %s\n"
8409 10498 msgstr ""
8410 10499
8411 10500 #, python-format
8412 10501 msgid "found new branch changeset %s\n"
8413 10502 msgstr ""
8414 10503
8415 10504 #, python-format
8416 10505 msgid "narrowed branch search to %s:%s\n"
8417 10506 msgstr ""
8418 10507
8419 10508 msgid "already have changeset "
8420 10509 msgstr ""
8421 10510
8422 10511 msgid "warning: repository is unrelated\n"
8423 10512 msgstr ""
8424 10513
8425 10514 msgid "repository is unrelated"
8426 10515 msgstr ""
8427 10516
8428 10517 msgid "found new changesets starting at "
8429 10518 msgstr ""
8430 10519
8431 10520 #, python-format
8432 10521 msgid "%d total queries\n"
8433 10522 msgstr ""
8434 10523
8435 10524 msgid "common changesets up to "
8436 10525 msgstr ""
8437 10526
8438 10527 msgid "requesting all changes\n"
8439 10528 msgstr "正在请求全部修改\n"
8440 10529
8441 msgid ""
8442 "Partial pull cannot be done because other repository doesn't support "
8443 "changegroupsubset."
10530 msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
8444 10531 msgstr ""
8445 10532
8446 10533 #, python-format
8447 10534 msgid "abort: push creates new remote branch '%s'!\n"
8448 10535 msgstr ""
8449 10536
8450 10537 msgid "abort: push creates new remote heads!\n"
8451 10538 msgstr ""
8452 10539
8453 10540 msgid "(did you forget to merge? use push -f to force)\n"
8454 10541 msgstr ""
8455 10542
8456 10543 msgid "note: unsynced remote changes!\n"
8457 10544 msgstr ""
8458 10545
8459 10546 #, python-format
8460 10547 msgid "%d changesets found\n"
8461 10548 msgstr "已发现 %d 个修改集\n"
8462 10549
8463 10550 msgid "list of changesets:\n"
8464 10551 msgstr ""
8465 10552
8466 10553 #, python-format
8467 10554 msgid "empty or missing revlog for %s"
8468 10555 msgstr ""
8469 10556
8470 10557 #, python-format
8471 10558 msgid "add changeset %s\n"
8472 10559 msgstr ""
8473 10560
8474 10561 msgid "adding changesets\n"
8475 10562 msgstr "正在增加修改集\n"
8476 10563
8477 10564 msgid "received changelog group is empty"
8478 10565 msgstr ""
8479 10566
8480 10567 msgid "adding manifests\n"
8481 10568 msgstr "正在增加清单\n"
8482 10569
8483 10570 msgid "adding file changes\n"
8484 10571 msgstr "正在增加文件改变\n"
8485 10572
8486 10573 #, python-format
8487 10574 msgid "adding %s revisions\n"
8488 10575 msgstr ""
8489 10576
8490 10577 msgid "received file revlog group is empty"
8491 10578 msgstr ""
8492 10579
8493 10580 #, python-format
8494 10581 msgid " (%+d heads)"
8495 10582 msgstr ""
8496 10583
8497 10584 #, python-format
8498 10585 msgid "added %d changesets with %d changes to %d files%s\n"
8499 10586 msgstr "已增加 %d 个修改集,包含 %d 个改变,修改了 %d 个文件%s\n"
8500 10587
8501 10588 msgid "updating the branch cache\n"
8502 10589 msgstr ""
8503 10590
8504 10591 msgid "Unexpected response from remote server:"
8505 10592 msgstr ""
8506 10593
8507 10594 msgid "operation forbidden by server"
8508 10595 msgstr ""
8509 10596
8510 10597 msgid "locking the remote repository failed"
8511 10598 msgstr ""
8512 10599
8513 10600 msgid "the server sent an unknown error code"
8514 10601 msgstr ""
8515 10602
8516 10603 msgid "streaming all changes\n"
8517 10604 msgstr ""
8518 10605
8519 10606 #, python-format
8520 10607 msgid "%d files to transfer, %s of data\n"
8521 10608 msgstr ""
8522 10609
8523 10610 #, python-format
8524 10611 msgid "adding %s (%s)\n"
8525 10612 msgstr ""
8526 10613
8527 10614 #, python-format
8528 10615 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8529 10616 msgstr ""
8530 10617
8531 10618 msgid "no [smtp]host in hgrc - cannot send mail"
8532 10619 msgstr ""
8533 10620
8534 10621 #, python-format
8535 10622 msgid "sending mail: smtp host %s, port %s\n"
8536 10623 msgstr ""
8537 10624
8538 10625 msgid "can't use TLS: Python SSL support not installed"
8539 10626 msgstr ""
8540 10627
8541 10628 msgid "(using tls)\n"
8542 10629 msgstr ""
8543 10630
8544 10631 #, python-format
8545 10632 msgid "(authenticating to mail server as %s)\n"
8546 10633 msgstr ""
8547 10634
8548 10635 #, python-format
8549 10636 msgid "sending mail: %s\n"
8550 10637 msgstr ""
8551 10638
8552 10639 msgid "smtp specified as email transport, but no smtp host configured"
8553 10640 msgstr ""
8554 10641
8555 10642 #, python-format
8556 10643 msgid "%r specified as email transport, but not in PATH"
8557 10644 msgstr ""
8558 10645
8559 10646 #, python-format
8560 10647 msgid "ignoring invalid sendcharset: %s\n"
8561 10648 msgstr ""
8562 10649
8563 10650 #, python-format
8564 10651 msgid "invalid email address: %s"
8565 10652 msgstr ""
8566 10653
8567 10654 #, python-format
8568 10655 msgid "invalid local address: %s"
8569 10656 msgstr ""
8570 10657
8571 10658 #, python-format
8572 10659 msgid "failed to remove %s from manifest"
8573 10660 msgstr ""
8574 10661
8575 10662 #, python-format
8576 10663 msgid "diff context lines count must be an integer, not %r"
8577 10664 msgstr ""
8578 10665
8579 10666 #, python-format
8580 msgid ""
8581 "untracked file in working directory differs from file in requested revision: "
8582 "'%s'"
10667 msgid "untracked file in working directory differs from file in requested revision: '%s'"
8583 10668 msgstr ""
8584 10669
8585 10670 #, python-format
8586 10671 msgid "case-folding collision between %s and %s"
8587 10672 msgstr ""
8588 10673
8589 10674 #, python-format
8590 10675 msgid ""
8591 10676 " conflicting flags for %s\n"
8592 10677 "(n)one, e(x)ec or sym(l)ink?"
8593 10678 msgstr ""
8594 10679
8595 10680 #, fuzzy
8596 10681 msgid "&None"
8597 10682 msgstr "完成\n"
8598 10683
8599 10684 msgid "E&xec"
8600 10685 msgstr ""
8601 10686
8602 10687 msgid "Sym&link"
8603 10688 msgstr ""
8604 10689
8605 10690 msgid "resolving manifests\n"
8606 10691 msgstr "正在解析清单\n"
8607 10692
8608 10693 #, python-format
8609 10694 msgid " overwrite %s partial %s\n"
8610 10695 msgstr ""
8611 10696
8612 10697 #, python-format
8613 10698 msgid " ancestor %s local %s remote %s\n"
8614 10699 msgstr ""
8615 10700
8616 10701 #, python-format
8617 10702 msgid ""
8618 10703 " local changed %s which remote deleted\n"
8619 10704 "use (c)hanged version or (d)elete?"
8620 10705 msgstr ""
8621 10706
8622 10707 msgid "&Changed"
8623 10708 msgstr ""
8624 10709
8625 10710 msgid "&Delete"
8626 10711 msgstr ""
8627 10712
8628 10713 #, python-format
8629 10714 msgid ""
8630 10715 "remote changed %s which local deleted\n"
8631 10716 "use (c)hanged version or leave (d)eleted?"
8632 10717 msgstr ""
8633 10718
8634 10719 msgid "&Deleted"
8635 10720 msgstr ""
8636 10721
8637 10722 #, python-format
8638 10723 msgid "preserving %s for resolve of %s\n"
8639 10724 msgstr ""
8640 10725
8641 10726 #, python-format
8642 10727 msgid "update failed to remove %s: %s!\n"
8643 10728 msgstr ""
8644 10729
8645 10730 #, python-format
8646 10731 msgid "getting %s\n"
8647 10732 msgstr "正在检出 %s\n"
8648 10733
8649 10734 #, python-format
8650 10735 msgid "getting %s to %s\n"
8651 10736 msgstr ""
8652 10737
8653 10738 #, python-format
8654 10739 msgid "warning: detected divergent renames of %s to:\n"
8655 10740 msgstr ""
8656 10741
8657 10742 #, python-format
8658 10743 msgid "branch %s not found"
8659 10744 msgstr ""
8660 10745
8661 10746 msgid "can't merge with ancestor"
8662 10747 msgstr ""
8663 10748
8664 10749 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8665 10750 msgstr ""
8666 10751
8667 10752 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8668 10753 msgstr ""
8669 10754
8670 10755 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8671 10756 msgstr ""
8672 10757
8673 10758 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8674 10759 msgstr ""
8675 10760
8676 10761 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8677 10762 msgstr ""
8678 10763
8679 10764 #, python-format
8680 10765 msgid "cannot create %s: destination already exists"
8681 10766 msgstr ""
8682 10767
8683 10768 #, python-format
8684 10769 msgid "cannot create %s: unable to create destination directory"
8685 10770 msgstr ""
8686 10771
8687 10772 #, python-format
8688 10773 msgid "found patch at byte %d\n"
8689 10774 msgstr ""
8690 10775
8691 10776 msgid "patch generated by hg export\n"
8692 10777 msgstr ""
8693 10778
8694 10779 #, python-format
8695 10780 msgid "unable to find '%s' for patching\n"
8696 10781 msgstr ""
8697 10782
8698 10783 #, python-format
8699 10784 msgid "patching file %s\n"
8700 10785 msgstr ""
8701 10786
8702 10787 #, python-format
8703 10788 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8704 10789 msgstr ""
8705 10790
8706 10791 #, python-format
8707 10792 msgid "bad hunk #%d %s (%d %d %d %d)"
8708 10793 msgstr ""
8709 10794
8710 10795 #, python-format
8711 10796 msgid "file %s already exists\n"
8712 10797 msgstr ""
8713 10798
8714 10799 #, python-format
8715 10800 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8716 10801 msgstr ""
8717 10802
8718 10803 #, python-format
8719 10804 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8720 10805 msgstr ""
8721 10806
8722 10807 #, python-format
8723 10808 msgid "Hunk #%d FAILED at %d\n"
8724 10809 msgstr ""
8725 10810
8726 10811 #, python-format
8727 10812 msgid "bad hunk #%d"
8728 10813 msgstr ""
8729 10814
8730 10815 #, python-format
8731 10816 msgid "bad hunk #%d old text line %d"
8732 10817 msgstr ""
8733 10818
8734 10819 msgid "could not extract binary patch"
8735 10820 msgstr ""
8736 10821
8737 10822 #, python-format
8738 10823 msgid "binary patch is %d bytes, not %d"
8739 10824 msgstr ""
8740 10825
8741 10826 #, python-format
8742 10827 msgid "unable to strip away %d dirs from %s"
8743 10828 msgstr ""
8744 10829
8745 10830 msgid "undefined source and destination files"
8746 10831 msgstr ""
8747 10832
8748 10833 #, python-format
8749 10834 msgid "malformed patch %s %s"
8750 10835 msgstr ""
8751 10836
8752 10837 #, python-format
8753 10838 msgid "unsupported parser state: %s"
8754 10839 msgstr ""
8755 10840
8756 10841 #, python-format
8757 10842 msgid "patch command failed: %s"
8758 10843 msgstr ""
8759 10844
8760 10845 #, python-format
8761 10846 msgid "Unsupported line endings type: %s"
8762 10847 msgstr ""
8763 10848
8764 10849 #, python-format
8765 10850 msgid "no valid hunks found; trying with %r instead\n"
8766 10851 msgstr ""
8767 10852
8768 10853 #, python-format
8769 10854 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
8770 10855 msgstr ""
8771 10856
8772 10857 #, python-format
8773 10858 msgid "exited with status %d"
8774 10859 msgstr ""
8775 10860
8776 10861 #, python-format
8777 10862 msgid "killed by signal %d"
8778 10863 msgstr ""
8779 10864
8780 10865 #, python-format
8781 10866 msgid "stopped by signal %d"
8782 10867 msgstr ""
8783 10868
8784 10869 msgid "invalid exit code"
8785 10870 msgstr ""
8786 10871
8787 10872 #, python-format
8788 10873 msgid "saving bundle to %s\n"
8789 10874 msgstr ""
8790 10875
8791 10876 msgid "adding branch\n"
8792 10877 msgstr ""
8793 10878
8794 10879 #, python-format
8795 10880 msgid "cannot %s; remote repository does not support the %r capability"
8796 10881 msgstr ""
8797 10882
8798 10883 #, python-format
8799 10884 msgid "unknown compression type %r"
8800 10885 msgstr ""
8801 10886
8802 10887 #, python-format
8803 10888 msgid "index %s unknown flags %#04x for format v0"
8804 10889 msgstr ""
8805 10890
8806 10891 #, python-format
8807 10892 msgid "index %s unknown flags %#04x for revlogng"
8808 10893 msgstr ""
8809 10894
8810 10895 #, python-format
8811 10896 msgid "index %s unknown format %d"
8812 10897 msgstr ""
8813 10898
8814 10899 #, python-format
8815 10900 msgid "index %s is corrupted"
8816 10901 msgstr ""
8817 10902
8818 10903 msgid "no node"
8819 10904 msgstr ""
8820 10905
8821 10906 msgid "ambiguous identifier"
8822 10907 msgstr ""
8823 10908
8824 10909 msgid "no match found"
8825 10910 msgstr ""
8826 10911
8827 10912 #, python-format
8828 10913 msgid "incompatible revision flag %x"
8829 10914 msgstr ""
8830 10915
8831 10916 #, python-format
8832 10917 msgid "%s not found in the transaction"
8833 10918 msgstr ""
8834 10919
8835 10920 msgid "unknown base"
8836 10921 msgstr ""
8837 10922
8838 10923 msgid "consistency error adding group"
8839 10924 msgstr ""
8840 10925
8841 10926 #, python-format
8842 10927 msgid "%s looks like a binary file."
8843 10928 msgstr ""
8844 10929
8845 10930 msgid "can only specify two labels."
8846 10931 msgstr ""
8847 10932
8848 10933 msgid "warning: conflicts during merge.\n"
8849 10934 msgstr ""
8850 10935
8851 10936 #, python-format
8852 10937 msgid "couldn't parse location %s"
8853 10938 msgstr ""
8854 10939
8855 10940 msgid "could not create remote repo"
8856 10941 msgstr ""
8857 10942
8858 10943 msgid "remote: "
8859 10944 msgstr ""
8860 10945
8861 10946 msgid "no suitable response from remote hg"
8862 10947 msgstr ""
8863 10948
8864 10949 #, python-format
8865 10950 msgid "push refused: %s"
8866 10951 msgstr ""
8867 10952
8868 10953 msgid "unsynced changes"
8869 10954 msgstr ""
8870 10955
8871 10956 msgid "cannot lock static-http repository"
8872 10957 msgstr ""
8873 10958
8874 10959 msgid "cannot create new static-http repository"
8875 10960 msgstr ""
8876 10961
8877 10962 #, python-format
8878 10963 msgid "invalid entry in fncache, line %s"
8879 10964 msgstr ""
8880 10965
8881 10966 msgid "scanning\n"
8882 10967 msgstr "正在扫描\n"
8883 10968
8884 10969 #, python-format
8885 10970 msgid "%d files, %d bytes to transfer\n"
8886 10971 msgstr "需要传输 %d 个文件,%d 字节\n"
8887 10972
8888 10973 #, python-format
8889 10974 msgid "sending %s (%d bytes)\n"
8890 10975 msgstr "正在发送 %s (%d 字节)\n"
8891 10976
8892 10977 #, python-format
8893 10978 msgid ""
8894 10979 " subrepository sources for %s differ\n"
8895 10980 "use (l)ocal source (%s) or (r)emote source (%s)?"
8896 10981 msgstr ""
8897 10982
8898 10983 msgid "&Remote"
8899 10984 msgstr ""
8900 10985
8901 10986 #, python-format
8902 10987 msgid ""
8903 10988 " local changed subrepository %s which remote removed\n"
8904 10989 "use (c)hanged version or (d)elete?"
8905 10990 msgstr ""
8906 10991
8907 10992 #, python-format
8908 10993 msgid ""
8909 10994 " remote changed subrepository %s which local removed\n"
8910 10995 "use (c)hanged version or (d)elete?"
8911 10996 msgstr ""
8912 10997
8913 10998 #, fuzzy, python-format
8914 10999 msgid "removing subrepo %s\n"
8915 11000 msgstr "正在删除 %s\n"
8916 11001
8917 11002 #, fuzzy, python-format
8918 11003 msgid "pulling subrepo %s\n"
8919 11004 msgstr "正在拉自 %s\n"
8920 11005
8921 11006 #, fuzzy, python-format
8922 11007 msgid "pushing subrepo %s\n"
8923 11008 msgstr "正在推到 %s\n"
8924 11009
8925 11010 #, python-format
8926 11011 msgid "%s, line %s: %s\n"
8927 11012 msgstr ""
8928 11013
8929 11014 msgid "cannot parse entry"
8930 11015 msgstr ""
8931 11016
8932 11017 #, python-format
8933 11018 msgid "node '%s' is not well formed"
8934 11019 msgstr ""
8935 11020
8936 11021 msgid "unmatched quotes"
8937 11022 msgstr "不匹配的引号"
8938 11023
8939 11024 #, python-format
8940 11025 msgid "error expanding '%s%%%s'"
8941 11026 msgstr ""
8942 11027
8943 11028 #, python-format
8944 11029 msgid "unknown filter '%s'"
8945 11030 msgstr ""
8946 11031
8947 11032 #, python-format
8948 11033 msgid "style not found: %s"
8949 11034 msgstr "没有找到样式: %s"
8950 11035
8951 11036 #, python-format
8952 11037 msgid "template file %s: %s"
8953 11038 msgstr "模版文件 %s: %s"
8954 11039
8955 11040 msgid "cannot use transaction when it is already committed/aborted"
8956 11041 msgstr ""
8957 11042
8958 11043 #, python-format
8959 11044 msgid "failed to truncate %s\n"
8960 11045 msgstr "截断 '%s' 失败\n"
8961 11046
8962 11047 msgid "transaction abort!\n"
8963 11048 msgstr "事务中止!\n"
8964 11049
8965 11050 msgid "rollback completed\n"
8966 11051 msgstr "完成回滚\n"
8967 11052
8968 11053 msgid "rollback failed - please run hg recover\n"
8969 11054 msgstr ""
8970 11055
8971 11056 #, python-format
8972 11057 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8973 11058 msgstr ""
8974 11059
8975 11060 #, python-format
8976 11061 msgid "Ignored: %s\n"
8977 11062 msgstr ""
8978 11063
8979 11064 #, fuzzy, python-format
8980 11065 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8981 11066 msgstr "显示不能信赖的配置选项"
8982 11067
8983 11068 #, python-format
8984 11069 msgid "%s.%s not a boolean ('%s')"
8985 11070 msgstr ""
8986 11071
8987 11072 msgid "enter a commit username:"
8988 11073 msgstr ""
8989 11074
8990 11075 #, python-format
8991 11076 msgid "No username found, using '%s' instead\n"
8992 11077 msgstr ""
8993 11078
8994 11079 msgid "Please specify a username."
8995 11080 msgstr ""
8996 11081
8997 11082 #, python-format
8998 11083 msgid "username %s contains a newline\n"
8999 11084 msgstr ""
9000 11085
9001 11086 msgid "response expected"
9002 11087 msgstr ""
9003 11088
9004 11089 msgid "unrecognized response\n"
9005 11090 msgstr ""
9006 11091
9007 11092 msgid "password: "
9008 11093 msgstr "密码: "
9009 11094
9010 11095 msgid "edit failed"
9011 11096 msgstr ""
9012 11097
9013 11098 msgid "http authorization required"
9014 11099 msgstr "需要 http 授权"
9015 11100
9016 11101 msgid "http authorization required\n"
9017 11102 msgstr "需要 http 授权\n"
9018 11103
9019 11104 #, python-format
9020 11105 msgid "realm: %s\n"
9021 11106 msgstr "领域: %s\n"
9022 11107
9023 11108 #, python-format
9024 11109 msgid "user: %s\n"
9025 11110 msgstr "用户: %s\n"
9026 11111
9027 11112 msgid "user:"
9028 11113 msgstr "用户:"
9029 11114
9030 11115 #, python-format
9031 11116 msgid "http auth: user %s, password %s\n"
9032 11117 msgstr ""
9033 11118
9034 11119 #, python-format
9035 11120 msgid "proxying through http://%s:%s\n"
9036 11121 msgstr ""
9037 11122
9038 11123 #, python-format
9039 11124 msgid "command '%s' failed: %s"
9040 11125 msgstr ""
9041 11126
9042 11127 #, python-format
9043 11128 msgid "path contains illegal component: %s"
9044 11129 msgstr ""
9045 11130
9046 11131 #, python-format
9047 11132 msgid "path %r is inside repo %r"
9048 11133 msgstr ""
9049 11134
9050 11135 #, python-format
9051 11136 msgid "path %r traverses symbolic link %r"
9052 11137 msgstr ""
9053 11138
9054 11139 msgid "Hardlinks not supported"
9055 11140 msgstr ""
9056 11141
9057 11142 #, python-format
9058 11143 msgid "could not symlink to %r: %s"
9059 11144 msgstr ""
9060 11145
9061 11146 #, python-format
9062 11147 msgid "invalid date: %r "
9063 11148 msgstr ""
9064 11149
9065 11150 #, python-format
9066 11151 msgid "date exceeds 32 bits: %d"
9067 11152 msgstr ""
9068 11153
9069 11154 #, python-format
9070 11155 msgid "impossible time zone offset: %d"
9071 11156 msgstr ""
9072 11157
9073 11158 #, python-format
9074 11159 msgid "invalid day spec: %s"
9075 11160 msgstr ""
9076 11161
9077 11162 #, python-format
9078 11163 msgid "%.0f GB"
9079 11164 msgstr ""
9080 11165
9081 11166 #, python-format
9082 11167 msgid "%.1f GB"
9083 11168 msgstr ""
9084 11169
9085 11170 #, python-format
9086 11171 msgid "%.2f GB"
9087 11172 msgstr ""
9088 11173
9089 11174 #, python-format
9090 11175 msgid "%.0f MB"
9091 11176 msgstr ""
9092 11177
9093 11178 #, python-format
9094 11179 msgid "%.1f MB"
9095 11180 msgstr ""
9096 11181
9097 11182 #, python-format
9098 11183 msgid "%.2f MB"
9099 11184 msgstr ""
9100 11185
9101 11186 #, python-format
9102 11187 msgid "%.0f KB"
9103 11188 msgstr ""
9104 11189
9105 11190 #, python-format
9106 11191 msgid "%.1f KB"
9107 11192 msgstr ""
9108 11193
9109 11194 #, python-format
9110 11195 msgid "%.2f KB"
9111 11196 msgstr ""
9112 11197
9113 11198 #, python-format
9114 11199 msgid "%.0f bytes"
9115 11200 msgstr ""
9116 11201
9117 11202 msgid "cannot verify bundle or remote repos"
9118 11203 msgstr ""
9119 11204
9120 11205 msgid "interrupted"
9121 11206 msgstr ""
9122 11207
9123 11208 #, python-format
9124 11209 msgid "empty or missing %s"
9125 11210 msgstr ""
9126 11211
9127 11212 #, python-format
9128 11213 msgid "data length off by %d bytes"
9129 11214 msgstr ""
9130 11215
9131 11216 #, python-format
9132 11217 msgid "index contains %d extra bytes"
9133 11218 msgstr ""
9134 11219
9135 11220 #, python-format
9136 11221 msgid "warning: `%s' uses revlog format 1"
9137 11222 msgstr ""
9138 11223
9139 11224 #, python-format
9140 11225 msgid "warning: `%s' uses revlog format 0"
9141 11226 msgstr ""
9142 11227
9143 11228 #, python-format
9144 11229 msgid "rev %d points to nonexistent changeset %d"
9145 11230 msgstr ""
9146 11231
9147 11232 #, python-format
9148 11233 msgid "rev %d points to unexpected changeset %d"
9149 11234 msgstr ""
9150 11235
9151 11236 #, python-format
9152 11237 msgid " (expected %s)"
9153 11238 msgstr ""
9154 11239
9155 11240 #, python-format
9156 11241 msgid "unknown parent 1 %s of %s"
9157 11242 msgstr ""
9158 11243
9159 11244 #, python-format
9160 11245 msgid "unknown parent 2 %s of %s"
9161 11246 msgstr ""
9162 11247
9163 11248 #, python-format
9164 11249 msgid "checking parents of %s"
9165 11250 msgstr ""
9166 11251
9167 11252 #, python-format
9168 11253 msgid "duplicate revision %d (%d)"
9169 11254 msgstr ""
9170 11255
9171 11256 #, python-format
9172 11257 msgid "repository uses revlog format %d\n"
9173 11258 msgstr ""
9174 11259
9175 11260 msgid "checking changesets\n"
9176 11261 msgstr ""
9177 11262
9178 11263 #, python-format
9179 11264 msgid "unpacking changeset %s"
9180 11265 msgstr ""
9181 11266
9182 11267 msgid "checking manifests\n"
9183 11268 msgstr ""
9184 11269
9185 11270 #, fuzzy, python-format
9186 11271 msgid "%s not in changesets"
9187 11272 msgstr "列出修改集"
9188 11273
9189 11274 msgid "file without name in manifest"
9190 11275 msgstr ""
9191 11276
9192 11277 #, python-format
9193 11278 msgid "reading manifest delta %s"
9194 11279 msgstr ""
9195 11280
9196 11281 msgid "crosschecking files in changesets and manifests\n"
9197 11282 msgstr ""
9198 11283
9199 11284 #, python-format
9200 11285 msgid "changeset refers to unknown manifest %s"
9201 11286 msgstr ""
9202 11287
9203 11288 msgid "in changeset but not in manifest"
9204 11289 msgstr ""
9205 11290
9206 11291 msgid "in manifest but not in changeset"
9207 11292 msgstr ""
9208 11293
9209 11294 msgid "checking files\n"
9210 11295 msgstr ""
9211 11296
9212 11297 #, python-format
9213 11298 msgid "cannot decode filename '%s'"
9214 11299 msgstr ""
9215 11300
9216 11301 #, python-format
9217 11302 msgid "broken revlog! (%s)"
9218 11303 msgstr ""
9219 11304
9220 11305 msgid "missing revlog!"
9221 11306 msgstr ""
9222 11307
9223 11308 #, python-format
9224 11309 msgid "%s not in manifests"
9225 11310 msgstr ""
9226 11311
9227 11312 #, python-format
9228 11313 msgid "unpacked size is %s, %s expected"
9229 11314 msgstr ""
9230 11315
9231 11316 #, python-format
9232 11317 msgid "unpacking %s"
9233 11318 msgstr ""
9234 11319
9235 11320 #, python-format
9236 11321 msgid "empty or missing copy source revlog %s:%s"
9237 11322 msgstr ""
9238 11323
9239 11324 #, python-format
9240 11325 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
9241 11326 msgstr ""
9242 11327
9243 11328 #, python-format
9244 11329 msgid "checking rename of %s"
9245 11330 msgstr ""
9246 11331
9247 11332 #, python-format
9248 11333 msgid "%s in manifests not found"
9249 11334 msgstr ""
9250 11335
9251 11336 #, python-format
9252 11337 msgid "warning: orphan revlog '%s'"
9253 11338 msgstr ""
9254 11339
9255 11340 #, python-format
9256 11341 msgid "%d files, %d changesets, %d total revisions\n"
9257 11342 msgstr ""
9258 11343
9259 11344 #, python-format
9260 11345 msgid "%d warnings encountered!\n"
9261 11346 msgstr ""
9262 11347
9263 11348 #, python-format
9264 11349 msgid "%d integrity errors encountered!\n"
9265 11350 msgstr ""
9266 11351
9267 11352 #, python-format
9268 11353 msgid "(first damaged changeset appears to be %d)\n"
9269 11354 msgstr ""
9270 11355
9271 11356 msgid "user name not available - set USERNAME environment variable"
9272 11357 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now