##// END OF EJS Templates
i18n-fr: translation of help screen strings
Cédric Duval -
r8976:8b4e2061 default
parent child Browse files
Show More
@@ -1,8793 +1,8806 b''
1 1 # French translations for Mercurial
2 2 # Traductions françaises de Mercurial
3 3 # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others
4 4 #
5 5 # Quelques règles :
6 6 # - dans l'aide d'une commande, la première ligne descriptive
7 7 # commence par un verbe au présent sans majuscule
8 8 # - dans l'aide d'une commande, la description des options
9 9 # utilise un verbe à l'infinitif
10 10 #
11 11 # Note : la terminologie ci-dessous est loin d'être complète, figée ou
12 12 # parfaite. À compléter et à améliorer, particulièrement les
13 13 # termes comportant un point d'interrogation...
14 14 #
15 15 # Dictionnaire de termes courants :
16 16 # - to apply a patch appliquer un patch
17 17 # - a branch une branche
18 18 # - to check out extraire (terminologie utilisée par svn)
19 19 # - children des rejetons ? des descendants ?
20 20 # - to clone clôner
21 21 # - a conflict un conflit
22 22 # - an extension une extension (au sens de module Mercurial)
23 23 # - to fold patches agréger des patchs (replier des patch ?? bof)
24 24 # - an integrity check une vérification d'intégrité (ou de cohérence ?)
25 25 # - a mail un courriel, un courrier électronique
26 26 # - a merge une fusion
27 27 # - to merge fusionner
28 28 # - a node un nœud ?
29 29 # - a patch queue/stack une pile de patchs (mq)
30 30 # - à l'utilisation c'est vraiment une _pile_
31 31 # (on y empile et dépile des patchs)
32 32 # - l'unique cas où _file_ conviendrait est dans le
33 33 # contexte de la commande qfinish
34 34 # => terme unique de pile pour plus de cohérence
35 35 # - the patch series la série (complète) de patchs (suite ?)
36 36 # - rejects des rejets ? (à propos de l'application d'un
37 37 # patch)
38 38 # - a repository un dépôt
39 39 # - to revert annuler des modifications (ou défaire ?)
40 40 # - a revision une révision
41 41 # - the topmost patch le dernier patch appliqué
42 42 # - a tree une arborescence
43 43 # - an unrelated repository un dépôt non apparenté
44 44 # - unversioned
45 45 # unmanaged
46 46 # untracked non suivi, non géré, pas sous contrôle du dépôt,
47 47 # hors révision ?
48 48 # - the working directory le répertoire de travail
49 49 #
50 50 # Termes très courants repris de l'anglais - à utiliser sans guillemets
51 51 # pour ne pas alourdir inutilement la traduction :
52 52 # - a diff un diff ? (ou également un patch ? synonymes...)
53 53 # - a hook un hook
54 54 # - a patch un patch
55 55 # - a tag un tag
56 56 # - to tag taguer
57 57 #
58 58 # Termes anglais avec une signification très spécifique, difficile à
59 59 # paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets :
60 60 # - a bundle un \"bundle\"
61 61 # - to bundle créer un \"bundle\" ?
62 62 # - a changeset un \"changeset\"
63 63 # - a changegroup un \"changegroup\"
64 64 # - the tip la révision \"tip\"
65 65 #
66 66 # Termes dont le classement / la traduction sont à déterminer :
67 67 # - a commit un commit, un \"commit\"
68 68 # - to commit \"committer\" ? (beuark, même dit tous les jours)
69 69 # - a guard une \"garde\" ? (une protection ?)
70 70 # - to guard a patch \"garder\" un patch ?
71 71 # - to pull rapatrier des \"changesets\" ? effectuer une
72 72 # opération de \"pull\" ? \"puller\" ?? (argh !)
73 73 # - to push propager ? (utilisé par svn pour commit)
74 74 # publier ? pousser ?? envoyer ??
75 75 # - the series file (mq) ?
76 76 #
77 77 # Notes :
78 78 # - (cédric) je verrais bien l'ajout d'une rubrique générale dans l'aide
79 79 # (par exemple 'hg help glossary') librement remplissable par chaque équipe
80 80 # de traduction, qui introduirait succintement à l'utilisateur les termes
81 81 # qui vont être rencontrés dans mercurial - et en particulier permettrait
82 82 # de faire le lien avec des termes franglisants parfois utilisés
83 83 # (par ex. fusionner = "merger", etc.) ... ?
84 84 #
85 85 msgid ""
86 86 msgstr ""
87 87 "Project-Id-Version: Mercurial\n"
88 88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
89 89 "POT-Creation-Date: 2009-06-28 20:09+0200\n"
90 90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
91 91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
92 92 "Language-Team: French\n"
93 93 "MIME-Version: 1.0\n"
94 94 "Content-Type: text/plain; charset=UTF-8\n"
95 95 "Content-Transfer-Encoding: 8bit\n"
96 96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
97 97
98 98 #, python-format
99 99 msgid " (default: %s)"
100 100 msgstr " (défaut: %s)"
101 101
102 102 msgid "OPTIONS"
103 103 msgstr ""
104 104
105 105 msgid "COMMANDS"
106 106 msgstr ""
107 107
108 108 msgid " options:\n"
109 109 msgstr ""
110 110
111 111 #, python-format
112 112 msgid ""
113 113 " aliases: %s\n"
114 114 "\n"
115 115 msgstr ""
116 116
117 117 msgid ""
118 118 "control access to a repository using simple hooks\n"
119 119 "\n"
120 120 "This hook makes it possible to allow or deny write access to portions\n"
121 121 "of a repository when receiving incoming changesets.\n"
122 122 "\n"
123 123 "The authorization is matched based on the local user name on the\n"
124 124 "system where the hook runs, and not the committer of the original\n"
125 125 "changeset (since the latter is merely informative).\n"
126 126 "\n"
127 127 "The acl hook is best used along with a restricted shell like hgsh,\n"
128 128 "preventing authenticating users from doing anything other than\n"
129 129 "pushing or pulling. The hook is not safe to use if users have\n"
130 130 "interactive shell access, as they can then disable the hook.\n"
131 131 "Nor is it safe if remote users share an account, because then there\n"
132 132 "is no way to distinguish them.\n"
133 133 "\n"
134 134 "To use this hook, configure the acl extension in your hgrc like this:\n"
135 135 "\n"
136 136 " [extensions]\n"
137 137 " hgext.acl =\n"
138 138 "\n"
139 139 " [hooks]\n"
140 140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
141 141 "\n"
142 142 " [acl]\n"
143 143 " # Check whether the source of incoming changes is in this list\n"
144 144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
145 145 " sources = serve\n"
146 146 "\n"
147 147 "The allow and deny sections take a subtree pattern as key (with a\n"
148 148 "glob syntax by default), and a comma separated list of users as\n"
149 149 "the corresponding value. The deny list is checked before the allow\n"
150 150 "list is.\n"
151 151 "\n"
152 152 " [acl.allow]\n"
153 153 " # If acl.allow is not present, all users are allowed by default.\n"
154 154 " # An empty acl.allow section means no users allowed.\n"
155 155 " docs/** = doc_writer\n"
156 156 " .hgtags = release_engineer\n"
157 157 "\n"
158 158 " [acl.deny]\n"
159 159 " # If acl.deny is not present, no users are refused by default.\n"
160 160 " # An empty acl.deny section means all users allowed.\n"
161 161 " glob pattern = user4, user5\n"
162 162 " ** = user6\n"
163 163 msgstr ""
164 164
165 165 #, python-format
166 166 msgid "acl: %s not enabled\n"
167 167 msgstr ""
168 168
169 169 #, python-format
170 170 msgid "acl: %s enabled, %d entries for user %s\n"
171 171 msgstr ""
172 172
173 173 #, python-format
174 174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
175 175 msgstr ""
176 176
177 177 #, python-format
178 178 msgid "acl: changes have source \"%s\" - skipping\n"
179 179 msgstr ""
180 180
181 181 #, python-format
182 182 msgid "acl: user %s denied on %s\n"
183 183 msgstr ""
184 184
185 185 #, python-format
186 186 msgid "acl: access denied for changeset %s"
187 187 msgstr ""
188 188
189 189 #, python-format
190 190 msgid "acl: user %s not allowed on %s\n"
191 191 msgstr ""
192 192
193 193 #, python-format
194 194 msgid "acl: allowing changeset %s\n"
195 195 msgstr ""
196 196
197 197 msgid ""
198 198 "track a line of development with movable markers\n"
199 199 "\n"
200 200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
201 201 "points to a changeset identified by its hash. If you commit a\n"
202 202 "changeset that is based on a changeset that has a bookmark on it,\n"
203 203 "the bookmark shifts to the new changeset.\n"
204 204 "\n"
205 205 "It is possible to use bookmark names in every revision lookup\n"
206 206 "(e.g. hg merge, hg update).\n"
207 207 "\n"
208 208 "By default, when several bookmarks point to the same changeset, they\n"
209 209 "will all move forward together. It is possible to obtain a more\n"
210 210 "git-like experience by adding the following configuration option to\n"
211 211 "your .hgrc:\n"
212 212 "\n"
213 213 " [bookmarks]\n"
214 214 " track.current = True\n"
215 215 "\n"
216 216 "This will cause Mercurial to track the bookmark that you are currently\n"
217 217 "using, and only update it. This is similar to git's approach to\n"
218 218 "branching.\n"
219 219 msgstr ""
220 220
221 221 msgid ""
222 222 "track a line of development with movable markers\n"
223 223 "\n"
224 224 " Bookmarks are pointers to certain commits that move when\n"
225 225 " committing. Bookmarks are local. They can be renamed, copied and\n"
226 226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
227 227 " 'hg update' to merge and update respectively to a given bookmark.\n"
228 228 "\n"
229 229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
230 230 " directory's parent revision with the given name. If you specify\n"
231 231 " a revision using -r REV (where REV may be an existing bookmark),\n"
232 232 " the bookmark is assigned to that revision.\n"
233 233 " "
234 234 msgstr ""
235 235
236 236 msgid "a bookmark of this name does not exist"
237 237 msgstr ""
238 238
239 239 msgid "a bookmark of the same name already exists"
240 240 msgstr ""
241 241
242 242 msgid "new bookmark name required"
243 243 msgstr ""
244 244
245 245 msgid "bookmark name required"
246 246 msgstr ""
247 247
248 248 msgid "bookmark name cannot contain newlines"
249 249 msgstr ""
250 250
251 251 msgid "a bookmark cannot have the name of an existing branch"
252 252 msgstr ""
253 253
254 254 msgid "force"
255 255 msgstr ""
256 256
257 257 msgid "revision"
258 258 msgstr ""
259 259
260 260 msgid "delete a given bookmark"
261 261 msgstr ""
262 262
263 263 msgid "rename a given bookmark"
264 264 msgstr ""
265 265
266 266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
267 267 msgstr ""
268 268
269 269 msgid ""
270 270 "integrate Mercurial with a Bugzilla bug tracker\n"
271 271 "\n"
272 272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
273 273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
274 274 "bug status.\n"
275 275 "\n"
276 276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
277 277 "installations using MySQL are supported.\n"
278 278 "\n"
279 279 "The hook relies on a Bugzilla script to send bug change notification\n"
280 280 "emails. That script changes between Bugzilla versions; the\n"
281 281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
282 282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
283 283 "be run by Mercurial as the user pushing the change; you will need to\n"
284 284 "ensure the Bugzilla install file permissions are set appropriately.\n"
285 285 "\n"
286 286 "Configuring the extension:\n"
287 287 "\n"
288 288 " [bugzilla]\n"
289 289 "\n"
290 290 " host Hostname of the MySQL server holding the Bugzilla\n"
291 291 " database.\n"
292 292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
293 293 " user Username to use to access MySQL server. Default 'bugs'.\n"
294 294 " password Password to use to access MySQL server.\n"
295 295 " timeout Database connection timeout (seconds). Default 5.\n"
296 296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
297 297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
298 298 " and '2.16' for versions prior to 2.18.\n"
299 299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
300 300 " changeset committer cannot be found as a Bugzilla user.\n"
301 301 " bzdir Bugzilla install directory. Used by default notify.\n"
302 302 " Default '/var/www/html/bugzilla'.\n"
303 303 " notify The command to run to get Bugzilla to send bug change\n"
304 304 " notification emails. Substitutes from a map with 3\n"
305 305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
306 306 " bugzilla email). Default depends on version; from 2.18\n"
307 307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
308 308 " %(id)s %(user)s\".\n"
309 309 " regexp Regular expression to match bug IDs in changeset commit\n"
310 310 " message. Must contain one \"()\" group. The default\n"
311 311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
312 312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
313 313 " variations thereof. Matching is case insensitive.\n"
314 314 " style The style file to use when formatting comments.\n"
315 315 " template Template to use when formatting comments. Overrides\n"
316 316 " style if specified. In addition to the usual Mercurial\n"
317 317 " keywords, the extension specifies:\n"
318 318 " {bug} The Bugzilla bug ID.\n"
319 319 " {root} The full pathname of the Mercurial\n"
320 320 " repository.\n"
321 321 " {webroot} Stripped pathname of the Mercurial\n"
322 322 " repository.\n"
323 323 " {hgweb} Base URL for browsing Mercurial\n"
324 324 " repositories.\n"
325 325 " Default 'changeset {node|short} in repo {root} refers '\n"
326 326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
327 327 " strip The number of slashes to strip from the front of {root}\n"
328 328 " to produce {webroot}. Default 0.\n"
329 329 " usermap Path of file containing Mercurial committer ID to\n"
330 330 " Bugzilla user ID mappings. If specified, the file\n"
331 331 " should contain one mapping per line,\n"
332 332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
333 333 " section.\n"
334 334 "\n"
335 335 " [usermap]\n"
336 336 " Any entries in this section specify mappings of Mercurial\n"
337 337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
338 338 " \"committer\"=\"Bugzilla user\"\n"
339 339 "\n"
340 340 " [web]\n"
341 341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
342 342 " from templates as {hgweb}.\n"
343 343 "\n"
344 344 "Activating the extension:\n"
345 345 "\n"
346 346 " [extensions]\n"
347 347 " hgext.bugzilla =\n"
348 348 "\n"
349 349 " [hooks]\n"
350 350 " # run bugzilla hook on every change pulled or pushed in here\n"
351 351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
352 352 "\n"
353 353 "Example configuration:\n"
354 354 "\n"
355 355 "This example configuration is for a collection of Mercurial\n"
356 356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
357 357 "installation in /opt/bugzilla-3.2.\n"
358 358 "\n"
359 359 " [bugzilla]\n"
360 360 " host=localhost\n"
361 361 " password=XYZZY\n"
362 362 " version=3.0\n"
363 363 " bzuser=unknown@domain.com\n"
364 364 " bzdir=/opt/bugzilla-3.2\n"
365 365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
366 366 "rev/{node|short}\\n\\n{desc}\\n\n"
367 367 " strip=5\n"
368 368 "\n"
369 369 " [web]\n"
370 370 " baseurl=http://dev.domain.com/hg\n"
371 371 "\n"
372 372 " [usermap]\n"
373 373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
374 374 "\n"
375 375 "Commits add a comment to the Bugzilla bug record of the form:\n"
376 376 "\n"
377 377 " Changeset 3b16791d6642 in repository-name.\n"
378 378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
379 379 "\n"
380 380 " Changeset commit comment. Bug 1234.\n"
381 381 msgstr ""
382 382
383 383 #, python-format
384 384 msgid "connecting to %s:%s as %s, password %s\n"
385 385 msgstr ""
386 386
387 387 #, python-format
388 388 msgid "query: %s %s\n"
389 389 msgstr ""
390 390
391 391 #, python-format
392 392 msgid "failed query: %s %s\n"
393 393 msgstr ""
394 394
395 395 msgid "unknown database schema"
396 396 msgstr ""
397 397
398 398 #, python-format
399 399 msgid "bug %d already knows about changeset %s\n"
400 400 msgstr ""
401 401
402 402 msgid "telling bugzilla to send mail:\n"
403 403 msgstr ""
404 404
405 405 #, python-format
406 406 msgid " bug %s\n"
407 407 msgstr ""
408 408
409 409 #, python-format
410 410 msgid "running notify command %s\n"
411 411 msgstr ""
412 412
413 413 #, python-format
414 414 msgid "bugzilla notify command %s"
415 415 msgstr ""
416 416
417 417 msgid "done\n"
418 418 msgstr ""
419 419
420 420 #, python-format
421 421 msgid "looking up user %s\n"
422 422 msgstr ""
423 423
424 424 #, python-format
425 425 msgid "cannot find bugzilla user id for %s"
426 426 msgstr ""
427 427
428 428 #, python-format
429 429 msgid "cannot find bugzilla user id for %s or %s"
430 430 msgstr ""
431 431
432 432 #, python-format
433 433 msgid "bugzilla version %s not supported"
434 434 msgstr ""
435 435
436 436 msgid ""
437 437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
438 438 "details:\n"
439 439 "\t{desc|tabindent}"
440 440 msgstr ""
441 441
442 442 #, python-format
443 443 msgid "python mysql support not available: %s"
444 444 msgstr ""
445 445
446 446 #, python-format
447 447 msgid "hook type %s does not pass a changeset id"
448 448 msgstr ""
449 449
450 450 #, python-format
451 451 msgid "database error: %s"
452 452 msgstr ""
453 453
454 454 msgid "display children changesets"
455 455 msgstr ""
456 456
457 457 msgid ""
458 458 "show the children of the given or working directory revision\n"
459 459 "\n"
460 460 " Print the children of the working directory's revisions. If a\n"
461 461 " revision is given via -r/--rev, the children of that revision will\n"
462 462 " be printed. If a file argument is given, revision in which the\n"
463 463 " file was last changed (after the working directory revision or the\n"
464 464 " argument to --rev if given) is printed.\n"
465 465 " "
466 466 msgstr ""
467 467
468 468 msgid "show children of the specified revision"
469 469 msgstr ""
470 470
471 471 msgid "hg children [-r REV] [FILE]"
472 472 msgstr ""
473 473
474 474 msgid "display statistics about repository history"
475 475 msgstr ""
476 476
477 477 #, python-format
478 478 msgid "Revision %d is a merge, ignoring...\n"
479 479 msgstr ""
480 480
481 481 #, python-format
482 482 msgid "generating stats: %d%%"
483 483 msgstr ""
484 484
485 485 msgid ""
486 486 "histogram of changes to the repository\n"
487 487 "\n"
488 488 " This command will display a histogram representing the number\n"
489 489 " of changed lines or revisions, grouped according to the given\n"
490 490 " template. The default template will group changes by author.\n"
491 491 " The --dateformat option may be used to group the results by\n"
492 492 " date instead.\n"
493 493 "\n"
494 494 " Statistics are based on the number of changed lines, or\n"
495 495 " alternatively the number of matching revisions if the\n"
496 496 " --changesets option is specified.\n"
497 497 "\n"
498 498 " Examples:\n"
499 499 "\n"
500 500 " # display count of changed lines for every committer\n"
501 501 " hg churn -t '{author|email}'\n"
502 502 "\n"
503 503 " # display daily activity graph\n"
504 504 " hg churn -f '%H' -s -c\n"
505 505 "\n"
506 506 " # display activity of developers by month\n"
507 507 " hg churn -f '%Y-%m' -s -c\n"
508 508 "\n"
509 509 " # display count of lines changed in every year\n"
510 510 " hg churn -f '%Y' -s\n"
511 511 "\n"
512 512 " It is possible to map alternate email addresses to a main address\n"
513 513 " by providing a file using the following format:\n"
514 514 "\n"
515 515 " <alias email> <actual email>\n"
516 516 "\n"
517 517 " Such a file may be specified with the --aliases option, otherwise a\n"
518 518 " .hgchurn file will be looked for in the working directory root.\n"
519 519 " "
520 520 msgstr ""
521 521
522 522 #, python-format
523 523 msgid "assuming %i character terminal\n"
524 524 msgstr ""
525 525
526 526 msgid "count rate for the specified revision or range"
527 527 msgstr ""
528 528
529 529 msgid "count rate for revisions matching date spec"
530 530 msgstr ""
531 531
532 532 msgid "template to group changesets"
533 533 msgstr ""
534 534
535 535 msgid "strftime-compatible format for grouping by date"
536 536 msgstr ""
537 537
538 538 msgid "count rate by number of changesets"
539 539 msgstr ""
540 540
541 541 msgid "sort by key (default: sort by count)"
542 542 msgstr ""
543 543
544 544 msgid "file with email aliases"
545 545 msgstr ""
546 546
547 547 msgid "show progress"
548 548 msgstr ""
549 549
550 550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
551 551 msgstr ""
552 552
553 553 msgid ""
554 554 "colorize output from some commands\n"
555 555 "\n"
556 556 "This extension modifies the status command to add color to its output\n"
557 557 "to reflect file status, the qseries command to add color to reflect\n"
558 558 "patch status (applied, unapplied, missing), and to diff-related\n"
559 559 "commands to highlight additions, removals, diff headers, and trailing\n"
560 560 "whitespace.\n"
561 561 "\n"
562 562 "Other effects in addition to color, like bold and underlined text, are\n"
563 563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
564 564 "function (aka ANSI escape codes). This module also provides the\n"
565 565 "render_text function, which can be used to add effects to any text.\n"
566 566 "\n"
567 567 "Default effects may be overridden from the .hgrc file:\n"
568 568 "\n"
569 569 "[color]\n"
570 570 "status.modified = blue bold underline red_background\n"
571 571 "status.added = green bold\n"
572 572 "status.removed = red bold blue_background\n"
573 573 "status.deleted = cyan bold underline\n"
574 574 "status.unknown = magenta bold underline\n"
575 575 "status.ignored = black bold\n"
576 576 "\n"
577 577 "# 'none' turns off all effects\n"
578 578 "status.clean = none\n"
579 579 "status.copied = none\n"
580 580 "\n"
581 581 "qseries.applied = blue bold underline\n"
582 582 "qseries.unapplied = black bold\n"
583 583 "qseries.missing = red bold\n"
584 584 "\n"
585 585 "diff.diffline = bold\n"
586 586 "diff.extended = cyan bold\n"
587 587 "diff.file_a = red bold\n"
588 588 "diff.file_b = green bold\n"
589 589 "diff.hunk = magenta\n"
590 590 "diff.deleted = red\n"
591 591 "diff.inserted = green\n"
592 592 "diff.changed = white\n"
593 593 "diff.trailingwhitespace = bold red_background\n"
594 594 msgstr ""
595 595
596 596 msgid "when to colorize (always, auto, or never)"
597 597 msgstr ""
598 598
599 599 msgid "don't colorize output"
600 600 msgstr ""
601 601
602 602 msgid "import from foreign VCS repositories into Mercurial"
603 603 msgstr ""
604 604
605 605 msgid ""
606 606 "convert a foreign SCM repository to a Mercurial one.\n"
607 607 "\n"
608 608 " Accepted source formats [identifiers]:\n"
609 609 " - Mercurial [hg]\n"
610 610 " - CVS [cvs]\n"
611 611 " - Darcs [darcs]\n"
612 612 " - git [git]\n"
613 613 " - Subversion [svn]\n"
614 614 " - Monotone [mtn]\n"
615 615 " - GNU Arch [gnuarch]\n"
616 616 " - Bazaar [bzr]\n"
617 617 " - Perforce [p4]\n"
618 618 "\n"
619 619 " Accepted destination formats [identifiers]:\n"
620 620 " - Mercurial [hg]\n"
621 621 " - Subversion [svn] (history on branches is not preserved)\n"
622 622 "\n"
623 623 " If no revision is given, all revisions will be converted.\n"
624 624 " Otherwise, convert will only import up to the named revision\n"
625 625 " (given in a format understood by the source).\n"
626 626 "\n"
627 627 " If no destination directory name is specified, it defaults to the\n"
628 628 " basename of the source with '-hg' appended. If the destination\n"
629 629 " repository doesn't exist, it will be created.\n"
630 630 "\n"
631 631 " By default, all sources except Mercurial will use\n"
632 632 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
633 633 " revision numbers order. Sort modes have the following effects:\n"
634 634 " --branchsort: convert from parent to child revision when\n"
635 635 " possible, which means branches are usually converted one after\n"
636 636 " the other. It generates more compact repositories.\n"
637 637 " --datesort: sort revisions by date. Converted repositories have\n"
638 638 " good-looking changelogs but are often an order of magnitude\n"
639 639 " larger than the same ones generated by --branchsort.\n"
640 640 " --sourcesort: try to preserve source revisions order, only\n"
641 641 " supported by Mercurial sources.\n"
642 642 "\n"
643 643 " If <REVMAP> isn't given, it will be put in a default location\n"
644 644 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
645 645 " that maps each source commit ID to the destination ID for that\n"
646 646 " revision, like so:\n"
647 647 " <source ID> <destination ID>\n"
648 648 "\n"
649 649 " If the file doesn't exist, it's automatically created. It's\n"
650 650 " updated on each commit copied, so convert-repo can be interrupted\n"
651 651 " and can be run repeatedly to copy new commits.\n"
652 652 "\n"
653 653 " The [username mapping] file is a simple text file that maps each\n"
654 654 " source commit author to a destination commit author. It is handy\n"
655 655 " for source SCMs that use unix logins to identify authors (eg:\n"
656 656 " CVS). One line per author mapping and the line format is:\n"
657 657 " srcauthor=whatever string you want\n"
658 658 "\n"
659 659 " The filemap is a file that allows filtering and remapping of files\n"
660 660 " and directories. Comment lines start with '#'. Each line can\n"
661 661 " contain one of the following directives:\n"
662 662 "\n"
663 663 " include path/to/file\n"
664 664 "\n"
665 665 " exclude path/to/file\n"
666 666 "\n"
667 667 " rename from/file to/file\n"
668 668 "\n"
669 669 " The 'include' directive causes a file, or all files under a\n"
670 670 " directory, to be included in the destination repository, and the\n"
671 671 " exclusion of all other files and directories not explicitly included.\n"
672 672 " The 'exclude' directive causes files or directories to be omitted.\n"
673 673 " The 'rename' directive renames a file or directory. To rename from\n"
674 674 " a subdirectory into the root of the repository, use '.' as the\n"
675 675 " path to rename to.\n"
676 676 "\n"
677 677 " The splicemap is a file that allows insertion of synthetic\n"
678 678 " history, letting you specify the parents of a revision. This is\n"
679 679 " useful if you want to e.g. give a Subversion merge two parents, or\n"
680 680 " graft two disconnected series of history together. Each entry\n"
681 681 " contains a key, followed by a space, followed by one or two\n"
682 682 " comma-separated values. The key is the revision ID in the source\n"
683 683 " revision control system whose parents should be modified (same\n"
684 684 " format as a key in .hg/shamap). The values are the revision IDs\n"
685 685 " (in either the source or destination revision control system) that\n"
686 686 " should be used as the new parents for that node.\n"
687 687 "\n"
688 688 " The branchmap is a file that allows you to rename a branch when it is\n"
689 689 " being brought in from whatever external repository. When used in\n"
690 690 " conjunction with a splicemap, it allows for a powerful combination\n"
691 691 " to help fix even the most badly mismanaged repositories and turn them\n"
692 692 " into nicely structured Mercurial repositories. The branchmap contains\n"
693 693 " lines of the form \"original_branch_name new_branch_name\".\n"
694 694 " \"original_branch_name\" is the name of the branch in the source\n"
695 695 " repository, and \"new_branch_name\" is the name of the branch is the\n"
696 696 " destination repository. This can be used to (for instance) move code\n"
697 697 " in one repository from \"default\" to a named branch.\n"
698 698 "\n"
699 699 " Mercurial Source\n"
700 700 " -----------------\n"
701 701 "\n"
702 702 " --config convert.hg.ignoreerrors=False (boolean)\n"
703 703 " ignore integrity errors when reading. Use it to fix Mercurial\n"
704 704 " repositories with missing revlogs, by converting from and to\n"
705 705 " Mercurial.\n"
706 706 " --config convert.hg.saverev=False (boolean)\n"
707 707 " store original revision ID in changeset (forces target IDs to\n"
708 708 " change)\n"
709 709 " --config convert.hg.startrev=0 (hg revision identifier)\n"
710 710 " convert start revision and its descendants\n"
711 711 "\n"
712 712 " CVS Source\n"
713 713 " ----------\n"
714 714 "\n"
715 715 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
716 716 " to indicate the starting point of what will be converted. Direct\n"
717 717 " access to the repository files is not needed, unless of course the\n"
718 718 " repository is :local:. The conversion uses the top level directory\n"
719 719 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
720 720 " commands to find files to convert. This means that unless a\n"
721 721 " filemap is given, all files under the starting directory will be\n"
722 722 " converted, and that any directory reorganization in the CVS\n"
723 723 " sandbox is ignored.\n"
724 724 "\n"
725 725 " Because CVS does not have changesets, it is necessary to collect\n"
726 726 " individual commits to CVS and merge them into changesets. CVS\n"
727 727 " source uses its internal changeset merging code by default but can\n"
728 728 " be configured to call the external 'cvsps' program by setting:\n"
729 729 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
730 730 " This option is deprecated and will be removed in Mercurial 1.4.\n"
731 731 "\n"
732 732 " The options shown are the defaults.\n"
733 733 "\n"
734 734 " Internal cvsps is selected by setting\n"
735 735 " --config convert.cvsps=builtin\n"
736 736 " and has a few more configurable options:\n"
737 737 " --config convert.cvsps.cache=True (boolean)\n"
738 738 " Set to False to disable remote log caching, for testing and\n"
739 739 " debugging purposes.\n"
740 740 " --config convert.cvsps.fuzz=60 (integer)\n"
741 741 " Specify the maximum time (in seconds) that is allowed\n"
742 742 " between commits with identical user and log message in a\n"
743 743 " single changeset. When very large files were checked in as\n"
744 744 " part of a changeset then the default may not be long\n"
745 745 " enough.\n"
746 746 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
747 747 " Specify a regular expression to which commit log messages\n"
748 748 " are matched. If a match occurs, then the conversion\n"
749 749 " process will insert a dummy revision merging the branch on\n"
750 750 " which this log message occurs to the branch indicated in\n"
751 751 " the regex.\n"
752 752 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
753 753 " Specify a regular expression to which commit log messages\n"
754 754 " are matched. If a match occurs, then the conversion\n"
755 755 " process will add the most recent revision on the branch\n"
756 756 " indicated in the regex as the second parent of the\n"
757 757 " changeset.\n"
758 758 "\n"
759 759 " The hgext/convert/cvsps wrapper script allows the builtin\n"
760 760 " changeset merging code to be run without doing a conversion. Its\n"
761 761 " parameters and output are similar to that of cvsps 2.1.\n"
762 762 "\n"
763 763 " Subversion Source\n"
764 764 " -----------------\n"
765 765 "\n"
766 766 " Subversion source detects classical trunk/branches/tags layouts.\n"
767 767 " By default, the supplied \"svn://repo/path/\" source URL is\n"
768 768 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
769 769 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
770 770 " its subdirectories are listed as possible branches. If\n"
771 771 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
772 772 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
773 773 " can be overridden with following options. Set them to paths\n"
774 774 " relative to the source URL, or leave them blank to disable auto\n"
775 775 " detection.\n"
776 776 "\n"
777 777 " --config convert.svn.branches=branches (directory name)\n"
778 778 " specify the directory containing branches\n"
779 779 " --config convert.svn.tags=tags (directory name)\n"
780 780 " specify the directory containing tags\n"
781 781 " --config convert.svn.trunk=trunk (directory name)\n"
782 782 " specify the name of the trunk branch\n"
783 783 "\n"
784 784 " Source history can be retrieved starting at a specific revision,\n"
785 785 " instead of being integrally converted. Only single branch\n"
786 786 " conversions are supported.\n"
787 787 "\n"
788 788 " --config convert.svn.startrev=0 (svn revision number)\n"
789 789 " specify start Subversion revision.\n"
790 790 "\n"
791 791 " Perforce Source\n"
792 792 " ---------------\n"
793 793 "\n"
794 794 " The Perforce (P4) importer can be given a p4 depot path or a\n"
795 795 " client specification as source. It will convert all files in the\n"
796 796 " source to a flat Mercurial repository, ignoring labels, branches\n"
797 797 " and integrations. Note that when a depot path is given you then\n"
798 798 " usually should specify a target directory, because otherwise the\n"
799 799 " target may be named ...-hg.\n"
800 800 "\n"
801 801 " It is possible to limit the amount of source history to be\n"
802 802 " converted by specifying an initial Perforce revision.\n"
803 803 "\n"
804 804 " --config convert.p4.startrev=0 (perforce changelist number)\n"
805 805 " specify initial Perforce revision.\n"
806 806 "\n"
807 807 "\n"
808 808 " Mercurial Destination\n"
809 809 " ---------------------\n"
810 810 "\n"
811 811 " --config convert.hg.clonebranches=False (boolean)\n"
812 812 " dispatch source branches in separate clones.\n"
813 813 " --config convert.hg.tagsbranch=default (branch name)\n"
814 814 " tag revisions branch name\n"
815 815 " --config convert.hg.usebranchnames=True (boolean)\n"
816 816 " preserve branch names\n"
817 817 "\n"
818 818 " "
819 819 msgstr ""
820 820
821 821 msgid ""
822 822 "create changeset information from CVS\n"
823 823 "\n"
824 824 " This command is intended as a debugging tool for the CVS to\n"
825 825 " Mercurial converter, and can be used as a direct replacement for\n"
826 826 " cvsps.\n"
827 827 "\n"
828 828 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
829 829 " named directory) in the CVS repository, and converts the log to a\n"
830 830 " series of changesets based on matching commit log entries and\n"
831 831 " dates."
832 832 msgstr ""
833 833
834 834 msgid "username mapping filename"
835 835 msgstr ""
836 836
837 837 msgid "destination repository type"
838 838 msgstr ""
839 839
840 840 msgid "remap file names using contents of file"
841 841 msgstr ""
842 842
843 843 msgid "import up to target revision REV"
844 844 msgstr ""
845 845
846 846 msgid "source repository type"
847 847 msgstr ""
848 848
849 849 msgid "splice synthesized history into place"
850 850 msgstr ""
851 851
852 852 msgid "change branch names while converting"
853 853 msgstr ""
854 854
855 855 msgid "try to sort changesets by branches"
856 856 msgstr ""
857 857
858 858 msgid "try to sort changesets by date"
859 859 msgstr ""
860 860
861 861 msgid "preserve source changesets order"
862 862 msgstr ""
863 863
864 864 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
865 865 msgstr ""
866 866
867 867 msgid "only return changes on specified branches"
868 868 msgstr ""
869 869
870 870 msgid "prefix to remove from file names"
871 871 msgstr ""
872 872
873 873 msgid "only return changes after or between specified tags"
874 874 msgstr ""
875 875
876 876 msgid "update cvs log cache"
877 877 msgstr ""
878 878
879 879 msgid "create new cvs log cache"
880 880 msgstr ""
881 881
882 882 msgid "set commit time fuzz in seconds"
883 883 msgstr ""
884 884
885 885 msgid "specify cvsroot"
886 886 msgstr ""
887 887
888 888 msgid "show parent changesets"
889 889 msgstr ""
890 890
891 891 msgid "show current changeset in ancestor branches"
892 892 msgstr ""
893 893
894 894 msgid "ignored for compatibility"
895 895 msgstr ""
896 896
897 897 msgid "hg debugcvsps [OPTION]... [PATH]..."
898 898 msgstr ""
899 899
900 900 msgid ""
901 901 "warning: lightweight checkouts may cause conversion failures, try with a "
902 902 "regular branch instead.\n"
903 903 msgstr ""
904 904
905 905 msgid "bzr source type could not be determined\n"
906 906 msgstr ""
907 907
908 908 #, python-format
909 909 msgid "%s is not a valid revision in current branch"
910 910 msgstr ""
911 911
912 912 #, python-format
913 913 msgid "%s is not available in %s anymore"
914 914 msgstr ""
915 915
916 916 #, python-format
917 917 msgid "%s.%s symlink has no target"
918 918 msgstr ""
919 919
920 920 #, python-format
921 921 msgid "cannot find required \"%s\" tool"
922 922 msgstr ""
923 923
924 924 #, python-format
925 925 msgid "running: %s\n"
926 926 msgstr ""
927 927
928 928 #, python-format
929 929 msgid "%s error:\n"
930 930 msgstr ""
931 931
932 932 #, python-format
933 933 msgid "syntax error in %s(%d): key/value pair expected"
934 934 msgstr ""
935 935
936 936 #, python-format
937 937 msgid "could not open map file %r: %s"
938 938 msgstr ""
939 939
940 940 #, python-format
941 941 msgid "%s: missing or unsupported repository"
942 942 msgstr ""
943 943
944 944 #, python-format
945 945 msgid "convert: %s\n"
946 946 msgstr ""
947 947
948 948 #, python-format
949 949 msgid "%s: unknown repository type"
950 950 msgstr ""
951 951
952 952 #, python-format
953 953 msgid "unknown sort mode: %s"
954 954 msgstr ""
955 955
956 956 #, python-format
957 957 msgid "cycle detected between %s and %s"
958 958 msgstr ""
959 959
960 960 msgid "not all revisions were sorted"
961 961 msgstr ""
962 962
963 963 #, python-format
964 964 msgid "Writing author map file %s\n"
965 965 msgstr ""
966 966
967 967 #, python-format
968 968 msgid "Ignoring bad line in author map file %s: %s\n"
969 969 msgstr ""
970 970
971 971 #, python-format
972 972 msgid "mapping author %s to %s\n"
973 973 msgstr ""
974 974
975 975 #, python-format
976 976 msgid "overriding mapping for author %s, was %s, will be %s\n"
977 977 msgstr ""
978 978
979 979 #, python-format
980 980 msgid "spliced in %s as parents of %s\n"
981 981 msgstr ""
982 982
983 983 msgid "scanning source...\n"
984 984 msgstr ""
985 985
986 986 msgid "sorting...\n"
987 987 msgstr ""
988 988
989 989 msgid "converting...\n"
990 990 msgstr ""
991 991
992 992 #, python-format
993 993 msgid "source: %s\n"
994 994 msgstr ""
995 995
996 996 #, python-format
997 997 msgid "assuming destination %s\n"
998 998 msgstr ""
999 999
1000 1000 msgid "more than one sort mode specified"
1001 1001 msgstr ""
1002 1002
1003 1003 msgid "--sourcesort is not supported by this data source"
1004 1004 msgstr ""
1005 1005
1006 1006 msgid ""
1007 1007 "warning: support for external cvsps is deprecated and will be removed in "
1008 1008 "Mercurial 1.4\n"
1009 1009 msgstr ""
1010 1010
1011 1011 #, python-format
1012 1012 msgid "revision %s is not a patchset number or date"
1013 1013 msgstr ""
1014 1014
1015 1015 msgid "using builtin cvsps\n"
1016 1016 msgstr ""
1017 1017
1018 1018 #, python-format
1019 1019 msgid "connecting to %s\n"
1020 1020 msgstr ""
1021 1021
1022 1022 msgid "CVS pserver authentication failed"
1023 1023 msgstr ""
1024 1024
1025 1025 msgid "server sucks"
1026 1026 msgstr ""
1027 1027
1028 1028 #, python-format
1029 1029 msgid "%d bytes missing from remote file"
1030 1030 msgstr ""
1031 1031
1032 1032 #, python-format
1033 1033 msgid "cvs server: %s\n"
1034 1034 msgstr ""
1035 1035
1036 1036 #, python-format
1037 1037 msgid "unknown CVS response: %s"
1038 1038 msgstr ""
1039 1039
1040 1040 msgid "collecting CVS rlog\n"
1041 1041 msgstr ""
1042 1042
1043 1043 #, python-format
1044 1044 msgid "reading cvs log cache %s\n"
1045 1045 msgstr ""
1046 1046
1047 1047 #, python-format
1048 1048 msgid "cache has %d log entries\n"
1049 1049 msgstr ""
1050 1050
1051 1051 #, python-format
1052 1052 msgid "error reading cache: %r\n"
1053 1053 msgstr ""
1054 1054
1055 1055 #, python-format
1056 1056 msgid "running %s\n"
1057 1057 msgstr ""
1058 1058
1059 1059 #, python-format
1060 1060 msgid "prefix=%r directory=%r root=%r\n"
1061 1061 msgstr ""
1062 1062
1063 1063 msgid "RCS file must be followed by working file"
1064 1064 msgstr ""
1065 1065
1066 1066 msgid "must have at least some revisions"
1067 1067 msgstr ""
1068 1068
1069 1069 msgid "expected revision number"
1070 1070 msgstr ""
1071 1071
1072 1072 msgid "revision must be followed by date line"
1073 1073 msgstr ""
1074 1074
1075 1075 #, python-format
1076 1076 msgid "found synthetic revision in %s: %r\n"
1077 1077 msgstr ""
1078 1078
1079 1079 #, python-format
1080 1080 msgid "writing cvs log cache %s\n"
1081 1081 msgstr ""
1082 1082
1083 1083 #, python-format
1084 1084 msgid "%d log entries\n"
1085 1085 msgstr ""
1086 1086
1087 1087 msgid "creating changesets\n"
1088 1088 msgstr ""
1089 1089
1090 1090 msgid "synthetic changeset cannot have multiple parents"
1091 1091 msgstr ""
1092 1092
1093 1093 #, python-format
1094 1094 msgid ""
1095 1095 "warning: CVS commit message references non-existent branch %r:\n"
1096 1096 "%s\n"
1097 1097 msgstr ""
1098 1098
1099 1099 #, python-format
1100 1100 msgid "%d changeset entries\n"
1101 1101 msgstr ""
1102 1102
1103 1103 msgid "Python ElementTree module is not available"
1104 1104 msgstr ""
1105 1105
1106 1106 #, python-format
1107 1107 msgid "cleaning up %s\n"
1108 1108 msgstr ""
1109 1109
1110 1110 msgid "internal calling inconsistency"
1111 1111 msgstr ""
1112 1112
1113 1113 msgid "errors in filemap"
1114 1114 msgstr ""
1115 1115
1116 1116 #, python-format
1117 1117 msgid "%s:%d: %r already in %s list\n"
1118 1118 msgstr ""
1119 1119
1120 1120 #, python-format
1121 1121 msgid "%s:%d: unknown directive %r\n"
1122 1122 msgstr ""
1123 1123
1124 1124 msgid "source repository doesn't support --filemap"
1125 1125 msgstr ""
1126 1126
1127 1127 #, python-format
1128 1128 msgid "%s does not look like a GNU Arch repo"
1129 1129 msgstr ""
1130 1130
1131 1131 msgid "cannot find a GNU Arch tool"
1132 1132 msgstr ""
1133 1133
1134 1134 #, python-format
1135 1135 msgid "analyzing tree version %s...\n"
1136 1136 msgstr ""
1137 1137
1138 1138 #, python-format
1139 1139 msgid ""
1140 1140 "tree analysis stopped because it points to an unregistered archive %s...\n"
1141 1141 msgstr ""
1142 1142
1143 1143 #, python-format
1144 1144 msgid "applying revision %s...\n"
1145 1145 msgstr ""
1146 1146
1147 1147 #, python-format
1148 1148 msgid "computing changeset between %s and %s...\n"
1149 1149 msgstr ""
1150 1150
1151 1151 #, python-format
1152 1152 msgid "obtaining revision %s...\n"
1153 1153 msgstr ""
1154 1154
1155 1155 #, python-format
1156 1156 msgid "analyzing revision %s...\n"
1157 1157 msgstr ""
1158 1158
1159 1159 #, python-format
1160 1160 msgid "could not parse cat-log of %s"
1161 1161 msgstr ""
1162 1162
1163 1163 #, python-format
1164 1164 msgid "%s is not a local Mercurial repo"
1165 1165 msgstr ""
1166 1166
1167 1167 #, python-format
1168 1168 msgid "initializing destination %s repository\n"
1169 1169 msgstr ""
1170 1170
1171 1171 msgid "run hg sink pre-conversion action\n"
1172 1172 msgstr ""
1173 1173
1174 1174 msgid "run hg sink post-conversion action\n"
1175 1175 msgstr ""
1176 1176
1177 1177 #, python-format
1178 1178 msgid "pulling from %s into %s\n"
1179 1179 msgstr ""
1180 1180
1181 1181 msgid "filtering out empty revision\n"
1182 1182 msgstr ""
1183 1183
1184 1184 msgid "updating tags\n"
1185 1185 msgstr ""
1186 1186
1187 1187 #, python-format
1188 1188 msgid "%s is not a valid start revision"
1189 1189 msgstr ""
1190 1190
1191 1191 #, python-format
1192 1192 msgid "ignoring: %s\n"
1193 1193 msgstr ""
1194 1194
1195 1195 msgid "run hg source pre-conversion action\n"
1196 1196 msgstr ""
1197 1197
1198 1198 msgid "run hg source post-conversion action\n"
1199 1199 msgstr ""
1200 1200
1201 1201 #, python-format
1202 1202 msgid "%s does not look like a monotone repo"
1203 1203 msgstr ""
1204 1204
1205 1205 #, python-format
1206 1206 msgid "copying file in renamed directory from '%s' to '%s'"
1207 1207 msgstr ""
1208 1208
1209 1209 msgid "reading p4 views\n"
1210 1210 msgstr ""
1211 1211
1212 1212 msgid "collecting p4 changelists\n"
1213 1213 msgstr ""
1214 1214
1215 1215 msgid "Subversion python bindings could not be loaded"
1216 1216 msgstr ""
1217 1217
1218 1218 #, python-format
1219 1219 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1220 1220 msgstr ""
1221 1221
1222 1222 msgid "Subversion python bindings are too old, 1.4 or later required"
1223 1223 msgstr ""
1224 1224
1225 1225 #, python-format
1226 1226 msgid "svn: revision %s is not an integer"
1227 1227 msgstr ""
1228 1228
1229 1229 #, python-format
1230 1230 msgid "svn: start revision %s is not an integer"
1231 1231 msgstr ""
1232 1232
1233 1233 #, python-format
1234 1234 msgid "no revision found in module %s"
1235 1235 msgstr ""
1236 1236
1237 1237 #, python-format
1238 1238 msgid "expected %s to be at %r, but not found"
1239 1239 msgstr ""
1240 1240
1241 1241 #, python-format
1242 1242 msgid "found %s at %r\n"
1243 1243 msgstr ""
1244 1244
1245 1245 #, python-format
1246 1246 msgid "ignoring empty branch %s\n"
1247 1247 msgstr ""
1248 1248
1249 1249 #, python-format
1250 1250 msgid "found branch %s at %d\n"
1251 1251 msgstr ""
1252 1252
1253 1253 msgid "svn: start revision is not supported with more than one branch"
1254 1254 msgstr ""
1255 1255
1256 1256 #, python-format
1257 1257 msgid "svn: no revision found after start revision %d"
1258 1258 msgstr ""
1259 1259
1260 1260 #, python-format
1261 1261 msgid "no tags found at revision %d\n"
1262 1262 msgstr ""
1263 1263
1264 1264 #, python-format
1265 1265 msgid "ignoring foreign branch %r\n"
1266 1266 msgstr ""
1267 1267
1268 1268 #, python-format
1269 1269 msgid "%s not found up to revision %d"
1270 1270 msgstr ""
1271 1271
1272 1272 #, python-format
1273 1273 msgid "branch renamed from %s to %s at %d\n"
1274 1274 msgstr ""
1275 1275
1276 1276 #, python-format
1277 1277 msgid "reparent to %s\n"
1278 1278 msgstr ""
1279 1279
1280 1280 #, python-format
1281 1281 msgid "copied to %s from %s@%s\n"
1282 1282 msgstr ""
1283 1283
1284 1284 #, python-format
1285 1285 msgid "gone from %s\n"
1286 1286 msgstr ""
1287 1287
1288 1288 #, python-format
1289 1289 msgid "entry %s\n"
1290 1290 msgstr ""
1291 1291
1292 1292 #, python-format
1293 1293 msgid "unknown path in revision %d: %s\n"
1294 1294 msgstr ""
1295 1295
1296 1296 #, python-format
1297 1297 msgid "mark %s came from %s:%d\n"
1298 1298 msgstr ""
1299 1299
1300 1300 #, python-format
1301 1301 msgid "parsing revision %d (%d changes)\n"
1302 1302 msgstr ""
1303 1303
1304 1304 #, python-format
1305 1305 msgid "found parent of branch %s at %d: %s\n"
1306 1306 msgstr ""
1307 1307
1308 1308 msgid "no copyfrom path, don't know what to do.\n"
1309 1309 msgstr ""
1310 1310
1311 1311 #, python-format
1312 1312 msgid "fetching revision log for \"%s\" from %d to %d\n"
1313 1313 msgstr ""
1314 1314
1315 1315 #, python-format
1316 1316 msgid "revision %d has no entries\n"
1317 1317 msgstr ""
1318 1318
1319 1319 #, python-format
1320 1320 msgid "svn: branch has no revision %s"
1321 1321 msgstr ""
1322 1322
1323 1323 #, python-format
1324 1324 msgid "%r is not under %r, ignoring\n"
1325 1325 msgstr ""
1326 1326
1327 1327 #, python-format
1328 1328 msgid "initializing svn repo %r\n"
1329 1329 msgstr ""
1330 1330
1331 1331 #, python-format
1332 1332 msgid "initializing svn wc %r\n"
1333 1333 msgstr ""
1334 1334
1335 1335 msgid "unexpected svn output:\n"
1336 1336 msgstr ""
1337 1337
1338 1338 msgid "unable to cope with svn output"
1339 1339 msgstr ""
1340 1340
1341 1341 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1342 1342 msgstr ""
1343 1343
1344 1344 msgid ""
1345 1345 "allow external programs to compare revisions\n"
1346 1346 "\n"
1347 1347 "The `extdiff' Mercurial extension allows you to use external programs\n"
1348 1348 "to compare revisions, or revision with working directory. The external diff\n"
1349 1349 "programs are called with a configurable set of options and two\n"
1350 1350 "non-option arguments: paths to directories containing snapshots of\n"
1351 1351 "files to compare.\n"
1352 1352 "\n"
1353 1353 "The `extdiff' extension also allows to configure new diff commands, so\n"
1354 1354 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1355 1355 "\n"
1356 1356 " [extdiff]\n"
1357 1357 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1358 1358 " cdiff = gdiff -Nprc5\n"
1359 1359 " ## or the old way:\n"
1360 1360 " #cmd.cdiff = gdiff\n"
1361 1361 " #opts.cdiff = -Nprc5\n"
1362 1362 "\n"
1363 1363 " # add new command called vdiff, runs kdiff3\n"
1364 1364 " vdiff = kdiff3\n"
1365 1365 "\n"
1366 1366 " # add new command called meld, runs meld (no need to name twice)\n"
1367 1367 " meld =\n"
1368 1368 "\n"
1369 1369 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1370 1370 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1371 1371 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1372 1372 "in\n"
1373 1373 " # your .vimrc\n"
1374 1374 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1375 1375 "\n"
1376 1376 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1377 1377 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1378 1378 "files, so running the external diff program will actually be pretty\n"
1379 1379 "fast (at least faster than having to compare the entire tree).\n"
1380 1380 msgstr ""
1381 1381
1382 1382 #, python-format
1383 1383 msgid "making snapshot of %d files from rev %s\n"
1384 1384 msgstr ""
1385 1385
1386 1386 #, python-format
1387 1387 msgid "making snapshot of %d files from working directory\n"
1388 1388 msgstr ""
1389 1389
1390 1390 msgid "cannot specify --rev and --change at the same time"
1391 1391 msgstr ""
1392 1392
1393 1393 #, python-format
1394 1394 msgid "running %r in %s\n"
1395 1395 msgstr ""
1396 1396
1397 1397 #, python-format
1398 1398 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1399 1399 msgstr ""
1400 1400
1401 1401 msgid "cleaning up temp directory\n"
1402 1402 msgstr ""
1403 1403
1404 1404 msgid ""
1405 1405 "use external program to diff repository (or selected files)\n"
1406 1406 "\n"
1407 1407 " Show differences between revisions for the specified files, using\n"
1408 1408 " an external program. The default program used is diff, with\n"
1409 1409 " default options \"-Npru\".\n"
1410 1410 "\n"
1411 1411 " To select a different program, use the -p/--program option. The\n"
1412 1412 " program will be passed the names of two directories to compare. To\n"
1413 1413 " pass additional options to the program, use -o/--option. These\n"
1414 1414 " will be passed before the names of the directories to compare.\n"
1415 1415 "\n"
1416 1416 " When two revision arguments are given, then changes are shown\n"
1417 1417 " between those revisions. If only one revision is specified then\n"
1418 1418 " that revision is compared to the working directory, and, when no\n"
1419 1419 " revisions are specified, the working directory files are compared\n"
1420 1420 " to its parent."
1421 1421 msgstr ""
1422 1422
1423 1423 msgid "comparison program to run"
1424 1424 msgstr ""
1425 1425
1426 1426 msgid "pass option to comparison program"
1427 1427 msgstr ""
1428 1428
1429 1429 msgid "change made by revision"
1430 1430 msgstr ""
1431 1431
1432 1432 msgid "hg extdiff [OPT]... [FILE]..."
1433 1433 msgstr ""
1434 1434
1435 1435 #, python-format
1436 1436 msgid "hg %s [OPTION]... [FILE]..."
1437 1437 msgstr ""
1438 1438
1439 1439 msgid "pull, update and merge in one command"
1440 1440 msgstr ""
1441 1441
1442 1442 msgid ""
1443 1443 "pull changes from a remote repository, merge new changes if needed.\n"
1444 1444 "\n"
1445 1445 " This finds all changes from the repository at the specified path\n"
1446 1446 " or URL and adds them to the local repository.\n"
1447 1447 "\n"
1448 1448 " If the pulled changes add a new branch head, the head is\n"
1449 1449 " automatically merged, and the result of the merge is committed.\n"
1450 1450 " Otherwise, the working directory is updated to include the new\n"
1451 1451 " changes.\n"
1452 1452 "\n"
1453 1453 " When a merge occurs, the newly pulled changes are assumed to be\n"
1454 1454 " \"authoritative\". The head of the new changes is used as the first\n"
1455 1455 " parent, with local changes as the second. To switch the merge\n"
1456 1456 " order, use --switch-parent.\n"
1457 1457 "\n"
1458 1458 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1459 1459 " "
1460 1460 msgstr ""
1461 1461
1462 1462 msgid ""
1463 1463 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1464 1464 msgstr ""
1465 1465
1466 1466 msgid "outstanding uncommitted merge"
1467 1467 msgstr ""
1468 1468
1469 1469 msgid "outstanding uncommitted changes"
1470 1470 msgstr ""
1471 1471
1472 1472 msgid "working directory is missing some files"
1473 1473 msgstr ""
1474 1474
1475 1475 msgid ""
1476 1476 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1477 1477 msgstr ""
1478 1478
1479 1479 #, python-format
1480 1480 msgid "pulling from %s\n"
1481 1481 msgstr ""
1482 1482
1483 1483 msgid ""
1484 1484 "Other repository doesn't support revision lookup, so a rev cannot be "
1485 1485 "specified."
1486 1486 msgstr ""
1487 1487
1488 1488 #, python-format
1489 1489 msgid ""
1490 1490 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1491 1491 "\" to merge them)\n"
1492 1492 msgstr ""
1493 1493
1494 1494 #, python-format
1495 1495 msgid "updating to %d:%s\n"
1496 1496 msgstr ""
1497 1497
1498 1498 #, python-format
1499 1499 msgid "merging with %d:%s\n"
1500 1500 msgstr ""
1501 1501
1502 1502 #, python-format
1503 1503 msgid "Automated merge with %s"
1504 1504 msgstr ""
1505 1505
1506 1506 #, python-format
1507 1507 msgid "new changeset %d:%s merges remote changes with local\n"
1508 1508 msgstr ""
1509 1509
1510 1510 msgid "a specific revision you would like to pull"
1511 1511 msgstr ""
1512 1512
1513 1513 msgid "edit commit message"
1514 1514 msgstr ""
1515 1515
1516 1516 msgid "edit commit message (DEPRECATED)"
1517 1517 msgstr ""
1518 1518
1519 1519 msgid "switch parents when merging"
1520 1520 msgstr ""
1521 1521
1522 1522 msgid "hg fetch [SOURCE]"
1523 1523 msgstr ""
1524 1524
1525 1525 msgid "sign and verify changesets"
1526 1526 msgstr ""
1527 1527
1528 1528 msgid "error while verifying signature"
1529 1529 msgstr ""
1530 1530
1531 1531 #, python-format
1532 1532 msgid "%s Bad signature from \"%s\"\n"
1533 1533 msgstr ""
1534 1534
1535 1535 #, python-format
1536 1536 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1537 1537 msgstr ""
1538 1538
1539 1539 #, python-format
1540 1540 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1541 1541 msgstr ""
1542 1542
1543 1543 msgid "list signed changesets"
1544 1544 msgstr ""
1545 1545
1546 1546 #, python-format
1547 1547 msgid "%s:%d node does not exist\n"
1548 1548 msgstr ""
1549 1549
1550 1550 msgid "verify all the signatures there may be for a particular revision"
1551 1551 msgstr ""
1552 1552
1553 1553 #, python-format
1554 1554 msgid "No valid signature for %s\n"
1555 1555 msgstr ""
1556 1556
1557 1557 msgid ""
1558 1558 "add a signature for the current or given revision\n"
1559 1559 "\n"
1560 1560 " If no revision is given, the parent of the working directory is used,\n"
1561 1561 " or tip if no revision is checked out.\n"
1562 1562 "\n"
1563 1563 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1564 1564 " "
1565 1565 msgstr ""
1566 1566
1567 1567 msgid "uncommitted merge - please provide a specific revision"
1568 1568 msgstr ""
1569 1569
1570 1570 msgid "Error while signing"
1571 1571 msgstr ""
1572 1572
1573 1573 msgid ""
1574 1574 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1575 1575 "force)"
1576 1576 msgstr ""
1577 1577
1578 1578 #, python-format
1579 1579 msgid "Added signature for changeset %s"
1580 1580 msgstr ""
1581 1581
1582 1582 msgid "unknown signature version"
1583 1583 msgstr ""
1584 1584
1585 1585 msgid "make the signature local"
1586 1586 msgstr ""
1587 1587
1588 1588 msgid "sign even if the sigfile is modified"
1589 1589 msgstr ""
1590 1590
1591 1591 msgid "do not commit the sigfile after signing"
1592 1592 msgstr ""
1593 1593
1594 1594 msgid "the key id to sign with"
1595 1595 msgstr ""
1596 1596
1597 1597 msgid "commit message"
1598 1598 msgstr ""
1599 1599
1600 1600 msgid "hg sign [OPTION]... [REVISION]..."
1601 1601 msgstr ""
1602 1602
1603 1603 msgid "hg sigcheck REVISION"
1604 1604 msgstr ""
1605 1605
1606 1606 msgid "hg sigs"
1607 1607 msgstr ""
1608 1608
1609 1609 msgid ""
1610 1610 "show revision graphs in terminals\n"
1611 1611 "\n"
1612 1612 "This extension adds a --graph option to the incoming, outgoing and log\n"
1613 1613 "commands. When this options is given, an ASCII representation of the\n"
1614 1614 "revision graph is also shown.\n"
1615 1615 msgstr ""
1616 1616
1617 1617 #, python-format
1618 1618 msgid "--graph option is incompatible with --%s"
1619 1619 msgstr ""
1620 1620
1621 1621 msgid ""
1622 1622 "show revision history alongside an ASCII revision graph\n"
1623 1623 "\n"
1624 1624 " Print a revision history alongside a revision graph drawn with\n"
1625 1625 " ASCII characters.\n"
1626 1626 "\n"
1627 1627 " Nodes printed as an @ character are parents of the working\n"
1628 1628 " directory.\n"
1629 1629 " "
1630 1630 msgstr ""
1631 1631
1632 1632 #, python-format
1633 1633 msgid "comparing with %s\n"
1634 1634 msgstr "comparaison avec %s\n"
1635 1635
1636 1636 msgid "no changes found\n"
1637 1637 msgstr "aucun changement trouvé\n"
1638 1638
1639 1639 msgid "show the revision DAG"
1640 1640 msgstr ""
1641 1641
1642 1642 msgid "limit number of changes displayed"
1643 1643 msgstr ""
1644 1644
1645 1645 msgid "show patch"
1646 1646 msgstr ""
1647 1647
1648 1648 msgid "show the specified revision or range"
1649 1649 msgstr ""
1650 1650
1651 1651 msgid "hg glog [OPTION]... [FILE]"
1652 1652 msgstr ""
1653 1653
1654 1654 msgid ""
1655 1655 "integrate Mercurial with a CIA notification service\n"
1656 1656 "\n"
1657 1657 "This is meant to be run as a changegroup or incoming hook.\n"
1658 1658 "To configure it, set the following options in your hgrc:\n"
1659 1659 "\n"
1660 1660 "[cia]\n"
1661 1661 "# your registered CIA user name\n"
1662 1662 "user = foo\n"
1663 1663 "# the name of the project in CIA\n"
1664 1664 "project = foo\n"
1665 1665 "# the module (subproject) (optional)\n"
1666 1666 "#module = foo\n"
1667 1667 "# Append a diffstat to the log message (optional)\n"
1668 1668 "#diffstat = False\n"
1669 1669 "# Template to use for log messages (optional)\n"
1670 1670 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1671 1671 "# Style to use (optional)\n"
1672 1672 "#style = foo\n"
1673 1673 "# The URL of the CIA notification service (optional)\n"
1674 1674 "# You can use mailto: URLs to send by email, eg\n"
1675 1675 "# mailto:cia@cia.vc\n"
1676 1676 "# Make sure to set email.from if you do this.\n"
1677 1677 "#url = http://cia.vc/\n"
1678 1678 "# print message instead of sending it (optional)\n"
1679 1679 "#test = False\n"
1680 1680 "\n"
1681 1681 "[hooks]\n"
1682 1682 "# one of these:\n"
1683 1683 "changegroup.cia = python:hgcia.hook\n"
1684 1684 "#incoming.cia = python:hgcia.hook\n"
1685 1685 "\n"
1686 1686 "[web]\n"
1687 1687 "# If you want hyperlinks (optional)\n"
1688 1688 "baseurl = http://server/path/to/repo\n"
1689 1689 msgstr ""
1690 1690
1691 1691 #, python-format
1692 1692 msgid "hgcia: sending update to %s\n"
1693 1693 msgstr ""
1694 1694
1695 1695 msgid "email.from must be defined when sending by email"
1696 1696 msgstr ""
1697 1697
1698 1698 msgid "cia: no user specified"
1699 1699 msgstr ""
1700 1700
1701 1701 msgid "cia: no project specified"
1702 1702 msgstr ""
1703 1703
1704 1704 msgid ""
1705 1705 "browse the repository in a graphical way\n"
1706 1706 "\n"
1707 1707 "The hgk extension allows browsing the history of a repository in a\n"
1708 1708 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1709 1709 "distributed with Mercurial.)\n"
1710 1710 "\n"
1711 1711 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1712 1712 "querying of information, and an extension to Mercurial named hgk.py,\n"
1713 1713 "which provides hooks for hgk to get information. hgk can be found in\n"
1714 1714 "the contrib directory, and the extension is shipped in the hgext\n"
1715 1715 "repository, and needs to be enabled.\n"
1716 1716 "\n"
1717 1717 "The hg view command will launch the hgk Tcl script. For this command\n"
1718 1718 "to work, hgk must be in your search path. Alternately, you can specify\n"
1719 1719 "the path to hgk in your .hgrc file:\n"
1720 1720 "\n"
1721 1721 " [hgk]\n"
1722 1722 " path=/location/of/hgk\n"
1723 1723 "\n"
1724 1724 "hgk can make use of the extdiff extension to visualize revisions.\n"
1725 1725 "Assuming you had already configured extdiff vdiff command, just add:\n"
1726 1726 "\n"
1727 1727 " [hgk]\n"
1728 1728 " vdiff=vdiff\n"
1729 1729 "\n"
1730 1730 "Revisions context menu will now display additional entries to fire\n"
1731 1731 "vdiff on hovered and selected revisions."
1732 1732 msgstr ""
1733 1733
1734 1734 msgid "diff trees from two commits"
1735 1735 msgstr ""
1736 1736
1737 1737 msgid "output common ancestor information"
1738 1738 msgstr ""
1739 1739
1740 1740 msgid "cat a specific revision"
1741 1741 msgstr ""
1742 1742
1743 1743 msgid "cat-file: type or revision not supplied\n"
1744 1744 msgstr ""
1745 1745
1746 1746 msgid "aborting hg cat-file only understands commits\n"
1747 1747 msgstr ""
1748 1748
1749 1749 msgid "parse given revisions"
1750 1750 msgstr ""
1751 1751
1752 1752 msgid "print revisions"
1753 1753 msgstr ""
1754 1754
1755 1755 msgid "print extension options"
1756 1756 msgstr ""
1757 1757
1758 1758 msgid "start interactive history viewer"
1759 1759 msgstr ""
1760 1760
1761 1761 msgid "hg view [-l LIMIT] [REVRANGE]"
1762 1762 msgstr ""
1763 1763
1764 1764 msgid "generate patch"
1765 1765 msgstr ""
1766 1766
1767 1767 msgid "recursive"
1768 1768 msgstr ""
1769 1769
1770 1770 msgid "pretty"
1771 1771 msgstr ""
1772 1772
1773 1773 msgid "stdin"
1774 1774 msgstr ""
1775 1775
1776 1776 msgid "detect copies"
1777 1777 msgstr ""
1778 1778
1779 1779 msgid "search"
1780 1780 msgstr ""
1781 1781
1782 1782 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1783 1783 msgstr ""
1784 1784
1785 1785 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1786 1786 msgstr ""
1787 1787
1788 1788 msgid "hg debug-config"
1789 1789 msgstr ""
1790 1790
1791 1791 msgid "hg debug-merge-base node node"
1792 1792 msgstr ""
1793 1793
1794 1794 msgid "ignored"
1795 1795 msgstr ""
1796 1796
1797 1797 msgid "hg debug-rev-parse REV"
1798 1798 msgstr ""
1799 1799
1800 1800 msgid "header"
1801 1801 msgstr ""
1802 1802
1803 1803 msgid "topo-order"
1804 1804 msgstr ""
1805 1805
1806 1806 msgid "parents"
1807 1807 msgstr ""
1808 1808
1809 1809 msgid "max-count"
1810 1810 msgstr ""
1811 1811
1812 1812 msgid "hg debug-rev-list [options] revs"
1813 1813 msgstr ""
1814 1814
1815 1815 msgid ""
1816 1816 "syntax highlighting for hgweb\n"
1817 1817 "\n"
1818 1818 "It depends on the Pygments syntax highlighting library:\n"
1819 1819 "http://pygments.org/\n"
1820 1820 "\n"
1821 1821 "There is a single configuration option:\n"
1822 1822 "\n"
1823 1823 "[web]\n"
1824 1824 "pygments_style = <style>\n"
1825 1825 "\n"
1826 1826 "The default is 'colorful'.\n"
1827 1827 "\n"
1828 1828 "-- Adam Hupp <adam@hupp.org>\n"
1829 1829 msgstr ""
1830 1830
1831 1831 msgid "accelerate status report using system level services"
1832 1832 msgstr ""
1833 1833
1834 1834 msgid "start an inotify server for this repository"
1835 1835 msgstr ""
1836 1836
1837 1837 msgid ""
1838 1838 "debugging information for inotify extension\n"
1839 1839 "\n"
1840 1840 " Prints the list of directories being watched by the inotify server.\n"
1841 1841 " "
1842 1842 msgstr ""
1843 1843
1844 1844 msgid "directories being watched:\n"
1845 1845 msgstr ""
1846 1846
1847 1847 msgid "run server in background"
1848 1848 msgstr ""
1849 1849
1850 1850 msgid "used internally by daemon mode"
1851 1851 msgstr ""
1852 1852
1853 1853 msgid "minutes to sit idle before exiting"
1854 1854 msgstr ""
1855 1855
1856 1856 msgid "name of file to write process ID to"
1857 1857 msgstr ""
1858 1858
1859 1859 msgid "hg inserve [OPT]..."
1860 1860 msgstr ""
1861 1861
1862 1862 msgid "(found dead inotify server socket; removing it)\n"
1863 1863 msgstr ""
1864 1864
1865 1865 msgid "(starting inotify server)\n"
1866 1866 msgstr ""
1867 1867
1868 1868 #, python-format
1869 1869 msgid "could not start inotify server: %s\n"
1870 1870 msgstr ""
1871 1871
1872 1872 #, python-format
1873 1873 msgid "could not talk to new inotify server: %s\n"
1874 1874 msgstr ""
1875 1875
1876 1876 msgid "(inotify server not running)\n"
1877 1877 msgstr ""
1878 1878
1879 1879 #, python-format
1880 1880 msgid "failed to contact inotify server: %s\n"
1881 1881 msgstr ""
1882 1882
1883 1883 msgid "received empty answer from inotify server"
1884 1884 msgstr ""
1885 1885
1886 1886 #, python-format
1887 1887 msgid "(inotify: received response from incompatible server version %d)\n"
1888 1888 msgstr ""
1889 1889
1890 1890 #, python-format
1891 1891 msgid "(inotify: received '%s' response when expecting '%s')\n"
1892 1892 msgstr ""
1893 1893
1894 1894 msgid "this system does not seem to support inotify"
1895 1895 msgstr ""
1896 1896
1897 1897 #, python-format
1898 1898 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1899 1899 msgstr ""
1900 1900
1901 1901 msgid "*** this limit is too low to watch every directory in this repository\n"
1902 1902 msgstr ""
1903 1903
1904 1904 msgid "*** counting directories: "
1905 1905 msgstr ""
1906 1906
1907 1907 #, python-format
1908 1908 msgid "found %d\n"
1909 1909 msgstr ""
1910 1910
1911 1911 #, python-format
1912 1912 msgid "*** to raise the limit from %d to %d (run as root):\n"
1913 1913 msgstr ""
1914 1914
1915 1915 #, python-format
1916 1916 msgid "*** echo %d > %s\n"
1917 1917 msgstr ""
1918 1918
1919 1919 #, python-format
1920 1920 msgid "cannot watch %s until inotify watch limit is raised"
1921 1921 msgstr ""
1922 1922
1923 1923 #, python-format
1924 1924 msgid "inotify service not available: %s"
1925 1925 msgstr ""
1926 1926
1927 1927 #, python-format
1928 1928 msgid "watching %r\n"
1929 1929 msgstr ""
1930 1930
1931 1931 #, python-format
1932 1932 msgid "watching directories under %r\n"
1933 1933 msgstr ""
1934 1934
1935 1935 #, python-format
1936 1936 msgid "status: %r dir(%d) -> %s\n"
1937 1937 msgstr ""
1938 1938
1939 1939 #, python-format
1940 1940 msgid "status: %r %s -> %s\n"
1941 1941 msgstr ""
1942 1942
1943 1943 #, python-format
1944 1944 msgid "%s dirstate reload\n"
1945 1945 msgstr ""
1946 1946
1947 1947 #, python-format
1948 1948 msgid "%s end dirstate reload\n"
1949 1949 msgstr ""
1950 1950
1951 1951 msgid "rescanning due to .hgignore change\n"
1952 1952 msgstr ""
1953 1953
1954 1954 #, python-format
1955 1955 msgid "%s event: created %s\n"
1956 1956 msgstr ""
1957 1957
1958 1958 #, python-format
1959 1959 msgid "%s event: deleted %s\n"
1960 1960 msgstr ""
1961 1961
1962 1962 #, python-format
1963 1963 msgid "%s event: modified %s\n"
1964 1964 msgstr ""
1965 1965
1966 1966 #, python-format
1967 1967 msgid "filesystem containing %s was unmounted\n"
1968 1968 msgstr ""
1969 1969
1970 1970 #, python-format
1971 1971 msgid "%s readable: %d bytes\n"
1972 1972 msgstr ""
1973 1973
1974 1974 #, python-format
1975 1975 msgid "%s below threshold - unhooking\n"
1976 1976 msgstr ""
1977 1977
1978 1978 #, python-format
1979 1979 msgid "%s reading %d events\n"
1980 1980 msgstr ""
1981 1981
1982 1982 #, python-format
1983 1983 msgid "%s hooking back up with %d bytes readable\n"
1984 1984 msgstr ""
1985 1985
1986 1986 #, python-format
1987 1987 msgid "could not start server: %s"
1988 1988 msgstr ""
1989 1989
1990 1990 #, python-format
1991 1991 msgid "answering query for %r\n"
1992 1992 msgstr ""
1993 1993
1994 1994 #, python-format
1995 1995 msgid "received query from incompatible client version %d\n"
1996 1996 msgstr ""
1997 1997
1998 1998 #, python-format
1999 1999 msgid "unrecognized query type: %s\n"
2000 2000 msgstr ""
2001 2001
2002 2002 msgid "finished setup\n"
2003 2003 msgstr ""
2004 2004
2005 2005 msgid ""
2006 2006 "expand expressions into changelog and summaries\n"
2007 2007 "\n"
2008 2008 "This extension allows the use of a special syntax in summaries,\n"
2009 2009 "which will be automatically expanded into links or any other\n"
2010 2010 "arbitrary expression, much like InterWiki does.\n"
2011 2011 "\n"
2012 2012 "A few example patterns (link to bug tracking, etc.) that may\n"
2013 2013 "be used in your hgrc:\n"
2014 2014 "\n"
2015 2015 " [interhg]\n"
2016 2016 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2017 2017 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2018 2018 "i\n"
2019 2019 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2020 2020 msgstr ""
2021 2021
2022 2022 #, python-format
2023 2023 msgid "interhg: invalid pattern for %s: %s\n"
2024 2024 msgstr ""
2025 2025
2026 2026 #, python-format
2027 2027 msgid "interhg: invalid regexp for %s: %s\n"
2028 2028 msgstr ""
2029 2029
2030 2030 msgid ""
2031 2031 "expand keywords in tracked files\n"
2032 2032 "\n"
2033 2033 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2034 2034 "tracked text files selected by your configuration.\n"
2035 2035 "\n"
2036 2036 "Keywords are only expanded in local repositories and not stored in the\n"
2037 2037 "change history. The mechanism can be regarded as a convenience for the\n"
2038 2038 "current user or for archive distribution.\n"
2039 2039 "\n"
2040 2040 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2041 2041 "hgrc files.\n"
2042 2042 "\n"
2043 2043 "Example:\n"
2044 2044 "\n"
2045 2045 " [keyword]\n"
2046 2046 " # expand keywords in every python file except those matching \"x*\"\n"
2047 2047 " **.py =\n"
2048 2048 " x* = ignore\n"
2049 2049 "\n"
2050 2050 "Note: the more specific you are in your filename patterns\n"
2051 2051 " the less you lose speed in huge repositories.\n"
2052 2052 "\n"
2053 2053 "For [keywordmaps] template mapping and expansion demonstration and\n"
2054 2054 "control run \"hg kwdemo\".\n"
2055 2055 "\n"
2056 2056 "An additional date template filter {date|utcdate} is provided.\n"
2057 2057 "\n"
2058 2058 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2059 2059 "replaced with customized keywords and templates. Again, run \"hg\n"
2060 2060 "kwdemo\" to control the results of your config changes.\n"
2061 2061 "\n"
2062 2062 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2063 2063 "the risk of inadvertently storing expanded keywords in the change\n"
2064 2064 "history.\n"
2065 2065 "\n"
2066 2066 "To force expansion after enabling it, or a configuration change, run\n"
2067 2067 "\"hg kwexpand\".\n"
2068 2068 "\n"
2069 2069 "Also, when committing with the record extension or using mq's qrecord,\n"
2070 2070 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2071 2071 "the files in question to update keyword expansions after all changes\n"
2072 2072 "have been checked in.\n"
2073 2073 "\n"
2074 2074 "Expansions spanning more than one line and incremental expansions,\n"
2075 2075 "like CVS' $Log$, are not supported. A keyword template map\n"
2076 2076 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2077 2077 msgstr ""
2078 2078
2079 2079 #, python-format
2080 2080 msgid "overwriting %s expanding keywords\n"
2081 2081 msgstr ""
2082 2082
2083 2083 #, python-format
2084 2084 msgid "overwriting %s shrinking keywords\n"
2085 2085 msgstr ""
2086 2086
2087 2087 msgid "[keyword] patterns cannot match"
2088 2088 msgstr ""
2089 2089
2090 2090 msgid "no [keyword] patterns configured"
2091 2091 msgstr ""
2092 2092
2093 2093 msgid ""
2094 2094 "print [keywordmaps] configuration and an expansion example\n"
2095 2095 "\n"
2096 2096 " Show current, custom, or default keyword template maps and their\n"
2097 2097 " expansions.\n"
2098 2098 "\n"
2099 2099 " Extend current configuration by specifying maps as arguments and\n"
2100 2100 " optionally by reading from an additional hgrc file.\n"
2101 2101 "\n"
2102 2102 " Override current keyword template maps with \"default\" option.\n"
2103 2103 " "
2104 2104 msgstr ""
2105 2105
2106 2106 #, python-format
2107 2107 msgid ""
2108 2108 "\n"
2109 2109 "\t%s\n"
2110 2110 msgstr ""
2111 2111
2112 2112 #, python-format
2113 2113 msgid "creating temporary repository at %s\n"
2114 2114 msgstr ""
2115 2115
2116 2116 #, python-format
2117 2117 msgid ""
2118 2118 "\n"
2119 2119 "%s keywords written to %s:\n"
2120 2120 msgstr ""
2121 2121
2122 2122 msgid "unhooked all commit hooks\n"
2123 2123 msgstr ""
2124 2124
2125 2125 #, python-format
2126 2126 msgid ""
2127 2127 "\n"
2128 2128 "removing temporary repository %s\n"
2129 2129 msgstr ""
2130 2130
2131 2131 msgid ""
2132 2132 "expand keywords in the working directory\n"
2133 2133 "\n"
2134 2134 " Run after (re)enabling keyword expansion.\n"
2135 2135 "\n"
2136 2136 " kwexpand refuses to run if given files contain local changes.\n"
2137 2137 " "
2138 2138 msgstr ""
2139 2139
2140 2140 msgid ""
2141 2141 "print files currently configured for keyword expansion\n"
2142 2142 "\n"
2143 2143 " Crosscheck which files in working directory are potential targets\n"
2144 2144 " for keyword expansion. That is, files matched by [keyword] config\n"
2145 2145 " patterns but not symlinks.\n"
2146 2146 " "
2147 2147 msgstr ""
2148 2148
2149 2149 msgid ""
2150 2150 "revert expanded keywords in the working directory\n"
2151 2151 "\n"
2152 2152 " Run before changing/disabling active keywords or if you experience\n"
2153 2153 " problems with \"hg import\" or \"hg merge\".\n"
2154 2154 "\n"
2155 2155 " kwshrink refuses to run if given files contain local changes.\n"
2156 2156 " "
2157 2157 msgstr ""
2158 2158
2159 2159 msgid "show default keyword template maps"
2160 2160 msgstr ""
2161 2161
2162 2162 msgid "read maps from rcfile"
2163 2163 msgstr ""
2164 2164
2165 2165 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2166 2166 msgstr ""
2167 2167
2168 2168 msgid "hg kwexpand [OPTION]... [FILE]..."
2169 2169 msgstr ""
2170 2170
2171 2171 msgid "show keyword status flags of all files"
2172 2172 msgstr ""
2173 2173
2174 2174 msgid "show files excluded from expansion"
2175 2175 msgstr ""
2176 2176
2177 2177 msgid "additionally show untracked files"
2178 2178 msgstr ""
2179 2179
2180 2180 msgid "hg kwfiles [OPTION]... [FILE]..."
2181 2181 msgstr ""
2182 2182
2183 2183 msgid "hg kwshrink [OPTION]... [FILE]..."
2184 2184 msgstr ""
2185 2185
2186 2186 msgid ""
2187 2187 "work with a stack of patches\n"
2188 2188 "\n"
2189 2189 "This extension lets you work with a stack of patches in a Mercurial\n"
2190 2190 "repository. It manages two stacks of patches - all known patches, and\n"
2191 2191 "applied patches (subset of known patches).\n"
2192 2192 "\n"
2193 2193 "Known patches are represented as patch files in the .hg/patches\n"
2194 2194 "directory. Applied patches are both patch files and changesets.\n"
2195 2195 "\n"
2196 2196 "Common tasks (use \"hg help command\" for more details):\n"
2197 2197 "\n"
2198 2198 "prepare repository to work with patches qinit\n"
2199 2199 "create new patch qnew\n"
2200 2200 "import existing patch qimport\n"
2201 2201 "\n"
2202 2202 "print patch series qseries\n"
2203 2203 "print applied patches qapplied\n"
2204 2204 "print name of top applied patch qtop\n"
2205 2205 "\n"
2206 2206 "add known patch to applied stack qpush\n"
2207 2207 "remove patch from applied stack qpop\n"
2208 2208 "refresh contents of top applied patch qrefresh\n"
2209 2209 msgstr ""
2210 2210
2211 2211 #, python-format
2212 2212 msgid "%s appears more than once in %s"
2213 2213 msgstr ""
2214 2214
2215 2215 msgid "guard cannot be an empty string"
2216 2216 msgstr ""
2217 2217
2218 2218 #, python-format
2219 2219 msgid "guard %r starts with invalid character: %r"
2220 2220 msgstr ""
2221 2221
2222 2222 #, python-format
2223 2223 msgid "invalid character in guard %r: %r"
2224 2224 msgstr ""
2225 2225
2226 2226 #, python-format
2227 2227 msgid "active guards: %s\n"
2228 2228 msgstr ""
2229 2229
2230 2230 #, python-format
2231 2231 msgid "guard %r too short"
2232 2232 msgstr ""
2233 2233
2234 2234 #, python-format
2235 2235 msgid "guard %r starts with invalid char"
2236 2236 msgstr ""
2237 2237
2238 2238 #, python-format
2239 2239 msgid "allowing %s - no guards in effect\n"
2240 2240 msgstr ""
2241 2241
2242 2242 #, python-format
2243 2243 msgid "allowing %s - no matching negative guards\n"
2244 2244 msgstr ""
2245 2245
2246 2246 #, python-format
2247 2247 msgid "allowing %s - guarded by %r\n"
2248 2248 msgstr ""
2249 2249
2250 2250 #, python-format
2251 2251 msgid "skipping %s - guarded by %r\n"
2252 2252 msgstr ""
2253 2253
2254 2254 #, python-format
2255 2255 msgid "skipping %s - no matching guards\n"
2256 2256 msgstr ""
2257 2257
2258 2258 #, python-format
2259 2259 msgid "error removing undo: %s\n"
2260 2260 msgstr ""
2261 2261
2262 2262 #, python-format
2263 2263 msgid "apply failed for patch %s"
2264 2264 msgstr ""
2265 2265
2266 2266 #, python-format
2267 2267 msgid "patch didn't work out, merging %s\n"
2268 2268 msgstr ""
2269 2269
2270 2270 #, python-format
2271 2271 msgid "update returned %d"
2272 2272 msgstr ""
2273 2273
2274 2274 msgid "repo commit failed"
2275 2275 msgstr ""
2276 2276
2277 2277 #, python-format
2278 2278 msgid "unable to read %s"
2279 2279 msgstr ""
2280 2280
2281 2281 #, python-format
2282 2282 msgid "patch %s does not exist\n"
2283 2283 msgstr ""
2284 2284
2285 2285 #, python-format
2286 2286 msgid "patch %s is not applied\n"
2287 2287 msgstr ""
2288 2288
2289 2289 msgid "patch failed, unable to continue (try -v)\n"
2290 2290 msgstr ""
2291 2291
2292 2292 #, python-format
2293 2293 msgid "applying %s\n"
2294 2294 msgstr ""
2295 2295
2296 2296 #, python-format
2297 2297 msgid "unable to read %s\n"
2298 2298 msgstr ""
2299 2299
2300 2300 #, python-format
2301 2301 msgid "imported patch %s\n"
2302 2302 msgstr ""
2303 2303
2304 2304 #, python-format
2305 2305 msgid ""
2306 2306 "\n"
2307 2307 "imported patch %s"
2308 2308 msgstr ""
2309 2309
2310 2310 #, python-format
2311 2311 msgid "patch %s is empty\n"
2312 2312 msgstr ""
2313 2313
2314 2314 msgid "patch failed, rejects left in working dir\n"
2315 2315 msgstr ""
2316 2316
2317 2317 msgid "fuzz found when applying patch, stopping\n"
2318 2318 msgstr ""
2319 2319
2320 2320 #, python-format
2321 2321 msgid "revision %d is not managed"
2322 2322 msgstr ""
2323 2323
2324 2324 #, python-format
2325 2325 msgid "cannot delete revision %d above applied patches"
2326 2326 msgstr ""
2327 2327
2328 2328 #, python-format
2329 2329 msgid "patch %s finalized without changeset message\n"
2330 2330 msgstr ""
2331 2331
2332 2332 msgid "qdelete requires at least one revision or patch name"
2333 2333 msgstr ""
2334 2334
2335 2335 #, python-format
2336 2336 msgid "cannot delete applied patch %s"
2337 2337 msgstr ""
2338 2338
2339 2339 #, python-format
2340 2340 msgid "patch %s not in series file"
2341 2341 msgstr ""
2342 2342
2343 2343 msgid "no patches applied"
2344 2344 msgstr ""
2345 2345
2346 2346 msgid "working directory revision is not qtip"
2347 2347 msgstr ""
2348 2348
2349 2349 msgid "local changes found, refresh first"
2350 2350 msgstr ""
2351 2351
2352 2352 msgid "local changes found"
2353 2353 msgstr ""
2354 2354
2355 2355 #, python-format
2356 2356 msgid "\"%s\" cannot be used as the name of a patch"
2357 2357 msgstr ""
2358 2358
2359 2359 #, python-format
2360 2360 msgid "patch \"%s\" already exists"
2361 2361 msgstr ""
2362 2362
2363 2363 #, python-format
2364 2364 msgid "error unlinking %s\n"
2365 2365 msgstr ""
2366 2366
2367 2367 #, python-format
2368 2368 msgid "patch name \"%s\" is ambiguous:\n"
2369 2369 msgstr ""
2370 2370
2371 2371 #, python-format
2372 2372 msgid "patch %s not in series"
2373 2373 msgstr ""
2374 2374
2375 2375 msgid "(working directory not at a head)\n"
2376 2376 msgstr ""
2377 2377
2378 2378 msgid "no patches in series\n"
2379 2379 msgstr ""
2380 2380
2381 2381 #, python-format
2382 2382 msgid "cannot push to a previous patch: %s"
2383 2383 msgstr ""
2384 2384
2385 2385 #, python-format
2386 2386 msgid "qpush: %s is already at the top\n"
2387 2387 msgstr ""
2388 2388
2389 2389 #, python-format
2390 2390 msgid "guarded by %r"
2391 2391 msgstr ""
2392 2392
2393 2393 msgid "no matching guards"
2394 2394 msgstr ""
2395 2395
2396 2396 #, python-format
2397 2397 msgid "cannot push '%s' - %s\n"
2398 2398 msgstr ""
2399 2399
2400 2400 msgid "all patches are currently applied\n"
2401 2401 msgstr ""
2402 2402
2403 2403 msgid "patch series already fully applied\n"
2404 2404 msgstr ""
2405 2405
2406 2406 msgid "cleaning up working directory..."
2407 2407 msgstr ""
2408 2408
2409 2409 #, python-format
2410 2410 msgid "errors during apply, please fix and refresh %s\n"
2411 2411 msgstr ""
2412 2412
2413 2413 #, python-format
2414 2414 msgid "now at: %s\n"
2415 2415 msgstr ""
2416 2416
2417 2417 #, python-format
2418 2418 msgid "patch %s is not applied"
2419 2419 msgstr ""
2420 2420
2421 2421 msgid "no patches applied\n"
2422 2422 msgstr ""
2423 2423
2424 2424 #, python-format
2425 2425 msgid "qpop: %s is already at the top\n"
2426 2426 msgstr ""
2427 2427
2428 2428 msgid "qpop: forcing dirstate update\n"
2429 2429 msgstr ""
2430 2430
2431 2431 #, python-format
2432 2432 msgid "trying to pop unknown node %s"
2433 2433 msgstr ""
2434 2434
2435 2435 msgid "popping would remove a revision not managed by this patch queue"
2436 2436 msgstr ""
2437 2437
2438 2438 msgid "deletions found between repo revs"
2439 2439 msgstr ""
2440 2440
2441 2441 msgid "patch queue now empty\n"
2442 2442 msgstr ""
2443 2443
2444 2444 msgid "cannot refresh a revision with children"
2445 2445 msgstr ""
2446 2446
2447 2447 msgid ""
2448 2448 "refresh interrupted while patch was popped! (revert --all, qpush to "
2449 2449 "recover)\n"
2450 2450 msgstr ""
2451 2451
2452 2452 msgid "patch queue directory already exists"
2453 2453 msgstr ""
2454 2454
2455 2455 #, python-format
2456 2456 msgid "patch %s is not in series file"
2457 2457 msgstr ""
2458 2458
2459 2459 msgid "No saved patch data found\n"
2460 2460 msgstr ""
2461 2461
2462 2462 #, python-format
2463 2463 msgid "restoring status: %s\n"
2464 2464 msgstr ""
2465 2465
2466 2466 msgid "save entry has children, leaving it alone\n"
2467 2467 msgstr ""
2468 2468
2469 2469 #, python-format
2470 2470 msgid "removing save entry %s\n"
2471 2471 msgstr ""
2472 2472
2473 2473 #, python-format
2474 2474 msgid "saved queue repository parents: %s %s\n"
2475 2475 msgstr ""
2476 2476
2477 2477 msgid "queue directory updating\n"
2478 2478 msgstr ""
2479 2479
2480 2480 msgid "Unable to load queue repository\n"
2481 2481 msgstr ""
2482 2482
2483 2483 msgid "save: no patches applied, exiting\n"
2484 2484 msgstr ""
2485 2485
2486 2486 msgid "status is already saved\n"
2487 2487 msgstr ""
2488 2488
2489 2489 msgid "hg patches saved state"
2490 2490 msgstr ""
2491 2491
2492 2492 msgid "repo commit failed\n"
2493 2493 msgstr ""
2494 2494
2495 2495 #, python-format
2496 2496 msgid "patch %s is already in the series file"
2497 2497 msgstr ""
2498 2498
2499 2499 msgid "option \"-r\" not valid when importing files"
2500 2500 msgstr ""
2501 2501
2502 2502 msgid "option \"-n\" not valid when importing multiple patches"
2503 2503 msgstr ""
2504 2504
2505 2505 #, python-format
2506 2506 msgid "revision %d is the root of more than one branch"
2507 2507 msgstr ""
2508 2508
2509 2509 #, python-format
2510 2510 msgid "revision %d is already managed"
2511 2511 msgstr ""
2512 2512
2513 2513 #, python-format
2514 2514 msgid "revision %d is not the parent of the queue"
2515 2515 msgstr ""
2516 2516
2517 2517 #, python-format
2518 2518 msgid "revision %d has unmanaged children"
2519 2519 msgstr ""
2520 2520
2521 2521 #, python-format
2522 2522 msgid "cannot import merge revision %d"
2523 2523 msgstr ""
2524 2524
2525 2525 #, python-format
2526 2526 msgid "revision %d is not the parent of %d"
2527 2527 msgstr ""
2528 2528
2529 2529 msgid "-e is incompatible with import from -"
2530 2530 msgstr ""
2531 2531
2532 2532 #, python-format
2533 2533 msgid "patch %s does not exist"
2534 2534 msgstr ""
2535 2535
2536 2536 msgid "need --name to import a patch from -"
2537 2537 msgstr ""
2538 2538
2539 2539 #, python-format
2540 2540 msgid "adding %s to series file\n"
2541 2541 msgstr ""
2542 2542
2543 2543 msgid ""
2544 2544 "remove patches from queue\n"
2545 2545 "\n"
2546 2546 " The patches must not be applied, and at least one patch is\n"
2547 2547 " required.\n"
2548 2548 "\n"
2549 2549 " With -k/--keep, the patch files are preserved in the patch\n"
2550 2550 " directory.\n"
2551 2551 "\n"
2552 2552 " To stop managing a patch and move it into permanent history,\n"
2553 2553 " use the qfinish command."
2554 2554 msgstr ""
2555 2555
2556 2556 msgid "print the patches already applied"
2557 2557 msgstr ""
2558 2558
2559 2559 msgid "print the patches not yet applied"
2560 2560 msgstr ""
2561 2561
2562 2562 msgid ""
2563 2563 "import a patch\n"
2564 2564 "\n"
2565 2565 " The patch is inserted into the series after the last applied\n"
2566 2566 " patch. If no patches have been applied, qimport prepends the patch\n"
2567 2567 " to the series.\n"
2568 2568 "\n"
2569 2569 " The patch will have the same name as its source file unless you\n"
2570 2570 " give it a new one with -n/--name.\n"
2571 2571 "\n"
2572 2572 " You can register an existing patch inside the patch directory with\n"
2573 2573 " the -e/--existing flag.\n"
2574 2574 "\n"
2575 2575 " With -f/--force, an existing patch of the same name will be\n"
2576 2576 " overwritten.\n"
2577 2577 "\n"
2578 2578 " An existing changeset may be placed under mq control with -r/--rev\n"
2579 2579 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2580 2580 " With -g/--git, patches imported with --rev will use the git diff\n"
2581 2581 " format. See the diffs help topic for information on why this is\n"
2582 2582 " important for preserving rename/copy information and permission\n"
2583 2583 " changes.\n"
2584 2584 "\n"
2585 2585 " To import a patch from standard input, pass - as the patch file.\n"
2586 2586 " When importing from standard input, a patch name must be specified\n"
2587 2587 " using the --name flag.\n"
2588 2588 " "
2589 2589 msgstr ""
2590 2590
2591 2591 msgid ""
2592 2592 "init a new queue repository\n"
2593 2593 "\n"
2594 2594 " The queue repository is unversioned by default. If\n"
2595 2595 " -c/--create-repo is specified, qinit will create a separate nested\n"
2596 2596 " repository for patches (qinit -c may also be run later to convert\n"
2597 2597 " an unversioned patch repository into a versioned one). You can use\n"
2598 2598 " qcommit to commit changes to this queue repository."
2599 2599 msgstr ""
2600 2600
2601 2601 msgid ""
2602 2602 "clone main and patch repository at same time\n"
2603 2603 "\n"
2604 2604 " If source is local, destination will have no patches applied. If\n"
2605 2605 " source is remote, this command can not check if patches are\n"
2606 2606 " applied in source, so cannot guarantee that patches are not\n"
2607 2607 " applied in destination. If you clone remote repository, be sure\n"
2608 2608 " before that it has no patches applied.\n"
2609 2609 "\n"
2610 2610 " Source patch repository is looked for in <src>/.hg/patches by\n"
2611 2611 " default. Use -p <url> to change.\n"
2612 2612 "\n"
2613 2613 " The patch directory must be a nested Mercurial repository, as\n"
2614 2614 " would be created by qinit -c.\n"
2615 2615 " "
2616 2616 msgstr ""
2617 2617
2618 2618 msgid "versioned patch repository not found (see qinit -c)"
2619 2619 msgstr ""
2620 2620
2621 2621 msgid "cloning main repository\n"
2622 2622 msgstr ""
2623 2623
2624 2624 msgid "cloning patch repository\n"
2625 2625 msgstr ""
2626 2626
2627 2627 msgid "stripping applied patches from destination repository\n"
2628 2628 msgstr ""
2629 2629
2630 2630 msgid "updating destination repository\n"
2631 2631 msgstr ""
2632 2632
2633 2633 msgid "commit changes in the queue repository"
2634 2634 msgstr ""
2635 2635
2636 2636 msgid "print the entire series file"
2637 2637 msgstr ""
2638 2638
2639 2639 msgid "print the name of the current patch"
2640 2640 msgstr ""
2641 2641
2642 2642 msgid "print the name of the next patch"
2643 2643 msgstr ""
2644 2644
2645 2645 msgid "all patches applied\n"
2646 2646 msgstr ""
2647 2647
2648 2648 msgid "print the name of the previous patch"
2649 2649 msgstr ""
2650 2650
2651 2651 msgid "only one patch applied\n"
2652 2652 msgstr ""
2653 2653
2654 2654 msgid ""
2655 2655 "create a new patch\n"
2656 2656 "\n"
2657 2657 " qnew creates a new patch on top of the currently-applied patch (if\n"
2658 2658 " any). It will refuse to run if there are any outstanding changes\n"
2659 2659 " unless -f/--force is specified, in which case the patch will be\n"
2660 2660 " initialized with them. You may also use -I/--include,\n"
2661 2661 " -X/--exclude, and/or a list of files after the patch name to add\n"
2662 2662 " only changes to matching files to the new patch, leaving the rest\n"
2663 2663 " as uncommitted modifications.\n"
2664 2664 "\n"
2665 2665 " -u/--user and -d/--date can be used to set the (given) user and\n"
2666 2666 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2667 2667 " to current user and date to current date.\n"
2668 2668 "\n"
2669 2669 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2670 2670 " well as the commit message. If none is specified, the header is\n"
2671 2671 " empty and the commit message is '[mq]: PATCH'.\n"
2672 2672 "\n"
2673 2673 " Use the -g/--git option to keep the patch in the git extended diff\n"
2674 2674 " format. Read the diffs help topic for more information on why this\n"
2675 2675 " is important for preserving permission changes and copy/rename\n"
2676 2676 " information.\n"
2677 2677 " "
2678 2678 msgstr ""
2679 2679
2680 2680 msgid ""
2681 2681 "update the current patch\n"
2682 2682 "\n"
2683 2683 " If any file patterns are provided, the refreshed patch will\n"
2684 2684 " contain only the modifications that match those patterns; the\n"
2685 2685 " remaining modifications will remain in the working directory.\n"
2686 2686 "\n"
2687 2687 " If -s/--short is specified, files currently included in the patch\n"
2688 2688 " will be refreshed just like matched files and remain in the patch.\n"
2689 2689 "\n"
2690 2690 " hg add/remove/copy/rename work as usual, though you might want to\n"
2691 2691 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2692 2692 " and renames. See the diffs help topic for more information on the\n"
2693 2693 " git diff format.\n"
2694 2694 " "
2695 2695 msgstr ""
2696 2696
2697 2697 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2698 2698 msgstr ""
2699 2699
2700 2700 msgid ""
2701 2701 "diff of the current patch and subsequent modifications\n"
2702 2702 "\n"
2703 2703 " Shows a diff which includes the current patch as well as any\n"
2704 2704 " changes which have been made in the working directory since the\n"
2705 2705 " last refresh (thus showing what the current patch would become\n"
2706 2706 " after a qrefresh).\n"
2707 2707 "\n"
2708 2708 " Use 'hg diff' if you only want to see the changes made since the\n"
2709 2709 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2710 2710 " by the current patch without including changes made since the\n"
2711 2711 " qrefresh.\n"
2712 2712 " "
2713 2713 msgstr ""
2714 2714
2715 2715 msgid ""
2716 2716 "fold the named patches into the current patch\n"
2717 2717 "\n"
2718 2718 " Patches must not yet be applied. Each patch will be successively\n"
2719 2719 " applied to the current patch in the order given. If all the\n"
2720 2720 " patches apply successfully, the current patch will be refreshed\n"
2721 2721 " with the new cumulative patch, and the folded patches will be\n"
2722 2722 " deleted. With -k/--keep, the folded patch files will not be\n"
2723 2723 " removed afterwards.\n"
2724 2724 "\n"
2725 2725 " The header for each folded patch will be concatenated with the\n"
2726 2726 " current patch header, separated by a line of '* * *'."
2727 2727 msgstr ""
2728 2728
2729 2729 msgid "qfold requires at least one patch name"
2730 2730 msgstr ""
2731 2731
2732 2732 msgid "No patches applied"
2733 2733 msgstr ""
2734 2734
2735 2735 #, python-format
2736 2736 msgid "Skipping already folded patch %s"
2737 2737 msgstr ""
2738 2738
2739 2739 #, python-format
2740 2740 msgid "qfold cannot fold already applied patch %s"
2741 2741 msgstr ""
2742 2742
2743 2743 #, python-format
2744 2744 msgid "Error folding patch %s"
2745 2745 msgstr ""
2746 2746
2747 2747 msgid "push or pop patches until named patch is at top of stack"
2748 2748 msgstr ""
2749 2749
2750 2750 msgid ""
2751 2751 "set or print guards for a patch\n"
2752 2752 "\n"
2753 2753 " Guards control whether a patch can be pushed. A patch with no\n"
2754 2754 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2755 2755 " pushed only if the qselect command has activated it. A patch with\n"
2756 2756 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2757 2757 " has activated it.\n"
2758 2758 "\n"
2759 2759 " With no arguments, print the currently active guards.\n"
2760 2760 " With arguments, set guards for the named patch.\n"
2761 2761 " NOTE: Specifying negative guards now requires '--'.\n"
2762 2762 "\n"
2763 2763 " To set guards on another patch:\n"
2764 2764 " hg qguard -- other.patch +2.6.17 -stable\n"
2765 2765 " "
2766 2766 msgstr ""
2767 2767
2768 2768 msgid "cannot mix -l/--list with options or arguments"
2769 2769 msgstr ""
2770 2770
2771 2771 msgid "no patch to work with"
2772 2772 msgstr ""
2773 2773
2774 2774 #, python-format
2775 2775 msgid "no patch named %s"
2776 2776 msgstr ""
2777 2777
2778 2778 msgid "print the header of the topmost or specified patch"
2779 2779 msgstr ""
2780 2780
2781 2781 msgid ""
2782 2782 "push the next patch onto the stack\n"
2783 2783 "\n"
2784 2784 " When -f/--force is applied, all local changes in patched files\n"
2785 2785 " will be lost.\n"
2786 2786 " "
2787 2787 msgstr ""
2788 2788
2789 2789 msgid "no saved queues found, please use -n\n"
2790 2790 msgstr ""
2791 2791
2792 2792 #, python-format
2793 2793 msgid "merging with queue at: %s\n"
2794 2794 msgstr ""
2795 2795
2796 2796 msgid ""
2797 2797 "pop the current patch off the stack\n"
2798 2798 "\n"
2799 2799 " By default, pops off the top of the patch stack. If given a patch\n"
2800 2800 " name, keeps popping off patches until the named patch is at the\n"
2801 2801 " top of the stack.\n"
2802 2802 " "
2803 2803 msgstr ""
2804 2804
2805 2805 #, python-format
2806 2806 msgid "using patch queue: %s\n"
2807 2807 msgstr ""
2808 2808
2809 2809 msgid ""
2810 2810 "rename a patch\n"
2811 2811 "\n"
2812 2812 " With one argument, renames the current patch to PATCH1.\n"
2813 2813 " With two arguments, renames PATCH1 to PATCH2."
2814 2814 msgstr ""
2815 2815
2816 2816 #, python-format
2817 2817 msgid "%s already exists"
2818 2818 msgstr ""
2819 2819
2820 2820 #, python-format
2821 2821 msgid "A patch named %s already exists in the series file"
2822 2822 msgstr ""
2823 2823
2824 2824 msgid "restore the queue state saved by a revision"
2825 2825 msgstr ""
2826 2826
2827 2827 msgid "save current queue state"
2828 2828 msgstr ""
2829 2829
2830 2830 #, python-format
2831 2831 msgid "destination %s exists and is not a directory"
2832 2832 msgstr ""
2833 2833
2834 2834 #, python-format
2835 2835 msgid "destination %s exists, use -f to force"
2836 2836 msgstr ""
2837 2837
2838 2838 #, python-format
2839 2839 msgid "copy %s to %s\n"
2840 2840 msgstr ""
2841 2841
2842 2842 msgid ""
2843 2843 "strip a revision and all its descendants from the repository\n"
2844 2844 "\n"
2845 2845 " If one of the working directory's parent revisions is stripped, the\n"
2846 2846 " working directory will be updated to the parent of the stripped\n"
2847 2847 " revision.\n"
2848 2848 " "
2849 2849 msgstr ""
2850 2850
2851 2851 msgid ""
2852 2852 "set or print guarded patches to push\n"
2853 2853 "\n"
2854 2854 " Use the qguard command to set or print guards on patch, then use\n"
2855 2855 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2856 2856 " it has no guards or any positive guards match the currently\n"
2857 2857 " selected guard, but will not be pushed if any negative guards\n"
2858 2858 " match the current guard. For example:\n"
2859 2859 "\n"
2860 2860 " qguard foo.patch -stable (negative guard)\n"
2861 2861 " qguard bar.patch +stable (positive guard)\n"
2862 2862 " qselect stable\n"
2863 2863 "\n"
2864 2864 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2865 2865 " it has a negative match) but push bar.patch (because it has a\n"
2866 2866 " positive match).\n"
2867 2867 "\n"
2868 2868 " With no arguments, prints the currently active guards.\n"
2869 2869 " With one argument, sets the active guard.\n"
2870 2870 "\n"
2871 2871 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2872 2872 " When no guards are active, patches with positive guards are\n"
2873 2873 " skipped and patches with negative guards are pushed.\n"
2874 2874 "\n"
2875 2875 " qselect can change the guards on applied patches. It does not pop\n"
2876 2876 " guarded patches by default. Use --pop to pop back to the last\n"
2877 2877 " applied patch that is not guarded. Use --reapply (which implies\n"
2878 2878 " --pop) to push back to the current patch afterwards, but skip\n"
2879 2879 " guarded patches.\n"
2880 2880 "\n"
2881 2881 " Use -s/--series to print a list of all guards in the series file\n"
2882 2882 " (no other arguments needed). Use -v for more information."
2883 2883 msgstr ""
2884 2884
2885 2885 msgid "guards deactivated\n"
2886 2886 msgstr ""
2887 2887
2888 2888 #, python-format
2889 2889 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
2890 2890 msgstr ""
2891 2891
2892 2892 #, python-format
2893 2893 msgid "number of guarded, applied patches has changed from %d to %d\n"
2894 2894 msgstr ""
2895 2895
2896 2896 msgid "guards in series file:\n"
2897 2897 msgstr ""
2898 2898
2899 2899 msgid "no guards in series file\n"
2900 2900 msgstr ""
2901 2901
2902 2902 msgid "active guards:\n"
2903 2903 msgstr ""
2904 2904
2905 2905 msgid "no active guards\n"
2906 2906 msgstr ""
2907 2907
2908 2908 msgid "popping guarded patches\n"
2909 2909 msgstr ""
2910 2910
2911 2911 msgid "reapplying unguarded patches\n"
2912 2912 msgstr ""
2913 2913
2914 2914 msgid ""
2915 2915 "move applied patches into repository history\n"
2916 2916 "\n"
2917 2917 " Finishes the specified revisions (corresponding to applied\n"
2918 2918 " patches) by moving them out of mq control into regular repository\n"
2919 2919 " history.\n"
2920 2920 "\n"
2921 2921 " Accepts a revision range or the -a/--applied option. If --applied\n"
2922 2922 " is specified, all applied mq revisions are removed from mq\n"
2923 2923 " control. Otherwise, the given revisions must be at the base of the\n"
2924 2924 " stack of applied patches.\n"
2925 2925 "\n"
2926 2926 " This can be especially useful if your changes have been applied to\n"
2927 2927 " an upstream repository, or if you are about to push your changes\n"
2928 2928 " to upstream.\n"
2929 2929 " "
2930 2930 msgstr ""
2931 2931
2932 2932 msgid "no revisions specified"
2933 2933 msgstr ""
2934 2934
2935 2935 msgid "cannot commit over an applied mq patch"
2936 2936 msgstr ""
2937 2937
2938 2938 msgid "source has mq patches applied"
2939 2939 msgstr ""
2940 2940
2941 2941 #, python-format
2942 2942 msgid "mq status file refers to unknown node %s\n"
2943 2943 msgstr ""
2944 2944
2945 2945 #, python-format
2946 2946 msgid "Tag %s overrides mq patch of the same name\n"
2947 2947 msgstr ""
2948 2948
2949 2949 msgid "cannot import over an applied patch"
2950 2950 msgstr ""
2951 2951
2952 2952 msgid "print first line of patch header"
2953 2953 msgstr ""
2954 2954
2955 2955 msgid "hg qapplied [-s] [PATCH]"
2956 2956 msgstr ""
2957 2957
2958 2958 msgid "use pull protocol to copy metadata"
2959 2959 msgstr ""
2960 2960
2961 2961 msgid "do not update the new working directories"
2962 2962 msgstr ""
2963 2963
2964 2964 msgid "use uncompressed transfer (fast over LAN)"
2965 2965 msgstr ""
2966 2966
2967 2967 msgid "location of source patch repository"
2968 2968 msgstr ""
2969 2969
2970 2970 msgid "hg qclone [OPTION]... SOURCE [DEST]"
2971 2971 msgstr ""
2972 2972
2973 2973 msgid "hg qcommit [OPTION]... [FILE]..."
2974 2974 msgstr ""
2975 2975
2976 2976 msgid "hg qdiff [OPTION]... [FILE]..."
2977 2977 msgstr ""
2978 2978
2979 2979 msgid "keep patch file"
2980 2980 msgstr ""
2981 2981
2982 2982 msgid "stop managing a revision (DEPRECATED)"
2983 2983 msgstr ""
2984 2984
2985 2985 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
2986 2986 msgstr ""
2987 2987
2988 2988 msgid "edit patch header"
2989 2989 msgstr ""
2990 2990
2991 2991 msgid "keep folded patch files"
2992 2992 msgstr ""
2993 2993
2994 2994 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
2995 2995 msgstr ""
2996 2996
2997 2997 msgid "overwrite any local changes"
2998 2998 msgstr ""
2999 2999
3000 3000 msgid "hg qgoto [OPTION]... PATCH"
3001 3001 msgstr ""
3002 3002
3003 3003 msgid "list all patches and guards"
3004 3004 msgstr ""
3005 3005
3006 3006 msgid "drop all guards"
3007 3007 msgstr ""
3008 3008
3009 3009 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3010 3010 msgstr ""
3011 3011
3012 3012 msgid "hg qheader [PATCH]"
3013 3013 msgstr ""
3014 3014
3015 3015 msgid "import file in patch directory"
3016 3016 msgstr ""
3017 3017
3018 3018 msgid "name of patch file"
3019 3019 msgstr ""
3020 3020
3021 3021 msgid "overwrite existing files"
3022 3022 msgstr ""
3023 3023
3024 3024 msgid "place existing revisions under mq control"
3025 3025 msgstr ""
3026 3026
3027 3027 msgid "use git extended diff format"
3028 3028 msgstr "utiliser le format de patch étendu de git"
3029 3029
3030 3030 msgid "qpush after importing"
3031 3031 msgstr ""
3032 3032
3033 3033 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3034 3034 msgstr ""
3035 3035
3036 3036 msgid "create queue repository"
3037 3037 msgstr ""
3038 3038
3039 3039 msgid "hg qinit [-c]"
3040 3040 msgstr ""
3041 3041
3042 3042 msgid "import uncommitted changes into patch"
3043 3043 msgstr ""
3044 3044
3045 3045 msgid "add \"From: <current user>\" to patch"
3046 3046 msgstr ""
3047 3047
3048 3048 msgid "add \"From: <given user>\" to patch"
3049 3049 msgstr ""
3050 3050
3051 3051 msgid "add \"Date: <current date>\" to patch"
3052 3052 msgstr ""
3053 3053
3054 3054 msgid "add \"Date: <given date>\" to patch"
3055 3055 msgstr ""
3056 3056
3057 3057 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3058 3058 msgstr ""
3059 3059
3060 3060 msgid "hg qnext [-s]"
3061 3061 msgstr ""
3062 3062
3063 3063 msgid "hg qprev [-s]"
3064 3064 msgstr ""
3065 3065
3066 3066 msgid "pop all patches"
3067 3067 msgstr ""
3068 3068
3069 3069 msgid "queue name to pop"
3070 3070 msgstr ""
3071 3071
3072 3072 msgid "forget any local changes"
3073 3073 msgstr ""
3074 3074
3075 3075 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3076 3076 msgstr ""
3077 3077
3078 3078 msgid "apply if the patch has rejects"
3079 3079 msgstr ""
3080 3080
3081 3081 msgid "list patch name in commit text"
3082 3082 msgstr ""
3083 3083
3084 3084 msgid "apply all patches"
3085 3085 msgstr ""
3086 3086
3087 3087 msgid "merge from another queue"
3088 3088 msgstr ""
3089 3089
3090 3090 msgid "merge queue name"
3091 3091 msgstr ""
3092 3092
3093 3093 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3094 3094 msgstr ""
3095 3095
3096 3096 msgid "refresh only files already in the patch and specified files"
3097 3097 msgstr ""
3098 3098
3099 3099 msgid "add/update \"From: <current user>\" in patch"
3100 3100 msgstr ""
3101 3101
3102 3102 msgid "add/update \"From: <given user>\" in patch"
3103 3103 msgstr ""
3104 3104
3105 3105 msgid "update \"Date: <current date>\" in patch (if present)"
3106 3106 msgstr ""
3107 3107
3108 3108 msgid "update \"Date: <given date>\" in patch (if present)"
3109 3109 msgstr ""
3110 3110
3111 3111 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3112 3112 msgstr ""
3113 3113
3114 3114 msgid "hg qrename PATCH1 [PATCH2]"
3115 3115 msgstr ""
3116 3116
3117 3117 msgid "delete save entry"
3118 3118 msgstr ""
3119 3119
3120 3120 msgid "update queue working directory"
3121 3121 msgstr ""
3122 3122
3123 3123 msgid "hg qrestore [-d] [-u] REV"
3124 3124 msgstr ""
3125 3125
3126 3126 msgid "copy patch directory"
3127 3127 msgstr ""
3128 3128
3129 3129 msgid "copy directory name"
3130 3130 msgstr ""
3131 3131
3132 3132 msgid "clear queue status file"
3133 3133 msgstr ""
3134 3134
3135 3135 msgid "force copy"
3136 3136 msgstr ""
3137 3137
3138 3138 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3139 3139 msgstr ""
3140 3140
3141 3141 msgid "disable all guards"
3142 3142 msgstr ""
3143 3143
3144 3144 msgid "list all guards in series file"
3145 3145 msgstr ""
3146 3146
3147 3147 msgid "pop to before first guarded applied patch"
3148 3148 msgstr ""
3149 3149
3150 3150 msgid "pop, then reapply patches"
3151 3151 msgstr ""
3152 3152
3153 3153 msgid "hg qselect [OPTION]... [GUARD]..."
3154 3154 msgstr ""
3155 3155
3156 3156 msgid "print patches not in series"
3157 3157 msgstr ""
3158 3158
3159 3159 msgid "hg qseries [-ms]"
3160 3160 msgstr ""
3161 3161
3162 3162 msgid "force removal with local changes"
3163 3163 msgstr ""
3164 3164
3165 3165 msgid "bundle unrelated changesets"
3166 3166 msgstr ""
3167 3167
3168 3168 msgid "no backups"
3169 3169 msgstr ""
3170 3170
3171 3171 msgid "hg strip [-f] [-b] [-n] REV"
3172 3172 msgstr ""
3173 3173
3174 3174 msgid "hg qtop [-s]"
3175 3175 msgstr ""
3176 3176
3177 3177 msgid "hg qunapplied [-s] [PATCH]"
3178 3178 msgstr ""
3179 3179
3180 3180 msgid "finish all applied changesets"
3181 3181 msgstr ""
3182 3182
3183 3183 msgid "hg qfinish [-a] [REV...]"
3184 3184 msgstr ""
3185 3185
3186 3186 msgid ""
3187 3187 "send e-mail notifications for commits/pushes\n"
3188 3188 "\n"
3189 3189 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3190 3190 "messages to stdout, for testing and configuring.\n"
3191 3191 "\n"
3192 3192 "To use, configure notify extension and enable in hgrc like this:\n"
3193 3193 "\n"
3194 3194 " [extensions]\n"
3195 3195 " hgext.notify =\n"
3196 3196 "\n"
3197 3197 " [hooks]\n"
3198 3198 " # one email for each incoming changeset\n"
3199 3199 " incoming.notify = python:hgext.notify.hook\n"
3200 3200 " # batch emails when many changesets incoming at one time\n"
3201 3201 " changegroup.notify = python:hgext.notify.hook\n"
3202 3202 "\n"
3203 3203 " [notify]\n"
3204 3204 " # config items go in here\n"
3205 3205 "\n"
3206 3206 " config items:\n"
3207 3207 "\n"
3208 3208 " REQUIRED:\n"
3209 3209 " config = /path/to/file # file containing subscriptions\n"
3210 3210 "\n"
3211 3211 " OPTIONAL:\n"
3212 3212 " test = True # print messages to stdout for testing\n"
3213 3213 " strip = 3 # number of slashes to strip for url paths\n"
3214 3214 " domain = example.com # domain to use if committer missing domain\n"
3215 3215 " style = ... # style file to use when formatting email\n"
3216 3216 " template = ... # template to use when formatting email\n"
3217 3217 " incoming = ... # template to use when run as incoming hook\n"
3218 3218 " changegroup = ... # template when run as changegroup hook\n"
3219 3219 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3220 3220 " maxsubject = 67 # truncate subject line longer than this\n"
3221 3221 " diffstat = True # add a diffstat before the diff content\n"
3222 3222 " sources = serve # notify if source of incoming changes in this "
3223 3223 "list\n"
3224 3224 " # (serve == ssh or http, push, pull, bundle)\n"
3225 3225 " [email]\n"
3226 3226 " from = user@host.com # email address to send as if none given\n"
3227 3227 " [web]\n"
3228 3228 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3229 3229 "\n"
3230 3230 " notify config file has same format as regular hgrc. it has two\n"
3231 3231 " sections so you can express subscriptions in whatever way is handier\n"
3232 3232 " for you.\n"
3233 3233 "\n"
3234 3234 " [usersubs]\n"
3235 3235 " # key is subscriber email, value is \",\"-separated list of glob "
3236 3236 "patterns\n"
3237 3237 " user@host = pattern\n"
3238 3238 "\n"
3239 3239 " [reposubs]\n"
3240 3240 " # key is glob pattern, value is \",\"-separated list of subscriber "
3241 3241 "emails\n"
3242 3242 " pattern = user@host\n"
3243 3243 "\n"
3244 3244 " glob patterns are matched against path to repository root.\n"
3245 3245 "\n"
3246 3246 " if you like, you can put notify config file in repository that users\n"
3247 3247 " can push changes to, they can manage their own subscriptions."
3248 3248 msgstr ""
3249 3249
3250 3250 #, python-format
3251 3251 msgid "%s: %d new changesets"
3252 3252 msgstr ""
3253 3253
3254 3254 #, python-format
3255 3255 msgid "notify: sending %d subscribers %d changes\n"
3256 3256 msgstr ""
3257 3257
3258 3258 #, python-format
3259 3259 msgid ""
3260 3260 "\n"
3261 3261 "diffs (truncated from %d to %d lines):\n"
3262 3262 "\n"
3263 3263 msgstr ""
3264 3264
3265 3265 #, python-format
3266 3266 msgid ""
3267 3267 "\n"
3268 3268 "diffs (%d lines):\n"
3269 3269 "\n"
3270 3270 msgstr ""
3271 3271
3272 3272 #, python-format
3273 3273 msgid "notify: no subscribers to repository %s\n"
3274 3274 msgstr ""
3275 3275
3276 3276 #, python-format
3277 3277 msgid "notify: changes have source \"%s\" - skipping\n"
3278 3278 msgstr ""
3279 3279
3280 3280 msgid ""
3281 3281 "browse command output with an external pager\n"
3282 3282 "\n"
3283 3283 "To set the pager that should be used, set the application variable:\n"
3284 3284 "\n"
3285 3285 " [pager]\n"
3286 3286 " pager = LESS='FSRX' less\n"
3287 3287 "\n"
3288 3288 "If no pager is set, the pager extensions uses the environment variable\n"
3289 3289 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3290 3290 "\n"
3291 3291 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3292 3292 "setting:\n"
3293 3293 "\n"
3294 3294 " [pager]\n"
3295 3295 " quiet = True\n"
3296 3296 "\n"
3297 3297 "You can disable the pager for certain commands by adding them to the\n"
3298 3298 "pager.ignore list:\n"
3299 3299 "\n"
3300 3300 " [pager]\n"
3301 3301 " ignore = version, help, update\n"
3302 3302 "\n"
3303 3303 "You can also enable the pager only for certain commands using\n"
3304 3304 "pager.attend:\n"
3305 3305 "\n"
3306 3306 " [pager]\n"
3307 3307 " attend = log\n"
3308 3308 "\n"
3309 3309 "If pager.attend is present, pager.ignore will be ignored.\n"
3310 3310 "\n"
3311 3311 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3312 3312 "specify them in the global .hgrc\n"
3313 3313 msgstr ""
3314 3314
3315 3315 msgid ""
3316 3316 "interpret suffixes to refer to ancestor revisions\n"
3317 3317 "\n"
3318 3318 "This extension allows you to use git-style suffixes to refer to the\n"
3319 3319 "ancestors of a specific revision.\n"
3320 3320 "\n"
3321 3321 "For example, if you can refer to a revision as \"foo\", then:\n"
3322 3322 "\n"
3323 3323 "- foo^N = Nth parent of foo\n"
3324 3324 " foo^0 = foo\n"
3325 3325 " foo^1 = first parent of foo\n"
3326 3326 " foo^2 = second parent of foo\n"
3327 3327 " foo^ = foo^1\n"
3328 3328 "\n"
3329 3329 "- foo~N = Nth first grandparent of foo\n"
3330 3330 " foo~0 = foo\n"
3331 3331 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3332 3332 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3333 3333 msgstr ""
3334 3334
3335 3335 # cédric: première ligne trop longue (utilisée pour la liste d'extensions
3336 3336 # activée, une par ligne) -> traduction abrégée
3337 3337 msgid ""
3338 3338 "send Mercurial changesets as a series of patch e-mails\n"
3339 3339 "\n"
3340 3340 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3341 3341 "describes the series as a whole.\n"
3342 3342 "\n"
3343 3343 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3344 3344 "first line of the changeset description as the subject text. The\n"
3345 3345 "message contains two or three body parts:\n"
3346 3346 "\n"
3347 3347 " The changeset description.\n"
3348 3348 "\n"
3349 3349 " [Optional] The result of running diffstat on the patch.\n"
3350 3350 "\n"
3351 3351 " The patch itself, as generated by \"hg export\".\n"
3352 3352 "\n"
3353 3353 "Each message refers to the first in the series using the In-Reply-To\n"
3354 3354 "and References headers, so they will show up as a sequence in threaded\n"
3355 3355 "mail and news readers, and in mail archives.\n"
3356 3356 "\n"
3357 3357 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3358 3358 "with a diffstat summary and the changeset summary, so you can be sure\n"
3359 3359 "you are sending the right changes.\n"
3360 3360 "\n"
3361 3361 "To configure other defaults, add a section like this to your hgrc\n"
3362 3362 "file:\n"
3363 3363 "\n"
3364 3364 " [email]\n"
3365 3365 " from = My Name <my@email>\n"
3366 3366 " to = recipient1, recipient2, ...\n"
3367 3367 " cc = cc1, cc2, ...\n"
3368 3368 " bcc = bcc1, bcc2, ...\n"
3369 3369 "\n"
3370 3370 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3371 3371 "as a patchbomb.\n"
3372 3372 "\n"
3373 3373 "To avoid sending patches prematurely, it is a good idea to first run\n"
3374 3374 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3375 3375 "prompted for an email recipient address, a subject and an introductory\n"
3376 3376 "message describing the patches of your patchbomb. Then when all is\n"
3377 3377 "done, patchbomb messages are displayed. If the PAGER environment\n"
3378 3378 "variable is set, your pager will be fired up once for each patchbomb\n"
3379 3379 "message, so you can verify everything is alright.\n"
3380 3380 "\n"
3381 3381 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3382 3382 "patchbomb message in a pager or sending the messages directly, it will\n"
3383 3383 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3384 3384 "can be previewed with any mail user agent which supports UNIX mbox\n"
3385 3385 "files, e.g. with mutt:\n"
3386 3386 "\n"
3387 3387 " % mutt -R -f mbox\n"
3388 3388 "\n"
3389 3389 "When you are previewing the patchbomb messages, you can use `formail'\n"
3390 3390 "(a utility that is commonly installed as part of the procmail\n"
3391 3391 "package), to send each message out:\n"
3392 3392 "\n"
3393 3393 " % formail -s sendmail -bm -t < mbox\n"
3394 3394 "\n"
3395 3395 "That should be all. Now your patchbomb is on its way out.\n"
3396 3396 "\n"
3397 3397 "You can also either configure the method option in the email section\n"
3398 3398 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3399 3399 "that the patchbomb extension can automatically send patchbombs\n"
3400 3400 "directly from the commandline. See the [email] and [smtp] sections in\n"
3401 3401 "hgrc(5) for details."
3402 3402 msgstr ""
3403 3403 "envoi d'une série de \"changesets\" par courrier électronique\n"
3404 3404 "\n"
3405 3405 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3406 3406 "décrivant dans son ensemble.\n"
3407 3407 "\n"
3408 3408 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3409 3409 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3410 3410 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3411 3411 "parties :\n"
3412 3412 "\n"
3413 3413 " La description du \"changeset\".\n"
3414 3414 "\n"
3415 3415 " Optionnellement, un résumé des modifications généré par le\n"
3416 3416 " programme diffstat.\n"
3417 3417 "\n"
3418 3418 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3419 3419 "\n"
3420 3420 "Chaque message fait référence au premier de la série (à l'aide\n"
3421 3421 "des en-têtes de message In-Reply-To et References) de manière à\n"
3422 3422 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3423 3423 "électronique et de nouvelles, ainsi que dans les archives de\n"
3424 3424 "messagerie.\n"
3425 3425 "\n"
3426 3426 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3427 3427 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3428 3428 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3429 3429 "d'être certain de bien envoyer les bonnes modifications.\n"
3430 3430 "\n"
3431 3431 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3432 3432 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3433 3433 "\n"
3434 3434 " [email]\n"
3435 3435 " from = Mon Nom <mon@adresse_de_courriel>\n"
3436 3436 " to = destinataire1, destinataire2, ...\n"
3437 3437 " cc = cc1, cc2, ...\n"
3438 3438 " bcc = bcc1, bcc2, ...\n"
3439 3439 "\n"
3440 3440 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3441 3441 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3442 3442 "\n"
3443 3443 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3444 3444 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3445 3445 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3446 3446 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3447 3447 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3448 3448 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3449 3449 "l'affichage chaque message, permettant de vérifier que tout est\n"
3450 3450 "correct.\n"
3451 3451 "\n"
3452 3452 "L'option -m/--mbox est également très utile : au lieu que les\n"
3453 3453 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3454 3454 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3455 3455 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3456 3456 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3457 3457 "comme par exemple mutt :\n"
3458 3458 "\n"
3459 3459 " % mutt -R -f mbox\n"
3460 3460 "\n"
3461 3461 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3462 3462 "utilisant formail (un outil généralement installé en même temps que\n"
3463 3463 "procmail) :\n"
3464 3464 "\n"
3465 3465 " % formail -s sendmail -bm -t < mbox\n"
3466 3466 "\n"
3467 3467 "Et voilà, vos patchs sont en route vers leur destination.\n"
3468 3468 "\n"
3469 3469 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3470 3470 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3471 3471 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3472 3472 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3473 3473 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3474 3474 "page de manuel hgrc(5) pour plus de détails."
3475 3475
3476 3476 msgid "Please enter a valid value.\n"
3477 3477 msgstr "Veuillez fournir une valeur valide.\n"
3478 3478
3479 3479 msgid "does the diffstat above look okay? "
3480 3480 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3481 3481
3482 3482 msgid "diffstat rejected"
3483 3483 msgstr "résumé des modifications rejeté"
3484 3484
3485 3485 msgid ""
3486 3486 "send changesets by email\n"
3487 3487 "\n"
3488 3488 " By default, diffs are sent in the format generated by hg export,\n"
3489 3489 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3490 3490 " introduction, which describes the series as a whole.\n"
3491 3491 "\n"
3492 3492 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3493 3493 " the first line of the changeset description as the subject text.\n"
3494 3494 " The message contains two or three parts. First, the changeset\n"
3495 3495 " description. Next, (optionally) if the diffstat program is\n"
3496 3496 " installed and -d/--diffstat is used, the result of running\n"
3497 3497 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3498 3498 " \"hg export\".\n"
3499 3499 "\n"
3500 3500 " By default the patch is included as text in the email body for\n"
3501 3501 " easy reviewing. Using the -a/--attach option will instead create\n"
3502 3502 " an attachment for the patch. With -i/--inline an inline attachment\n"
3503 3503 " will be created.\n"
3504 3504 "\n"
3505 3505 " With -o/--outgoing, emails will be generated for patches not found\n"
3506 3506 " in the destination repository (or only those which are ancestors\n"
3507 3507 " of the specified revisions if any are provided)\n"
3508 3508 "\n"
3509 3509 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3510 3510 " single email containing a binary Mercurial bundle as an attachment\n"
3511 3511 " will be sent.\n"
3512 3512 "\n"
3513 3513 " Examples:\n"
3514 3514 "\n"
3515 3515 " hg email -r 3000 # send patch 3000 only\n"
3516 3516 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3517 3517 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3518 3518 " hg email 3000 # send patch 3000 (deprecated)\n"
3519 3519 "\n"
3520 3520 " hg email -o # send all patches not in default\n"
3521 3521 " hg email -o DEST # send all patches not in DEST\n"
3522 3522 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3523 3523 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3524 3524 "\n"
3525 3525 " hg email -b # send bundle of all patches not in default\n"
3526 3526 " hg email -b DEST # send bundle of all patches not in DEST\n"
3527 3527 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3528 3528 "default\n"
3529 3529 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3530 3530 "\n"
3531 3531 " Before using this command, you will need to enable email in your\n"
3532 3532 " hgrc. See the [email] section in hgrc(5) for details.\n"
3533 3533 " "
3534 3534 msgstr ""
3535 3535 "envoi de \"changesets\" par courrier électronique\n"
3536 3536 "\n"
3537 3537 " Par défaut, les modifications sont envoyées au format généré par\n"
3538 3538 " \"hg export\", une par message. La série débute par un message\n"
3539 3539 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3540 3540 "\n"
3541 3541 " Chaque courriel a pour sujet un résumé des modifications\n"
3542 3542 " apportées par le patch (pris en première ligne de la description\n"
3543 3543 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3544 3544 " Le message est constitué de deux ou trois parties. D'abord,\n"
3545 3545 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3546 3546 " un résumé des modifications généré par le programme diffstat si\n"
3547 3547 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3548 3548 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3549 3549 "\n"
3550 3550 " Par défaut le patch est inclus textuellement dans le corps du\n"
3551 3551 " message afin de faciliter les relectures et commentaires.\n"
3552 3552 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3553 3553 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3554 3554 " insère celle-ci dans le corps.\n"
3555 3555 "\n"
3556 3556 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3557 3557 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3558 3558 " ancêtres des révisions spécifiées, le cas échéant).\n"
3559 3559 "\n"
3560 3560 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3561 3561 " même manière que pour --outgoing, mais il seront envoyés via\n"
3562 3562 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3563 3563 "\n"
3564 3564 " Exemples :\n"
3565 3565 "\n"
3566 3566 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3567 3567 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3568 3568 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3569 3569 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3570 3570 "\n"
3571 3571 " hg email -o # envoyer les patchs absents de la\n"
3572 3572 " destination par défaut\n"
3573 3573 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3574 3574 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3575 3575 " de la destination par défaut\n"
3576 3576 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3577 3577 " de DEST\n"
3578 3578 "\n"
3579 3579 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3580 3580 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3581 3581 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3582 3582 " [email] pour plus de détails.\n"
3583 3583 " "
3584 3584
3585 3585 msgid "specify at least one changeset with -r or -o"
3586 3586 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3587 3587
3588 3588 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3589 3589 msgstr ""
3590 3590 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3591 3591 "bundle est utilisé"
3592 3592
3593 3593 msgid "too many destinations"
3594 3594 msgstr "trop de destinations"
3595 3595
3596 3596 msgid "use only one form to specify the revision"
3597 3597 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3598 3598
3599 3599 msgid ""
3600 3600 "\n"
3601 3601 "Write the introductory message for the patch series.\n"
3602 3602 "\n"
3603 3603 msgstr ""
3604 3604 "\n"
3605 3605 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3606 3606 "\n"
3607 3607
3608 3608 #, python-format
3609 3609 msgid ""
3610 3610 "This patch series consists of %d patches.\n"
3611 3611 "\n"
3612 3612 msgstr ""
3613 3613 "Cette série comporte %d patchs.\n"
3614 3614 "\n"
3615 3615
3616 3616 # diffstat sur l'ensemble des patchs
3617 3617 msgid "Final summary:\n"
3618 3618 msgstr "Résumé complet des modifications :\n"
3619 3619
3620 3620 # mode --test
3621 3621 msgid "Displaying "
3622 3622 msgstr "Affichage de "
3623 3623
3624 3624 # mode --mbox
3625 3625 msgid "Writing "
3626 3626 msgstr "Écriture de "
3627 3627
3628 3628 # mode d'envoi par défaut
3629 3629 msgid "Sending "
3630 3630 msgstr "Envoi de "
3631 3631
3632 3632 msgid "send patches as attachments"
3633 3633 msgstr "envoyer les patchs en tant que pièces jointes"
3634 3634
3635 3635 msgid "send patches as inline attachments"
3636 3636 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3637 3637
3638 3638 msgid "email addresses of blind carbon copy recipients"
3639 3639 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3640 3640
3641 3641 msgid "email addresses of copy recipients"
3642 3642 msgstr "adresses électroniques des destinataires en copie carbone"
3643 3643
3644 3644 msgid "add diffstat output to messages"
3645 3645 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3646 3646
3647 3647 msgid "use the given date as the sending date"
3648 3648 msgstr "utiliser la date fournie comme date d'envoi"
3649 3649
3650 3650 msgid "use the given file as the series description"
3651 3651 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3652 3652
3653 3653 msgid "email address of sender"
3654 3654 msgstr "adresse électronique de l'expéditeur"
3655 3655
3656 3656 msgid "print messages that would be sent"
3657 3657 msgstr "afficher les messages tels qu'ils seraient envoyés"
3658 3658
3659 3659 msgid "write messages to mbox file instead of sending them"
3660 3660 msgstr ""
3661 3661 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3662 3662
3663 3663 msgid "subject of first message (intro or single patch)"
3664 3664 msgstr "sujet du premier message (intro ou patch unique)"
3665 3665
3666 3666 msgid "message identifier to reply to"
3667 3667 msgstr "identifiant du message auquel répondre"
3668 3668
3669 3669 msgid "email addresses of recipients"
3670 3670 msgstr "adresses électroniques des destinataires"
3671 3671
3672 3672 msgid "omit hg patch header"
3673 3673 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3674 3674
3675 3675 msgid "send changes not found in the target repository"
3676 3676 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3677 3677
3678 3678 msgid "send changes not in target as a binary bundle"
3679 3679 msgstr ""
3680 3680 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3681 3681 "\"bundle\" binaire"
3682 3682
3683 3683 msgid "name of the bundle attachment file"
3684 3684 msgstr "nom à donner au fichier \"bundle\" envoyé"
3685 3685
3686 3686 msgid "a revision to send"
3687 3687 msgstr "une révision à envoyer"
3688 3688
3689 3689 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3690 3690 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3691 3691
3692 3692 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3693 3693 msgstr ""
3694 3694 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3695 3695 "(avec -b/--bundle)"
3696 3696
3697 3697 msgid "send an introduction email for a single patch"
3698 3698 msgstr "envoyer un courriel d'introduction pour un patch seul"
3699 3699
3700 3700 msgid "hg email [OPTION]... [DEST]..."
3701 3701 msgstr "hg email [OPTION]... [DEST]..."
3702 3702
3703 3703 msgid "delete files not tracked from the working directory"
3704 3704 msgstr ""
3705 3705
3706 3706 msgid ""
3707 3707 "removes files not tracked by Mercurial\n"
3708 3708 "\n"
3709 3709 " Delete files not known to Mercurial. This is useful to test local\n"
3710 3710 " and uncommitted changes in an otherwise-clean source tree.\n"
3711 3711 "\n"
3712 3712 " This means that purge will delete:\n"
3713 3713 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3714 3714 " - Empty directories: in fact Mercurial ignores directories unless\n"
3715 3715 " they contain files under source control management\n"
3716 3716 " But it will leave untouched:\n"
3717 3717 " - Modified and unmodified tracked files\n"
3718 3718 " - Ignored files (unless --all is specified)\n"
3719 3719 " - New files added to the repository (with \"hg add\")\n"
3720 3720 "\n"
3721 3721 " If directories are given on the command line, only files in these\n"
3722 3722 " directories are considered.\n"
3723 3723 "\n"
3724 3724 " Be careful with purge, as you could irreversibly delete some files\n"
3725 3725 " you forgot to add to the repository. If you only want to print the\n"
3726 3726 " list of files that this program would delete, use the --print\n"
3727 3727 " option.\n"
3728 3728 " "
3729 3729 msgstr ""
3730 3730
3731 3731 #, python-format
3732 3732 msgid "%s cannot be removed"
3733 3733 msgstr ""
3734 3734
3735 3735 #, python-format
3736 3736 msgid "warning: %s\n"
3737 3737 msgstr ""
3738 3738
3739 3739 #, python-format
3740 3740 msgid "Removing file %s\n"
3741 3741 msgstr ""
3742 3742
3743 3743 #, python-format
3744 3744 msgid "Removing directory %s\n"
3745 3745 msgstr ""
3746 3746
3747 3747 msgid "abort if an error occurs"
3748 3748 msgstr ""
3749 3749
3750 3750 msgid "purge ignored files too"
3751 3751 msgstr ""
3752 3752
3753 3753 msgid "print filenames instead of deleting them"
3754 3754 msgstr ""
3755 3755
3756 3756 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3757 3757 msgstr ""
3758 3758
3759 3759 msgid "hg purge [OPTION]... [DIR]..."
3760 3760 msgstr ""
3761 3761
3762 3762 msgid ""
3763 3763 "move sets of revisions to a different ancestor\n"
3764 3764 "\n"
3765 3765 "This extension lets you rebase changesets in an existing Mercurial\n"
3766 3766 "repository.\n"
3767 3767 "\n"
3768 3768 "For more information:\n"
3769 3769 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
3770 3770 msgstr ""
3771 3771
3772 3772 msgid "first revision, do not change ancestor\n"
3773 3773 msgstr ""
3774 3774
3775 3775 msgid ""
3776 3776 "move changeset (and descendants) to a different branch\n"
3777 3777 "\n"
3778 3778 " Rebase uses repeated merging to graft changesets from one part of\n"
3779 3779 " history onto another. This can be useful for linearizing local\n"
3780 3780 " changes relative to a master development tree.\n"
3781 3781 "\n"
3782 3782 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3783 3783 " continued with --continue/-c or aborted with --abort/-a.\n"
3784 3784 " "
3785 3785 msgstr ""
3786 3786
3787 3787 msgid "cannot use both abort and continue"
3788 3788 msgstr ""
3789 3789
3790 3790 msgid "cannot use collapse with continue or abort"
3791 3791 msgstr ""
3792 3792
3793 3793 msgid "abort and continue do not allow specifying revisions"
3794 3794 msgstr ""
3795 3795
3796 3796 msgid "cannot specify both a revision and a base"
3797 3797 msgstr ""
3798 3798
3799 3799 msgid "nothing to rebase\n"
3800 3800 msgstr ""
3801 3801
3802 3802 msgid "cannot use both keepbranches and extrafn"
3803 3803 msgstr ""
3804 3804
3805 3805 msgid "rebase merging completed\n"
3806 3806 msgstr ""
3807 3807
3808 3808 msgid "warning: new changesets detected on source branch, not stripping\n"
3809 3809 msgstr ""
3810 3810
3811 3811 msgid "rebase completed\n"
3812 3812 msgstr ""
3813 3813
3814 3814 #, python-format
3815 3815 msgid "%d revisions have been skipped\n"
3816 3816 msgstr ""
3817 3817
3818 3818 msgid " set parents\n"
3819 3819 msgstr ""
3820 3820
3821 3821 #, python-format
3822 3822 msgid "rebasing %d:%s\n"
3823 3823 msgstr ""
3824 3824
3825 3825 #, python-format
3826 3826 msgid " future parents are %d and %d\n"
3827 3827 msgstr ""
3828 3828
3829 3829 #, python-format
3830 3830 msgid " update to %d:%s\n"
3831 3831 msgstr ""
3832 3832
3833 3833 msgid " already in target\n"
3834 3834 msgstr ""
3835 3835
3836 3836 #, python-format
3837 3837 msgid " merge against %d:%s\n"
3838 3838 msgstr ""
3839 3839
3840 3840 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3841 3841 msgstr ""
3842 3842
3843 3843 msgid "resuming interrupted rebase\n"
3844 3844 msgstr ""
3845 3845
3846 3846 #, python-format
3847 3847 msgid "no changes, revision %d skipped\n"
3848 3848 msgstr ""
3849 3849
3850 3850 #, python-format
3851 3851 msgid "next revision set to %s\n"
3852 3852 msgstr ""
3853 3853
3854 3854 #, python-format
3855 3855 msgid "cannot use revision %d as base, result would have 3 parents"
3856 3856 msgstr ""
3857 3857
3858 3858 #, python-format
3859 3859 msgid "revision %d is an mq patch (%s), finalize it.\n"
3860 3860 msgstr ""
3861 3861
3862 3862 #, python-format
3863 3863 msgid "import mq patch %d (%s)\n"
3864 3864 msgstr ""
3865 3865
3866 3866 msgid "rebase status stored\n"
3867 3867 msgstr ""
3868 3868
3869 3869 msgid "rebase status resumed\n"
3870 3870 msgstr ""
3871 3871
3872 3872 msgid "no rebase in progress"
3873 3873 msgstr ""
3874 3874
3875 3875 msgid "warning: new changesets detected on target branch, not stripping\n"
3876 3876 msgstr ""
3877 3877
3878 3878 msgid "rebase aborted\n"
3879 3879 msgstr ""
3880 3880
3881 3881 msgid "cannot rebase onto an applied mq patch"
3882 3882 msgstr ""
3883 3883
3884 3884 msgid "cannot rebase an ancestor"
3885 3885 msgstr ""
3886 3886
3887 3887 msgid "cannot rebase a descendant"
3888 3888 msgstr ""
3889 3889
3890 3890 msgid "already working on current\n"
3891 3891 msgstr ""
3892 3892
3893 3893 msgid "already working on the current branch\n"
3894 3894 msgstr ""
3895 3895
3896 3896 #, python-format
3897 3897 msgid "rebase onto %d starting from %d\n"
3898 3898 msgstr ""
3899 3899
3900 3900 msgid "unable to collapse, there is more than one external parent"
3901 3901 msgstr ""
3902 3902
3903 3903 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3904 3904 msgstr ""
3905 3905
3906 3906 msgid "rebase working directory to branch head"
3907 3907 msgstr ""
3908 3908
3909 3909 msgid "rebase from a given revision"
3910 3910 msgstr ""
3911 3911
3912 3912 msgid "rebase from the base of a given revision"
3913 3913 msgstr ""
3914 3914
3915 3915 msgid "rebase onto a given revision"
3916 3916 msgstr ""
3917 3917
3918 3918 msgid "collapse the rebased revisions"
3919 3919 msgstr ""
3920 3920
3921 3921 msgid "keep original revisions"
3922 3922 msgstr ""
3923 3923
3924 3924 msgid "keep original branches"
3925 3925 msgstr ""
3926 3926
3927 3927 msgid "continue an interrupted rebase"
3928 3928 msgstr ""
3929 3929
3930 3930 msgid "abort an interrupted rebase"
3931 3931 msgstr ""
3932 3932
3933 3933 msgid ""
3934 3934 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
3935 3935 "| [-c] | [-a]"
3936 3936 msgstr ""
3937 3937
3938 3938 msgid "interactively select which sets of changes to commit/qrefresh"
3939 3939 msgstr ""
3940 3940
3941 3941 msgid "this modifies a binary file (all or nothing)\n"
3942 3942 msgstr ""
3943 3943
3944 3944 msgid "this is a binary file\n"
3945 3945 msgstr ""
3946 3946
3947 3947 #, python-format
3948 3948 msgid "%d hunks, %d lines changed\n"
3949 3949 msgstr ""
3950 3950
3951 3951 msgid "[Ynsfdaq?]"
3952 3952 msgstr ""
3953 3953
3954 3954 msgid "&Yes, record this change"
3955 3955 msgstr ""
3956 3956
3957 3957 msgid "&No, skip this change"
3958 3958 msgstr ""
3959 3959
3960 3960 msgid "&Skip remaining changes to this file"
3961 3961 msgstr ""
3962 3962
3963 3963 msgid "Record remaining changes to this &file"
3964 3964 msgstr ""
3965 3965
3966 3966 msgid "&Done, skip remaining changes and files"
3967 3967 msgstr ""
3968 3968
3969 3969 msgid "Record &all changes to all remaining files"
3970 3970 msgstr ""
3971 3971
3972 3972 msgid "&Quit, recording no changes"
3973 3973 msgstr ""
3974 3974
3975 3975 msgid "&?"
3976 3976 msgstr ""
3977 3977
3978 3978 msgid "y"
3979 3979 msgstr ""
3980 3980
3981 3981 msgid "?"
3982 3982 msgstr ""
3983 3983
3984 3984 msgid "y - record this change"
3985 3985 msgstr ""
3986 3986
3987 3987 msgid "s"
3988 3988 msgstr ""
3989 3989
3990 3990 msgid "f"
3991 3991 msgstr ""
3992 3992
3993 3993 msgid "d"
3994 3994 msgstr ""
3995 3995
3996 3996 msgid "a"
3997 3997 msgstr ""
3998 3998
3999 3999 msgid "q"
4000 4000 msgstr ""
4001 4001
4002 4002 msgid "user quit"
4003 4003 msgstr ""
4004 4004
4005 4005 #, python-format
4006 4006 msgid "examine changes to %s?"
4007 4007 msgstr ""
4008 4008
4009 4009 msgid " and "
4010 4010 msgstr ""
4011 4011
4012 4012 #, python-format
4013 4013 msgid "record this change to %r?"
4014 4014 msgstr ""
4015 4015
4016 4016 #, python-format
4017 4017 msgid "record change %d/%d to %r?"
4018 4018 msgstr ""
4019 4019
4020 4020 msgid ""
4021 4021 "interactively select changes to commit\n"
4022 4022 "\n"
4023 4023 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4024 4024 " will be candidates for recording.\n"
4025 4025 "\n"
4026 4026 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4027 4027 "\n"
4028 4028 " You will be prompted for whether to record changes to each\n"
4029 4029 " modified file, and for files with multiple changes, for each\n"
4030 4030 " change to use. For each query, the following responses are\n"
4031 4031 " possible:\n"
4032 4032 "\n"
4033 4033 " y - record this change\n"
4034 4034 " n - skip this change\n"
4035 4035 "\n"
4036 4036 " s - skip remaining changes to this file\n"
4037 4037 " f - record remaining changes to this file\n"
4038 4038 "\n"
4039 4039 " d - done, skip remaining changes and files\n"
4040 4040 " a - record all changes to all remaining files\n"
4041 4041 " q - quit, recording no changes\n"
4042 4042 "\n"
4043 4043 " ? - display help"
4044 4044 msgstr ""
4045 4045
4046 4046 msgid "'mq' extension not loaded"
4047 4047 msgstr ""
4048 4048
4049 4049 msgid "running non-interactively, use commit instead"
4050 4050 msgstr ""
4051 4051
4052 4052 msgid "no changes to record\n"
4053 4053 msgstr ""
4054 4054
4055 4055 #, python-format
4056 4056 msgid "backup %r as %r\n"
4057 4057 msgstr ""
4058 4058
4059 4059 msgid "applying patch\n"
4060 4060 msgstr ""
4061 4061
4062 4062 msgid "patch failed to apply"
4063 4063 msgstr ""
4064 4064
4065 4065 #, python-format
4066 4066 msgid "restoring %r to %r\n"
4067 4067 msgstr ""
4068 4068
4069 4069 msgid "hg record [OPTION]... [FILE]..."
4070 4070 msgstr ""
4071 4071
4072 4072 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4073 4073 msgstr ""
4074 4074
4075 4075 msgid "share a common history between several working directories"
4076 4076 msgstr ""
4077 4077
4078 4078 msgid ""
4079 4079 "create a new shared repository (experimental)\n"
4080 4080 "\n"
4081 4081 " Initialize a new repository and working directory that shares its\n"
4082 4082 " history with another repository.\n"
4083 4083 "\n"
4084 4084 " NOTE: actions that change history such as rollback or moving the\n"
4085 4085 " source may confuse sharers.\n"
4086 4086 " "
4087 4087 msgstr ""
4088 4088
4089 4089 msgid "do not create a working copy"
4090 4090 msgstr ""
4091 4091
4092 4092 msgid "[-U] SOURCE [DEST]"
4093 4093 msgstr ""
4094 4094
4095 4095 msgid ""
4096 4096 "transplant changesets from another branch\n"
4097 4097 "\n"
4098 4098 "This extension allows you to transplant patches from another branch.\n"
4099 4099 "\n"
4100 4100 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4101 4101 "map from a changeset hash to its hash in the source repository.\n"
4102 4102 msgstr ""
4103 4103
4104 4104 #, python-format
4105 4105 msgid "skipping already applied revision %s\n"
4106 4106 msgstr ""
4107 4107
4108 4108 #, python-format
4109 4109 msgid "skipping merge changeset %s:%s\n"
4110 4110 msgstr ""
4111 4111
4112 4112 #, python-format
4113 4113 msgid "%s merged at %s\n"
4114 4114 msgstr ""
4115 4115
4116 4116 #, python-format
4117 4117 msgid "%s transplanted to %s\n"
4118 4118 msgstr ""
4119 4119
4120 4120 #, python-format
4121 4121 msgid "filtering %s\n"
4122 4122 msgstr ""
4123 4123
4124 4124 msgid "filter failed"
4125 4125 msgstr ""
4126 4126
4127 4127 msgid "can only omit patchfile if merging"
4128 4128 msgstr ""
4129 4129
4130 4130 #, python-format
4131 4131 msgid "%s: empty changeset"
4132 4132 msgstr ""
4133 4133
4134 4134 msgid "Fix up the merge and run hg transplant --continue"
4135 4135 msgstr ""
4136 4136
4137 4137 #, python-format
4138 4138 msgid "%s transplanted as %s\n"
4139 4139 msgstr ""
4140 4140
4141 4141 msgid "transplant log file is corrupt"
4142 4142 msgstr ""
4143 4143
4144 4144 #, python-format
4145 4145 msgid "working dir not at transplant parent %s"
4146 4146 msgstr ""
4147 4147
4148 4148 msgid "commit failed"
4149 4149 msgstr ""
4150 4150
4151 4151 msgid "apply changeset? [ynmpcq?]:"
4152 4152 msgstr ""
4153 4153
4154 4154 msgid ""
4155 4155 "transplant changesets from another branch\n"
4156 4156 "\n"
4157 4157 " Selected changesets will be applied on top of the current working\n"
4158 4158 " directory with the log of the original changeset. If --log is\n"
4159 4159 " specified, log messages will have a comment appended of the form:\n"
4160 4160 "\n"
4161 4161 " (transplanted from CHANGESETHASH)\n"
4162 4162 "\n"
4163 4163 " You can rewrite the changelog message with the --filter option.\n"
4164 4164 " Its argument will be invoked with the current changelog message as\n"
4165 4165 " $1 and the patch as $2.\n"
4166 4166 "\n"
4167 4167 " If --source/-s is specified, selects changesets from the named\n"
4168 4168 " repository. If --branch/-b is specified, selects changesets from\n"
4169 4169 " the branch holding the named revision, up to that revision. If\n"
4170 4170 " --all/-a is specified, all changesets on the branch will be\n"
4171 4171 " transplanted, otherwise you will be prompted to select the\n"
4172 4172 " changesets you want.\n"
4173 4173 "\n"
4174 4174 " hg transplant --branch REVISION --all will rebase the selected\n"
4175 4175 " branch (up to the named revision) onto your current working\n"
4176 4176 " directory.\n"
4177 4177 "\n"
4178 4178 " You can optionally mark selected transplanted changesets as merge\n"
4179 4179 " changesets. You will not be prompted to transplant any ancestors\n"
4180 4180 " of a merged transplant, and you can merge descendants of them\n"
4181 4181 " normally instead of transplanting them.\n"
4182 4182 "\n"
4183 4183 " If no merges or revisions are provided, hg transplant will start\n"
4184 4184 " an interactive changeset browser.\n"
4185 4185 "\n"
4186 4186 " If a changeset application fails, you can fix the merge by hand\n"
4187 4187 " and then resume where you left off by calling hg transplant\n"
4188 4188 " --continue/-c.\n"
4189 4189 " "
4190 4190 msgstr ""
4191 4191
4192 4192 msgid "--continue is incompatible with branch, all or merge"
4193 4193 msgstr ""
4194 4194
4195 4195 msgid "no source URL, branch tag or revision list provided"
4196 4196 msgstr ""
4197 4197
4198 4198 msgid "--all requires a branch revision"
4199 4199 msgstr ""
4200 4200
4201 4201 msgid "--all is incompatible with a revision list"
4202 4202 msgstr ""
4203 4203
4204 4204 msgid "no revision checked out"
4205 4205 msgstr ""
4206 4206
4207 4207 msgid "outstanding uncommitted merges"
4208 4208 msgstr ""
4209 4209
4210 4210 msgid "outstanding local changes"
4211 4211 msgstr ""
4212 4212
4213 4213 msgid "pull patches from REPOSITORY"
4214 4214 msgstr ""
4215 4215
4216 4216 msgid "pull patches from branch BRANCH"
4217 4217 msgstr ""
4218 4218
4219 4219 msgid "pull all changesets up to BRANCH"
4220 4220 msgstr ""
4221 4221
4222 4222 msgid "skip over REV"
4223 4223 msgstr ""
4224 4224
4225 4225 msgid "merge at REV"
4226 4226 msgstr ""
4227 4227
4228 4228 msgid "append transplant info to log message"
4229 4229 msgstr ""
4230 4230
4231 4231 msgid "continue last transplant session after repair"
4232 4232 msgstr ""
4233 4233
4234 4234 msgid "filter changesets through FILTER"
4235 4235 msgstr ""
4236 4236
4237 4237 msgid ""
4238 4238 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4239 4239 msgstr ""
4240 4240
4241 4241 msgid ""
4242 4242 "allow the use of MBCS paths with problematic encoding\n"
4243 4243 "\n"
4244 4244 "Some MBCS encodings are not good for some path operations (i.e.\n"
4245 4245 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4246 4246 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4247 4247 "This extension can be used to fix the issue with those encodings by\n"
4248 4248 "wrapping some functions to convert to Unicode string before path\n"
4249 4249 "operation.\n"
4250 4250 "\n"
4251 4251 "This extension is useful for:\n"
4252 4252 " * Japanese Windows users using shift_jis encoding.\n"
4253 4253 " * Chinese Windows users using big5 encoding.\n"
4254 4254 " * All users who use a repository with one of problematic encodings on\n"
4255 4255 " case-insensitive file system.\n"
4256 4256 "\n"
4257 4257 "This extension is not needed for:\n"
4258 4258 " * Any user who use only ASCII chars in path.\n"
4259 4259 " * Any user who do not use any of problematic encodings.\n"
4260 4260 "\n"
4261 4261 "Note that there are some limitations on using this extension:\n"
4262 4262 " * You should use single encoding in one repository.\n"
4263 4263 " * You should set same encoding for the repository by locale or\n"
4264 4264 " HGENCODING.\n"
4265 4265 "\n"
4266 4266 "Path encoding conversion are done between Unicode and\n"
4267 4267 "encoding.encoding which is decided by Mercurial from current locale\n"
4268 4268 "setting or HGENCODING.\n"
4269 4269 msgstr ""
4270 4270
4271 4271 #, python-format
4272 4272 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4273 4273 msgstr ""
4274 4274
4275 4275 msgid "[win32mbcs] cannot activate on this platform.\n"
4276 4276 msgstr ""
4277 4277
4278 4278 #, python-format
4279 4279 msgid "[win32mbcs] activated with encoding: %s\n"
4280 4280 msgstr ""
4281 4281
4282 4282 msgid ""
4283 4283 "perform automatic newline conversion\n"
4284 4284 "\n"
4285 4285 "To perform automatic newline conversion, use:\n"
4286 4286 "\n"
4287 4287 "[extensions]\n"
4288 4288 "hgext.win32text =\n"
4289 4289 "[encode]\n"
4290 4290 "** = cleverencode:\n"
4291 4291 "# or ** = macencode:\n"
4292 4292 "\n"
4293 4293 "[decode]\n"
4294 4294 "** = cleverdecode:\n"
4295 4295 "# or ** = macdecode:\n"
4296 4296 "\n"
4297 4297 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4298 4298 "accident:\n"
4299 4299 "\n"
4300 4300 "[hooks]\n"
4301 4301 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4302 4302 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4303 4303 "\n"
4304 4304 "To do the same check on a server to prevent CRLF/CR from being\n"
4305 4305 "pushed or pulled:\n"
4306 4306 "\n"
4307 4307 "[hooks]\n"
4308 4308 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4309 4309 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4310 4310 msgstr ""
4311 4311
4312 4312 #, python-format
4313 4313 msgid ""
4314 4314 "WARNING: %s already has %s line endings\n"
4315 4315 "and does not need EOL conversion by the win32text plugin.\n"
4316 4316 "Before your next commit, please reconsider your encode/decode settings in \n"
4317 4317 "Mercurial.ini or %s.\n"
4318 4318 msgstr ""
4319 4319
4320 4320 #, python-format
4321 4321 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4322 4322 msgstr ""
4323 4323
4324 4324 #, python-format
4325 4325 msgid "in %s: %s\n"
4326 4326 msgstr ""
4327 4327
4328 4328 #, python-format
4329 4329 msgid ""
4330 4330 "\n"
4331 4331 "To prevent this mistake in your local repository,\n"
4332 4332 "add to Mercurial.ini or .hg/hgrc:\n"
4333 4333 "\n"
4334 4334 "[hooks]\n"
4335 4335 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4336 4336 "\n"
4337 4337 "and also consider adding:\n"
4338 4338 "\n"
4339 4339 "[extensions]\n"
4340 4340 "hgext.win32text =\n"
4341 4341 "[encode]\n"
4342 4342 "** = %sencode:\n"
4343 4343 "[decode]\n"
4344 4344 "** = %sdecode:\n"
4345 4345 msgstr ""
4346 4346
4347 4347 msgid ""
4348 4348 "discover and advertise repositories on the local network\n"
4349 4349 "\n"
4350 4350 "Zeroconf enabled repositories will be announced in a network without\n"
4351 4351 "the need to configure a server or a service. They can be discovered\n"
4352 4352 "without knowing their actual IP address.\n"
4353 4353 "\n"
4354 4354 "To allow other people to discover your repository using run \"hg serve\"\n"
4355 4355 "in your repository.\n"
4356 4356 "\n"
4357 4357 " $ cd test\n"
4358 4358 " $ hg serve\n"
4359 4359 "\n"
4360 4360 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4361 4361 "\n"
4362 4362 " $ hg paths\n"
4363 4363 " zc-test = http://example.com:8000/test\n"
4364 4364 msgstr ""
4365 4365
4366 4366 msgid "archive prefix contains illegal components"
4367 4367 msgstr ""
4368 4368
4369 4369 msgid "cannot give prefix when archiving to files"
4370 4370 msgstr ""
4371 4371
4372 4372 #, python-format
4373 4373 msgid "unknown archive type '%s'"
4374 4374 msgstr ""
4375 4375
4376 4376 msgid "invalid changegroup"
4377 4377 msgstr ""
4378 4378
4379 4379 msgid "unknown parent"
4380 4380 msgstr ""
4381 4381
4382 4382 #, python-format
4383 4383 msgid "integrity check failed on %s:%d"
4384 4384 msgstr ""
4385 4385
4386 4386 #, python-format
4387 4387 msgid "%s: not a Mercurial bundle file"
4388 4388 msgstr ""
4389 4389
4390 4390 #, python-format
4391 4391 msgid "%s: unknown bundle version"
4392 4392 msgstr ""
4393 4393
4394 4394 #, python-format
4395 4395 msgid "%s: unknown bundle compression type"
4396 4396 msgstr ""
4397 4397
4398 4398 msgid "cannot create new bundle repository"
4399 4399 msgstr ""
4400 4400
4401 4401 #, python-format
4402 4402 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4403 4403 msgstr ""
4404 4404
4405 4405 msgid "empty username"
4406 4406 msgstr ""
4407 4407
4408 4408 #, python-format
4409 4409 msgid "username %s contains a newline"
4410 4410 msgstr ""
4411 4411
4412 4412 msgid "options --message and --logfile are mutually exclusive"
4413 4413 msgstr ""
4414 4414
4415 4415 #, python-format
4416 4416 msgid "can't read commit message '%s': %s"
4417 4417 msgstr ""
4418 4418
4419 4419 msgid "limit must be a positive integer"
4420 4420 msgstr ""
4421 4421
4422 4422 msgid "limit must be positive"
4423 4423 msgstr ""
4424 4424
4425 4425 msgid "too many revisions specified"
4426 4426 msgstr ""
4427 4427
4428 4428 #, python-format
4429 4429 msgid "invalid format spec '%%%s' in output filename"
4430 4430 msgstr ""
4431 4431
4432 4432 #, python-format
4433 4433 msgid "adding %s\n"
4434 4434 msgstr ""
4435 4435
4436 4436 #, python-format
4437 4437 msgid "removing %s\n"
4438 4438 msgstr ""
4439 4439
4440 4440 #, python-format
4441 4441 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4442 4442 msgstr ""
4443 4443
4444 4444 #, python-format
4445 4445 msgid "%s: not copying - file is not managed\n"
4446 4446 msgstr ""
4447 4447
4448 4448 #, python-format
4449 4449 msgid "%s: not copying - file has been marked for remove\n"
4450 4450 msgstr ""
4451 4451
4452 4452 #, python-format
4453 4453 msgid "%s: not overwriting - %s collides with %s\n"
4454 4454 msgstr ""
4455 4455
4456 4456 #, python-format
4457 4457 msgid "%s: not overwriting - file exists\n"
4458 4458 msgstr ""
4459 4459
4460 4460 #, python-format
4461 4461 msgid "%s: deleted in working copy\n"
4462 4462 msgstr ""
4463 4463
4464 4464 #, python-format
4465 4465 msgid "%s: cannot copy - %s\n"
4466 4466 msgstr ""
4467 4467
4468 4468 #, python-format
4469 4469 msgid "moving %s to %s\n"
4470 4470 msgstr ""
4471 4471
4472 4472 #, python-format
4473 4473 msgid "copying %s to %s\n"
4474 4474 msgstr ""
4475 4475
4476 4476 #, python-format
4477 4477 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4478 4478 msgstr ""
4479 4479
4480 4480 msgid "no source or destination specified"
4481 4481 msgstr ""
4482 4482
4483 4483 msgid "no destination specified"
4484 4484 msgstr ""
4485 4485
4486 4486 msgid "with multiple sources, destination must be an existing directory"
4487 4487 msgstr ""
4488 4488
4489 4489 #, python-format
4490 4490 msgid "destination %s is not a directory"
4491 4491 msgstr ""
4492 4492
4493 4493 msgid "no files to copy"
4494 4494 msgstr ""
4495 4495
4496 4496 msgid "(consider using --after)\n"
4497 4497 msgstr ""
4498 4498
4499 4499 #, python-format
4500 4500 msgid "changeset: %d:%s\n"
4501 4501 msgstr ""
4502 4502
4503 4503 #, python-format
4504 4504 msgid "branch: %s\n"
4505 4505 msgstr ""
4506 4506
4507 4507 #, python-format
4508 4508 msgid "tag: %s\n"
4509 4509 msgstr ""
4510 4510
4511 4511 #, python-format
4512 4512 msgid "parent: %d:%s\n"
4513 4513 msgstr ""
4514 4514
4515 4515 #, python-format
4516 4516 msgid "manifest: %d:%s\n"
4517 4517 msgstr ""
4518 4518
4519 4519 #, python-format
4520 4520 msgid "user: %s\n"
4521 4521 msgstr ""
4522 4522
4523 4523 #, python-format
4524 4524 msgid "date: %s\n"
4525 4525 msgstr ""
4526 4526
4527 4527 msgid "files+:"
4528 4528 msgstr ""
4529 4529
4530 4530 msgid "files-:"
4531 4531 msgstr ""
4532 4532
4533 4533 msgid "files:"
4534 4534 msgstr ""
4535 4535
4536 4536 #, python-format
4537 4537 msgid "files: %s\n"
4538 4538 msgstr ""
4539 4539
4540 4540 #, python-format
4541 4541 msgid "copies: %s\n"
4542 4542 msgstr ""
4543 4543
4544 4544 #, python-format
4545 4545 msgid "extra: %s=%s\n"
4546 4546 msgstr ""
4547 4547
4548 4548 msgid "description:\n"
4549 4549 msgstr ""
4550 4550
4551 4551 #, python-format
4552 4552 msgid "summary: %s\n"
4553 4553 msgstr ""
4554 4554
4555 4555 #, python-format
4556 4556 msgid "%s: no key named '%s'"
4557 4557 msgstr ""
4558 4558
4559 4559 #, python-format
4560 4560 msgid "%s: %s"
4561 4561 msgstr ""
4562 4562
4563 4563 #, python-format
4564 4564 msgid "Found revision %s from %s\n"
4565 4565 msgstr ""
4566 4566
4567 4567 msgid "revision matching date not found"
4568 4568 msgstr ""
4569 4569
4570 4570 #, python-format
4571 4571 msgid "cannot follow nonexistent file: \"%s\""
4572 4572 msgstr ""
4573 4573
4574 4574 #, python-format
4575 4575 msgid "%s:%s copy source revision cannot be found!\n"
4576 4576 msgstr ""
4577 4577
4578 4578 msgid "can only follow copies/renames for explicit filenames"
4579 4579 msgstr ""
4580 4580
4581 4581 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4582 4582 msgstr ""
4583 4583
4584 4584 msgid "HG: Leave message empty to abort commit."
4585 4585 msgstr ""
4586 4586
4587 4587 #, python-format
4588 4588 msgid "HG: user: %s"
4589 4589 msgstr ""
4590 4590
4591 4591 msgid "HG: branch merge"
4592 4592 msgstr ""
4593 4593
4594 4594 #, python-format
4595 4595 msgid "HG: branch '%s'"
4596 4596 msgstr ""
4597 4597
4598 4598 #, python-format
4599 4599 msgid "HG: added %s"
4600 4600 msgstr ""
4601 4601
4602 4602 #, python-format
4603 4603 msgid "HG: changed %s"
4604 4604 msgstr ""
4605 4605
4606 4606 #, python-format
4607 4607 msgid "HG: removed %s"
4608 4608 msgstr ""
4609 4609
4610 4610 msgid "HG: no files changed"
4611 4611 msgstr ""
4612 4612
4613 4613 msgid "empty commit message"
4614 4614 msgstr ""
4615 4615
4616 4616 msgid ""
4617 4617 "add the specified files on the next commit\n"
4618 4618 "\n"
4619 4619 " Schedule files to be version controlled and added to the\n"
4620 4620 " repository.\n"
4621 4621 "\n"
4622 4622 " The files will be added to the repository at the next commit. To\n"
4623 4623 " undo an add before that, see hg forget.\n"
4624 4624 "\n"
4625 4625 " If no names are given, add all files to the repository.\n"
4626 4626 " "
4627 4627 msgstr ""
4628 4628
4629 4629 msgid ""
4630 4630 "add all new files, delete all missing files\n"
4631 4631 "\n"
4632 4632 " Add all new files and remove all missing files from the\n"
4633 4633 " repository.\n"
4634 4634 "\n"
4635 4635 " New files are ignored if they match any of the patterns in\n"
4636 4636 " .hgignore. As with add, these changes take effect at the next\n"
4637 4637 " commit.\n"
4638 4638 "\n"
4639 4639 " Use the -s/--similarity option to detect renamed files. With a\n"
4640 4640 " parameter > 0, this compares every removed file with every added\n"
4641 4641 " file and records those similar enough as renames. This option\n"
4642 4642 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4643 4643 " identical) as its parameter. Detecting renamed files this way can\n"
4644 4644 " be expensive.\n"
4645 4645 " "
4646 4646 msgstr ""
4647 4647
4648 4648 msgid "similarity must be a number"
4649 4649 msgstr ""
4650 4650
4651 4651 msgid "similarity must be between 0 and 100"
4652 4652 msgstr ""
4653 4653
4654 4654 msgid ""
4655 4655 "show changeset information by line for each file\n"
4656 4656 "\n"
4657 4657 " List changes in files, showing the revision id responsible for\n"
4658 4658 " each line\n"
4659 4659 "\n"
4660 4660 " This command is useful for discovering when a change was made and\n"
4661 4661 " by whom.\n"
4662 4662 "\n"
4663 4663 " Without the -a/--text option, annotate will avoid processing files\n"
4664 4664 " it detects as binary. With -a, annotate will annotate the file\n"
4665 4665 " anyway, although the results will probably be neither useful\n"
4666 4666 " nor desirable.\n"
4667 4667 " "
4668 4668 msgstr ""
4669 4669
4670 4670 msgid "at least one filename or pattern is required"
4671 4671 msgstr ""
4672 4672
4673 4673 msgid "at least one of -n/-c is required for -l"
4674 4674 msgstr ""
4675 4675
4676 4676 #, python-format
4677 4677 msgid "%s: binary file\n"
4678 4678 msgstr ""
4679 4679
4680 4680 msgid ""
4681 4681 "create an unversioned archive of a repository revision\n"
4682 4682 "\n"
4683 4683 " By default, the revision used is the parent of the working\n"
4684 4684 " directory; use -r/--rev to specify a different revision.\n"
4685 4685 "\n"
4686 4686 " To specify the type of archive to create, use -t/--type. Valid\n"
4687 4687 " types are:\n"
4688 4688 "\n"
4689 4689 " \"files\" (default): a directory full of files\n"
4690 4690 " \"tar\": tar archive, uncompressed\n"
4691 4691 " \"tbz2\": tar archive, compressed using bzip2\n"
4692 4692 " \"tgz\": tar archive, compressed using gzip\n"
4693 4693 " \"uzip\": zip archive, uncompressed\n"
4694 4694 " \"zip\": zip archive, compressed using deflate\n"
4695 4695 "\n"
4696 4696 " The exact name of the destination archive or directory is given\n"
4697 4697 " using a format string; see 'hg help export' for details.\n"
4698 4698 "\n"
4699 4699 " Each member added to an archive file has a directory prefix\n"
4700 4700 " prepended. Use -p/--prefix to specify a format string for the\n"
4701 4701 " prefix. The default is the basename of the archive, with suffixes\n"
4702 4702 " removed.\n"
4703 4703 " "
4704 4704 msgstr ""
4705 4705
4706 4706 msgid "no working directory: please specify a revision"
4707 4707 msgstr ""
4708 4708
4709 4709 msgid "repository root cannot be destination"
4710 4710 msgstr ""
4711 4711
4712 4712 msgid "cannot archive plain files to stdout"
4713 4713 msgstr ""
4714 4714
4715 4715 msgid ""
4716 4716 "reverse effect of earlier changeset\n"
4717 4717 "\n"
4718 4718 " Commit the backed out changes as a new changeset. The new\n"
4719 4719 " changeset is a child of the backed out changeset.\n"
4720 4720 "\n"
4721 4721 " If you backout a changeset other than the tip, a new head is\n"
4722 4722 " created. This head will be the new tip and you should merge this\n"
4723 4723 " backout changeset with another head.\n"
4724 4724 "\n"
4725 4725 " The --merge option remembers the parent of the working directory\n"
4726 4726 " before starting the backout, then merges the new head with that\n"
4727 4727 " changeset afterwards. This saves you from doing the merge by hand.\n"
4728 4728 " The result of this merge is not committed, as with a normal merge.\n"
4729 4729 "\n"
4730 4730 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4731 4731 " "
4732 4732 msgstr ""
4733 4733
4734 4734 msgid "please specify just one revision"
4735 4735 msgstr ""
4736 4736
4737 4737 msgid "please specify a revision to backout"
4738 4738 msgstr ""
4739 4739
4740 4740 msgid "cannot backout change on a different branch"
4741 4741 msgstr ""
4742 4742
4743 4743 msgid "cannot backout a change with no parents"
4744 4744 msgstr ""
4745 4745
4746 4746 msgid "cannot backout a merge changeset without --parent"
4747 4747 msgstr ""
4748 4748
4749 4749 #, python-format
4750 4750 msgid "%s is not a parent of %s"
4751 4751 msgstr ""
4752 4752
4753 4753 msgid "cannot use --parent on non-merge changeset"
4754 4754 msgstr ""
4755 4755
4756 4756 #, python-format
4757 4757 msgid "Backed out changeset %s"
4758 4758 msgstr ""
4759 4759
4760 4760 #, python-format
4761 4761 msgid "changeset %s backs out changeset %s\n"
4762 4762 msgstr ""
4763 4763
4764 4764 #, python-format
4765 4765 msgid "merging with changeset %s\n"
4766 4766 msgstr ""
4767 4767
4768 4768 msgid "the backout changeset is a new head - do not forget to merge\n"
4769 4769 msgstr ""
4770 4770
4771 4771 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4772 4772 msgstr ""
4773 4773
4774 4774 msgid ""
4775 4775 "subdivision search of changesets\n"
4776 4776 "\n"
4777 4777 " This command helps to find changesets which introduce problems. To\n"
4778 4778 " use, mark the earliest changeset you know exhibits the problem as\n"
4779 4779 " bad, then mark the latest changeset which is free from the problem\n"
4780 4780 " as good. Bisect will update your working directory to a revision\n"
4781 4781 " for testing (unless the -U/--noupdate option is specified). Once\n"
4782 4782 " you have performed tests, mark the working directory as good or\n"
4783 4783 " bad, and bisect will either update to another candidate changeset\n"
4784 4784 " or announce that it has found the bad revision.\n"
4785 4785 "\n"
4786 4786 " As a shortcut, you can also use the revision argument to mark a\n"
4787 4787 " revision as good or bad without checking it out first.\n"
4788 4788 "\n"
4789 4789 " If you supply a command, it will be used for automatic bisection.\n"
4790 4790 " Its exit status will be used to mark revisions as good or bad:\n"
4791 4791 " status 0 means good, 125 means to skip the revision, 127\n"
4792 4792 " (command not found) will abort the bisection, and any other\n"
4793 4793 " non-zero exit status means the revision is bad.\n"
4794 4794 " "
4795 4795 msgstr ""
4796 4796
4797 4797 msgid "The first good revision is:\n"
4798 4798 msgstr ""
4799 4799
4800 4800 msgid "The first bad revision is:\n"
4801 4801 msgstr ""
4802 4802
4803 4803 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4804 4804 msgstr ""
4805 4805
4806 4806 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4807 4807 msgstr ""
4808 4808
4809 4809 msgid "cannot bisect (no known good revisions)"
4810 4810 msgstr ""
4811 4811
4812 4812 msgid "cannot bisect (no known bad revisions)"
4813 4813 msgstr ""
4814 4814
4815 4815 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4816 4816 msgstr ""
4817 4817
4818 4818 msgid "incompatible arguments"
4819 4819 msgstr ""
4820 4820
4821 4821 #, python-format
4822 4822 msgid "cannot find executable: %s"
4823 4823 msgstr ""
4824 4824
4825 4825 #, python-format
4826 4826 msgid "failed to execute %s"
4827 4827 msgstr ""
4828 4828
4829 4829 #, python-format
4830 4830 msgid "%s killed"
4831 4831 msgstr ""
4832 4832
4833 4833 #, python-format
4834 4834 msgid "Changeset %d:%s: %s\n"
4835 4835 msgstr ""
4836 4836
4837 4837 #, python-format
4838 4838 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
4839 4839 msgstr ""
4840 4840
4841 4841 msgid ""
4842 4842 "set or show the current branch name\n"
4843 4843 "\n"
4844 4844 " With no argument, show the current branch name. With one argument,\n"
4845 4845 " set the working directory branch name (the branch will not exist\n"
4846 4846 " in the repository until the next commit). Standard practice\n"
4847 4847 " recommends that primary development take place on the 'default'\n"
4848 4848 " branch.\n"
4849 4849 "\n"
4850 4850 " Unless -f/--force is specified, branch will not let you set a\n"
4851 4851 " branch name that already exists, even if it's inactive.\n"
4852 4852 "\n"
4853 4853 " Use -C/--clean to reset the working directory branch to that of\n"
4854 4854 " the parent of the working directory, negating a previous branch\n"
4855 4855 " change.\n"
4856 4856 "\n"
4857 4857 " Use the command 'hg update' to switch to an existing branch.\n"
4858 4858 " "
4859 4859 msgstr ""
4860 4860
4861 4861 #, python-format
4862 4862 msgid "reset working directory to branch %s\n"
4863 4863 msgstr ""
4864 4864
4865 4865 msgid "a branch of the same name already exists (use --force to override)"
4866 4866 msgstr ""
4867 4867
4868 4868 #, python-format
4869 4869 msgid "marked working directory as branch %s\n"
4870 4870 msgstr ""
4871 4871
4872 4872 msgid ""
4873 4873 "list repository named branches\n"
4874 4874 "\n"
4875 4875 " List the repository's named branches, indicating which ones are\n"
4876 4876 " inactive. If active is specified, only show active branches.\n"
4877 4877 "\n"
4878 4878 " A branch is considered active if it contains repository heads.\n"
4879 4879 "\n"
4880 4880 " Use the command 'hg update' to switch to an existing branch.\n"
4881 4881 " "
4882 4882 msgstr ""
4883 4883
4884 4884 msgid ""
4885 4885 "create a changegroup file\n"
4886 4886 "\n"
4887 4887 " Generate a compressed changegroup file collecting changesets not\n"
4888 4888 " known to be in another repository.\n"
4889 4889 "\n"
4890 4890 " If no destination repository is specified the destination is\n"
4891 4891 " assumed to have all the nodes specified by one or more --base\n"
4892 4892 " parameters. To create a bundle containing all changesets, use\n"
4893 4893 " -a/--all (or --base null).\n"
4894 4894 "\n"
4895 4895 " To change the compression method applied, use the -t/--type\n"
4896 4896 " option. The available compression methods are: none, bzip2, and\n"
4897 4897 " gzip (by default, bundles are compressed using bzip2).\n"
4898 4898 "\n"
4899 4899 " The bundle file can then be transferred using conventional means\n"
4900 4900 " and applied to another repository with the unbundle or pull\n"
4901 4901 " command. This is useful when direct push and pull are not\n"
4902 4902 " available or when exporting an entire repository is undesirable.\n"
4903 4903 "\n"
4904 4904 " Applying bundles preserves all changeset contents including\n"
4905 4905 " permissions, copy/rename information, and revision history.\n"
4906 4906 " "
4907 4907 msgstr ""
4908 4908
4909 4909 msgid "--base is incompatible with specifying a destination"
4910 4910 msgstr ""
4911 4911
4912 4912 msgid "unknown bundle type specified with --type"
4913 4913 msgstr ""
4914 4914
4915 4915 msgid ""
4916 4916 "output the current or given revision of files\n"
4917 4917 "\n"
4918 4918 " Print the specified files as they were at the given revision. If\n"
4919 4919 " no revision is given, the parent of the working directory is used,\n"
4920 4920 " or tip if no revision is checked out.\n"
4921 4921 "\n"
4922 4922 " Output may be to a file, in which case the name of the file is\n"
4923 4923 " given using a format string. The formatting rules are the same as\n"
4924 4924 " for the export command, with the following additions:\n"
4925 4925 "\n"
4926 4926 " %s basename of file being printed\n"
4927 4927 " %d dirname of file being printed, or '.' if in repository root\n"
4928 4928 " %p root-relative path name of file being printed\n"
4929 4929 " "
4930 4930 msgstr ""
4931 4931
4932 4932 msgid ""
4933 4933 "make a copy of an existing repository\n"
4934 4934 "\n"
4935 4935 " Create a copy of an existing repository in a new directory.\n"
4936 4936 "\n"
4937 4937 " If no destination directory name is specified, it defaults to the\n"
4938 4938 " basename of the source.\n"
4939 4939 "\n"
4940 4940 " The location of the source is added to the new repository's\n"
4941 4941 " .hg/hgrc file, as the default to be used for future pulls.\n"
4942 4942 "\n"
4943 4943 " If you use the -r/--rev option to clone up to a specific revision,\n"
4944 4944 " no subsequent revisions (including subsequent tags) will be\n"
4945 4945 " present in the cloned repository. This option implies --pull, even\n"
4946 4946 " on local repositories.\n"
4947 4947 "\n"
4948 4948 " By default, clone will check out the head of the 'default' branch.\n"
4949 4949 " If the -U/--noupdate option is used, the new clone will contain\n"
4950 4950 " only a repository (.hg) and no working copy (the working copy\n"
4951 4951 " parent is the null revision).\n"
4952 4952 "\n"
4953 4953 " See 'hg help urls' for valid source format details.\n"
4954 4954 "\n"
4955 4955 " It is possible to specify an ssh:// URL as the destination, but no\n"
4956 4956 " .hg/hgrc and working directory will be created on the remote side.\n"
4957 4957 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
4958 4958 "\n"
4959 4959 " For efficiency, hardlinks are used for cloning whenever the source\n"
4960 4960 " and destination are on the same filesystem (note this applies only\n"
4961 4961 " to the repository data, not to the checked out files). Some\n"
4962 4962 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
4963 4963 " do not report errors. In these cases, use the --pull option to\n"
4964 4964 " avoid hardlinking.\n"
4965 4965 "\n"
4966 4966 " In some cases, you can clone repositories and checked out files\n"
4967 4967 " using full hardlinks with\n"
4968 4968 "\n"
4969 4969 " $ cp -al REPO REPOCLONE\n"
4970 4970 "\n"
4971 4971 " This is the fastest way to clone, but it is not always safe. The\n"
4972 4972 " operation is not atomic (making sure REPO is not modified during\n"
4973 4973 " the operation is up to you) and you have to make sure your editor\n"
4974 4974 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
4975 4975 " this is not compatible with certain extensions that place their\n"
4976 4976 " metadata under the .hg directory, such as mq.\n"
4977 4977 "\n"
4978 4978 " "
4979 4979 msgstr ""
4980 4980
4981 4981 msgid ""
4982 4982 "commit the specified files or all outstanding changes\n"
4983 4983 "\n"
4984 4984 " Commit changes to the given files into the repository. Unlike a\n"
4985 4985 " centralized RCS, this operation is a local operation. See hg push\n"
4986 4986 " for a way to actively distribute your changes.\n"
4987 4987 "\n"
4988 4988 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4989 4989 " will be committed.\n"
4990 4990 "\n"
4991 4991 " If you are committing the result of a merge, do not provide any\n"
4992 4992 " filenames or -I/-X filters.\n"
4993 4993 "\n"
4994 4994 " If no commit message is specified, the configured editor is\n"
4995 4995 " started to prompt you for a message.\n"
4996 4996 "\n"
4997 4997 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4998 4998 " "
4999 4999 msgstr ""
5000 5000
5001 5001 msgid "created new head\n"
5002 5002 msgstr ""
5003 5003
5004 5004 #, python-format
5005 5005 msgid "committed changeset %d:%s\n"
5006 5006 msgstr ""
5007 5007
5008 5008 msgid ""
5009 5009 "mark files as copied for the next commit\n"
5010 5010 "\n"
5011 5011 " Mark dest as having copies of source files. If dest is a\n"
5012 5012 " directory, copies are put in that directory. If dest is a file,\n"
5013 5013 " the source must be a single file.\n"
5014 5014 "\n"
5015 5015 " By default, this command copies the contents of files as they\n"
5016 5016 " exist in the working directory. If invoked with -A/--after, the\n"
5017 5017 " operation is recorded, but no copying is performed.\n"
5018 5018 "\n"
5019 5019 " This command takes effect with the next commit. To undo a copy\n"
5020 5020 " before that, see hg revert.\n"
5021 5021 " "
5022 5022 msgstr ""
5023 5023
5024 5024 msgid "find the ancestor revision of two revisions in a given index"
5025 5025 msgstr ""
5026 5026
5027 5027 msgid "There is no Mercurial repository here (.hg not found)"
5028 5028 msgstr ""
5029 5029
5030 5030 msgid "either two or three arguments required"
5031 5031 msgstr ""
5032 5032
5033 5033 msgid "returns the completion list associated with the given command"
5034 5034 msgstr ""
5035 5035
5036 5036 msgid "rebuild the dirstate as it would look like for the given revision"
5037 5037 msgstr ""
5038 5038
5039 5039 msgid "validate the correctness of the current dirstate"
5040 5040 msgstr ""
5041 5041
5042 5042 #, python-format
5043 5043 msgid "%s in state %s, but not in manifest1\n"
5044 5044 msgstr ""
5045 5045
5046 5046 #, python-format
5047 5047 msgid "%s in state %s, but also in manifest1\n"
5048 5048 msgstr ""
5049 5049
5050 5050 #, python-format
5051 5051 msgid "%s in state %s, but not in either manifest\n"
5052 5052 msgstr ""
5053 5053
5054 5054 #, python-format
5055 5055 msgid "%s in manifest1, but listed as state %s"
5056 5056 msgstr ""
5057 5057
5058 5058 msgid ".hg/dirstate inconsistent with current parent's manifest"
5059 5059 msgstr ""
5060 5060
5061 5061 msgid ""
5062 5062 "show combined config settings from all hgrc files\n"
5063 5063 "\n"
5064 5064 " With no arguments, print names and values of all config items.\n"
5065 5065 "\n"
5066 5066 " With one argument of the form section.name, print just the value\n"
5067 5067 " of that config item.\n"
5068 5068 "\n"
5069 5069 " With multiple arguments, print names and values of all config\n"
5070 5070 " items with matching section names.\n"
5071 5071 "\n"
5072 5072 " With --debug, the source (filename and line number) is printed\n"
5073 5073 " for each config item.\n"
5074 5074 " "
5075 5075 msgstr ""
5076 5076
5077 5077 msgid "only one config item permitted"
5078 5078 msgstr ""
5079 5079
5080 5080 msgid ""
5081 5081 "manually set the parents of the current working directory\n"
5082 5082 "\n"
5083 5083 " This is useful for writing repository conversion tools, but should\n"
5084 5084 " be used with care.\n"
5085 5085 " "
5086 5086 msgstr ""
5087 5087
5088 5088 msgid "show the contents of the current dirstate"
5089 5089 msgstr ""
5090 5090
5091 5091 #, python-format
5092 5092 msgid "copy: %s -> %s\n"
5093 5093 msgstr ""
5094 5094
5095 5095 msgid "dump the contents of a data file revision"
5096 5096 msgstr ""
5097 5097
5098 5098 #, python-format
5099 5099 msgid "invalid revision identifier %s"
5100 5100 msgstr ""
5101 5101
5102 5102 msgid "parse and display a date"
5103 5103 msgstr ""
5104 5104
5105 5105 msgid "dump the contents of an index file"
5106 5106 msgstr ""
5107 5107
5108 5108 msgid "dump an index DAG as a graphviz dot file"
5109 5109 msgstr ""
5110 5110
5111 5111 msgid "test Mercurial installation"
5112 5112 msgstr ""
5113 5113
5114 5114 #, python-format
5115 5115 msgid "Checking encoding (%s)...\n"
5116 5116 msgstr ""
5117 5117
5118 5118 msgid " (check that your locale is properly set)\n"
5119 5119 msgstr ""
5120 5120
5121 5121 msgid "Checking extensions...\n"
5122 5122 msgstr ""
5123 5123
5124 5124 msgid " One or more extensions could not be found"
5125 5125 msgstr ""
5126 5126
5127 5127 msgid " (check that you compiled the extensions)\n"
5128 5128 msgstr ""
5129 5129
5130 5130 msgid "Checking templates...\n"
5131 5131 msgstr ""
5132 5132
5133 5133 msgid " (templates seem to have been installed incorrectly)\n"
5134 5134 msgstr ""
5135 5135
5136 5136 msgid "Checking patch...\n"
5137 5137 msgstr ""
5138 5138
5139 5139 msgid " patch call failed:\n"
5140 5140 msgstr ""
5141 5141
5142 5142 msgid " unexpected patch output!\n"
5143 5143 msgstr ""
5144 5144
5145 5145 msgid " patch test failed!\n"
5146 5146 msgstr ""
5147 5147
5148 5148 msgid ""
5149 5149 " (Current patch tool may be incompatible with patch, or misconfigured. "
5150 5150 "Please check your .hgrc file)\n"
5151 5151 msgstr ""
5152 5152
5153 5153 msgid ""
5154 5154 " Internal patcher failure, please report this error to http://www.selenic."
5155 5155 "com/mercurial/bts\n"
5156 5156 msgstr ""
5157 5157
5158 5158 msgid "Checking commit editor...\n"
5159 5159 msgstr ""
5160 5160
5161 5161 msgid " No commit editor set and can't find vi in PATH\n"
5162 5162 msgstr ""
5163 5163
5164 5164 msgid " (specify a commit editor in your .hgrc file)\n"
5165 5165 msgstr ""
5166 5166
5167 5167 #, python-format
5168 5168 msgid " Can't find editor '%s' in PATH\n"
5169 5169 msgstr ""
5170 5170
5171 5171 msgid "Checking username...\n"
5172 5172 msgstr ""
5173 5173
5174 5174 msgid " (specify a username in your .hgrc file)\n"
5175 5175 msgstr ""
5176 5176
5177 5177 msgid "No problems detected\n"
5178 5178 msgstr ""
5179 5179
5180 5180 #, python-format
5181 5181 msgid "%s problems detected, please check your install!\n"
5182 5182 msgstr ""
5183 5183
5184 5184 msgid "dump rename information"
5185 5185 msgstr ""
5186 5186
5187 5187 #, python-format
5188 5188 msgid "%s renamed from %s:%s\n"
5189 5189 msgstr ""
5190 5190
5191 5191 #, python-format
5192 5192 msgid "%s not renamed\n"
5193 5193 msgstr ""
5194 5194
5195 5195 msgid "show how files match on given patterns"
5196 5196 msgstr ""
5197 5197
5198 5198 msgid ""
5199 5199 "diff repository (or selected files)\n"
5200 5200 "\n"
5201 5201 " Show differences between revisions for the specified files.\n"
5202 5202 "\n"
5203 5203 " Differences between files are shown using the unified diff format.\n"
5204 5204 "\n"
5205 5205 " NOTE: diff may generate unexpected results for merges, as it will\n"
5206 5206 " default to comparing against the working directory's first parent\n"
5207 5207 " changeset if no revisions are specified.\n"
5208 5208 "\n"
5209 5209 " When two revision arguments are given, then changes are shown\n"
5210 5210 " between those revisions. If only one revision is specified then\n"
5211 5211 " that revision is compared to the working directory, and, when no\n"
5212 5212 " revisions are specified, the working directory files are compared\n"
5213 5213 " to its parent.\n"
5214 5214 "\n"
5215 5215 " Without the -a/--text option, diff will avoid generating diffs of\n"
5216 5216 " files it detects as binary. With -a, diff will generate a diff\n"
5217 5217 " anyway, probably with undesirable results.\n"
5218 5218 "\n"
5219 5219 " Use the -g/--git option to generate diffs in the git extended diff\n"
5220 5220 " format. For more information, read 'hg help diffs'.\n"
5221 5221 " "
5222 5222 msgstr ""
5223 5223
5224 5224 msgid ""
5225 5225 "dump the header and diffs for one or more changesets\n"
5226 5226 "\n"
5227 5227 " Print the changeset header and diffs for one or more revisions.\n"
5228 5228 "\n"
5229 5229 " The information shown in the changeset header is: author,\n"
5230 5230 " changeset hash, parent(s) and commit comment.\n"
5231 5231 "\n"
5232 5232 " NOTE: export may generate unexpected diff output for merge\n"
5233 5233 " changesets, as it will compare the merge changeset against its\n"
5234 5234 " first parent only.\n"
5235 5235 "\n"
5236 5236 " Output may be to a file, in which case the name of the file is\n"
5237 5237 " given using a format string. The formatting rules are as follows:\n"
5238 5238 "\n"
5239 5239 " %% literal \"%\" character\n"
5240 5240 " %H changeset hash (40 bytes of hexadecimal)\n"
5241 5241 " %N number of patches being generated\n"
5242 5242 " %R changeset revision number\n"
5243 5243 " %b basename of the exporting repository\n"
5244 5244 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5245 5245 " %n zero-padded sequence number, starting at 1\n"
5246 5246 " %r zero-padded changeset revision number\n"
5247 5247 "\n"
5248 5248 " Without the -a/--text option, export will avoid generating diffs\n"
5249 5249 " of files it detects as binary. With -a, export will generate a\n"
5250 5250 " diff anyway, probably with undesirable results.\n"
5251 5251 "\n"
5252 5252 " Use the -g/--git option to generate diffs in the git extended diff\n"
5253 5253 " format. See 'hg help diffs' for more information.\n"
5254 5254 "\n"
5255 5255 " With the --switch-parent option, the diff will be against the\n"
5256 5256 " second parent. It can be useful to review a merge.\n"
5257 5257 " "
5258 5258 msgstr ""
5259 5259
5260 5260 msgid "export requires at least one changeset"
5261 5261 msgstr ""
5262 5262
5263 5263 msgid "exporting patches:\n"
5264 5264 msgstr ""
5265 5265
5266 5266 msgid "exporting patch:\n"
5267 5267 msgstr ""
5268 5268
5269 5269 msgid ""
5270 5270 "forget the specified files on the next commit\n"
5271 5271 "\n"
5272 5272 " Mark the specified files so they will no longer be tracked\n"
5273 5273 " after the next commit.\n"
5274 5274 "\n"
5275 5275 " This only removes files from the current branch, not from the\n"
5276 5276 " entire project history, and it does not delete them from the\n"
5277 5277 " working directory.\n"
5278 5278 "\n"
5279 5279 " To undo a forget before the next commit, see hg add.\n"
5280 5280 " "
5281 5281 msgstr ""
5282 5282
5283 5283 msgid "no files specified"
5284 5284 msgstr ""
5285 5285
5286 5286 #, python-format
5287 5287 msgid "not removing %s: file is already untracked\n"
5288 5288 msgstr ""
5289 5289
5290 5290 msgid ""
5291 5291 "search for a pattern in specified files and revisions\n"
5292 5292 "\n"
5293 5293 " Search revisions of files for a regular expression.\n"
5294 5294 "\n"
5295 5295 " This command behaves differently than Unix grep. It only accepts\n"
5296 5296 " Python/Perl regexps. It searches repository history, not the\n"
5297 5297 " working directory. It always prints the revision number in which a\n"
5298 5298 " match appears.\n"
5299 5299 "\n"
5300 5300 " By default, grep only prints output for the first revision of a\n"
5301 5301 " file in which it finds a match. To get it to print every revision\n"
5302 5302 " that contains a change in match status (\"-\" for a match that\n"
5303 5303 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5304 5304 " use the --all flag.\n"
5305 5305 " "
5306 5306 msgstr ""
5307 5307
5308 5308 #, python-format
5309 5309 msgid "grep: invalid match pattern: %s\n"
5310 5310 msgstr ""
5311 5311
5312 5312 msgid ""
5313 5313 "show current repository heads or show branch heads\n"
5314 5314 "\n"
5315 5315 " With no arguments, show all repository head changesets.\n"
5316 5316 "\n"
5317 5317 " Repository \"heads\" are changesets that don't have child\n"
5318 5318 " changesets. They are where development generally takes place and\n"
5319 5319 " are the usual targets for update and merge operations.\n"
5320 5320 "\n"
5321 5321 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5322 5322 " the named branch associated with that revision. The name of the\n"
5323 5323 " branch is called the revision's branch tag.\n"
5324 5324 "\n"
5325 5325 " Branch heads are revisions on a given named branch that do not have\n"
5326 5326 " any children on the same branch. A branch head could be a true head\n"
5327 5327 " or it could be the last changeset on a branch before a new branch\n"
5328 5328 " was created. If none of the branch heads are true heads, the branch\n"
5329 5329 " is considered inactive.\n"
5330 5330 "\n"
5331 5331 " If STARTREV is specified only those heads (or branch heads) that\n"
5332 5332 " are descendants of STARTREV will be displayed.\n"
5333 5333 " "
5334 5334 msgstr ""
5335 5335
5336 5336 #, python-format
5337 5337 msgid "no open branch heads on branch %s\n"
5338 5338 msgstr ""
5339 5339
5340 5340 #, python-format
5341 5341 msgid "no changes on branch %s containing %s are reachable from %s\n"
5342 5342 msgstr ""
5343 5343
5344 5344 #, python-format
5345 5345 msgid "no changes on branch %s are reachable from %s\n"
5346 5346 msgstr ""
5347 5347
5348 5348 msgid ""
5349 5349 "show help for a given topic or a help overview\n"
5350 5350 "\n"
5351 5351 " With no arguments, print a list of commands with short help messages.\n"
5352 5352 "\n"
5353 5353 " Given a topic, extension, or command name, print help for that\n"
5354 5354 " topic."
5355 5355 msgstr ""
5356 5356
5357 5357 msgid "global options:"
5358 msgstr ""
5358 msgstr "options globales :"
5359 5359
5360 5360 msgid "use \"hg help\" for the full list of commands"
5361 msgstr ""
5361 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5362 5362
5363 5363 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5364 5364 msgstr ""
5365
5365 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5366 "plus de détails"
5367
5368 # la chaîne passée est préfixée par un espace
5366 5369 #, python-format
5367 5370 msgid "use \"hg -v help%s\" to show aliases and global options"
5368 5371 msgstr ""
5372 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5369 5373
5370 5374 #, python-format
5371 5375 msgid "use \"hg -v help %s\" to show global options"
5372 msgstr ""
5376 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5373 5377
5374 5378 msgid ""
5375 5379 "list of commands:\n"
5376 5380 "\n"
5377 5381 msgstr ""
5382 "liste des commandes :\n"
5383 "\n"
5378 5384
5379 5385 #, python-format
5380 5386 msgid ""
5381 5387 "\n"
5382 5388 "aliases: %s\n"
5383 5389 msgstr ""
5390 "\n"
5391 "alias : %s\n"
5384 5392
5385 5393 msgid "(no help text available)"
5386 msgstr ""
5394 msgstr "(pas d'aide disponible)"
5387 5395
5388 5396 msgid "options:\n"
5389 msgstr ""
5397 msgstr "options :\n"
5390 5398
5391 5399 msgid "no commands defined\n"
5392 msgstr ""
5400 msgstr "pas de commandes définies\n"
5393 5401
5394 5402 msgid "enabled extensions:"
5395 msgstr ""
5403 msgstr "extensions activées :"
5396 5404
5397 5405 msgid "no help text available"
5398 msgstr ""
5406 msgstr "pas d'aide disponible"
5399 5407
5400 5408 #, python-format
5401 5409 msgid "%s extension - %s\n"
5402 msgstr ""
5410 msgstr "extension %s - %s\n"
5403 5411
5404 5412 msgid "Mercurial Distributed SCM\n"
5405 msgstr ""
5413 msgstr "Mercurial, système de gestion de sources distribué\n"
5406 5414
5407 5415 msgid ""
5408 5416 "basic commands:\n"
5409 5417 "\n"
5410 5418 msgstr ""
5419 "commandes de base :\n"
5420 "\n"
5411 5421
5412 5422 msgid ""
5413 5423 "\n"
5414 5424 "additional help topics:\n"
5415 5425 "\n"
5416 5426 msgstr ""
5427 "\n"
5428 "sujets d'aide supplémentaires :\n"
5429 "\n"
5417 5430
5418 5431 msgid ""
5419 5432 "identify the working copy or specified revision\n"
5420 5433 "\n"
5421 5434 " With no revision, print a summary of the current state of the\n"
5422 5435 " repository.\n"
5423 5436 "\n"
5424 5437 " Specifying a path to a repository root or Mercurial bundle will\n"
5425 5438 " cause lookup to operate on that repository/bundle.\n"
5426 5439 "\n"
5427 5440 " This summary identifies the repository state using one or two\n"
5428 5441 " parent hash identifiers, followed by a \"+\" if there are\n"
5429 5442 " uncommitted changes in the working directory, a list of tags for\n"
5430 5443 " this revision and a branch name for non-default branches.\n"
5431 5444 " "
5432 5445 msgstr ""
5433 5446
5434 5447 msgid ""
5435 5448 "import an ordered set of patches\n"
5436 5449 "\n"
5437 5450 " Import a list of patches and commit them individually.\n"
5438 5451 "\n"
5439 5452 " If there are outstanding changes in the working directory, import\n"
5440 5453 " will abort unless given the -f/--force flag.\n"
5441 5454 "\n"
5442 5455 " You can import a patch straight from a mail message. Even patches\n"
5443 5456 " as attachments work (to use the body part, it must have type\n"
5444 5457 " text/plain or text/x-patch). From and Subject headers of email\n"
5445 5458 " message are used as default committer and commit message. All\n"
5446 5459 " text/plain body parts before first diff are added to commit\n"
5447 5460 " message.\n"
5448 5461 "\n"
5449 5462 " If the imported patch was generated by hg export, user and\n"
5450 5463 " description from patch override values from message headers and\n"
5451 5464 " body. Values given on command line with -m/--message and -u/--user\n"
5452 5465 " override these.\n"
5453 5466 "\n"
5454 5467 " If --exact is specified, import will set the working directory to\n"
5455 5468 " the parent of each patch before applying it, and will abort if the\n"
5456 5469 " resulting changeset has a different ID than the one recorded in\n"
5457 5470 " the patch. This may happen due to character set problems or other\n"
5458 5471 " deficiencies in the text patch format.\n"
5459 5472 "\n"
5460 5473 " With -s/--similarity, hg will attempt to discover renames and\n"
5461 5474 " copies in the patch in the same way as 'addremove'.\n"
5462 5475 "\n"
5463 5476 " To read a patch from standard input, use \"-\" as the patch name.\n"
5464 5477 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5465 5478 " "
5466 5479 msgstr ""
5467 5480
5468 5481 msgid "applying patch from stdin\n"
5469 5482 msgstr ""
5470 5483
5471 5484 msgid "no diffs found"
5472 5485 msgstr ""
5473 5486
5474 5487 #, python-format
5475 5488 msgid ""
5476 5489 "message:\n"
5477 5490 "%s\n"
5478 5491 msgstr ""
5479 5492
5480 5493 msgid "not a Mercurial patch"
5481 5494 msgstr ""
5482 5495
5483 5496 msgid "patch is damaged or loses information"
5484 5497 msgstr ""
5485 5498
5486 5499 msgid ""
5487 5500 "show new changesets found in source\n"
5488 5501 "\n"
5489 5502 " Show new changesets found in the specified path/URL or the default\n"
5490 5503 " pull location. These are the changesets that would have been pulled\n"
5491 5504 " if a pull at the time you issued this command.\n"
5492 5505 "\n"
5493 5506 " For remote repository, using --bundle avoids downloading the\n"
5494 5507 " changesets twice if the incoming is followed by a pull.\n"
5495 5508 "\n"
5496 5509 " See pull for valid source format details.\n"
5497 5510 " "
5498 5511 msgstr ""
5499 5512
5500 5513 msgid ""
5501 5514 "create a new repository in the given directory\n"
5502 5515 "\n"
5503 5516 " Initialize a new repository in the given directory. If the given\n"
5504 5517 " directory does not exist, it will be created.\n"
5505 5518 "\n"
5506 5519 " If no directory is given, the current directory is used.\n"
5507 5520 "\n"
5508 5521 " It is possible to specify an ssh:// URL as the destination.\n"
5509 5522 " See 'hg help urls' for more information.\n"
5510 5523 " "
5511 5524 msgstr ""
5512 5525
5513 5526 msgid ""
5514 5527 "locate files matching specific patterns\n"
5515 5528 "\n"
5516 5529 " Print files under Mercurial control in the working directory whose\n"
5517 5530 " names match the given patterns.\n"
5518 5531 "\n"
5519 5532 " By default, this command searches all directories in the working\n"
5520 5533 " directory. To search just the current directory and its\n"
5521 5534 " subdirectories, use \"--include .\".\n"
5522 5535 "\n"
5523 5536 " If no patterns are given to match, this command prints the names\n"
5524 5537 " of all files under Mercurial control in the working directory.\n"
5525 5538 "\n"
5526 5539 " If you want to feed the output of this command into the \"xargs\"\n"
5527 5540 " command, use the -0 option to both this command and \"xargs\". This\n"
5528 5541 " will avoid the problem of \"xargs\" treating single filenames that\n"
5529 5542 " contain whitespace as multiple filenames.\n"
5530 5543 " "
5531 5544 msgstr ""
5532 5545
5533 5546 msgid ""
5534 5547 "show revision history of entire repository or files\n"
5535 5548 "\n"
5536 5549 " Print the revision history of the specified files or the entire\n"
5537 5550 " project.\n"
5538 5551 "\n"
5539 5552 " File history is shown without following rename or copy history of\n"
5540 5553 " files. Use -f/--follow with a filename to follow history across\n"
5541 5554 " renames and copies. --follow without a filename will only show\n"
5542 5555 " ancestors or descendants of the starting revision. --follow-first\n"
5543 5556 " only follows the first parent of merge revisions.\n"
5544 5557 "\n"
5545 5558 " If no revision range is specified, the default is tip:0 unless\n"
5546 5559 " --follow is set, in which case the working directory parent is\n"
5547 5560 " used as the starting revision.\n"
5548 5561 "\n"
5549 5562 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5550 5563 "\n"
5551 5564 " By default this command prints revision number and changeset id,\n"
5552 5565 " tags, non-trivial parents, user, date and time, and a summary for\n"
5553 5566 " each commit. When the -v/--verbose switch is used, the list of\n"
5554 5567 " changed files and full commit message are shown.\n"
5555 5568 "\n"
5556 5569 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5557 5570 " changesets, as it will only compare the merge changeset against\n"
5558 5571 " its first parent. Also, only files different from BOTH parents\n"
5559 5572 " will appear in files:.\n"
5560 5573 " "
5561 5574 msgstr ""
5562 5575
5563 5576 msgid ""
5564 5577 "output the current or given revision of the project manifest\n"
5565 5578 "\n"
5566 5579 " Print a list of version controlled files for the given revision.\n"
5567 5580 " If no revision is given, the first parent of the working directory\n"
5568 5581 " is used, or the null revision if no revision is checked out.\n"
5569 5582 "\n"
5570 5583 " With -v, print file permissions, symlink and executable bits.\n"
5571 5584 " With --debug, print file revision hashes.\n"
5572 5585 " "
5573 5586 msgstr ""
5574 5587
5575 5588 msgid ""
5576 5589 "merge working directory with another revision\n"
5577 5590 "\n"
5578 5591 " The current working directory is updated with all changes made in\n"
5579 5592 " the requested revision since the last common predecessor revision.\n"
5580 5593 "\n"
5581 5594 " Files that changed between either parent are marked as changed for\n"
5582 5595 " the next commit and a commit must be performed before any further\n"
5583 5596 " updates to the repository are allowed. The next commit will have\n"
5584 5597 " two parents.\n"
5585 5598 "\n"
5586 5599 " If no revision is specified, the working directory's parent is a\n"
5587 5600 " head revision, and the current branch contains exactly one other\n"
5588 5601 " head, the other head is merged with by default. Otherwise, an\n"
5589 5602 " explicit revision with which to merge with must be provided.\n"
5590 5603 " "
5591 5604 msgstr ""
5592 5605
5593 5606 #, python-format
5594 5607 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5595 5608 msgstr ""
5596 5609
5597 5610 #, python-format
5598 5611 msgid "branch '%s' has one head - please merge with an explicit rev"
5599 5612 msgstr ""
5600 5613
5601 5614 msgid "there is nothing to merge"
5602 5615 msgstr ""
5603 5616
5604 5617 #, python-format
5605 5618 msgid "%s - use \"hg update\" instead"
5606 5619 msgstr ""
5607 5620
5608 5621 msgid ""
5609 5622 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5610 5623 "rev"
5611 5624 msgstr ""
5612 5625
5613 5626 msgid ""
5614 5627 "show changesets not found in destination\n"
5615 5628 "\n"
5616 5629 " Show changesets not found in the specified destination repository\n"
5617 5630 " or the default push location. These are the changesets that would\n"
5618 5631 " be pushed if a push was requested.\n"
5619 5632 "\n"
5620 5633 " See pull for valid destination format details.\n"
5621 5634 " "
5622 5635 msgstr ""
5623 5636
5624 5637 msgid ""
5625 5638 "show the parents of the working directory or revision\n"
5626 5639 "\n"
5627 5640 " Print the working directory's parent revisions. If a revision is\n"
5628 5641 " given via -r/--rev, the parent of that revision will be printed.\n"
5629 5642 " If a file argument is given, the revision in which the file was\n"
5630 5643 " last changed (before the working directory revision or the\n"
5631 5644 " argument to --rev if given) is printed.\n"
5632 5645 " "
5633 5646 msgstr ""
5634 5647
5635 5648 msgid "can only specify an explicit filename"
5636 5649 msgstr ""
5637 5650
5638 5651 #, python-format
5639 5652 msgid "'%s' not found in manifest!"
5640 5653 msgstr ""
5641 5654
5642 5655 msgid ""
5643 5656 "show aliases for remote repositories\n"
5644 5657 "\n"
5645 5658 " Show definition of symbolic path name NAME. If no name is given,\n"
5646 5659 " show definition of all available names.\n"
5647 5660 "\n"
5648 5661 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5649 5662 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5650 5663 "\n"
5651 5664 " See 'hg help urls' for more information.\n"
5652 5665 " "
5653 5666 msgstr ""
5654 5667
5655 5668 msgid "not found!\n"
5656 5669 msgstr ""
5657 5670
5658 5671 msgid "not updating, since new heads added\n"
5659 5672 msgstr ""
5660 5673
5661 5674 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5662 5675 msgstr ""
5663 5676
5664 5677 msgid "(run 'hg update' to get a working copy)\n"
5665 5678 msgstr ""
5666 5679
5667 5680 msgid ""
5668 5681 "pull changes from the specified source\n"
5669 5682 "\n"
5670 5683 " Pull changes from a remote repository to a local one.\n"
5671 5684 "\n"
5672 5685 " This finds all changes from the repository at the specified path\n"
5673 5686 " or URL and adds them to a local repository (the current one unless\n"
5674 5687 " -R is specified). By default, this does not update the copy of the\n"
5675 5688 " project in the working directory.\n"
5676 5689 "\n"
5677 5690 " Use hg incoming if you want to see what would have been added by a\n"
5678 5691 " pull at the time you issued this command. If you then decide to\n"
5679 5692 " added those changes to the repository, you should use pull -r X\n"
5680 5693 " where X is the last changeset listed by hg incoming.\n"
5681 5694 "\n"
5682 5695 " If SOURCE is omitted, the 'default' path will be used.\n"
5683 5696 " See 'hg help urls' for more information.\n"
5684 5697 " "
5685 5698 msgstr ""
5686 5699
5687 5700 msgid ""
5688 5701 "push changes to the specified destination\n"
5689 5702 "\n"
5690 5703 " Push changes from the local repository to the given destination.\n"
5691 5704 "\n"
5692 5705 " This is the symmetrical operation for pull. It moves changes from\n"
5693 5706 " the current repository to a different one. If the destination is\n"
5694 5707 " local this is identical to a pull in that directory from the\n"
5695 5708 " current one.\n"
5696 5709 "\n"
5697 5710 " By default, push will refuse to run if it detects the result would\n"
5698 5711 " increase the number of remote heads. This generally indicates the\n"
5699 5712 " user forgot to pull and merge before pushing.\n"
5700 5713 "\n"
5701 5714 " If -r/--rev is used, the named revision and all its ancestors will\n"
5702 5715 " be pushed to the remote repository.\n"
5703 5716 "\n"
5704 5717 " Please see 'hg help urls' for important details about ssh://\n"
5705 5718 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5706 5719 " "
5707 5720 msgstr ""
5708 5721
5709 5722 #, python-format
5710 5723 msgid "pushing to %s\n"
5711 5724 msgstr ""
5712 5725
5713 5726 msgid ""
5714 5727 "roll back an interrupted transaction\n"
5715 5728 "\n"
5716 5729 " Recover from an interrupted commit or pull.\n"
5717 5730 "\n"
5718 5731 " This command tries to fix the repository status after an\n"
5719 5732 " interrupted operation. It should only be necessary when Mercurial\n"
5720 5733 " suggests it.\n"
5721 5734 " "
5722 5735 msgstr ""
5723 5736
5724 5737 msgid ""
5725 5738 "remove the specified files on the next commit\n"
5726 5739 "\n"
5727 5740 " Schedule the indicated files for removal from the repository.\n"
5728 5741 "\n"
5729 5742 " This only removes files from the current branch, not from the\n"
5730 5743 " entire project history. -A/--after can be used to remove only\n"
5731 5744 " files that have already been deleted, -f/--force can be used to\n"
5732 5745 " force deletion, and -Af can be used to remove files from the next\n"
5733 5746 " revision without deleting them from the working directory.\n"
5734 5747 "\n"
5735 5748 " The following table details the behavior of remove for different\n"
5736 5749 " file states (columns) and option combinations (rows). The file\n"
5737 5750 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5738 5751 " (as reported by hg status). The actions are Warn, Remove (from\n"
5739 5752 " branch) and Delete (from disk).\n"
5740 5753 "\n"
5741 5754 " A C M !\n"
5742 5755 " none W RD W R\n"
5743 5756 " -f R RD RD R\n"
5744 5757 " -A W W W R\n"
5745 5758 " -Af R R R R\n"
5746 5759 "\n"
5747 5760 " This command schedules the files to be removed at the next commit.\n"
5748 5761 " To undo a remove before that, see hg revert.\n"
5749 5762 " "
5750 5763 msgstr ""
5751 5764
5752 5765 #, python-format
5753 5766 msgid "not removing %s: file is untracked\n"
5754 5767 msgstr ""
5755 5768
5756 5769 #, python-format
5757 5770 msgid "not removing %s: file %s (use -f to force removal)\n"
5758 5771 msgstr ""
5759 5772
5760 5773 msgid "still exists"
5761 5774 msgstr ""
5762 5775
5763 5776 msgid "is modified"
5764 5777 msgstr ""
5765 5778
5766 5779 msgid "has been marked for add"
5767 5780 msgstr ""
5768 5781
5769 5782 msgid ""
5770 5783 "rename files; equivalent of copy + remove\n"
5771 5784 "\n"
5772 5785 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5773 5786 " is a directory, copies are put in that directory. If dest is a\n"
5774 5787 " file, there can only be one source.\n"
5775 5788 "\n"
5776 5789 " By default, this command copies the contents of files as they\n"
5777 5790 " exist in the working directory. If invoked with -A/--after, the\n"
5778 5791 " operation is recorded, but no copying is performed.\n"
5779 5792 "\n"
5780 5793 " This command takes effect at the next commit. To undo a rename\n"
5781 5794 " before that, see hg revert.\n"
5782 5795 " "
5783 5796 msgstr ""
5784 5797
5785 5798 msgid ""
5786 5799 "retry file merges from a merge or update\n"
5787 5800 "\n"
5788 5801 " This command will cleanly retry unresolved file merges using file\n"
5789 5802 " revisions preserved from the last update or merge. To attempt to\n"
5790 5803 " resolve all unresolved files, use the -a/--all switch.\n"
5791 5804 "\n"
5792 5805 " If a conflict is resolved manually, please note that the changes\n"
5793 5806 " will be overwritten if the merge is retried with resolve. The\n"
5794 5807 " -m/--mark switch should be used to mark the file as resolved.\n"
5795 5808 "\n"
5796 5809 " This command also allows listing resolved files and manually\n"
5797 5810 " indicating whether or not files are resolved. All files must be\n"
5798 5811 " marked as resolved before a commit is permitted.\n"
5799 5812 "\n"
5800 5813 " The codes used to show the status of files are:\n"
5801 5814 " U = unresolved\n"
5802 5815 " R = resolved\n"
5803 5816 " "
5804 5817 msgstr ""
5805 5818
5806 5819 msgid "too many options specified"
5807 5820 msgstr ""
5808 5821
5809 5822 msgid "can't specify --all and patterns"
5810 5823 msgstr ""
5811 5824
5812 5825 msgid "no files or directories specified; use --all to remerge all files"
5813 5826 msgstr ""
5814 5827
5815 5828 msgid ""
5816 5829 "restore individual files or directories to an earlier state\n"
5817 5830 "\n"
5818 5831 " (Use update -r to check out earlier revisions, revert does not\n"
5819 5832 " change the working directory parents.)\n"
5820 5833 "\n"
5821 5834 " With no revision specified, revert the named files or directories\n"
5822 5835 " to the contents they had in the parent of the working directory.\n"
5823 5836 " This restores the contents of the affected files to an unmodified\n"
5824 5837 " state and unschedules adds, removes, copies, and renames. If the\n"
5825 5838 " working directory has two parents, you must explicitly specify the\n"
5826 5839 " revision to revert to.\n"
5827 5840 "\n"
5828 5841 " Using the -r/--rev option, revert the given files or directories\n"
5829 5842 " to their contents as of a specific revision. This can be helpful\n"
5830 5843 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
5831 5844 " dates' for a list of formats valid for -d/--date.\n"
5832 5845 "\n"
5833 5846 " Revert modifies the working directory. It does not commit any\n"
5834 5847 " changes, or change the parent of the working directory. If you\n"
5835 5848 " revert to a revision other than the parent of the working\n"
5836 5849 " directory, the reverted files will thus appear modified\n"
5837 5850 " afterwards.\n"
5838 5851 "\n"
5839 5852 " If a file has been deleted, it is restored. If the executable mode\n"
5840 5853 " of a file was changed, it is reset.\n"
5841 5854 "\n"
5842 5855 " If names are given, all files matching the names are reverted.\n"
5843 5856 " If no arguments are given, no files are reverted.\n"
5844 5857 "\n"
5845 5858 " Modified files are saved with a .orig suffix before reverting.\n"
5846 5859 " To disable these backups, use --no-backup.\n"
5847 5860 " "
5848 5861 msgstr ""
5849 5862
5850 5863 msgid "you can't specify a revision and a date"
5851 5864 msgstr ""
5852 5865
5853 5866 msgid "no files or directories specified; use --all to revert the whole repo"
5854 5867 msgstr ""
5855 5868
5856 5869 #, python-format
5857 5870 msgid "forgetting %s\n"
5858 5871 msgstr ""
5859 5872
5860 5873 #, python-format
5861 5874 msgid "reverting %s\n"
5862 5875 msgstr ""
5863 5876
5864 5877 #, python-format
5865 5878 msgid "undeleting %s\n"
5866 5879 msgstr ""
5867 5880
5868 5881 #, python-format
5869 5882 msgid "saving current version of %s as %s\n"
5870 5883 msgstr ""
5871 5884
5872 5885 #, python-format
5873 5886 msgid "file not managed: %s\n"
5874 5887 msgstr ""
5875 5888
5876 5889 #, python-format
5877 5890 msgid "no changes needed to %s\n"
5878 5891 msgstr ""
5879 5892
5880 5893 msgid ""
5881 5894 "roll back the last transaction\n"
5882 5895 "\n"
5883 5896 " This command should be used with care. There is only one level of\n"
5884 5897 " rollback, and there is no way to undo a rollback. It will also\n"
5885 5898 " restore the dirstate at the time of the last transaction, losing\n"
5886 5899 " any dirstate changes since that time. This command does not alter\n"
5887 5900 " the working directory.\n"
5888 5901 "\n"
5889 5902 " Transactions are used to encapsulate the effects of all commands\n"
5890 5903 " that create new changesets or propagate existing changesets into a\n"
5891 5904 " repository. For example, the following commands are transactional,\n"
5892 5905 " and their effects can be rolled back:\n"
5893 5906 "\n"
5894 5907 " commit\n"
5895 5908 " import\n"
5896 5909 " pull\n"
5897 5910 " push (with this repository as destination)\n"
5898 5911 " unbundle\n"
5899 5912 "\n"
5900 5913 " This command is not intended for use on public repositories. Once\n"
5901 5914 " changes are visible for pull by other users, rolling a transaction\n"
5902 5915 " back locally is ineffective (someone else may already have pulled\n"
5903 5916 " the changes). Furthermore, a race is possible with readers of the\n"
5904 5917 " repository; for example an in-progress pull from the repository\n"
5905 5918 " may fail if a rollback is performed.\n"
5906 5919 " "
5907 5920 msgstr ""
5908 5921
5909 5922 msgid ""
5910 5923 "print the root (top) of the current working directory\n"
5911 5924 "\n"
5912 5925 " Print the root directory of the current repository.\n"
5913 5926 " "
5914 5927 msgstr ""
5915 5928
5916 5929 msgid ""
5917 5930 "export the repository via HTTP\n"
5918 5931 "\n"
5919 5932 " Start a local HTTP repository browser and pull server.\n"
5920 5933 "\n"
5921 5934 " By default, the server logs accesses to stdout and errors to\n"
5922 5935 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
5923 5936 " files.\n"
5924 5937 " "
5925 5938 msgstr ""
5926 5939
5927 5940 #, python-format
5928 5941 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
5929 5942 msgstr ""
5930 5943
5931 5944 msgid ""
5932 5945 "show changed files in the working directory\n"
5933 5946 "\n"
5934 5947 " Show status of files in the repository. If names are given, only\n"
5935 5948 " files that match are shown. Files that are clean or ignored or\n"
5936 5949 " the source of a copy/move operation, are not listed unless\n"
5937 5950 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
5938 5951 " Unless options described with \"show only ...\" are given, the\n"
5939 5952 " options -mardu are used.\n"
5940 5953 "\n"
5941 5954 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
5942 5955 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
5943 5956 "\n"
5944 5957 " NOTE: status may appear to disagree with diff if permissions have\n"
5945 5958 " changed or a merge has occurred. The standard diff format does not\n"
5946 5959 " report permission changes and diff only reports changes relative\n"
5947 5960 " to one merge parent.\n"
5948 5961 "\n"
5949 5962 " If one revision is given, it is used as the base revision.\n"
5950 5963 " If two revisions are given, the differences between them are\n"
5951 5964 " shown.\n"
5952 5965 "\n"
5953 5966 " The codes used to show the status of files are:\n"
5954 5967 " M = modified\n"
5955 5968 " A = added\n"
5956 5969 " R = removed\n"
5957 5970 " C = clean\n"
5958 5971 " ! = missing (deleted by non-hg command, but still tracked)\n"
5959 5972 " ? = not tracked\n"
5960 5973 " I = ignored\n"
5961 5974 " = origin of the previous file listed as A (added)\n"
5962 5975 " "
5963 5976 msgstr ""
5964 5977
5965 5978 msgid ""
5966 5979 "add one or more tags for the current or given revision\n"
5967 5980 "\n"
5968 5981 " Name a particular revision using <name>.\n"
5969 5982 "\n"
5970 5983 " Tags are used to name particular revisions of the repository and are\n"
5971 5984 " very useful to compare different revisions, to go back to significant\n"
5972 5985 " earlier versions or to mark branch points as releases, etc.\n"
5973 5986 "\n"
5974 5987 " If no revision is given, the parent of the working directory is\n"
5975 5988 " used, or tip if no revision is checked out.\n"
5976 5989 "\n"
5977 5990 " To facilitate version control, distribution, and merging of tags,\n"
5978 5991 " they are stored as a file named \".hgtags\" which is managed\n"
5979 5992 " similarly to other project files and can be hand-edited if\n"
5980 5993 " necessary. The file '.hg/localtags' is used for local tags (not\n"
5981 5994 " shared among repositories).\n"
5982 5995 "\n"
5983 5996 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5984 5997 " "
5985 5998 msgstr ""
5986 5999
5987 6000 msgid "tag names must be unique"
5988 6001 msgstr ""
5989 6002
5990 6003 #, python-format
5991 6004 msgid "the name '%s' is reserved"
5992 6005 msgstr ""
5993 6006
5994 6007 msgid "--rev and --remove are incompatible"
5995 6008 msgstr ""
5996 6009
5997 6010 #, python-format
5998 6011 msgid "tag '%s' does not exist"
5999 6012 msgstr ""
6000 6013
6001 6014 #, python-format
6002 6015 msgid "tag '%s' is not a global tag"
6003 6016 msgstr ""
6004 6017
6005 6018 #, python-format
6006 6019 msgid "tag '%s' is not a local tag"
6007 6020 msgstr ""
6008 6021
6009 6022 #, python-format
6010 6023 msgid "Removed tag %s"
6011 6024 msgstr ""
6012 6025
6013 6026 #, python-format
6014 6027 msgid "tag '%s' already exists (use -f to force)"
6015 6028 msgstr ""
6016 6029
6017 6030 #, python-format
6018 6031 msgid "Added tag %s for changeset %s"
6019 6032 msgstr ""
6020 6033
6021 6034 msgid ""
6022 6035 "list repository tags\n"
6023 6036 "\n"
6024 6037 " This lists both regular and local tags. When the -v/--verbose\n"
6025 6038 " switch is used, a third column \"local\" is printed for local tags.\n"
6026 6039 " "
6027 6040 msgstr ""
6028 6041
6029 6042 msgid ""
6030 6043 "show the tip revision\n"
6031 6044 "\n"
6032 6045 " The tip revision (usually just called the tip) is the changeset\n"
6033 6046 " most recently added to the repository (and therefore the most\n"
6034 6047 " recently changed head).\n"
6035 6048 "\n"
6036 6049 " If you have just made a commit, that commit will be the tip. If\n"
6037 6050 " you have just pulled changes from another repository, the tip of\n"
6038 6051 " that repository becomes the current tip. The \"tip\" tag is special\n"
6039 6052 " and cannot be renamed or assigned to a different changeset.\n"
6040 6053 " "
6041 6054 msgstr ""
6042 6055
6043 6056 msgid ""
6044 6057 "apply one or more changegroup files\n"
6045 6058 "\n"
6046 6059 " Apply one or more compressed changegroup files generated by the\n"
6047 6060 " bundle command.\n"
6048 6061 " "
6049 6062 msgstr ""
6050 6063
6051 6064 msgid ""
6052 6065 "update working directory\n"
6053 6066 "\n"
6054 6067 " Update the repository's working directory to the specified\n"
6055 6068 " revision, or the tip of the current branch if none is specified.\n"
6056 6069 " Use null as the revision to remove the working copy (like 'hg\n"
6057 6070 " clone -U').\n"
6058 6071 "\n"
6059 6072 " When the working directory contains no uncommitted changes, it\n"
6060 6073 " will be replaced by the state of the requested revision from the\n"
6061 6074 " repository. When the requested revision is on a different branch,\n"
6062 6075 " the working directory will additionally be switched to that\n"
6063 6076 " branch.\n"
6064 6077 "\n"
6065 6078 " When there are uncommitted changes, use option -C/--clean to\n"
6066 6079 " discard them, forcibly replacing the state of the working\n"
6067 6080 " directory with the requested revision. Alternately, use -c/--check\n"
6068 6081 " to abort.\n"
6069 6082 "\n"
6070 6083 " When there are uncommitted changes and option -C/--clean is not\n"
6071 6084 " used, and the parent revision and requested revision are on the\n"
6072 6085 " same branch, and one of them is an ancestor of the other, then the\n"
6073 6086 " new working directory will contain the requested revision merged\n"
6074 6087 " with the uncommitted changes. Otherwise, the update will fail with\n"
6075 6088 " a suggestion to use 'merge' or 'update -C' instead.\n"
6076 6089 "\n"
6077 6090 " If you want to update just one file to an older revision, use\n"
6078 6091 " revert.\n"
6079 6092 "\n"
6080 6093 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6081 6094 " "
6082 6095 msgstr ""
6083 6096
6084 6097 msgid "uncommitted local changes"
6085 6098 msgstr ""
6086 6099
6087 6100 msgid ""
6088 6101 "verify the integrity of the repository\n"
6089 6102 "\n"
6090 6103 " Verify the integrity of the current repository.\n"
6091 6104 "\n"
6092 6105 " This will perform an extensive check of the repository's\n"
6093 6106 " integrity, validating the hashes and checksums of each entry in\n"
6094 6107 " the changelog, manifest, and tracked files, as well as the\n"
6095 6108 " integrity of their crosslinks and indices.\n"
6096 6109 " "
6097 6110 msgstr ""
6098 6111
6099 6112 msgid "output version and copyright information"
6100 6113 msgstr ""
6101 6114
6102 6115 #, python-format
6103 6116 msgid "Mercurial Distributed SCM (version %s)\n"
6104 6117 msgstr ""
6105 6118
6106 6119 msgid ""
6107 6120 "\n"
6108 6121 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6109 6122 "This is free software; see the source for copying conditions. There is NO\n"
6110 6123 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6111 6124 msgstr ""
6112 6125
6113 6126 msgid "repository root directory or symbolic path name"
6114 6127 msgstr ""
6115 6128
6116 6129 msgid "change working directory"
6117 6130 msgstr ""
6118 6131
6119 6132 msgid "do not prompt, assume 'yes' for any required answers"
6120 6133 msgstr ""
6121 6134
6122 6135 msgid "suppress output"
6123 6136 msgstr ""
6124 6137
6125 6138 msgid "enable additional output"
6126 6139 msgstr ""
6127 6140
6128 6141 msgid "set/override config option"
6129 6142 msgstr ""
6130 6143
6131 6144 msgid "enable debugging output"
6132 6145 msgstr ""
6133 6146
6134 6147 msgid "start debugger"
6135 6148 msgstr ""
6136 6149
6137 6150 msgid "set the charset encoding"
6138 6151 msgstr ""
6139 6152
6140 6153 msgid "set the charset encoding mode"
6141 6154 msgstr ""
6142 6155
6143 6156 msgid "print traceback on exception"
6144 6157 msgstr ""
6145 6158
6146 6159 msgid "time how long the command takes"
6147 6160 msgstr ""
6148 6161
6149 6162 msgid "print command execution profile"
6150 6163 msgstr ""
6151 6164
6152 6165 msgid "output version information and exit"
6153 6166 msgstr ""
6154 6167
6155 6168 msgid "display help and exit"
6156 6169 msgstr ""
6157 6170
6158 6171 msgid "do not perform actions, just print output"
6159 6172 msgstr ""
6160 6173
6161 6174 msgid "specify ssh command to use"
6162 6175 msgstr ""
6163 6176
6164 6177 msgid "specify hg command to run on the remote side"
6165 6178 msgstr ""
6166 6179
6167 6180 msgid "include names matching the given patterns"
6168 6181 msgstr ""
6169 6182
6170 6183 msgid "exclude names matching the given patterns"
6171 6184 msgstr ""
6172 6185
6173 6186 msgid "use <text> as commit message"
6174 6187 msgstr ""
6175 6188
6176 6189 msgid "read commit message from <file>"
6177 6190 msgstr ""
6178 6191
6179 6192 msgid "record datecode as commit date"
6180 6193 msgstr ""
6181 6194
6182 6195 msgid "record the specified user as committer"
6183 6196 msgstr ""
6184 6197
6185 6198 msgid "display using template map file"
6186 6199 msgstr ""
6187 6200
6188 6201 msgid "display with template"
6189 6202 msgstr ""
6190 6203
6191 6204 msgid "do not show merges"
6192 6205 msgstr ""
6193 6206
6194 6207 msgid "treat all files as text"
6195 6208 msgstr ""
6196 6209
6197 6210 msgid "don't include dates in diff headers"
6198 6211 msgstr ""
6199 6212
6200 6213 msgid "show which function each change is in"
6201 6214 msgstr ""
6202 6215
6203 6216 msgid "ignore white space when comparing lines"
6204 6217 msgstr ""
6205 6218
6206 6219 msgid "ignore changes in the amount of white space"
6207 6220 msgstr ""
6208 6221
6209 6222 msgid "ignore changes whose lines are all blank"
6210 6223 msgstr ""
6211 6224
6212 6225 msgid "number of lines of context to show"
6213 6226 msgstr ""
6214 6227
6215 6228 msgid "guess renamed files by similarity (0<=s<=100)"
6216 6229 msgstr ""
6217 6230
6218 6231 msgid "[OPTION]... [FILE]..."
6219 6232 msgstr ""
6220 6233
6221 6234 msgid "annotate the specified revision"
6222 6235 msgstr ""
6223 6236
6224 6237 msgid "follow file copies and renames"
6225 6238 msgstr ""
6226 6239
6227 6240 msgid "list the author (long with -v)"
6228 6241 msgstr ""
6229 6242
6230 6243 msgid "list the date (short with -q)"
6231 6244 msgstr ""
6232 6245
6233 6246 msgid "list the revision number (default)"
6234 6247 msgstr ""
6235 6248
6236 6249 msgid "list the changeset"
6237 6250 msgstr ""
6238 6251
6239 6252 msgid "show line number at the first appearance"
6240 6253 msgstr ""
6241 6254
6242 6255 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6243 6256 msgstr ""
6244 6257
6245 6258 msgid "do not pass files through decoders"
6246 6259 msgstr ""
6247 6260
6248 6261 msgid "directory prefix for files in archive"
6249 6262 msgstr ""
6250 6263
6251 6264 msgid "revision to distribute"
6252 6265 msgstr ""
6253 6266
6254 6267 msgid "type of distribution to create"
6255 6268 msgstr ""
6256 6269
6257 6270 msgid "[OPTION]... DEST"
6258 6271 msgstr ""
6259 6272
6260 6273 msgid "merge with old dirstate parent after backout"
6261 6274 msgstr ""
6262 6275
6263 6276 msgid "parent to choose when backing out merge"
6264 6277 msgstr ""
6265 6278
6266 6279 msgid "revision to backout"
6267 6280 msgstr ""
6268 6281
6269 6282 msgid "[OPTION]... [-r] REV"
6270 6283 msgstr ""
6271 6284
6272 6285 msgid "reset bisect state"
6273 6286 msgstr ""
6274 6287
6275 6288 msgid "mark changeset good"
6276 6289 msgstr ""
6277 6290
6278 6291 msgid "mark changeset bad"
6279 6292 msgstr ""
6280 6293
6281 6294 msgid "skip testing changeset"
6282 6295 msgstr ""
6283 6296
6284 6297 msgid "use command to check changeset state"
6285 6298 msgstr ""
6286 6299
6287 6300 msgid "do not update to target"
6288 6301 msgstr ""
6289 6302
6290 6303 msgid "[-gbsr] [-c CMD] [REV]"
6291 6304 msgstr ""
6292 6305
6293 6306 msgid "set branch name even if it shadows an existing branch"
6294 6307 msgstr ""
6295 6308
6296 6309 msgid "reset branch name to parent branch name"
6297 6310 msgstr ""
6298 6311
6299 6312 msgid "[-fC] [NAME]"
6300 6313 msgstr ""
6301 6314
6302 6315 msgid "show only branches that have unmerged heads"
6303 6316 msgstr ""
6304 6317
6305 6318 msgid "[-a]"
6306 6319 msgstr ""
6307 6320
6308 6321 msgid "run even when remote repository is unrelated"
6309 6322 msgstr ""
6310 6323
6311 6324 msgid "a changeset up to which you would like to bundle"
6312 6325 msgstr ""
6313 6326
6314 6327 msgid "a base changeset to specify instead of a destination"
6315 6328 msgstr ""
6316 6329
6317 6330 msgid "bundle all changesets in the repository"
6318 6331 msgstr ""
6319 6332
6320 6333 msgid "bundle compression type to use"
6321 6334 msgstr ""
6322 6335
6323 6336 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6324 6337 msgstr ""
6325 6338
6326 6339 msgid "print output to file with formatted name"
6327 6340 msgstr ""
6328 6341
6329 6342 msgid "print the given revision"
6330 6343 msgstr ""
6331 6344
6332 6345 msgid "apply any matching decode filter"
6333 6346 msgstr ""
6334 6347
6335 6348 msgid "[OPTION]... FILE..."
6336 6349 msgstr ""
6337 6350
6338 6351 msgid "the clone will only contain a repository (no working copy)"
6339 6352 msgstr ""
6340 6353
6341 6354 msgid "a changeset you would like to have after cloning"
6342 6355 msgstr ""
6343 6356
6344 6357 msgid "[OPTION]... SOURCE [DEST]"
6345 6358 msgstr ""
6346 6359
6347 6360 msgid "mark new/missing files as added/removed before committing"
6348 6361 msgstr ""
6349 6362
6350 6363 msgid "mark a branch as closed, hiding it from the branch list"
6351 6364 msgstr ""
6352 6365
6353 6366 msgid "record a copy that has already occurred"
6354 6367 msgstr ""
6355 6368
6356 6369 msgid "forcibly copy over an existing managed file"
6357 6370 msgstr ""
6358 6371
6359 6372 msgid "[OPTION]... [SOURCE]... DEST"
6360 6373 msgstr ""
6361 6374
6362 6375 msgid "[INDEX] REV1 REV2"
6363 6376 msgstr ""
6364 6377
6365 6378 msgid "[COMMAND]"
6366 6379 msgstr ""
6367 6380
6368 6381 msgid "show the command options"
6369 6382 msgstr ""
6370 6383
6371 6384 msgid "[-o] CMD"
6372 6385 msgstr ""
6373 6386
6374 6387 msgid "try extended date formats"
6375 6388 msgstr ""
6376 6389
6377 6390 msgid "[-e] DATE [RANGE]"
6378 6391 msgstr ""
6379 6392
6380 6393 msgid "FILE REV"
6381 6394 msgstr ""
6382 6395
6383 6396 msgid "[PATH]"
6384 6397 msgstr ""
6385 6398
6386 6399 msgid "FILE"
6387 6400 msgstr ""
6388 6401
6389 6402 msgid "revision to rebuild to"
6390 6403 msgstr ""
6391 6404
6392 6405 msgid "[-r REV] [REV]"
6393 6406 msgstr ""
6394 6407
6395 6408 msgid "revision to debug"
6396 6409 msgstr ""
6397 6410
6398 6411 msgid "[-r REV] FILE"
6399 6412 msgstr ""
6400 6413
6401 6414 msgid "REV1 [REV2]"
6402 6415 msgstr ""
6403 6416
6404 6417 msgid "do not display the saved mtime"
6405 6418 msgstr ""
6406 6419
6407 6420 msgid "[OPTION]..."
6408 6421 msgstr ""
6409 6422
6410 6423 msgid "revision to check"
6411 6424 msgstr ""
6412 6425
6413 6426 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6414 6427 msgstr ""
6415 6428
6416 6429 msgid "diff against the second parent"
6417 6430 msgstr ""
6418 6431
6419 6432 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6420 6433 msgstr ""
6421 6434
6422 6435 msgid "end fields with NUL"
6423 6436 msgstr ""
6424 6437
6425 6438 msgid "print all revisions that match"
6426 6439 msgstr ""
6427 6440
6428 6441 msgid "follow changeset history, or file history across copies and renames"
6429 6442 msgstr ""
6430 6443
6431 6444 msgid "ignore case when matching"
6432 6445 msgstr ""
6433 6446
6434 6447 msgid "print only filenames and revisions that match"
6435 6448 msgstr ""
6436 6449
6437 6450 msgid "print matching line numbers"
6438 6451 msgstr ""
6439 6452
6440 6453 msgid "search in given revision range"
6441 6454 msgstr ""
6442 6455
6443 6456 msgid "[OPTION]... PATTERN [FILE]..."
6444 6457 msgstr ""
6445 6458
6446 6459 msgid "show only heads which are descendants of REV"
6447 6460 msgstr ""
6448 6461
6449 6462 msgid "show only the active heads from open branches"
6450 6463 msgstr ""
6451 6464
6452 6465 msgid "show normal and closed heads"
6453 6466 msgstr ""
6454 6467
6455 6468 msgid "[-r STARTREV] [REV]..."
6456 6469 msgstr ""
6457 6470
6458 6471 msgid "[TOPIC]"
6459 6472 msgstr ""
6460 6473
6461 6474 msgid "identify the specified revision"
6462 6475 msgstr ""
6463 6476
6464 6477 msgid "show local revision number"
6465 6478 msgstr ""
6466 6479
6467 6480 msgid "show global revision id"
6468 6481 msgstr ""
6469 6482
6470 6483 msgid "show branch"
6471 6484 msgstr ""
6472 6485
6473 6486 msgid "show tags"
6474 6487 msgstr ""
6475 6488
6476 6489 msgid "[-nibt] [-r REV] [SOURCE]"
6477 6490 msgstr ""
6478 6491
6479 6492 msgid ""
6480 6493 "directory strip option for patch. This has the same meaning as the "
6481 6494 "corresponding patch option"
6482 6495 msgstr ""
6483 6496
6484 6497 msgid "base path"
6485 6498 msgstr ""
6486 6499
6487 6500 msgid "skip check for outstanding uncommitted changes"
6488 6501 msgstr ""
6489 6502
6490 6503 msgid "don't commit, just update the working directory"
6491 6504 msgstr ""
6492 6505
6493 6506 msgid "apply patch to the nodes from which it was generated"
6494 6507 msgstr ""
6495 6508
6496 6509 msgid "use any branch information in patch (implied by --exact)"
6497 6510 msgstr ""
6498 6511
6499 6512 msgid "[OPTION]... PATCH..."
6500 6513 msgstr ""
6501 6514
6502 6515 msgid "show newest record first"
6503 6516 msgstr ""
6504 6517
6505 6518 msgid "file to store the bundles into"
6506 6519 msgstr ""
6507 6520
6508 6521 msgid "a specific revision up to which you would like to pull"
6509 6522 msgstr ""
6510 6523
6511 6524 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6512 6525 msgstr ""
6513 6526
6514 6527 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6515 6528 msgstr ""
6516 6529
6517 6530 msgid "search the repository as it stood at REV"
6518 6531 msgstr ""
6519 6532
6520 6533 msgid "end filenames with NUL, for use with xargs"
6521 6534 msgstr ""
6522 6535
6523 6536 msgid "print complete paths from the filesystem root"
6524 6537 msgstr ""
6525 6538
6526 6539 msgid "[OPTION]... [PATTERN]..."
6527 6540 msgstr ""
6528 6541
6529 6542 msgid "only follow the first parent of merge changesets"
6530 6543 msgstr ""
6531 6544
6532 6545 msgid "show revisions matching date spec"
6533 6546 msgstr ""
6534 6547
6535 6548 msgid "show copied files"
6536 6549 msgstr ""
6537 6550
6538 6551 msgid "do case-insensitive search for a keyword"
6539 6552 msgstr ""
6540 6553
6541 6554 msgid "include revisions where files were removed"
6542 6555 msgstr ""
6543 6556
6544 6557 msgid "show only merges"
6545 6558 msgstr ""
6546 6559
6547 6560 msgid "revisions committed by user"
6548 6561 msgstr ""
6549 6562
6550 6563 msgid "show only changesets within the given named branch"
6551 6564 msgstr ""
6552 6565
6553 6566 msgid "do not display revision or any of its ancestors"
6554 6567 msgstr ""
6555 6568
6556 6569 msgid "[OPTION]... [FILE]"
6557 6570 msgstr ""
6558 6571
6559 6572 msgid "revision to display"
6560 6573 msgstr ""
6561 6574
6562 6575 msgid "[-r REV]"
6563 6576 msgstr ""
6564 6577
6565 6578 msgid "force a merge with outstanding changes"
6566 6579 msgstr ""
6567 6580
6568 6581 msgid "revision to merge"
6569 6582 msgstr ""
6570 6583
6571 6584 msgid "review revisions to merge (no merge is performed)"
6572 6585 msgstr ""
6573 6586
6574 6587 msgid "[-f] [[-r] REV]"
6575 6588 msgstr ""
6576 6589
6577 6590 msgid "a specific revision up to which you would like to push"
6578 6591 msgstr ""
6579 6592
6580 6593 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6581 6594 msgstr ""
6582 6595
6583 6596 msgid "show parents from the specified revision"
6584 6597 msgstr ""
6585 6598
6586 6599 msgid "[-r REV] [FILE]"
6587 6600 msgstr ""
6588 6601
6589 6602 msgid "[NAME]"
6590 6603 msgstr ""
6591 6604
6592 6605 msgid "update to new tip if changesets were pulled"
6593 6606 msgstr ""
6594 6607
6595 6608 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6596 6609 msgstr ""
6597 6610
6598 6611 msgid "force push"
6599 6612 msgstr ""
6600 6613
6601 6614 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6602 6615 msgstr ""
6603 6616
6604 6617 msgid "record delete for missing files"
6605 6618 msgstr ""
6606 6619
6607 6620 msgid "remove (and delete) file even if added or modified"
6608 6621 msgstr ""
6609 6622
6610 6623 msgid "record a rename that has already occurred"
6611 6624 msgstr ""
6612 6625
6613 6626 msgid "[OPTION]... SOURCE... DEST"
6614 6627 msgstr ""
6615 6628
6616 6629 msgid "remerge all unresolved files"
6617 6630 msgstr ""
6618 6631
6619 6632 msgid "list state of files needing merge"
6620 6633 msgstr ""
6621 6634
6622 6635 msgid "mark files as resolved"
6623 6636 msgstr ""
6624 6637
6625 6638 msgid "unmark files as resolved"
6626 6639 msgstr ""
6627 6640
6628 6641 msgid "revert all changes when no arguments given"
6629 6642 msgstr ""
6630 6643
6631 6644 msgid "tipmost revision matching date"
6632 6645 msgstr ""
6633 6646
6634 6647 msgid "revision to revert to"
6635 6648 msgstr ""
6636 6649
6637 6650 msgid "do not save backup copies of files"
6638 6651 msgstr ""
6639 6652
6640 6653 msgid "[OPTION]... [-r REV] [NAME]..."
6641 6654 msgstr ""
6642 6655
6643 6656 msgid "name of access log file to write to"
6644 6657 msgstr ""
6645 6658
6646 6659 msgid "name of error log file to write to"
6647 6660 msgstr ""
6648 6661
6649 6662 msgid "port to listen on (default: 8000)"
6650 6663 msgstr ""
6651 6664
6652 6665 msgid "address to listen on (default: all interfaces)"
6653 6666 msgstr ""
6654 6667
6655 6668 msgid "prefix path to serve from (default: server root)"
6656 6669 msgstr ""
6657 6670
6658 6671 msgid "name to show in web pages (default: working directory)"
6659 6672 msgstr ""
6660 6673
6661 6674 msgid "name of the webdir config file (serve more than one repository)"
6662 6675 msgstr ""
6663 6676
6664 6677 msgid "for remote clients"
6665 6678 msgstr ""
6666 6679
6667 6680 msgid "web templates to use"
6668 6681 msgstr ""
6669 6682
6670 6683 msgid "template style to use"
6671 6684 msgstr ""
6672 6685
6673 6686 msgid "use IPv6 in addition to IPv4"
6674 6687 msgstr ""
6675 6688
6676 6689 msgid "SSL certificate file"
6677 6690 msgstr ""
6678 6691
6679 6692 msgid "show untrusted configuration options"
6680 6693 msgstr ""
6681 6694
6682 6695 msgid "[-u] [NAME]..."
6683 6696 msgstr ""
6684 6697
6685 6698 msgid "show status of all files"
6686 6699 msgstr ""
6687 6700
6688 6701 msgid "show only modified files"
6689 6702 msgstr ""
6690 6703
6691 6704 msgid "show only added files"
6692 6705 msgstr ""
6693 6706
6694 6707 msgid "show only removed files"
6695 6708 msgstr ""
6696 6709
6697 6710 msgid "show only deleted (but tracked) files"
6698 6711 msgstr ""
6699 6712
6700 6713 msgid "show only files without changes"
6701 6714 msgstr ""
6702 6715
6703 6716 msgid "show only unknown (not tracked) files"
6704 6717 msgstr ""
6705 6718
6706 6719 msgid "show only ignored files"
6707 6720 msgstr ""
6708 6721
6709 6722 msgid "hide status prefix"
6710 6723 msgstr ""
6711 6724
6712 6725 msgid "show source of copied files"
6713 6726 msgstr ""
6714 6727
6715 6728 msgid "show difference from revision"
6716 6729 msgstr ""
6717 6730
6718 6731 msgid "replace existing tag"
6719 6732 msgstr ""
6720 6733
6721 6734 msgid "make the tag local"
6722 6735 msgstr ""
6723 6736
6724 6737 msgid "revision to tag"
6725 6738 msgstr ""
6726 6739
6727 6740 msgid "remove a tag"
6728 6741 msgstr ""
6729 6742
6730 6743 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6731 6744 msgstr ""
6732 6745
6733 6746 msgid "[-p]"
6734 6747 msgstr ""
6735 6748
6736 6749 msgid "update to new tip if changesets were unbundled"
6737 6750 msgstr ""
6738 6751
6739 6752 msgid "[-u] FILE..."
6740 6753 msgstr ""
6741 6754
6742 6755 msgid "overwrite locally modified files (no backup)"
6743 6756 msgstr ""
6744 6757
6745 6758 msgid "check for uncommitted changes"
6746 6759 msgstr ""
6747 6760
6748 6761 msgid "[-C] [-d DATE] [[-r] REV]"
6749 6762 msgstr ""
6750 6763
6751 6764 #, python-format
6752 6765 msgid "config error at %s:%d: '%s'"
6753 6766 msgstr ""
6754 6767
6755 6768 msgid "not found in manifest"
6756 6769 msgstr ""
6757 6770
6758 6771 msgid "branch name not in UTF-8!"
6759 6772 msgstr ""
6760 6773
6761 6774 #, python-format
6762 6775 msgid " searching for copies back to rev %d\n"
6763 6776 msgstr ""
6764 6777
6765 6778 #, python-format
6766 6779 msgid ""
6767 6780 " unmatched files in local:\n"
6768 6781 " %s\n"
6769 6782 msgstr ""
6770 6783
6771 6784 #, python-format
6772 6785 msgid ""
6773 6786 " unmatched files in other:\n"
6774 6787 " %s\n"
6775 6788 msgstr ""
6776 6789
6777 6790 msgid " all copies found (* = to merge, ! = divergent):\n"
6778 6791 msgstr ""
6779 6792
6780 6793 msgid " checking for directory renames\n"
6781 6794 msgstr ""
6782 6795
6783 6796 #, python-format
6784 6797 msgid " dir %s -> %s\n"
6785 6798 msgstr ""
6786 6799
6787 6800 #, python-format
6788 6801 msgid " file %s -> %s\n"
6789 6802 msgstr ""
6790 6803
6791 6804 msgid "working directory state appears damaged!"
6792 6805 msgstr ""
6793 6806
6794 6807 #, python-format
6795 6808 msgid "'\\n' and '\\r' disallowed in filenames: %r"
6796 6809 msgstr ""
6797 6810
6798 6811 #, python-format
6799 6812 msgid "directory %r already in dirstate"
6800 6813 msgstr ""
6801 6814
6802 6815 #, python-format
6803 6816 msgid "file %r in dirstate clashes with %r"
6804 6817 msgstr ""
6805 6818
6806 6819 #, python-format
6807 6820 msgid "not in dirstate: %s\n"
6808 6821 msgstr ""
6809 6822
6810 6823 msgid "unknown"
6811 6824 msgstr ""
6812 6825
6813 6826 msgid "character device"
6814 6827 msgstr ""
6815 6828
6816 6829 msgid "block device"
6817 6830 msgstr ""
6818 6831
6819 6832 msgid "fifo"
6820 6833 msgstr ""
6821 6834
6822 6835 msgid "socket"
6823 6836 msgstr ""
6824 6837
6825 6838 msgid "directory"
6826 6839 msgstr ""
6827 6840
6828 6841 #, python-format
6829 6842 msgid "unsupported file type (type is %s)"
6830 6843 msgstr ""
6831 6844
6832 6845 #, python-format
6833 6846 msgid "abort: %s\n"
6834 6847 msgstr ""
6835 6848
6836 6849 #, python-format
6837 6850 msgid ""
6838 6851 "hg: command '%s' is ambiguous:\n"
6839 6852 " %s\n"
6840 6853 msgstr ""
6841 6854
6842 6855 #, python-format
6843 6856 msgid "hg: %s\n"
6844 6857 msgstr ""
6845 6858
6846 6859 #, python-format
6847 6860 msgid "timed out waiting for lock held by %s"
6848 6861 msgstr ""
6849 6862
6850 6863 #, python-format
6851 6864 msgid "lock held by %s"
6852 6865 msgstr ""
6853 6866
6854 6867 #, python-format
6855 6868 msgid "abort: %s: %s\n"
6856 6869 msgstr ""
6857 6870
6858 6871 #, python-format
6859 6872 msgid "abort: could not lock %s: %s\n"
6860 6873 msgstr ""
6861 6874
6862 6875 #, python-format
6863 6876 msgid "hg %s: %s\n"
6864 6877 msgstr ""
6865 6878
6866 6879 #, python-format
6867 6880 msgid "abort: %s!\n"
6868 6881 msgstr ""
6869 6882
6870 6883 #, python-format
6871 6884 msgid "abort: %s"
6872 6885 msgstr ""
6873 6886
6874 6887 msgid " empty string\n"
6875 6888 msgstr ""
6876 6889
6877 6890 msgid "killed!\n"
6878 6891 msgstr ""
6879 6892
6880 6893 #, python-format
6881 6894 msgid "hg: unknown command '%s'\n"
6882 6895 msgstr ""
6883 6896
6884 6897 #, python-format
6885 6898 msgid "abort: could not import module %s!\n"
6886 6899 msgstr ""
6887 6900
6888 6901 msgid "(did you forget to compile extensions?)\n"
6889 6902 msgstr ""
6890 6903
6891 6904 msgid "(is your Python install correct?)\n"
6892 6905 msgstr ""
6893 6906
6894 6907 #, python-format
6895 6908 msgid "abort: error: %s\n"
6896 6909 msgstr ""
6897 6910
6898 6911 msgid "broken pipe\n"
6899 6912 msgstr ""
6900 6913
6901 6914 msgid "interrupted!\n"
6902 6915 msgstr ""
6903 6916
6904 6917 msgid ""
6905 6918 "\n"
6906 6919 "broken pipe\n"
6907 6920 msgstr ""
6908 6921
6909 6922 msgid "abort: out of memory\n"
6910 6923 msgstr ""
6911 6924
6912 6925 msgid "** unknown exception encountered, details follow\n"
6913 6926 msgstr ""
6914 6927
6915 6928 msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
6916 6929 msgstr ""
6917 6930
6918 6931 msgid "** or mercurial@selenic.com\n"
6919 6932 msgstr ""
6920 6933
6921 6934 #, python-format
6922 6935 msgid "** Mercurial Distributed SCM (version %s)\n"
6923 6936 msgstr ""
6924 6937
6925 6938 #, python-format
6926 6939 msgid "** Extensions loaded: %s\n"
6927 6940 msgstr ""
6928 6941
6929 6942 #, python-format
6930 6943 msgid "no definition for alias '%s'\n"
6931 6944 msgstr ""
6932 6945
6933 6946 #, python-format
6934 6947 msgid "alias '%s' resolves to unknown command '%s'\n"
6935 6948 msgstr ""
6936 6949
6937 6950 #, python-format
6938 6951 msgid "alias '%s' resolves to ambiguous command '%s'\n"
6939 6952 msgstr ""
6940 6953
6941 6954 #, python-format
6942 6955 msgid "alias '%s' shadows command\n"
6943 6956 msgstr ""
6944 6957
6945 6958 #, python-format
6946 6959 msgid "malformed --config option: %s"
6947 6960 msgstr ""
6948 6961
6949 6962 #, python-format
6950 6963 msgid "extension '%s' overrides commands: %s\n"
6951 6964 msgstr ""
6952 6965
6953 6966 msgid "Option --config may not be abbreviated!"
6954 6967 msgstr ""
6955 6968
6956 6969 msgid "Option --cwd may not be abbreviated!"
6957 6970 msgstr ""
6958 6971
6959 6972 msgid ""
6960 6973 "Option -R has to be separated from other options (e.g. not -qR) and --"
6961 6974 "repository may only be abbreviated as --repo!"
6962 6975 msgstr ""
6963 6976
6964 6977 #, python-format
6965 6978 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
6966 6979 msgstr ""
6967 6980
6968 6981 #, python-format
6969 6982 msgid "repository '%s' is not local"
6970 6983 msgstr ""
6971 6984
6972 6985 msgid "invalid arguments"
6973 6986 msgstr ""
6974 6987
6975 6988 #, python-format
6976 6989 msgid "unrecognized profiling format '%s' - Ignored\n"
6977 6990 msgstr ""
6978 6991
6979 6992 msgid ""
6980 6993 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
6981 6994 "misc/lsprof/"
6982 6995 msgstr ""
6983 6996
6984 6997 #, python-format
6985 6998 msgid "*** failed to import extension %s from %s: %s\n"
6986 6999 msgstr ""
6987 7000
6988 7001 #, python-format
6989 7002 msgid "*** failed to import extension %s: %s\n"
6990 7003 msgstr ""
6991 7004
6992 7005 #, python-format
6993 7006 msgid "couldn't find merge tool %s\n"
6994 7007 msgstr ""
6995 7008
6996 7009 #, python-format
6997 7010 msgid "tool %s can't handle symlinks\n"
6998 7011 msgstr ""
6999 7012
7000 7013 #, python-format
7001 7014 msgid "tool %s can't handle binary\n"
7002 7015 msgstr ""
7003 7016
7004 7017 #, python-format
7005 7018 msgid "tool %s requires a GUI\n"
7006 7019 msgstr ""
7007 7020
7008 7021 #, python-format
7009 7022 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7010 7023 msgstr ""
7011 7024
7012 7025 #, python-format
7013 7026 msgid ""
7014 7027 " no tool found to merge %s\n"
7015 7028 "keep (l)ocal or take (o)ther?"
7016 7029 msgstr ""
7017 7030
7018 7031 msgid "&Local"
7019 7032 msgstr ""
7020 7033
7021 7034 msgid "&Other"
7022 7035 msgstr ""
7023 7036
7024 7037 msgid "l"
7025 7038 msgstr ""
7026 7039
7027 7040 #, python-format
7028 7041 msgid "merging %s and %s to %s\n"
7029 7042 msgstr ""
7030 7043
7031 7044 #, python-format
7032 7045 msgid "merging %s\n"
7033 7046 msgstr ""
7034 7047
7035 7048 #, python-format
7036 7049 msgid "my %s other %s ancestor %s\n"
7037 7050 msgstr ""
7038 7051
7039 7052 msgid " premerge successful\n"
7040 7053 msgstr ""
7041 7054
7042 7055 #, python-format
7043 7056 msgid ""
7044 7057 " output file %s appears unchanged\n"
7045 7058 "was merge successful (yn)?"
7046 7059 msgstr ""
7047 7060
7048 7061 msgid "&No"
7049 7062 msgstr ""
7050 7063
7051 7064 msgid "&Yes"
7052 7065 msgstr ""
7053 7066
7054 7067 msgid "n"
7055 7068 msgstr ""
7056 7069
7057 7070 #, python-format
7058 7071 msgid "merging %s failed!\n"
7059 7072 msgstr ""
7060 7073
7061 7074 #, python-format
7062 7075 msgid "Inconsistent state, %s:%s is good and bad"
7063 7076 msgstr ""
7064 7077
7065 7078 #, python-format
7066 7079 msgid "unknown bisect kind %s"
7067 7080 msgstr ""
7068 7081
7069 7082 msgid ""
7070 7083 "\n"
7071 7084 " Mercurial has the ability to add new features through the use of\n"
7072 7085 " extensions. Extensions may add new commands, add options to\n"
7073 7086 " existing commands, change the default behavior of commands, or\n"
7074 7087 " implement hooks.\n"
7075 7088 "\n"
7076 7089 " Extensions are not loaded by default for a variety of reasons:\n"
7077 7090 " they can increase startup overhead; they may be meant for\n"
7078 7091 " advanced usage only; they may provide potentially dangerous\n"
7079 7092 " abilities (such as letting you destroy or modify history); they\n"
7080 7093 " might not be ready for prime time; or they may alter some\n"
7081 7094 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7082 7095 " activate extensions as needed.\n"
7083 7096 "\n"
7084 7097 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7085 7098 " or in the Python search path, create an entry for it in your\n"
7086 7099 " hgrc, like this:\n"
7087 7100 "\n"
7088 7101 " [extensions]\n"
7089 7102 " foo =\n"
7090 7103 "\n"
7091 7104 " You may also specify the full path to an extension:\n"
7092 7105 "\n"
7093 7106 " [extensions]\n"
7094 7107 " myfeature = ~/.hgext/myfeature.py\n"
7095 7108 "\n"
7096 7109 " To explicitly disable an extension enabled in an hgrc of broader\n"
7097 7110 " scope, prepend its path with !:\n"
7098 7111 "\n"
7099 7112 " [extensions]\n"
7100 7113 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7101 7114 " hgext.bar = !/path/to/extension/bar.py\n"
7102 7115 " # ditto, but no path was supplied for extension baz\n"
7103 7116 " hgext.baz = !\n"
7104 7117 " "
7105 7118 msgstr ""
7106 7119
7107 7120 msgid "disabled extensions:"
7108 7121 msgstr ""
7109 7122
7110 7123 msgid "Date Formats"
7111 7124 msgstr ""
7112 7125
7113 7126 msgid ""
7114 7127 "\n"
7115 7128 " Some commands allow the user to specify a date, e.g.:\n"
7116 7129 " * backout, commit, import, tag: Specify the commit date.\n"
7117 7130 " * log, revert, update: Select revision(s) by date.\n"
7118 7131 "\n"
7119 7132 " Many date formats are valid. Here are some examples:\n"
7120 7133 "\n"
7121 7134 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7122 7135 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7123 7136 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7124 7137 " \"Dec 6\" (midnight)\n"
7125 7138 " \"13:18\" (today assumed)\n"
7126 7139 " \"3:39\" (3:39AM assumed)\n"
7127 7140 " \"3:39pm\" (15:39)\n"
7128 7141 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7129 7142 " \"2006-12-6 13:18\"\n"
7130 7143 " \"2006-12-6\"\n"
7131 7144 " \"12-6\"\n"
7132 7145 " \"12/6\"\n"
7133 7146 " \"12/6/6\" (Dec 6 2006)\n"
7134 7147 "\n"
7135 7148 " Lastly, there is Mercurial's internal format:\n"
7136 7149 "\n"
7137 7150 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7138 7151 "\n"
7139 7152 " This is the internal representation format for dates. unixtime is\n"
7140 7153 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7141 7154 " offset is the offset of the local timezone, in seconds west of UTC\n"
7142 7155 " (negative if the timezone is east of UTC).\n"
7143 7156 "\n"
7144 7157 " The log command also accepts date ranges:\n"
7145 7158 "\n"
7146 7159 " \"<{datetime}\" - at or before a given date/time\n"
7147 7160 " \">{datetime}\" - on or after a given date/time\n"
7148 7161 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7149 7162 " \"-{days}\" - within a given number of days of today\n"
7150 7163 " "
7151 7164 msgstr ""
7152 7165
7153 7166 msgid "File Name Patterns"
7154 7167 msgstr ""
7155 7168
7156 7169 msgid ""
7157 7170 "\n"
7158 7171 " Mercurial accepts several notations for identifying one or more\n"
7159 7172 " files at a time.\n"
7160 7173 "\n"
7161 7174 " By default, Mercurial treats filenames as shell-style extended\n"
7162 7175 " glob patterns.\n"
7163 7176 "\n"
7164 7177 " Alternate pattern notations must be specified explicitly.\n"
7165 7178 "\n"
7166 7179 " To use a plain path name without any pattern matching, start it\n"
7167 7180 " with \"path:\". These path names must completely match starting at\n"
7168 7181 " the current repository root.\n"
7169 7182 "\n"
7170 7183 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7171 7184 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7172 7185 " match files in the current directory ending with \".c\".\n"
7173 7186 "\n"
7174 7187 " The supported glob syntax extensions are \"**\" to match any string\n"
7175 7188 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7176 7189 "\n"
7177 7190 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7178 7191 " Regexp pattern matching is anchored at the root of the repository.\n"
7179 7192 "\n"
7180 7193 " Plain examples:\n"
7181 7194 "\n"
7182 7195 " path:foo/bar a name bar in a directory named foo in the root of\n"
7183 7196 " the repository\n"
7184 7197 " path:path:name a file or directory named \"path:name\"\n"
7185 7198 "\n"
7186 7199 " Glob examples:\n"
7187 7200 "\n"
7188 7201 " glob:*.c any name ending in \".c\" in the current directory\n"
7189 7202 " *.c any name ending in \".c\" in the current directory\n"
7190 7203 " **.c any name ending in \".c\" in any subdirectory of the\n"
7191 7204 " current directory including itself.\n"
7192 7205 " foo/*.c any name ending in \".c\" in the directory foo\n"
7193 7206 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7194 7207 " including itself.\n"
7195 7208 "\n"
7196 7209 " Regexp examples:\n"
7197 7210 "\n"
7198 7211 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7199 7212 "\n"
7200 7213 " "
7201 7214 msgstr ""
7202 7215
7203 7216 msgid "Environment Variables"
7204 7217 msgstr ""
7205 7218
7206 7219 msgid ""
7207 7220 "\n"
7208 7221 "HG::\n"
7209 7222 " Path to the 'hg' executable, automatically passed when running\n"
7210 7223 " hooks, extensions or external tools. If unset or empty, this is\n"
7211 7224 " the hg executable's name if it's frozen, or an executable named\n"
7212 7225 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7213 7226 " Windows) is searched.\n"
7214 7227 "\n"
7215 7228 "HGEDITOR::\n"
7216 7229 " This is the name of the editor to run when committing. See EDITOR.\n"
7217 7230 "\n"
7218 7231 " (deprecated, use .hgrc)\n"
7219 7232 "\n"
7220 7233 "HGENCODING::\n"
7221 7234 " This overrides the default locale setting detected by Mercurial.\n"
7222 7235 " This setting is used to convert data including usernames,\n"
7223 7236 " changeset descriptions, tag names, and branches. This setting can\n"
7224 7237 " be overridden with the --encoding command-line option.\n"
7225 7238 "\n"
7226 7239 "HGENCODINGMODE::\n"
7227 7240 " This sets Mercurial's behavior for handling unknown characters\n"
7228 7241 " while transcoding user input. The default is \"strict\", which\n"
7229 7242 " causes Mercurial to abort if it can't map a character. Other\n"
7230 7243 " settings include \"replace\", which replaces unknown characters, and\n"
7231 7244 " \"ignore\", which drops them. This setting can be overridden with\n"
7232 7245 " the --encodingmode command-line option.\n"
7233 7246 "\n"
7234 7247 "HGMERGE::\n"
7235 7248 " An executable to use for resolving merge conflicts. The program\n"
7236 7249 " will be executed with three arguments: local file, remote file,\n"
7237 7250 " ancestor file.\n"
7238 7251 "\n"
7239 7252 " (deprecated, use .hgrc)\n"
7240 7253 "\n"
7241 7254 "HGRCPATH::\n"
7242 7255 " A list of files or directories to search for hgrc files. Item\n"
7243 7256 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7244 7257 " platform default search path is used. If empty, only the .hg/hgrc\n"
7245 7258 " from the current repository is read.\n"
7246 7259 "\n"
7247 7260 " For each element in HGRCPATH:\n"
7248 7261 " * if it's a directory, all files ending with .rc are added\n"
7249 7262 " * otherwise, the file itself will be added\n"
7250 7263 "\n"
7251 7264 "HGUSER::\n"
7252 7265 " This is the string used as the author of a commit. If not set,\n"
7253 7266 " available values will be considered in this order:\n"
7254 7267 "\n"
7255 7268 " * HGUSER (deprecated)\n"
7256 7269 " * hgrc files from the HGRCPATH\n"
7257 7270 " * EMAIL\n"
7258 7271 " * interactive prompt\n"
7259 7272 " * LOGNAME (with '@hostname' appended)\n"
7260 7273 "\n"
7261 7274 " (deprecated, use .hgrc)\n"
7262 7275 "\n"
7263 7276 "EMAIL::\n"
7264 7277 " May be used as the author of a commit; see HGUSER.\n"
7265 7278 "\n"
7266 7279 "LOGNAME::\n"
7267 7280 " May be used as the author of a commit; see HGUSER.\n"
7268 7281 "\n"
7269 7282 "VISUAL::\n"
7270 7283 " This is the name of the editor to use when committing. See EDITOR.\n"
7271 7284 "\n"
7272 7285 "EDITOR::\n"
7273 7286 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7274 7287 " user to modify, for example when writing commit messages. The\n"
7275 7288 " editor it uses is determined by looking at the environment\n"
7276 7289 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7277 7290 " non-empty one is chosen. If all of them are empty, the editor\n"
7278 7291 " defaults to 'vi'.\n"
7279 7292 "\n"
7280 7293 "PYTHONPATH::\n"
7281 7294 " This is used by Python to find imported modules and may need to be\n"
7282 7295 " set appropriately if this Mercurial is not installed system-wide.\n"
7283 7296 " "
7284 7297 msgstr ""
7285 7298
7286 7299 msgid "Specifying Single Revisions"
7287 7300 msgstr ""
7288 7301
7289 7302 msgid ""
7290 7303 "\n"
7291 7304 " Mercurial supports several ways to specify individual revisions.\n"
7292 7305 "\n"
7293 7306 " A plain integer is treated as a revision number. Negative integers\n"
7294 7307 " are treated as topological offsets from the tip, with -1 denoting\n"
7295 7308 " the tip. As such, negative numbers are only useful if you've\n"
7296 7309 " memorized your local tree numbers and want to save typing a single\n"
7297 7310 " digit. This editor suggests copy and paste.\n"
7298 7311 "\n"
7299 7312 " A 40-digit hexadecimal string is treated as a unique revision\n"
7300 7313 " identifier.\n"
7301 7314 "\n"
7302 7315 " A hexadecimal string less than 40 characters long is treated as a\n"
7303 7316 " unique revision identifier, and referred to as a short-form\n"
7304 7317 " identifier. A short-form identifier is only valid if it is the\n"
7305 7318 " prefix of exactly one full-length identifier.\n"
7306 7319 "\n"
7307 7320 " Any other string is treated as a tag name, which is a symbolic\n"
7308 7321 " name associated with a revision identifier. Tag names may not\n"
7309 7322 " contain the \":\" character.\n"
7310 7323 "\n"
7311 7324 " The reserved name \"tip\" is a special tag that always identifies\n"
7312 7325 " the most recent revision.\n"
7313 7326 "\n"
7314 7327 " The reserved name \"null\" indicates the null revision. This is the\n"
7315 7328 " revision of an empty repository, and the parent of revision 0.\n"
7316 7329 "\n"
7317 7330 " The reserved name \".\" indicates the working directory parent. If\n"
7318 7331 " no working directory is checked out, it is equivalent to null. If\n"
7319 7332 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7320 7333 " first parent.\n"
7321 7334 " "
7322 7335 msgstr ""
7323 7336
7324 7337 msgid "Specifying Multiple Revisions"
7325 7338 msgstr ""
7326 7339
7327 7340 msgid ""
7328 7341 "\n"
7329 7342 " When Mercurial accepts more than one revision, they may be\n"
7330 7343 " specified individually, or provided as a topologically continuous\n"
7331 7344 " range, separated by the \":\" character.\n"
7332 7345 "\n"
7333 7346 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7334 7347 " are revision identifiers. Both BEGIN and END are optional. If\n"
7335 7348 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7336 7349 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7337 7350 " \"all revisions\".\n"
7338 7351 "\n"
7339 7352 " If BEGIN is greater than END, revisions are treated in reverse\n"
7340 7353 " order.\n"
7341 7354 "\n"
7342 7355 " A range acts as a closed interval. This means that a range of 3:5\n"
7343 7356 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7344 7357 " "
7345 7358 msgstr ""
7346 7359
7347 7360 msgid "Diff Formats"
7348 7361 msgstr ""
7349 7362
7350 7363 msgid ""
7351 7364 "\n"
7352 7365 " Mercurial's default format for showing changes between two\n"
7353 7366 " versions of a file is compatible with the unified format of GNU\n"
7354 7367 " diff, which can be used by GNU patch and many other standard\n"
7355 7368 " tools.\n"
7356 7369 "\n"
7357 7370 " While this standard format is often enough, it does not encode the\n"
7358 7371 " following information:\n"
7359 7372 "\n"
7360 7373 " - executable status and other permission bits\n"
7361 7374 " - copy or rename information\n"
7362 7375 " - changes in binary files\n"
7363 7376 " - creation or deletion of empty files\n"
7364 7377 "\n"
7365 7378 " Mercurial also supports the extended diff format from the git VCS\n"
7366 7379 " which addresses these limitations. The git diff format is not\n"
7367 7380 " produced by default because a few widespread tools still do not\n"
7368 7381 " understand this format.\n"
7369 7382 "\n"
7370 7383 " This means that when generating diffs from a Mercurial repository\n"
7371 7384 " (e.g. with \"hg export\"), you should be careful about things like\n"
7372 7385 " file copies and renames or other things mentioned above, because\n"
7373 7386 " when applying a standard diff to a different repository, this\n"
7374 7387 " extra information is lost. Mercurial's internal operations (like\n"
7375 7388 " push and pull) are not affected by this, because they use an\n"
7376 7389 " internal binary format for communicating changes.\n"
7377 7390 "\n"
7378 7391 " To make Mercurial produce the git extended diff format, use the\n"
7379 7392 " --git option available for many commands, or set 'git = True' in\n"
7380 7393 " the [diff] section of your hgrc. You do not need to set this\n"
7381 7394 " option when importing diffs in this format or using them in the mq\n"
7382 7395 " extension.\n"
7383 7396 " "
7384 7397 msgstr ""
7385 7398
7386 7399 msgid "Template Usage"
7387 7400 msgstr ""
7388 7401
7389 7402 msgid ""
7390 7403 "\n"
7391 7404 " Mercurial allows you to customize output of commands through\n"
7392 7405 " templates. You can either pass in a template from the command\n"
7393 7406 " line, via the --template option, or select an existing\n"
7394 7407 " template-style (--style).\n"
7395 7408 "\n"
7396 7409 " You can customize output for any \"log-like\" command: log,\n"
7397 7410 " outgoing, incoming, tip, parents, heads and glog.\n"
7398 7411 "\n"
7399 7412 " Three styles are packaged with Mercurial: default (the style used\n"
7400 7413 " when no explicit preference is passed), compact and changelog.\n"
7401 7414 " Usage:\n"
7402 7415 "\n"
7403 7416 " $ hg log -r1 --style changelog\n"
7404 7417 "\n"
7405 7418 " A template is a piece of text, with markup to invoke variable\n"
7406 7419 " expansion:\n"
7407 7420 "\n"
7408 7421 " $ hg log -r1 --template \"{node}\\n\"\n"
7409 7422 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7410 7423 "\n"
7411 7424 " Strings in curly braces are called keywords. The availability of\n"
7412 7425 " keywords depends on the exact context of the templater. These\n"
7413 7426 " keywords are usually available for templating a log-like command:\n"
7414 7427 "\n"
7415 7428 " - author: String. The unmodified author of the changeset.\n"
7416 7429 " - branches: String. The name of the branch on which the changeset\n"
7417 7430 " was committed. Will be empty if the branch name was default.\n"
7418 7431 " - date: Date information. The date when the changeset was committed.\n"
7419 7432 " - desc: String. The text of the changeset description.\n"
7420 7433 " - diffstat: String. Statistics of changes with the following\n"
7421 7434 " format: \"modified files: +added/-removed lines\"\n"
7422 7435 " - files: List of strings. All files modified, added, or removed by\n"
7423 7436 " this changeset.\n"
7424 7437 " - file_adds: List of strings. Files added by this changeset.\n"
7425 7438 " - file_mods: List of strings. Files modified by this changeset.\n"
7426 7439 " - file_dels: List of strings. Files removed by this changeset.\n"
7427 7440 " - node: String. The changeset identification hash, as a\n"
7428 7441 " 40-character hexadecimal string.\n"
7429 7442 " - parents: List of strings. The parents of the changeset.\n"
7430 7443 " - rev: Integer. The repository-local changeset revision number.\n"
7431 7444 " - tags: List of strings. Any tags associated with the changeset.\n"
7432 7445 "\n"
7433 7446 " The \"date\" keyword does not produce human-readable output. If you\n"
7434 7447 " want to use a date in your output, you can use a filter to process\n"
7435 7448 " it. Filters are functions which return a string based on the input\n"
7436 7449 " variable. You can also use a chain of filters to get the desired\n"
7437 7450 " output:\n"
7438 7451 "\n"
7439 7452 " $ hg tip --template \"{date|isodate}\\n\"\n"
7440 7453 " 2008-08-21 18:22 +0000\n"
7441 7454 "\n"
7442 7455 " List of filters:\n"
7443 7456 "\n"
7444 7457 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7445 7458 " every line except the last.\n"
7446 7459 " - age: Date. Returns a human-readable date/time difference between\n"
7447 7460 " the given date/time and the current date/time.\n"
7448 7461 " - basename: Any text. Treats the text as a path, and returns the\n"
7449 7462 " last component of the path after splitting by the path\n"
7450 7463 " separator (ignoring trailing separators). For example,\n"
7451 7464 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7452 7465 "\".\n"
7453 7466 " - stripdir: Treat the text as path and strip a directory level, if\n"
7454 7467 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7455 7468 " - date: Date. Returns a date in a Unix date format, including\n"
7456 7469 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7457 7470 " - domain: Any text. Finds the first string that looks like an\n"
7458 7471 " email address, and extracts just the domain component.\n"
7459 7472 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7460 7473 " - email: Any text. Extracts the first string that looks like an\n"
7461 7474 " email address. Example: 'User <user@example.com>' becomes\n"
7462 7475 " 'user@example.com'.\n"
7463 7476 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7464 7477 " \"<\" and \">\" with XML entities.\n"
7465 7478 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7466 7479 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7467 7480 " - firstline: Any text. Returns the first line of text.\n"
7468 7481 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7469 7482 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7470 7483 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7471 7484 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7472 7485 " - localdate: Date. Converts a date to local date.\n"
7473 7486 " - obfuscate: Any text. Returns the input text rendered as a\n"
7474 7487 " sequence of XML entities.\n"
7475 7488 " - person: Any text. Returns the text before an email address.\n"
7476 7489 " - rfc822date: Date. Returns a date using the same format used\n"
7477 7490 " in email headers.\n"
7478 7491 " - short: Changeset hash. Returns the short form of a changeset\n"
7479 7492 " hash, i.e. a 12-byte hexadecimal string.\n"
7480 7493 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7481 7494 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7482 7495 " - tabindent: Any text. Returns the text, with every line except\n"
7483 7496 " the first starting with a tab character.\n"
7484 7497 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7485 7498 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7486 7499 " - user: Any text. Returns the user portion of an email address.\n"
7487 7500 " "
7488 7501 msgstr ""
7489 7502
7490 7503 msgid "URL Paths"
7491 7504 msgstr ""
7492 7505
7493 7506 msgid ""
7494 7507 "\n"
7495 7508 " Valid URLs are of the form:\n"
7496 7509 "\n"
7497 7510 " local/filesystem/path (or file://local/filesystem/path)\n"
7498 7511 " http://[user[:pass]@]host[:port]/[path]\n"
7499 7512 " https://[user[:pass]@]host[:port]/[path]\n"
7500 7513 " ssh://[user[:pass]@]host[:port]/[path]\n"
7501 7514 "\n"
7502 7515 " Paths in the local filesystem can either point to Mercurial\n"
7503 7516 " repositories or to bundle files (as created by 'hg bundle' or\n"
7504 7517 " 'hg incoming --bundle').\n"
7505 7518 "\n"
7506 7519 " An optional identifier after # indicates a particular branch, tag,\n"
7507 7520 " or changeset to use from the remote repository.\n"
7508 7521 "\n"
7509 7522 " Some features, such as pushing to http:// and https:// URLs are\n"
7510 7523 " only possible if the feature is explicitly enabled on the remote\n"
7511 7524 " Mercurial server.\n"
7512 7525 "\n"
7513 7526 " Some notes about using SSH with Mercurial:\n"
7514 7527 " - SSH requires an accessible shell account on the destination\n"
7515 7528 " machine and a copy of hg in the remote path or specified with as\n"
7516 7529 " remotecmd.\n"
7517 7530 " - path is relative to the remote user's home directory by default.\n"
7518 7531 " Use an extra slash at the start of a path to specify an absolute "
7519 7532 "path:\n"
7520 7533 " ssh://example.com//tmp/repository\n"
7521 7534 " - Mercurial doesn't use its own compression via SSH; the right\n"
7522 7535 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7523 7536 " Host *.mylocalnetwork.example.com\n"
7524 7537 " Compression no\n"
7525 7538 " Host *\n"
7526 7539 " Compression yes\n"
7527 7540 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7528 7541 " or with the --ssh command line option.\n"
7529 7542 "\n"
7530 7543 " These URLs can all be stored in your hgrc with path aliases under\n"
7531 7544 " the [paths] section like so:\n"
7532 7545 " [paths]\n"
7533 7546 " alias1 = URL1\n"
7534 7547 " alias2 = URL2\n"
7535 7548 " ...\n"
7536 7549 "\n"
7537 7550 " You can then use the alias for any command that uses a URL (for\n"
7538 7551 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7539 7552 "\n"
7540 7553 " Two path aliases are special because they are used as defaults\n"
7541 7554 " when you do not provide the URL to a command:\n"
7542 7555 "\n"
7543 7556 " default:\n"
7544 7557 " When you create a repository with hg clone, the clone command\n"
7545 7558 " saves the location of the source repository as the new\n"
7546 7559 " repository's 'default' path. This is then used when you omit\n"
7547 7560 " path from push- and pull-like commands (including incoming and\n"
7548 7561 " outgoing).\n"
7549 7562 "\n"
7550 7563 " default-push:\n"
7551 7564 " The push command will look for a path named 'default-push', and\n"
7552 7565 " prefer it over 'default' if both are defined.\n"
7553 7566 " "
7554 7567 msgstr ""
7555 7568
7556 7569 msgid "Using additional features"
7557 7570 msgstr ""
7558 7571
7559 7572 msgid "can only share local repositories"
7560 7573 msgstr ""
7561 7574
7562 7575 msgid "destination already exists"
7563 7576 msgstr ""
7564 7577
7565 7578 msgid "updating working directory\n"
7566 7579 msgstr ""
7567 7580
7568 7581 #, python-format
7569 7582 msgid "destination directory: %s\n"
7570 7583 msgstr ""
7571 7584
7572 7585 #, python-format
7573 7586 msgid "destination '%s' already exists"
7574 7587 msgstr ""
7575 7588
7576 7589 #, python-format
7577 7590 msgid "destination '%s' is not empty"
7578 7591 msgstr ""
7579 7592
7580 7593 msgid ""
7581 7594 "src repository does not support revision lookup and so doesn't support clone "
7582 7595 "by revision"
7583 7596 msgstr ""
7584 7597
7585 7598 msgid "clone from remote to remote not supported"
7586 7599 msgstr ""
7587 7600
7588 7601 msgid "updated"
7589 7602 msgstr ""
7590 7603
7591 7604 msgid "merged"
7592 7605 msgstr ""
7593 7606
7594 7607 msgid "removed"
7595 7608 msgstr ""
7596 7609
7597 7610 msgid "unresolved"
7598 7611 msgstr ""
7599 7612
7600 7613 #, python-format
7601 7614 msgid "%d files %s"
7602 7615 msgstr ""
7603 7616
7604 7617 msgid "use 'hg resolve' to retry unresolved file merges\n"
7605 7618 msgstr ""
7606 7619
7607 7620 msgid ""
7608 7621 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7609 7622 "abandon\n"
7610 7623 msgstr ""
7611 7624
7612 7625 msgid "(branch merge, don't forget to commit)\n"
7613 7626 msgstr ""
7614 7627
7615 7628 #, python-format
7616 7629 msgid "error reading %s/.hg/hgrc: %s\n"
7617 7630 msgstr ""
7618 7631
7619 7632 msgid "SSL support is unavailable"
7620 7633 msgstr ""
7621 7634
7622 7635 msgid "IPv6 is not available on this system"
7623 7636 msgstr ""
7624 7637
7625 7638 #, python-format
7626 7639 msgid "cannot start server at '%s:%d': %s"
7627 7640 msgstr ""
7628 7641
7629 7642 #, python-format
7630 7643 msgid "calling hook %s: %s\n"
7631 7644 msgstr ""
7632 7645
7633 7646 #, python-format
7634 7647 msgid "%s hook is invalid (\"%s\" not in a module)"
7635 7648 msgstr ""
7636 7649
7637 7650 #, python-format
7638 7651 msgid "%s hook is invalid (import of \"%s\" failed)"
7639 7652 msgstr ""
7640 7653
7641 7654 #, python-format
7642 7655 msgid "%s hook is invalid (\"%s\" is not defined)"
7643 7656 msgstr ""
7644 7657
7645 7658 #, python-format
7646 7659 msgid "%s hook is invalid (\"%s\" is not callable)"
7647 7660 msgstr ""
7648 7661
7649 7662 #, python-format
7650 7663 msgid "error: %s hook failed: %s\n"
7651 7664 msgstr ""
7652 7665
7653 7666 #, python-format
7654 7667 msgid "error: %s hook raised an exception: %s\n"
7655 7668 msgstr ""
7656 7669
7657 7670 #, python-format
7658 7671 msgid "%s hook failed"
7659 7672 msgstr ""
7660 7673
7661 7674 #, python-format
7662 7675 msgid "warning: %s hook failed\n"
7663 7676 msgstr ""
7664 7677
7665 7678 #, python-format
7666 7679 msgid "running hook %s: %s\n"
7667 7680 msgstr ""
7668 7681
7669 7682 #, python-format
7670 7683 msgid "%s hook %s"
7671 7684 msgstr ""
7672 7685
7673 7686 #, python-format
7674 7687 msgid "warning: %s hook %s\n"
7675 7688 msgstr ""
7676 7689
7677 7690 msgid "connection ended unexpectedly"
7678 7691 msgstr ""
7679 7692
7680 7693 #, python-format
7681 7694 msgid "unsupported URL component: \"%s\""
7682 7695 msgstr ""
7683 7696
7684 7697 #, python-format
7685 7698 msgid "using %s\n"
7686 7699 msgstr ""
7687 7700
7688 7701 #, python-format
7689 7702 msgid "capabilities: %s\n"
7690 7703 msgstr ""
7691 7704
7692 7705 msgid "operation not supported over http"
7693 7706 msgstr ""
7694 7707
7695 7708 #, python-format
7696 7709 msgid "sending %s command\n"
7697 7710 msgstr ""
7698 7711
7699 7712 #, python-format
7700 7713 msgid "sending %s bytes\n"
7701 7714 msgstr ""
7702 7715
7703 7716 msgid "authorization failed"
7704 7717 msgstr ""
7705 7718
7706 7719 #, python-format
7707 7720 msgid "http error while sending %s command\n"
7708 7721 msgstr ""
7709 7722
7710 7723 msgid "http error, possibly caused by proxy setting"
7711 7724 msgstr ""
7712 7725
7713 7726 #, python-format
7714 7727 msgid "real URL is %s\n"
7715 7728 msgstr ""
7716 7729
7717 7730 #, python-format
7718 7731 msgid "requested URL: '%s'\n"
7719 7732 msgstr ""
7720 7733
7721 7734 #, python-format
7722 7735 msgid "'%s' does not appear to be an hg repository"
7723 7736 msgstr ""
7724 7737
7725 7738 #, python-format
7726 7739 msgid "'%s' sent a broken Content-Type header (%s)"
7727 7740 msgstr ""
7728 7741
7729 7742 #, python-format
7730 7743 msgid "'%s' uses newer protocol %s"
7731 7744 msgstr ""
7732 7745
7733 7746 msgid "look up remote revision"
7734 7747 msgstr ""
7735 7748
7736 7749 msgid "unexpected response:"
7737 7750 msgstr ""
7738 7751
7739 7752 msgid "look up remote changes"
7740 7753 msgstr ""
7741 7754
7742 7755 msgid "push failed (unexpected response):"
7743 7756 msgstr ""
7744 7757
7745 7758 #, python-format
7746 7759 msgid "push failed: %s"
7747 7760 msgstr ""
7748 7761
7749 7762 msgid "Python support for SSL and HTTPS is not installed"
7750 7763 msgstr ""
7751 7764
7752 7765 msgid "cannot create new http repository"
7753 7766 msgstr ""
7754 7767
7755 7768 #, python-format
7756 7769 msgid "%s: ignoring invalid syntax '%s'\n"
7757 7770 msgstr ""
7758 7771
7759 7772 #, python-format
7760 7773 msgid "skipping unreadable ignore file '%s': %s\n"
7761 7774 msgstr ""
7762 7775
7763 7776 #, python-format
7764 7777 msgid "repository %s not found"
7765 7778 msgstr ""
7766 7779
7767 7780 #, python-format
7768 7781 msgid "repository %s already exists"
7769 7782 msgstr ""
7770 7783
7771 7784 #, python-format
7772 7785 msgid "requirement '%s' not supported"
7773 7786 msgstr ""
7774 7787
7775 7788 #, python-format
7776 7789 msgid ".hg/sharedpath points to nonexistent directory %s"
7777 7790 msgstr ""
7778 7791
7779 7792 #, python-format
7780 7793 msgid "%r cannot be used in a tag name"
7781 7794 msgstr ""
7782 7795
7783 7796 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7784 7797 msgstr ""
7785 7798
7786 7799 #, python-format
7787 7800 msgid "%s, line %s: %s\n"
7788 7801 msgstr ""
7789 7802
7790 7803 msgid "cannot parse entry"
7791 7804 msgstr ""
7792 7805
7793 7806 #, python-format
7794 7807 msgid "node '%s' is not well formed"
7795 7808 msgstr ""
7796 7809
7797 7810 #, python-format
7798 7811 msgid "working directory has unknown parent '%s'!"
7799 7812 msgstr ""
7800 7813
7801 7814 #, python-format
7802 7815 msgid "unknown revision '%s'"
7803 7816 msgstr ""
7804 7817
7805 7818 #, python-format
7806 7819 msgid "filtering %s through %s\n"
7807 7820 msgstr ""
7808 7821
7809 7822 msgid "journal already exists - run hg recover"
7810 7823 msgstr ""
7811 7824
7812 7825 msgid "rolling back interrupted transaction\n"
7813 7826 msgstr ""
7814 7827
7815 7828 msgid "no interrupted transaction available\n"
7816 7829 msgstr ""
7817 7830
7818 7831 msgid "rolling back last transaction\n"
7819 7832 msgstr ""
7820 7833
7821 7834 #, python-format
7822 7835 msgid "Named branch could not be reset, current branch still is: %s\n"
7823 7836 msgstr ""
7824 7837
7825 7838 msgid "no rollback information available\n"
7826 7839 msgstr ""
7827 7840
7828 7841 #, python-format
7829 7842 msgid "waiting for lock on %s held by %r\n"
7830 7843 msgstr ""
7831 7844
7832 7845 #, python-format
7833 7846 msgid "repository %s"
7834 7847 msgstr ""
7835 7848
7836 7849 #, python-format
7837 7850 msgid "working directory of %s"
7838 7851 msgstr ""
7839 7852
7840 7853 #, python-format
7841 7854 msgid " %s: searching for copy revision for %s\n"
7842 7855 msgstr ""
7843 7856
7844 7857 #, python-format
7845 7858 msgid " %s: copy %s:%s\n"
7846 7859 msgstr ""
7847 7860
7848 7861 msgid "cannot partially commit a merge (do not specify files or patterns)"
7849 7862 msgstr ""
7850 7863
7851 7864 msgid "file not found!"
7852 7865 msgstr ""
7853 7866
7854 7867 msgid "no match under directory!"
7855 7868 msgstr ""
7856 7869
7857 7870 msgid "file not tracked!"
7858 7871 msgstr ""
7859 7872
7860 7873 msgid "nothing changed\n"
7861 7874 msgstr ""
7862 7875
7863 7876 msgid "unresolved merge conflicts (see hg resolve)"
7864 7877 msgstr ""
7865 7878
7866 7879 #, python-format
7867 7880 msgid "committing subrepository %s\n"
7868 7881 msgstr ""
7869 7882
7870 7883 #, python-format
7871 7884 msgid "trouble committing %s!\n"
7872 7885 msgstr ""
7873 7886
7874 7887 #, python-format
7875 7888 msgid "%s does not exist!\n"
7876 7889 msgstr ""
7877 7890
7878 7891 #, python-format
7879 7892 msgid ""
7880 7893 "%s: files over 10MB may cause memory and performance problems\n"
7881 7894 "(use 'hg revert %s' to unadd the file)\n"
7882 7895 msgstr ""
7883 7896
7884 7897 #, python-format
7885 7898 msgid "%s not added: only files and symlinks supported currently\n"
7886 7899 msgstr ""
7887 7900
7888 7901 #, python-format
7889 7902 msgid "%s already tracked!\n"
7890 7903 msgstr ""
7891 7904
7892 7905 #, python-format
7893 7906 msgid "%s not added!\n"
7894 7907 msgstr ""
7895 7908
7896 7909 #, python-format
7897 7910 msgid "%s still exists!\n"
7898 7911 msgstr ""
7899 7912
7900 7913 #, python-format
7901 7914 msgid "%s not tracked!\n"
7902 7915 msgstr ""
7903 7916
7904 7917 #, python-format
7905 7918 msgid "%s not removed!\n"
7906 7919 msgstr ""
7907 7920
7908 7921 #, python-format
7909 7922 msgid "copy failed: %s is not a file or a symbolic link\n"
7910 7923 msgstr ""
7911 7924
7912 7925 msgid "searching for changes\n"
7913 7926 msgstr ""
7914 7927
7915 7928 #, python-format
7916 7929 msgid "examining %s:%s\n"
7917 7930 msgstr ""
7918 7931
7919 7932 msgid "branch already found\n"
7920 7933 msgstr ""
7921 7934
7922 7935 #, python-format
7923 7936 msgid "found incomplete branch %s:%s\n"
7924 7937 msgstr ""
7925 7938
7926 7939 #, python-format
7927 7940 msgid "found new changeset %s\n"
7928 7941 msgstr ""
7929 7942
7930 7943 #, python-format
7931 7944 msgid "request %d: %s\n"
7932 7945 msgstr ""
7933 7946
7934 7947 #, python-format
7935 7948 msgid "received %s:%s\n"
7936 7949 msgstr ""
7937 7950
7938 7951 #, python-format
7939 7952 msgid "narrowing %d:%d %s\n"
7940 7953 msgstr ""
7941 7954
7942 7955 #, python-format
7943 7956 msgid "found new branch changeset %s\n"
7944 7957 msgstr ""
7945 7958
7946 7959 #, python-format
7947 7960 msgid "narrowed branch search to %s:%s\n"
7948 7961 msgstr ""
7949 7962
7950 7963 msgid "already have changeset "
7951 7964 msgstr ""
7952 7965
7953 7966 msgid "warning: repository is unrelated\n"
7954 7967 msgstr ""
7955 7968
7956 7969 msgid "repository is unrelated"
7957 7970 msgstr ""
7958 7971
7959 7972 msgid "found new changesets starting at "
7960 7973 msgstr ""
7961 7974
7962 7975 #, python-format
7963 7976 msgid "%d total queries\n"
7964 7977 msgstr ""
7965 7978
7966 7979 msgid "common changesets up to "
7967 7980 msgstr ""
7968 7981
7969 7982 msgid "requesting all changes\n"
7970 7983 msgstr ""
7971 7984
7972 7985 msgid ""
7973 7986 "Partial pull cannot be done because other repository doesn't support "
7974 7987 "changegroupsubset."
7975 7988 msgstr ""
7976 7989
7977 7990 #, python-format
7978 7991 msgid "abort: push creates new remote branch '%s'!\n"
7979 7992 msgstr ""
7980 7993
7981 7994 msgid "abort: push creates new remote heads!\n"
7982 7995 msgstr ""
7983 7996
7984 7997 msgid "(did you forget to merge? use push -f to force)\n"
7985 7998 msgstr ""
7986 7999
7987 8000 msgid "note: unsynced remote changes!\n"
7988 8001 msgstr ""
7989 8002
7990 8003 #, python-format
7991 8004 msgid "%d changesets found\n"
7992 8005 msgstr ""
7993 8006
7994 8007 msgid "list of changesets:\n"
7995 8008 msgstr ""
7996 8009
7997 8010 #, python-format
7998 8011 msgid "empty or missing revlog for %s"
7999 8012 msgstr ""
8000 8013
8001 8014 #, python-format
8002 8015 msgid "add changeset %s\n"
8003 8016 msgstr ""
8004 8017
8005 8018 msgid "adding changesets\n"
8006 8019 msgstr ""
8007 8020
8008 8021 msgid "received changelog group is empty"
8009 8022 msgstr ""
8010 8023
8011 8024 msgid "adding manifests\n"
8012 8025 msgstr ""
8013 8026
8014 8027 msgid "adding file changes\n"
8015 8028 msgstr ""
8016 8029
8017 8030 #, python-format
8018 8031 msgid "adding %s revisions\n"
8019 8032 msgstr ""
8020 8033
8021 8034 msgid "received file revlog group is empty"
8022 8035 msgstr ""
8023 8036
8024 8037 #, python-format
8025 8038 msgid " (%+d heads)"
8026 8039 msgstr ""
8027 8040
8028 8041 #, python-format
8029 8042 msgid "added %d changesets with %d changes to %d files%s\n"
8030 8043 msgstr ""
8031 8044
8032 8045 msgid "updating the branch cache\n"
8033 8046 msgstr ""
8034 8047
8035 8048 msgid "Unexpected response from remote server:"
8036 8049 msgstr ""
8037 8050
8038 8051 msgid "operation forbidden by server"
8039 8052 msgstr ""
8040 8053
8041 8054 msgid "locking the remote repository failed"
8042 8055 msgstr ""
8043 8056
8044 8057 msgid "the server sent an unknown error code"
8045 8058 msgstr ""
8046 8059
8047 8060 msgid "streaming all changes\n"
8048 8061 msgstr ""
8049 8062
8050 8063 #, python-format
8051 8064 msgid "%d files to transfer, %s of data\n"
8052 8065 msgstr ""
8053 8066
8054 8067 #, python-format
8055 8068 msgid "adding %s (%s)\n"
8056 8069 msgstr ""
8057 8070
8058 8071 #, python-format
8059 8072 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8060 8073 msgstr ""
8061 8074
8062 8075 msgid "no [smtp]host in hgrc - cannot send mail"
8063 8076 msgstr ""
8064 8077
8065 8078 #, python-format
8066 8079 msgid "sending mail: smtp host %s, port %s\n"
8067 8080 msgstr ""
8068 8081
8069 8082 msgid "can't use TLS: Python SSL support not installed"
8070 8083 msgstr ""
8071 8084
8072 8085 msgid "(using tls)\n"
8073 8086 msgstr ""
8074 8087
8075 8088 #, python-format
8076 8089 msgid "(authenticating to mail server as %s)\n"
8077 8090 msgstr ""
8078 8091
8079 8092 #, python-format
8080 8093 msgid "sending mail: %s\n"
8081 8094 msgstr ""
8082 8095
8083 8096 msgid "smtp specified as email transport, but no smtp host configured"
8084 8097 msgstr ""
8085 8098
8086 8099 #, python-format
8087 8100 msgid "%r specified as email transport, but not in PATH"
8088 8101 msgstr ""
8089 8102
8090 8103 #, python-format
8091 8104 msgid "ignoring invalid sendcharset: %s\n"
8092 8105 msgstr ""
8093 8106
8094 8107 #, python-format
8095 8108 msgid "invalid email address: %s"
8096 8109 msgstr ""
8097 8110
8098 8111 #, python-format
8099 8112 msgid "invalid local address: %s"
8100 8113 msgstr ""
8101 8114
8102 8115 #, python-format
8103 8116 msgid "failed to remove %s from manifest"
8104 8117 msgstr ""
8105 8118
8106 8119 #, python-format
8107 8120 msgid "diff context lines count must be an integer, not %r"
8108 8121 msgstr ""
8109 8122
8110 8123 #, python-format
8111 8124 msgid ""
8112 8125 "untracked file in working directory differs from file in requested revision: "
8113 8126 "'%s'"
8114 8127 msgstr ""
8115 8128
8116 8129 #, python-format
8117 8130 msgid "case-folding collision between %s and %s"
8118 8131 msgstr ""
8119 8132
8120 8133 #, python-format
8121 8134 msgid ""
8122 8135 " conflicting flags for %s\n"
8123 8136 "(n)one, e(x)ec or sym(l)ink?"
8124 8137 msgstr ""
8125 8138
8126 8139 msgid "&None"
8127 8140 msgstr ""
8128 8141
8129 8142 msgid "E&xec"
8130 8143 msgstr ""
8131 8144
8132 8145 msgid "Sym&link"
8133 8146 msgstr ""
8134 8147
8135 8148 msgid "resolving manifests\n"
8136 8149 msgstr ""
8137 8150
8138 8151 #, python-format
8139 8152 msgid " overwrite %s partial %s\n"
8140 8153 msgstr ""
8141 8154
8142 8155 #, python-format
8143 8156 msgid " ancestor %s local %s remote %s\n"
8144 8157 msgstr ""
8145 8158
8146 8159 #, python-format
8147 8160 msgid ""
8148 8161 " local changed %s which remote deleted\n"
8149 8162 "use (c)hanged version or (d)elete?"
8150 8163 msgstr ""
8151 8164
8152 8165 msgid "&Changed"
8153 8166 msgstr ""
8154 8167
8155 8168 msgid "&Delete"
8156 8169 msgstr ""
8157 8170
8158 8171 msgid "c"
8159 8172 msgstr ""
8160 8173
8161 8174 #, python-format
8162 8175 msgid ""
8163 8176 "remote changed %s which local deleted\n"
8164 8177 "use (c)hanged version or leave (d)eleted?"
8165 8178 msgstr ""
8166 8179
8167 8180 msgid "&Deleted"
8168 8181 msgstr ""
8169 8182
8170 8183 #, python-format
8171 8184 msgid "preserving %s for resolve of %s\n"
8172 8185 msgstr ""
8173 8186
8174 8187 #, python-format
8175 8188 msgid "update failed to remove %s: %s!\n"
8176 8189 msgstr ""
8177 8190
8178 8191 #, python-format
8179 8192 msgid "getting %s\n"
8180 8193 msgstr ""
8181 8194
8182 8195 #, python-format
8183 8196 msgid "getting %s to %s\n"
8184 8197 msgstr ""
8185 8198
8186 8199 #, python-format
8187 8200 msgid "warning: detected divergent renames of %s to:\n"
8188 8201 msgstr ""
8189 8202
8190 8203 #, python-format
8191 8204 msgid "branch %s not found"
8192 8205 msgstr ""
8193 8206
8194 8207 msgid "can't merge with ancestor"
8195 8208 msgstr ""
8196 8209
8197 8210 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8198 8211 msgstr ""
8199 8212
8200 8213 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8201 8214 msgstr ""
8202 8215
8203 8216 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8204 8217 msgstr ""
8205 8218
8206 8219 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8207 8220 msgstr ""
8208 8221
8209 8222 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8210 8223 msgstr ""
8211 8224
8212 8225 #, python-format
8213 8226 msgid "cannot create %s: destination already exists"
8214 8227 msgstr ""
8215 8228
8216 8229 #, python-format
8217 8230 msgid "cannot create %s: unable to create destination directory"
8218 8231 msgstr ""
8219 8232
8220 8233 #, python-format
8221 8234 msgid "found patch at byte %d\n"
8222 8235 msgstr ""
8223 8236
8224 8237 msgid "patch generated by hg export\n"
8225 8238 msgstr ""
8226 8239
8227 8240 #, python-format
8228 8241 msgid "unable to find '%s' for patching\n"
8229 8242 msgstr ""
8230 8243
8231 8244 #, python-format
8232 8245 msgid "patching file %s\n"
8233 8246 msgstr ""
8234 8247
8235 8248 #, python-format
8236 8249 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8237 8250 msgstr ""
8238 8251
8239 8252 #, python-format
8240 8253 msgid "bad hunk #%d %s (%d %d %d %d)"
8241 8254 msgstr ""
8242 8255
8243 8256 #, python-format
8244 8257 msgid "file %s already exists\n"
8245 8258 msgstr ""
8246 8259
8247 8260 #, python-format
8248 8261 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8249 8262 msgstr ""
8250 8263
8251 8264 #, python-format
8252 8265 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8253 8266 msgstr ""
8254 8267
8255 8268 #, python-format
8256 8269 msgid "Hunk #%d FAILED at %d\n"
8257 8270 msgstr ""
8258 8271
8259 8272 #, python-format
8260 8273 msgid "bad hunk #%d"
8261 8274 msgstr ""
8262 8275
8263 8276 #, python-format
8264 8277 msgid "bad hunk #%d old text line %d"
8265 8278 msgstr ""
8266 8279
8267 8280 msgid "could not extract binary patch"
8268 8281 msgstr ""
8269 8282
8270 8283 #, python-format
8271 8284 msgid "binary patch is %d bytes, not %d"
8272 8285 msgstr ""
8273 8286
8274 8287 #, python-format
8275 8288 msgid "unable to strip away %d dirs from %s"
8276 8289 msgstr ""
8277 8290
8278 8291 msgid "undefined source and destination files"
8279 8292 msgstr ""
8280 8293
8281 8294 #, python-format
8282 8295 msgid "malformed patch %s %s"
8283 8296 msgstr ""
8284 8297
8285 8298 #, python-format
8286 8299 msgid "unsupported parser state: %s"
8287 8300 msgstr ""
8288 8301
8289 8302 #, python-format
8290 8303 msgid "patch command failed: %s"
8291 8304 msgstr ""
8292 8305
8293 8306 #, python-format
8294 8307 msgid "Unsupported line endings type: %s"
8295 8308 msgstr ""
8296 8309
8297 8310 #, python-format
8298 8311 msgid "no valid hunks found; trying with %r instead\n"
8299 8312 msgstr ""
8300 8313
8301 8314 #, python-format
8302 8315 msgid "exited with status %d"
8303 8316 msgstr ""
8304 8317
8305 8318 #, python-format
8306 8319 msgid "killed by signal %d"
8307 8320 msgstr ""
8308 8321
8309 8322 #, python-format
8310 8323 msgid "stopped by signal %d"
8311 8324 msgstr ""
8312 8325
8313 8326 msgid "invalid exit code"
8314 8327 msgstr ""
8315 8328
8316 8329 #, python-format
8317 8330 msgid "saving bundle to %s\n"
8318 8331 msgstr ""
8319 8332
8320 8333 msgid "adding branch\n"
8321 8334 msgstr ""
8322 8335
8323 8336 #, python-format
8324 8337 msgid "cannot %s; remote repository does not support the %r capability"
8325 8338 msgstr ""
8326 8339
8327 8340 #, python-format
8328 8341 msgid "unknown compression type %r"
8329 8342 msgstr ""
8330 8343
8331 8344 #, python-format
8332 8345 msgid "index %s unknown flags %#04x for format v0"
8333 8346 msgstr ""
8334 8347
8335 8348 #, python-format
8336 8349 msgid "index %s unknown flags %#04x for revlogng"
8337 8350 msgstr ""
8338 8351
8339 8352 #, python-format
8340 8353 msgid "index %s unknown format %d"
8341 8354 msgstr ""
8342 8355
8343 8356 #, python-format
8344 8357 msgid "index %s is corrupted"
8345 8358 msgstr ""
8346 8359
8347 8360 msgid "no node"
8348 8361 msgstr ""
8349 8362
8350 8363 msgid "ambiguous identifier"
8351 8364 msgstr ""
8352 8365
8353 8366 msgid "no match found"
8354 8367 msgstr ""
8355 8368
8356 8369 #, python-format
8357 8370 msgid "incompatible revision flag %x"
8358 8371 msgstr ""
8359 8372
8360 8373 #, python-format
8361 8374 msgid "%s not found in the transaction"
8362 8375 msgstr ""
8363 8376
8364 8377 msgid "unknown base"
8365 8378 msgstr ""
8366 8379
8367 8380 msgid "consistency error adding group"
8368 8381 msgstr ""
8369 8382
8370 8383 #, python-format
8371 8384 msgid "%s looks like a binary file."
8372 8385 msgstr ""
8373 8386
8374 8387 msgid "can only specify two labels."
8375 8388 msgstr ""
8376 8389
8377 8390 msgid "warning: conflicts during merge.\n"
8378 8391 msgstr ""
8379 8392
8380 8393 #, python-format
8381 8394 msgid "couldn't parse location %s"
8382 8395 msgstr ""
8383 8396
8384 8397 msgid "could not create remote repo"
8385 8398 msgstr ""
8386 8399
8387 8400 msgid "remote: "
8388 8401 msgstr ""
8389 8402
8390 8403 msgid "no suitable response from remote hg"
8391 8404 msgstr ""
8392 8405
8393 8406 #, python-format
8394 8407 msgid "push refused: %s"
8395 8408 msgstr ""
8396 8409
8397 8410 msgid "unsynced changes"
8398 8411 msgstr ""
8399 8412
8400 8413 msgid "cannot lock static-http repository"
8401 8414 msgstr ""
8402 8415
8403 8416 msgid "cannot create new static-http repository"
8404 8417 msgstr ""
8405 8418
8406 8419 #, python-format
8407 8420 msgid "invalid entry in fncache, line %s"
8408 8421 msgstr ""
8409 8422
8410 8423 msgid "scanning\n"
8411 8424 msgstr ""
8412 8425
8413 8426 #, python-format
8414 8427 msgid "%d files, %d bytes to transfer\n"
8415 8428 msgstr ""
8416 8429
8417 8430 #, python-format
8418 8431 msgid "sending %s (%d bytes)\n"
8419 8432 msgstr ""
8420 8433
8421 8434 #, python-format
8422 8435 msgid ""
8423 8436 " subrepository sources for %s differ\n"
8424 8437 "use (l)ocal source (%s) or (r)emote source (%s)?"
8425 8438 msgstr ""
8426 8439
8427 8440 msgid "&Remote"
8428 8441 msgstr ""
8429 8442
8430 8443 msgid "r"
8431 8444 msgstr ""
8432 8445
8433 8446 #, python-format
8434 8447 msgid ""
8435 8448 " local changed subrepository %s which remote removed\n"
8436 8449 "use (c)hanged version or (d)elete?"
8437 8450 msgstr ""
8438 8451
8439 8452 #, python-format
8440 8453 msgid ""
8441 8454 " remote changed subrepository %s which local removed\n"
8442 8455 "use (c)hanged version or (d)elete?"
8443 8456 msgstr ""
8444 8457
8445 8458 #, python-format
8446 8459 msgid "removing subrepo %s\n"
8447 8460 msgstr ""
8448 8461
8449 8462 #, python-format
8450 8463 msgid "pulling subrepo %s\n"
8451 8464 msgstr ""
8452 8465
8453 8466 #, python-format
8454 8467 msgid "pushing subrepo %s\n"
8455 8468 msgstr ""
8456 8469
8457 8470 msgid "unmatched quotes"
8458 8471 msgstr ""
8459 8472
8460 8473 #, python-format
8461 8474 msgid "error expanding '%s%%%s'"
8462 8475 msgstr ""
8463 8476
8464 8477 #, python-format
8465 8478 msgid "unknown filter '%s'"
8466 8479 msgstr ""
8467 8480
8468 8481 #, python-format
8469 8482 msgid "style not found: %s"
8470 8483 msgstr ""
8471 8484
8472 8485 #, python-format
8473 8486 msgid "template file %s: %s"
8474 8487 msgstr ""
8475 8488
8476 8489 msgid "cannot use transaction when it is already committed/aborted"
8477 8490 msgstr ""
8478 8491
8479 8492 #, python-format
8480 8493 msgid "failed to truncate %s\n"
8481 8494 msgstr ""
8482 8495
8483 8496 msgid "transaction abort!\n"
8484 8497 msgstr ""
8485 8498
8486 8499 msgid "rollback completed\n"
8487 8500 msgstr ""
8488 8501
8489 8502 msgid "rollback failed - please run hg recover\n"
8490 8503 msgstr ""
8491 8504
8492 8505 #, python-format
8493 8506 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8494 8507 msgstr ""
8495 8508
8496 8509 #, python-format
8497 8510 msgid "Ignored: %s\n"
8498 8511 msgstr ""
8499 8512
8500 8513 #, python-format
8501 8514 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8502 8515 msgstr ""
8503 8516
8504 8517 #, python-format
8505 8518 msgid "%s.%s not a boolean ('%s')"
8506 8519 msgstr ""
8507 8520
8508 8521 msgid "enter a commit username:"
8509 8522 msgstr ""
8510 8523
8511 8524 #, python-format
8512 8525 msgid "No username found, using '%s' instead\n"
8513 8526 msgstr ""
8514 8527
8515 8528 msgid "Please specify a username."
8516 8529 msgstr ""
8517 8530
8518 8531 #, python-format
8519 8532 msgid "username %s contains a newline\n"
8520 8533 msgstr ""
8521 8534
8522 8535 msgid "unrecognized response\n"
8523 8536 msgstr ""
8524 8537
8525 8538 msgid "response expected"
8526 8539 msgstr ""
8527 8540
8528 8541 msgid "password: "
8529 8542 msgstr ""
8530 8543
8531 8544 msgid "edit failed"
8532 8545 msgstr ""
8533 8546
8534 8547 msgid "http authorization required"
8535 8548 msgstr ""
8536 8549
8537 8550 msgid "http authorization required\n"
8538 8551 msgstr ""
8539 8552
8540 8553 #, python-format
8541 8554 msgid "realm: %s\n"
8542 8555 msgstr ""
8543 8556
8544 8557 #, python-format
8545 8558 msgid "user: %s\n"
8546 8559 msgstr ""
8547 8560
8548 8561 msgid "user:"
8549 8562 msgstr ""
8550 8563
8551 8564 #, python-format
8552 8565 msgid "http auth: user %s, password %s\n"
8553 8566 msgstr ""
8554 8567
8555 8568 #, python-format
8556 8569 msgid "proxying through http://%s:%s\n"
8557 8570 msgstr ""
8558 8571
8559 8572 #, python-format
8560 8573 msgid "command '%s' failed: %s"
8561 8574 msgstr ""
8562 8575
8563 8576 #, python-format
8564 8577 msgid "path contains illegal component: %s"
8565 8578 msgstr ""
8566 8579
8567 8580 #, python-format
8568 8581 msgid "path %r is inside repo %r"
8569 8582 msgstr ""
8570 8583
8571 8584 #, python-format
8572 8585 msgid "path %r traverses symbolic link %r"
8573 8586 msgstr ""
8574 8587
8575 8588 msgid "Hardlinks not supported"
8576 8589 msgstr ""
8577 8590
8578 8591 #, python-format
8579 8592 msgid "could not symlink to %r: %s"
8580 8593 msgstr ""
8581 8594
8582 8595 #, python-format
8583 8596 msgid "invalid date: %r "
8584 8597 msgstr ""
8585 8598
8586 8599 #, python-format
8587 8600 msgid "date exceeds 32 bits: %d"
8588 8601 msgstr ""
8589 8602
8590 8603 #, python-format
8591 8604 msgid "impossible time zone offset: %d"
8592 8605 msgstr ""
8593 8606
8594 8607 #, python-format
8595 8608 msgid "invalid day spec: %s"
8596 8609 msgstr ""
8597 8610
8598 8611 #, python-format
8599 8612 msgid "%.0f GB"
8600 8613 msgstr ""
8601 8614
8602 8615 #, python-format
8603 8616 msgid "%.1f GB"
8604 8617 msgstr ""
8605 8618
8606 8619 #, python-format
8607 8620 msgid "%.2f GB"
8608 8621 msgstr ""
8609 8622
8610 8623 #, python-format
8611 8624 msgid "%.0f MB"
8612 8625 msgstr ""
8613 8626
8614 8627 #, python-format
8615 8628 msgid "%.1f MB"
8616 8629 msgstr ""
8617 8630
8618 8631 #, python-format
8619 8632 msgid "%.2f MB"
8620 8633 msgstr ""
8621 8634
8622 8635 #, python-format
8623 8636 msgid "%.0f KB"
8624 8637 msgstr ""
8625 8638
8626 8639 #, python-format
8627 8640 msgid "%.1f KB"
8628 8641 msgstr ""
8629 8642
8630 8643 #, python-format
8631 8644 msgid "%.2f KB"
8632 8645 msgstr ""
8633 8646
8634 8647 #, python-format
8635 8648 msgid "%.0f bytes"
8636 8649 msgstr ""
8637 8650
8638 8651 msgid "cannot verify bundle or remote repos"
8639 8652 msgstr ""
8640 8653
8641 8654 msgid "interrupted"
8642 8655 msgstr ""
8643 8656
8644 8657 #, python-format
8645 8658 msgid "empty or missing %s"
8646 8659 msgstr ""
8647 8660
8648 8661 #, python-format
8649 8662 msgid "data length off by %d bytes"
8650 8663 msgstr ""
8651 8664
8652 8665 #, python-format
8653 8666 msgid "index contains %d extra bytes"
8654 8667 msgstr ""
8655 8668
8656 8669 #, python-format
8657 8670 msgid "warning: `%s' uses revlog format 1"
8658 8671 msgstr ""
8659 8672
8660 8673 #, python-format
8661 8674 msgid "warning: `%s' uses revlog format 0"
8662 8675 msgstr ""
8663 8676
8664 8677 #, python-format
8665 8678 msgid "rev %d points to nonexistent changeset %d"
8666 8679 msgstr ""
8667 8680
8668 8681 #, python-format
8669 8682 msgid "rev %d points to unexpected changeset %d"
8670 8683 msgstr ""
8671 8684
8672 8685 #, python-format
8673 8686 msgid " (expected %s)"
8674 8687 msgstr ""
8675 8688
8676 8689 #, python-format
8677 8690 msgid "unknown parent 1 %s of %s"
8678 8691 msgstr ""
8679 8692
8680 8693 #, python-format
8681 8694 msgid "unknown parent 2 %s of %s"
8682 8695 msgstr ""
8683 8696
8684 8697 #, python-format
8685 8698 msgid "checking parents of %s"
8686 8699 msgstr ""
8687 8700
8688 8701 #, python-format
8689 8702 msgid "duplicate revision %d (%d)"
8690 8703 msgstr ""
8691 8704
8692 8705 #, python-format
8693 8706 msgid "repository uses revlog format %d\n"
8694 8707 msgstr ""
8695 8708
8696 8709 msgid "checking changesets\n"
8697 8710 msgstr ""
8698 8711
8699 8712 #, python-format
8700 8713 msgid "unpacking changeset %s"
8701 8714 msgstr ""
8702 8715
8703 8716 msgid "checking manifests\n"
8704 8717 msgstr ""
8705 8718
8706 8719 #, python-format
8707 8720 msgid "%s not in changesets"
8708 8721 msgstr ""
8709 8722
8710 8723 msgid "file without name in manifest"
8711 8724 msgstr ""
8712 8725
8713 8726 #, python-format
8714 8727 msgid "reading manifest delta %s"
8715 8728 msgstr ""
8716 8729
8717 8730 msgid "crosschecking files in changesets and manifests\n"
8718 8731 msgstr ""
8719 8732
8720 8733 #, python-format
8721 8734 msgid "changeset refers to unknown manifest %s"
8722 8735 msgstr ""
8723 8736
8724 8737 msgid "in changeset but not in manifest"
8725 8738 msgstr ""
8726 8739
8727 8740 msgid "in manifest but not in changeset"
8728 8741 msgstr ""
8729 8742
8730 8743 msgid "checking files\n"
8731 8744 msgstr ""
8732 8745
8733 8746 #, python-format
8734 8747 msgid "cannot decode filename '%s'"
8735 8748 msgstr ""
8736 8749
8737 8750 #, python-format
8738 8751 msgid "broken revlog! (%s)"
8739 8752 msgstr ""
8740 8753
8741 8754 msgid "missing revlog!"
8742 8755 msgstr ""
8743 8756
8744 8757 #, python-format
8745 8758 msgid "%s not in manifests"
8746 8759 msgstr ""
8747 8760
8748 8761 #, python-format
8749 8762 msgid "unpacked size is %s, %s expected"
8750 8763 msgstr ""
8751 8764
8752 8765 #, python-format
8753 8766 msgid "unpacking %s"
8754 8767 msgstr ""
8755 8768
8756 8769 #, python-format
8757 8770 msgid "empty or missing copy source revlog %s:%s"
8758 8771 msgstr ""
8759 8772
8760 8773 #, python-format
8761 8774 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
8762 8775 msgstr ""
8763 8776
8764 8777 #, python-format
8765 8778 msgid "checking rename of %s"
8766 8779 msgstr ""
8767 8780
8768 8781 #, python-format
8769 8782 msgid "%s in manifests not found"
8770 8783 msgstr ""
8771 8784
8772 8785 #, python-format
8773 8786 msgid "warning: orphan revlog '%s'"
8774 8787 msgstr ""
8775 8788
8776 8789 #, python-format
8777 8790 msgid "%d files, %d changesets, %d total revisions\n"
8778 8791 msgstr ""
8779 8792
8780 8793 #, python-format
8781 8794 msgid "%d warnings encountered!\n"
8782 8795 msgstr ""
8783 8796
8784 8797 #, python-format
8785 8798 msgid "%d integrity errors encountered!\n"
8786 8799 msgstr ""
8787 8800
8788 8801 #, python-format
8789 8802 msgid "(first damaged changeset appears to be %d)\n"
8790 8803 msgstr ""
8791 8804
8792 8805 msgid "user name not available - set USERNAME environment variable"
8793 8806 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now