Show More
This diff has been collapsed as it changes many lines, (5525 lines changed) Show them Hide them | |||
@@ -1,26 +1,25 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 分支 |
@@ -43,7 +42,7 b'' | |||
|
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" |
@@ -55,8 +54,8 b' msgstr ""' | |||
|
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 |
@@ -69,62 +68,72 b' msgstr "\xe9\x80\x89\xe9\xa1\xb9"' | |||
|
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 |
msg |
|
|
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. |
|
|
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). |
|
|
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. |
|
|
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 = |
|
|
108 | "\n" | |
|
106 | " acl =" | |
|
107 | msgstr "" | |
|
108 | ||
|
109 | msgid "" | |
|
109 | 110 | " [hooks]\n" |
|
110 |
" pretxnchangegroup.acl = python:hgext.acl.hook |
|
|
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 |
|
|
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. :: |
|
|
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 |
|
|
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" |
@@ -164,38 +173,47 b' msgstr "acl: \xe7\x94\xa8\xe6\x88\xb7 %s \xe8\xa2\xab\xe6\x8b\x92\xe7\xbb\x9d\xe8\xae\xbf\xe9\x97\xae %s\\n"' | |||
|
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. |
|
|
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). |
|
|
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:: |
|
|
182 | "\n" | |
|
195 | "your .hgrc::" | |
|
196 | msgstr "" | |
|
197 | ||
|
198 | msgid "" | |
|
183 | 199 | " [bookmarks]\n" |
|
184 |
" track.current = True |
|
|
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. |
|
|
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" |
@@ -236,117 +254,171 b' msgstr "\xe6\x94\xb9\xe5\x90\x8d\xe6\x8c\x87\xe5\xae\x9a\xe4\xb9\xa6\xe7\xad\xbe"' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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: |
|
|
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. |
|
|
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'. |
|
|
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'. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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'. |
|
|
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\". |
|
|
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. |
|
|
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. |
|
|
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:: |
|
|
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. |
|
|
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}' |
|
|
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. |
|
|
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. |
|
|
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\" |
|
|
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}. |
|
|
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 = |
|
|
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 |
|
|
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. :: |
|
|
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" |
@@ -356,20 +428,28 b' msgid ""' | |||
|
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 |
|
|
360 | "\n" | |
|
431 | " strip=5" | |
|
432 | msgstr "" | |
|
433 | ||
|
434 | msgid "" | |
|
361 | 435 | " [web]\n" |
|
362 |
" baseurl=http://dev.domain.com/hg |
|
|
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 |
|
|
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 |
|
|
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 |
@@ -447,9 +527,11 b' msgid "command to display child changese' | |||
|
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" |
@@ -457,8 +539,6 b' msgid ""' | |||
|
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" |
@@ -481,38 +561,55 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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}' |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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:: |
|
|
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 | " " |
@@ -550,38 +647,50 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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" |
@@ -606,11 +715,13 b' msgstr ""' | |||
|
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]: |
|
|
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" |
@@ -619,72 +730,103 b' msgid ""' | |||
|
619 | 730 | " - Monotone [mtn]\n" |
|
620 | 731 | " - GNU Arch [gnuarch]\n" |
|
621 | 732 | " - Bazaar [bzr]\n" |
|
622 |
" - Perforce [p4] |
|
|
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) |
|
|
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). |
|
|
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. |
|
|
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: |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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:: |
|
|
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. |
|
|
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 |
|
|
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:: |
|
|
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. |
|
|
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" |
@@ -694,8 +836,10 b' msgid ""' | |||
|
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. |
|
|
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" |
@@ -705,11 +849,15 b' msgid ""' | |||
|
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. |
|
|
709 | "\n" | |
|
852 | " in one repository from \"default\" to a named branch." | |
|
853 | msgstr "" | |
|
854 | ||
|
855 | msgid "" | |
|
710 | 856 | " Mercurial Source\n" |
|
711 |
" ---------------- |
|
|
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" |
@@ -718,11 +866,15 b' msgid ""' | |||
|
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 |
|
|
722 | "\n" | |
|
869 | " convert start revision and its descendants" | |
|
870 | msgstr "" | |
|
871 | ||
|
872 | msgid "" | |
|
723 | 873 | " CVS Source\n" |
|
724 |
" ---------- |
|
|
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" |
@@ -731,25 +883,35 b' msgid ""' | |||
|
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. |
|
|
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:: |
|
|
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" |
@@ -767,15 +929,21 b' msgid ""' | |||
|
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. |
|
|
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. |
|
|
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 |
" ----------------- |
|
|
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" |
@@ -785,58 +953,80 b' msgid ""' | |||
|
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. |
|
|
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 |
|
|
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. |
|
|
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. |
|
|
803 | "\n" | |
|
976 | " specify start Subversion revision." | |
|
977 | msgstr "" | |
|
978 | ||
|
979 | msgid "" | |
|
804 | 980 | " Perforce Source\n" |
|
805 |
" --------------- |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
819 | "\n" | |
|
1000 | " specify initial Perforce revision." | |
|
1001 | msgstr "" | |
|
1002 | ||
|
1003 | msgid "" | |
|
820 | 1004 | " Mercurial Destination\n" |
|
821 |
" --------------------- |
|
|
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 |
|
|
829 | "\n" | |
|
830 | " " | |
|
831 |
msg |
|
|
832 | ||
|
833 | msgid "" | |
|
834 |
"create changeset information from CVS |
|
|
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. |
|
|
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" |
@@ -909,9 +1099,7 b' msgstr ""' | |||
|
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" |
@@ -1015,9 +1203,7 b' msgstr ""' | |||
|
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 |
@@ -1035,8 +1221,7 b' 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 |
@@ -1154,8 +1339,7 b' 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 |
@@ -1359,37 +1543,50 b' msgstr "\xe4\xb8\x8d\xe8\x83\xbd\xe5\xa4\x84\xe7\x90\x86 svn \xe7\x9a\x84\xe8\xbe\x93\xe5\x87\xba"' | |||
|
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. |
|
|
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. :: |
|
|
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 |
|
|
1380 | "\n" | |
|
1568 | " #opts.cdiff = -Nprc5" | |
|
1569 | msgstr "" | |
|
1570 | ||
|
1571 | msgid "" | |
|
1381 | 1572 | " # add new command called vdiff, runs kdiff3\n" |
|
1382 |
" vdiff = kdiff3 |
|
|
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 = |
|
|
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)' |
|
|
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" |
@@ -1418,18 +1615,23 b' msgstr ""' | |||
|
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\". |
|
|
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. |
|
|
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" |
@@ -1450,12 +1652,17 b' 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. |
|
|
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" |
@@ -1469,28 +1676,34 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -1502,23 +1715,18 b' msgstr ""' | |||
|
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 |
@@ -1580,14 +1788,12 b' msgstr ""' | |||
|
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. |
|
|
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" |
@@ -1596,9 +1802,7 b' msgstr ""' | |||
|
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" |
@@ -1628,9 +1832,10 b' msgstr ""' | |||
|
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" |
@@ -1640,12 +1845,15 b' msgstr ""' | |||
|
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. |
|
|
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 | " " |
@@ -1673,12 +1881,15 b' msgstr ""' | |||
|
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:: |
|
|
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" |
@@ -1698,13 +1909,17 b' msgid ""' | |||
|
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 |
|
|
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 |
|
|
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" |
@@ -1723,32 +1938,45 b' msgstr ""' | |||
|
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.) |
|
|
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. |
|
|
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:: |
|
|
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 |
|
|
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:: |
|
|
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 |
|
|
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 "" |
@@ -1834,18 +2062,23 b' msgstr ""' | |||
|
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/ |
|
|
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> |
|
|
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" |
@@ -1854,9 +2087,10 b' msgstr ""' | |||
|
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 "" |
@@ -2018,20 +2252,24 b' msgstr ""' | |||
|
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. |
|
|
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:: |
|
|
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 | |
@@ -2043,52 +2281,76 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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 |
|
|
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. |
|
|
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. |
|
|
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\". |
|
|
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. |
|
|
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. |
|
|
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\". |
|
|
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. |
|
|
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" |
@@ -2108,17 +2370,23 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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 "" |
@@ -2173,33 +2441,45 b' 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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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:: |
|
|
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" |
@@ -2207,12 +2487,15 b' msgid ""' | |||
|
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\". |
|
|
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 "" |
@@ -2244,25 +2527,35 b' msgstr ""' | |||
|
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). |
|
|
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. |
|
|
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 |
|
|
2262 | "\n" | |
|
2550 | " import existing patch qimport" | |
|
2551 | msgstr "" | |
|
2552 | ||
|
2553 | msgid "" | |
|
2263 | 2554 | " print patch series qseries\n" |
|
2264 |
" print applied patches qapplied |
|
|
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" |
@@ -2508,8 +2801,7 b' msgstr ""' | |||
|
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" |
@@ -2603,13 +2895,15 b' msgstr ""' | |||
|
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. |
|
|
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 "" |
@@ -2627,29 +2921,142 b' 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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -2673,33 +3080,38 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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 | " " |
@@ -2738,25 +3150,32 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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'. |
|
|
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" |
@@ -2765,29 +3184,32 b' msgid ""' | |||
|
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. |
|
|
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. |
|
|
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" |
@@ -2797,39 +3219,44 b' msgid "option \\"-e\\" incompatible with \\' | |||
|
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). |
|
|
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. |
|
|
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 "" |
@@ -2855,19 +3282,24 b' msgstr ""' | |||
|
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. |
|
|
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 '--'. |
|
|
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 | " " |
@@ -2887,15 +3319,15 b' msgid "print the header of the topmost o' | |||
|
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 | |
@@ -2907,16 +3339,16 b' 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 | " " |
@@ -2925,9 +3357,10 b' msgstr ""' | |||
|
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 "" |
@@ -2959,49 +3392,62 b' 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: |
|
|
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 |
|
|
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). |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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 "" |
@@ -3035,18 +3481,23 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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" |
@@ -3321,33 +3772,47 b' msgstr ""' | |||
|
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. |
|
|
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:: |
|
|
3332 | "\n" | |
|
3785 | "this::" | |
|
3786 | msgstr "" | |
|
3787 | ||
|
3788 | msgid "" | |
|
3333 | 3789 | " [extensions]\n" |
|
3334 |
" notify = |
|
|
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 |
|
|
3341 | "\n" | |
|
3798 | " changegroup.notify = python:hgext.notify.hook" | |
|
3799 | msgstr "" | |
|
3800 | ||
|
3801 | msgid "" | |
|
3342 | 3802 | " [notify]\n" |
|
3343 |
" # config items go here |
|
|
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" |
@@ -3363,24 +3828,34 b' msgid ""' | |||
|
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 |
|
|
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. |
|
|
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 |
|
|
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 |
|
|
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 "" |
@@ -3396,15 +3871,13 b' msgstr ""' | |||
|
3396 | 3871 | #, python-format |
|
3397 | 3872 | msgid "" |
|
3398 | 3873 | "\n" |
|
3399 |
"diffs (truncated from %d to %d lines): |
|
|
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 |
@@ -3415,119 +3888,170 b' msgstr ""' | |||
|
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:: |
|
|
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 |
|
|
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. |
|
|
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:: |
|
|
3431 | "\n" | |
|
3909 | "setting::" | |
|
3910 | msgstr "" | |
|
3911 | ||
|
3912 | msgid "" | |
|
3432 | 3913 | " [pager]\n" |
|
3433 |
" quiet = True |
|
|
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:: |
|
|
3437 | "\n" | |
|
3919 | "pager.ignore list::" | |
|
3920 | msgstr "" | |
|
3921 | ||
|
3922 | msgid "" | |
|
3438 | 3923 | " [pager]\n" |
|
3439 |
" ignore = version, help, update |
|
|
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:: |
|
|
3443 | "\n" | |
|
3929 | "pager.attend::" | |
|
3930 | msgstr "" | |
|
3931 | ||
|
3932 | msgid "" | |
|
3444 | 3933 | " [pager]\n" |
|
3445 |
" attend = log |
|
|
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. |
|
|
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 |
|
|
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. |
|
|
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: |
|
|
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\". |
|
|
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. |
|
|
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. |
|
|
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:: |
|
|
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, ... |
|
|
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. |
|
|
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. |
|
|
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:: |
|
|
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:: |
|
|
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" |
@@ -3544,53 +4068,66 b' msgstr ""' | |||
|
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. |
|
|
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\". |
|
|
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. |
|
|
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) |
|
|
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. |
|
|
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) |
|
|
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 |
|
|
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 | " " |
@@ -3610,14 +4147,11 b' msgstr ""' | |||
|
3610 | 4147 | |
|
3611 | 4148 | msgid "" |
|
3612 | 4149 | "\n" |
|
3613 |
"Write the introductory message for the patch series. |
|
|
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" |
@@ -3705,27 +4239,38 b' msgstr ""' | |||
|
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. |
|
|
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 |
|
|
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\") |
|
|
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. |
|
|
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" |
@@ -3765,12 +4310,15 b' msgstr "\xe5\x9c\xa8\xe6\x96\x87\xe4\xbb\xb6\xe5\x90\x8d\xe7\xa7\xb0\xe7\xbb\x93\xe5\xb0\xbe\xe5\xa2\x9e\xe5\x8a\xa0 NUL\xef\xbc\x8c\xe7\x94\xa8\xe4\xba\x8e xargs"' | |||
|
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. |
|
|
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 "" |
@@ -3778,13 +4326,16 b' msgstr ""' | |||
|
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. |
|
|
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 | " " |
@@ -3936,9 +4487,7 b' msgstr ""' | |||
|
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" |
@@ -4007,30 +4556,41 b' msgstr ""' | |||
|
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. |
|
|
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:: |
|
|
4022 | "\n" | |
|
4574 | " possible::" | |
|
4575 | msgstr "" | |
|
4576 | ||
|
4577 | msgid "" | |
|
4023 | 4578 | " y - record this change\n" |
|
4024 |
" n - skip this change |
|
|
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 |
|
|
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 |
|
|
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" |
@@ -4065,12 +4625,15 b' msgstr ""' | |||
|
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. |
|
|
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 | " " |
@@ -4082,11 +4645,13 b' msgstr ""' | |||
|
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. |
|
|
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 "" |
@@ -4141,38 +4706,52 b' msgstr ""' | |||
|
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:: |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -4224,38 +4803,49 b' msgstr ""' | |||
|
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 |
msg |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -4272,31 +4862,41 b' msgstr ""' | |||
|
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:: |
|
|
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: |
|
|
4285 | "\n" | |
|
4876 | " # or ** = macencode:" | |
|
4877 | msgstr "" | |
|
4878 | ||
|
4879 | msgid "" | |
|
4286 | 4880 | " [decode]\n" |
|
4287 | 4881 | " ** = cleverdecode:\n" |
|
4288 |
" # or ** = macdecode: |
|
|
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 |
|
|
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:: |
|
|
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" |
@@ -4322,13 +4922,21 b' msgstr ""' | |||
|
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: |
|
|
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 |
|
|
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" |
@@ -4337,21 +4945,29 b' msgid ""' | |||
|
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. |
|
|
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:: |
|
|
4349 | "\n" | |
|
4959 | "in your repository::" | |
|
4960 | msgstr "" | |
|
4961 | ||
|
4962 | msgid "" | |
|
4350 | 4963 | " $ cd test\n" |
|
4351 |
" $ hg serve |
|
|
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 "" |
@@ -4612,38 +5228,46 b' 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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -4660,27 +5284,29 b' msgid "similarity must be between 0 and ' | |||
|
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 |
|
|
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. |
|
|
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 | " " |
@@ -4695,25 +5321,34 b' msgstr ""' | |||
|
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. |
|
|
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:: |
|
|
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 |
|
|
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. |
|
|
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" |
@@ -4730,23 +5365,25 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -4785,9 +5422,10 b' msgstr ""' | |||
|
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" |
@@ -4795,11 +5433,15 b' msgid ""' | |||
|
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. |
|
|
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. |
|
|
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" |
@@ -4852,22 +5494,29 b' msgstr "\xe4\xbf\xae\xe6\x94\xb9\xe9\x9b\x86: %d:%s\\n"' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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 | " " |
@@ -4884,40 +5533,54 b' msgstr ""' | |||
|
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). |
|
|
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. |
|
|
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. |
|
|
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). |
|
|
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). |
|
|
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. |
|
|
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 | " " |
@@ -4929,62 +5592,85 b' msgstr ""' | |||
|
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. |
|
|
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:: |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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). |
|
|
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. |
|
|
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. |
|
|
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 :: |
|
|
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" |
@@ -4995,37 +5681,33 b' msgid ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -5037,17 +5719,22 b' msgstr "\xe5\xb7\xb2\xe7\xbb\x8f\xe5\x88\x9b\xe5\xbb\xba\xe6\x96\xb0\xe9\xa1\xb6\xe7\x82\xb9\\n"' | |||
|
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. |
|
|
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. |
|
|
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 | " " |
@@ -5090,17 +5777,23 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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 | " " |
@@ -5109,9 +5802,10 b' msgstr ""' | |||
|
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 | " " |
@@ -5177,14 +5871,10 b' msgstr ""' | |||
|
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" |
@@ -5228,67 +5918,78 b' msgid "show how files match on given pat' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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:: |
|
|
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" |
@@ -5296,31 +5997,8 b' msgid ""' | |||
|
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 |
|
|
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" |
@@ -5328,14 +6006,31 b' msgstr ""' | |||
|
5328 | 6006 | " %b 待导出的版本库的基本名称\n" |
|
5329 | 6007 | " %h 短修改集哈希(12 位十六进制数字)\n" |
|
5330 | 6008 | " %n 从 1 开始补 0 的序列号\n" |
|
5331 |
" %r 补 0 的修改集版本号 |
|
|
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 |
" 时,可能会有不合需要的结果。 |
|
|
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 |
" 更多信息。 |
|
|
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 | |
@@ -5348,16 +6043,21 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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 "" |
@@ -5369,16 +6069,20 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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" |
@@ -5391,28 +6095,38 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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). |
|
|
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. |
|
|
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). |
|
|
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 | " " |
@@ -5433,11 +6147,13 b' msgstr ""' | |||
|
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. |
|
|
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 "" |
@@ -5459,12 +6175,8 b' msgstr "\xe4\xbd\xbf\xe7\x94\xa8 \\"hg -v help%s\\" \xe6\x98\xbe\xe7\xa4\xba\xe5\x88\xab\xe5\x90\x8d\xe5\x92\x8c\xe5\x85\xa8\xe5\xb1\x80\xe9\x80\x89\xe9\xa1\xb9"' | |||
|
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 "" |
@@ -5494,39 +6206,36 b' 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 |
msg |
|
|
5509 |
" |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -5534,35 +6243,47 b' msgid ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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'. |
|
|
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" |
@@ -5588,56 +6309,69 b' msgstr "%s \xe4\xb8\x8d\xe6\x98\xaf\xe6\x9c\xac\xe5\x9c\xb0\xe7\x9a\x84\xe6\xb0\xb4\xe9\x93\xb6\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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 .\". |
|
|
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. |
|
|
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" |
@@ -5646,29 +6380,156 b' msgid ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -5699,30 +6560,65 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -5753,26 +6649,29 b' msgstr ""' | |||
|
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. |
|
|
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" |
@@ -5780,8 +6679,6 b' msgid ""' | |||
|
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" |
@@ -5794,15 +6691,20 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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 "" |
@@ -5820,21 +6722,71 b' msgid "(run \'hg update\' to get a working' | |||
|
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. |
|
|
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. |
|
|
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 | " " |
@@ -5851,41 +6803,47 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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 | " " |
@@ -5894,11 +6852,13 b' msgstr ""' | |||
|
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. |
|
|
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" |
@@ -5906,51 +6866,57 b' msgid ""' | |||
|
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. |
|
|
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):: |
|
|
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 |
|
|
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 |
|
|
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 | " " |
@@ -5972,39 +6938,46 b' msgstr ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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 | " " |
@@ -6019,36 +6992,49 b' msgstr ""' | |||
|
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.) |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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 | " " |
@@ -6084,26 +7070,33 b' msgstr "\xe6\x96\x87\xe4\xbb\xb6\xe6\x9c\xaa\xe8\xa2\xab\xe6\x8e\xa7\xe5\x88\xb6: %s\\n"' | |||
|
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. |
|
|
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:: |
|
|
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 |
|
|
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" |
@@ -6113,28 +7106,29 b' msgid ""' | |||
|
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 | " " |
@@ -6144,30 +7138,172 b' msgid "listening at http://%s%s/%s (boun' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -6205,26 +7341,29 b' msgstr ""' | |||
|
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>. |
|
|
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. |
|
|
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. |
|
|
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). |
|
|
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" |
@@ -6253,21 +7392,25 b' msgstr "\xe9\x9d\x9e\xe6\x9c\xac\xe5\x9c\xb0\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93 \'%s\'"' | |||
|
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). |
|
|
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" |
@@ -6275,66 +7418,68 b' msgid ""' | |||
|
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'). |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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'。 |
|
|
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 "" |
@@ -6343,11 +7488,13 b' msgstr ""' | |||
|
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. |
|
|
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" |
@@ -6749,9 +7896,7 b' msgstr ""' | |||
|
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" |
@@ -7242,11 +8387,8 b' msgid "Option --cwd may not be abbreviat' | |||
|
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" |
@@ -7263,11 +8405,8 b' msgstr "\xe9\x9d\x9e\xe6\xb3\x95\xe5\x8f\x82\xe6\x95\xb0"' | |||
|
7263 | 8405 | msgid "unrecognized profiling format '%s' - Ignored\n" |
|
7264 | 8406 | msgstr "" |
|
7265 | 8407 | |
|
7266 | msgid "" | |
|
7267 |
"lsprof |
|
|
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" |
@@ -7355,31 +8494,44 b' msgid ""' | |||
|
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. |
|
|
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. |
|
|
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:: |
|
|
7371 | "\n" | |
|
8513 | " this::" | |
|
8514 | msgstr "" | |
|
8515 | ||
|
8516 | msgid "" | |
|
7372 | 8517 | " [extensions]\n" |
|
7373 |
" foo = |
|
|
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 |
|
|
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 !:: |
|
|
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" |
@@ -7400,13 +8552,18 b' msgstr ""' | |||
|
7400 | 8552 | |
|
7401 | 8553 | msgid "" |
|
7402 | 8554 | "\n" |
|
7403 |
" Some commands allow the user to specify a date, e.g.: |
|
|
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. |
|
|
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" |
@@ -7419,19 +8576,26 b' msgid ""' | |||
|
7419 | 8576 | " \"2006-12-6\"\n" |
|
7420 | 8577 | " \"12-6\"\n" |
|
7421 | 8578 | " \"12/6\"\n" |
|
7422 |
" \"12/6/6\" (Dec 6 2006) |
|
|
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). |
|
|
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" |
@@ -7445,48 +8609,65 b' msgstr ""' | |||
|
7445 | 8609 | msgid "" |
|
7446 | 8610 | "\n" |
|
7447 | 8611 | " Mercurial accepts several notations for identifying one or more\n" |
|
7448 |
" files at a time. |
|
|
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. |
|
|
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. |
|
|
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\". |
|
|
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\". |
|
|
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. |
|
|
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\" |
|
|
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. |
|
|
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" |
@@ -7499,74 +8680,98 b' msgid ""' | |||
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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 |
|
|
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: |
|
|
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) |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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'. |
|
|
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" |
@@ -7578,31 +8783,45 b' msgstr ""' | |||
|
7578 | 8783 | |
|
7579 | 8784 | msgid "" |
|
7580 | 8785 | "\n" |
|
7581 |
" Mercurial supports several ways to specify individual revisions. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -7618,32 +8837,36 b' 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. |
|
|
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\". |
|
|
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. |
|
|
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 | " " |
@@ -7657,29 +8880,57 b' msgid ""' | |||
|
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. |
|
|
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: |
|
|
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 |
|
|
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. |
|
|
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. |
|
|
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" |
@@ -7687,25 +8938,6 b' msgid ""' | |||
|
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" |
@@ -7720,27 +8952,56 b' msgid ""' | |||
|
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). |
|
|
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. |
|
|
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:: |
|
|
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:: |
|
|
7736 | "\n" | |
|
8983 | " expansion::" | |
|
8984 | msgstr " 模版是文本片断,其中的标记用于变量扩展:" | |
|
8985 | ||
|
8986 | #, fuzzy | |
|
8987 | msgid "" | |
|
7737 | 8988 | " $ hg log -r1 --template \"{node}\\n\"\n" |
|
7738 |
" b56ce7b07c52de7d5fd79fb89701ea538af65746 |
|
|
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: |
|
|
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" |
@@ -7761,19 +9022,47 b' msgid ""' | |||
|
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. |
|
|
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:: |
|
|
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 |
|
|
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" |
@@ -7829,53 +9118,11 b' msgid ""' | |||
|
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" |
@@ -7911,69 +9158,915 b' msgstr "\xe7\xbb\x9f\xe4\xb8\x80\xe8\xb5\x84\xe6\xba\x90\xe5\xae\x9a\xe4\xbd\x8d\xe8\xb7\xaf\xe5\xbe\x84"' | |||
|
7911 | 9158 | #, fuzzy |
|
7912 | 9159 | msgid "" |
|
7913 | 9160 | "\n" |
|
7914 |
" Valid URLs are of the form:: |
|
|
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] |
|
|
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'). |
|
|
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'. |
|
|
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. |
|
|
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:: |
|
|
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.:: |
|
|
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. |
|
|
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:: |
|
|
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" | |
|
9819 | " [paths]\n" | |
|
9820 | " alias1 = URL1\n" | |
|
9821 | " alias2 = URL2\n" | |
|
9822 | " ...\n" | |
|
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 "" | |
|
7959 | 9840 | " [paths]\n" |
|
7960 | 9841 | " alias1 = URL1\n" |
|
7961 | 9842 | " alias2 = URL2\n" |
|
7962 |
" ... |
|
|
7963 | "\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). |
|
|
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: |
|
|
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). |
|
|
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" |
@@ -8057,9 +10150,7 b' msgstr ""' | |||
|
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" |
@@ -8084,9 +10175,7 b' msgstr "%d \xe4\xb8\xaa\xe6\x96\x87\xe4\xbb\xb6%s"' | |||
|
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" |
@@ -8438,9 +10527,7 b' msgstr ""' | |||
|
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 |
@@ -8577,9 +10664,7 b' msgid "diff context lines count must be ' | |||
|
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 |
General Comments 0
You need to be logged in to leave comments.
Login now