##// END OF EJS Templates
i18n-fr: split messages into paragraphs
Martin Geisler -
r11395:42b46d3c default
parent child Browse files
Show More
This diff has been collapsed as it changes many lines, (5816 lines changed) Show them Hide them
@@ -106,25 +106,25 b' msgid "COMMANDS"'
106 106 msgstr "COMMANDES"
107 107
108 108 #, fuzzy
109 msgid ""
110 " options:\n"
111 "\n"
109 msgid " options:"
112 110 msgstr "options :\n"
113 111
114 112 #, python-format
115 msgid ""
116 " aliases: %s\n"
117 "\n"
118 msgstr ""
119
120 msgid ""
121 "Some commands allow the user to specify a date, e.g.:\n"
122 "\n"
113 msgid " aliases: %s"
114 msgstr ""
115
116 msgid "Some commands allow the user to specify a date, e.g.:"
117 msgstr ""
118
119 msgid ""
123 120 "- backout, commit, import, tag: Specify the commit date.\n"
124 "- log, revert, update: Select revision(s) by date.\n"
125 "\n"
126 "Many date formats are valid. Here are some examples::\n"
127 "\n"
121 "- log, revert, update: Select revision(s) by date."
122 msgstr ""
123
124 msgid "Many date formats are valid. Here are some examples::"
125 msgstr ""
126
127 msgid ""
128 128 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
129 129 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
130 130 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
@@ -137,19 +137,26 b' msgid ""'
137 137 " \"2006-12-6\"\n"
138 138 " \"12-6\"\n"
139 139 " \"12/6\"\n"
140 " \"12/6/6\" (Dec 6 2006)\n"
141 "\n"
142 "Lastly, there is Mercurial's internal format::\n"
143 "\n"
144 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
145 "\n"
140 " \"12/6/6\" (Dec 6 2006)"
141 msgstr ""
142
143 msgid "Lastly, there is Mercurial's internal format::"
144 msgstr ""
145
146 msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)"
147 msgstr ""
148
149 msgid ""
146 150 "This is the internal representation format for dates. unixtime is the\n"
147 151 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
148 152 "the offset of the local timezone, in seconds west of UTC (negative if\n"
149 "the timezone is east of UTC).\n"
150 "\n"
151 "The log command also accepts date ranges::\n"
152 "\n"
153 "the timezone is east of UTC)."
154 msgstr ""
155
156 msgid "The log command also accepts date ranges::"
157 msgstr ""
158
159 msgid ""
153 160 " \"<{datetime}\" - at or before a given date/time\n"
154 161 " \">{datetime}\" - on or after a given date/time\n"
155 162 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
@@ -159,29 +166,39 b' msgstr ""'
159 166 msgid ""
160 167 "Mercurial's default format for showing changes between two versions of\n"
161 168 "a file is compatible with the unified format of GNU diff, which can be\n"
162 "used by GNU patch and many other standard tools.\n"
163 "\n"
169 "used by GNU patch and many other standard tools."
170 msgstr ""
171
172 msgid ""
164 173 "While this standard format is often enough, it does not encode the\n"
165 "following information:\n"
166 "\n"
174 "following information:"
175 msgstr ""
176
177 msgid ""
167 178 "- executable status and other permission bits\n"
168 179 "- copy or rename information\n"
169 180 "- changes in binary files\n"
170 "- creation or deletion of empty files\n"
171 "\n"
181 "- creation or deletion of empty files"
182 msgstr ""
183
184 msgid ""
172 185 "Mercurial also supports the extended diff format from the git VCS\n"
173 186 "which addresses these limitations. The git diff format is not produced\n"
174 187 "by default because a few widespread tools still do not understand this\n"
175 "format.\n"
176 "\n"
188 "format."
189 msgstr ""
190
191 msgid ""
177 192 "This means that when generating diffs from a Mercurial repository\n"
178 193 "(e.g. with \"hg export\"), you should be careful about things like file\n"
179 194 "copies and renames or other things mentioned above, because when\n"
180 195 "applying a standard diff to a different repository, this extra\n"
181 196 "information is lost. Mercurial's internal operations (like push and\n"
182 197 "pull) are not affected by this, because they use an internal binary\n"
183 "format for communicating changes.\n"
184 "\n"
198 "format for communicating changes."
199 msgstr ""
200
201 msgid ""
185 202 "To make Mercurial produce the git extended diff format, use the --git\n"
186 203 "option available for many commands, or set 'git = True' in the [diff]\n"
187 204 "section of your hgrc. You do not need to set this option when\n"
@@ -194,74 +211,98 b' msgid ""'
194 211 " hooks, extensions or external tools. If unset or empty, this is\n"
195 212 " the hg executable's name if it's frozen, or an executable named\n"
196 213 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
197 " Windows) is searched.\n"
198 "\n"
214 " Windows) is searched."
215 msgstr ""
216
217 msgid ""
199 218 "HGEDITOR\n"
200 " This is the name of the editor to run when committing. See EDITOR.\n"
201 "\n"
202 " (deprecated, use .hgrc)\n"
203 "\n"
219 " This is the name of the editor to run when committing. See EDITOR."
220 msgstr ""
221
222 msgid " (deprecated, use .hgrc)"
223 msgstr ""
224
225 msgid ""
204 226 "HGENCODING\n"
205 227 " This overrides the default locale setting detected by Mercurial.\n"
206 228 " This setting is used to convert data including usernames,\n"
207 229 " changeset descriptions, tag names, and branches. This setting can\n"
208 " be overridden with the --encoding command-line option.\n"
209 "\n"
230 " be overridden with the --encoding command-line option."
231 msgstr ""
232
233 msgid ""
210 234 "HGENCODINGMODE\n"
211 235 " This sets Mercurial's behavior for handling unknown characters\n"
212 236 " while transcoding user input. The default is \"strict\", which\n"
213 237 " causes Mercurial to abort if it can't map a character. Other\n"
214 238 " settings include \"replace\", which replaces unknown characters, and\n"
215 239 " \"ignore\", which drops them. This setting can be overridden with\n"
216 " the --encodingmode command-line option.\n"
217 "\n"
240 " the --encodingmode command-line option."
241 msgstr ""
242
243 msgid ""
218 244 "HGMERGE\n"
219 245 " An executable to use for resolving merge conflicts. The program\n"
220 246 " will be executed with three arguments: local file, remote file,\n"
221 " ancestor file.\n"
222 "\n"
223 " (deprecated, use .hgrc)\n"
224 "\n"
247 " ancestor file."
248 msgstr ""
249
250 msgid ""
225 251 "HGRCPATH\n"
226 252 " A list of files or directories to search for hgrc files. Item\n"
227 253 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
228 254 " platform default search path is used. If empty, only the .hg/hgrc\n"
229 " from the current repository is read.\n"
230 "\n"
231 " For each element in HGRCPATH:\n"
232 "\n"
255 " from the current repository is read."
256 msgstr ""
257
258 msgid " For each element in HGRCPATH:"
259 msgstr ""
260
261 msgid ""
233 262 " - if it's a directory, all files ending with .rc are added\n"
234 " - otherwise, the file itself will be added\n"
235 "\n"
263 " - otherwise, the file itself will be added"
264 msgstr ""
265
266 msgid ""
236 267 "HGUSER\n"
237 268 " This is the string used as the author of a commit. If not set,\n"
238 " available values will be considered in this order:\n"
239 "\n"
269 " available values will be considered in this order:"
270 msgstr ""
271
272 msgid ""
240 273 " - HGUSER (deprecated)\n"
241 274 " - hgrc files from the HGRCPATH\n"
242 275 " - EMAIL\n"
243 276 " - interactive prompt\n"
244 " - LOGNAME (with '@hostname' appended)\n"
245 "\n"
246 " (deprecated, use .hgrc)\n"
247 "\n"
277 " - LOGNAME (with '@hostname' appended)"
278 msgstr ""
279
280 msgid ""
248 281 "EMAIL\n"
249 " May be used as the author of a commit; see HGUSER.\n"
250 "\n"
282 " May be used as the author of a commit; see HGUSER."
283 msgstr ""
284
285 msgid ""
251 286 "LOGNAME\n"
252 " May be used as the author of a commit; see HGUSER.\n"
253 "\n"
287 " May be used as the author of a commit; see HGUSER."
288 msgstr ""
289
290 msgid ""
254 291 "VISUAL\n"
255 " This is the name of the editor to use when committing. See EDITOR.\n"
256 "\n"
292 " This is the name of the editor to use when committing. See EDITOR."
293 msgstr ""
294
295 msgid ""
257 296 "EDITOR\n"
258 297 " Sometimes Mercurial needs to open a text file in an editor for a\n"
259 298 " user to modify, for example when writing commit messages. The\n"
260 299 " editor it uses is determined by looking at the environment\n"
261 300 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
262 301 " non-empty one is chosen. If all of them are empty, the editor\n"
263 " defaults to 'vi'.\n"
264 "\n"
302 " defaults to 'vi'."
303 msgstr ""
304
305 msgid ""
265 306 "PYTHONPATH\n"
266 307 " This is used by Python to find imported modules and may need to be\n"
267 308 " set appropriately if this Mercurial is not installed system-wide.\n"
@@ -272,44 +313,25 b' msgid ""'
272 313 "Mercurial has the ability to add new features through the use of\n"
273 314 "extensions. Extensions may add new commands, add options to\n"
274 315 "existing commands, change the default behavior of commands, or\n"
275 "implement hooks.\n"
276 "\n"
316 "implement hooks."
317 msgstr ""
318 "\n"
319 " Mercurial a la capacité de s'enrichir de nouvelles\n"
320 " fonctionnalités par le biais d'extensions. Les extensions\n"
321 " permettent d'ajouter des nouvelles commandes, de changer le\n"
322 " comportement de commandes existantes ou leur ajouter des\n"
323 " options, ou encore d'implémenter de nouveaux \"hooks\"."
324
325 #, fuzzy
326 msgid ""
277 327 "Extensions are not loaded by default for a variety of reasons:\n"
278 328 "they can increase startup overhead; they may be meant for advanced\n"
279 329 "usage only; they may provide potentially dangerous abilities (such\n"
280 330 "as letting you destroy or modify history); they might not be ready\n"
281 331 "for prime time; or they may alter some usual behaviors of stock\n"
282 332 "Mercurial. It is thus up to the user to activate extensions as\n"
283 "needed.\n"
284 "\n"
285 "To enable the \"foo\" extension, either shipped with Mercurial or in\n"
286 "the Python search path, create an entry for it in your hgrc, like\n"
287 "this::\n"
288 "\n"
289 " [extensions]\n"
290 " foo =\n"
291 "\n"
292 "You may also specify the full path to an extension::\n"
293 "\n"
294 " [extensions]\n"
295 " myfeature = ~/.hgext/myfeature.py\n"
296 "\n"
297 "To explicitly disable an extension enabled in an hgrc of broader\n"
298 "scope, prepend its path with !::\n"
299 "\n"
300 " [extensions]\n"
301 " # disabling extension bar residing in /path/to/extension/bar.py\n"
302 " bar = !/path/to/extension/bar.py\n"
303 " # ditto, but no path was supplied for extension baz\n"
304 " baz = !\n"
305 msgstr ""
306 "\n"
307 " Mercurial a la capacité de s'enrichir de nouvelles\n"
308 " fonctionnalités par le biais d'extensions. Les extensions\n"
309 " permettent d'ajouter des nouvelles commandes, de changer le\n"
310 " comportement de commandes existantes ou leur ajouter des\n"
311 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
312 "\n"
333 "needed."
334 msgstr ""
313 335 " Les extensions ne sont pas chargées automatiquement par défaut\n"
314 336 " pour diverses raisons : elles peuvent accroître la latence\n"
315 337 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
@@ -320,23 +342,54 b' msgstr ""'
320 342 " grand nombre ; ou encore elles peuvent modifier certains des\n"
321 343 " comportements habituels de Mercurial.\n"
322 344 " Il appartient donc à l'utilisateur de les activer en fonction\n"
323 " de ses besoins.\n"
324 "\n"
345 " de ses besoins."
346
347 #, fuzzy
348 msgid ""
349 "To enable the \"foo\" extension, either shipped with Mercurial or in\n"
350 "the Python search path, create an entry for it in your hgrc, like\n"
351 "this::"
352 msgstr ""
325 353 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
326 354 " présente dans le chemin de recherche de Python, déclarez-la\n"
327 " dans votre fichier de configuration hgrc comme suit :\n"
328 "\n"
355 " dans votre fichier de configuration hgrc comme suit :"
356
357 #, fuzzy
358 msgid ""
359 " [extensions]\n"
360 " foo ="
361 msgstr ""
362 " [extensions]\n"
363 " truc ="
364
365 #, fuzzy
366 msgid "You may also specify the full path to an extension::"
367 msgstr " Vous pouvez aussi indiquer l'endroit où elle se trouve :"
368
369 #, fuzzy
370 msgid ""
329 371 " [extensions]\n"
330 " truc =\n"
331 "\n"
332 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
333 "\n"
372 " myfeature = ~/.hgext/myfeature.py"
373 msgstr ""
334 374 " [extensions]\n"
335 " monbidule = ~/.hgext/monbidule.py\n"
336 "\n"
375 " monbidule = ~/.hgext/monbidule.py"
376
377 #, fuzzy
378 msgid ""
379 "To explicitly disable an extension enabled in an hgrc of broader\n"
380 "scope, prepend its path with !::"
381 msgstr ""
337 382 " Pour forcer la désactivation d'une extension activée par un\n"
338 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
339 "\n"
383 " autre hgrc, précédez son chemin d'un point d'exclamation :"
384
385 #, fuzzy
386 msgid ""
387 " [extensions]\n"
388 " # disabling extension bar residing in /path/to/extension/bar.py\n"
389 " bar = !/path/to/extension/bar.py\n"
390 " # ditto, but no path was supplied for extension baz\n"
391 " baz = !\n"
392 msgstr ""
340 393 " [extensions]\n"
341 394 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
342 395 " bar = !/vers/machin.py\n"
@@ -347,89 +400,126 b' msgstr ""'
347 400 msgid ""
348 401 "When Mercurial accepts more than one revision, they may be specified\n"
349 402 "individually, or provided as a topologically continuous range,\n"
350 "separated by the \":\" character.\n"
351 "\n"
403 "separated by the \":\" character."
404 msgstr ""
405
406 msgid ""
352 407 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
353 408 "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
354 409 "specified, it defaults to revision number 0. If END is not specified,\n"
355 "it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
356 "\n"
357 "If BEGIN is greater than END, revisions are treated in reverse order.\n"
358 "\n"
410 "it defaults to the tip. The range \":\" thus means \"all revisions\"."
411 msgstr ""
412
413 msgid "If BEGIN is greater than END, revisions are treated in reverse order."
414 msgstr ""
415
416 msgid ""
359 417 "A range acts as a closed interval. This means that a range of 3:5\n"
360 418 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
361 419 msgstr ""
362 420
363 421 msgid ""
364 422 "Mercurial accepts several notations for identifying one or more files\n"
365 "at a time.\n"
366 "\n"
423 "at a time."
424 msgstr ""
425
426 msgid ""
367 427 "By default, Mercurial treats filenames as shell-style extended glob\n"
368 "patterns.\n"
369 "\n"
370 "Alternate pattern notations must be specified explicitly.\n"
371 "\n"
428 "patterns."
429 msgstr ""
430
431 msgid "Alternate pattern notations must be specified explicitly."
432 msgstr ""
433
434 msgid ""
372 435 "To use a plain path name without any pattern matching, start it with\n"
373 436 "``path:``. These path names must completely match starting at the\n"
374 "current repository root.\n"
375 "\n"
437 "current repository root."
438 msgstr ""
439
440 msgid ""
376 441 "To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
377 442 "at the current directory; a glob such as ``*.c`` will only match files\n"
378 "in the current directory ending with ``.c``.\n"
379 "\n"
443 "in the current directory ending with ``.c``."
444 msgstr ""
445
446 msgid ""
380 447 "The supported glob syntax extensions are ``**`` to match any string\n"
381 "across path separators and ``{a,b}`` to mean \"a or b\".\n"
382 "\n"
448 "across path separators and ``{a,b}`` to mean \"a or b\"."
449 msgstr ""
450
451 msgid ""
383 452 "To use a Perl/Python regular expression, start a name with ``re:``.\n"
384 "Regexp pattern matching is anchored at the root of the repository.\n"
385 "\n"
386 "Plain examples::\n"
387 "\n"
453 "Regexp pattern matching is anchored at the root of the repository."
454 msgstr ""
455
456 msgid "Plain examples::"
457 msgstr ""
458
459 msgid ""
388 460 " path:foo/bar a name bar in a directory named foo in the root\n"
389 461 " of the repository\n"
390 " path:path:name a file or directory named \"path:name\"\n"
391 "\n"
392 "Glob examples::\n"
393 "\n"
462 " path:path:name a file or directory named \"path:name\""
463 msgstr ""
464
465 msgid "Glob examples::"
466 msgstr ""
467
468 msgid ""
394 469 " glob:*.c any name ending in \".c\" in the current directory\n"
395 470 " *.c any name ending in \".c\" in the current directory\n"
396 471 " **.c any name ending in \".c\" in any subdirectory of the\n"
397 472 " current directory including itself.\n"
398 473 " foo/*.c any name ending in \".c\" in the directory foo\n"
399 474 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
400 " including itself.\n"
401 "\n"
402 "Regexp examples::\n"
403 "\n"
404 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
405 msgstr ""
406
407 msgid ""
408 "Mercurial supports several ways to specify individual revisions.\n"
409 "\n"
475 " including itself."
476 msgstr ""
477
478 msgid "Regexp examples::"
479 msgstr ""
480
481 msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
482 msgstr ""
483
484 msgid "Mercurial supports several ways to specify individual revisions."
485 msgstr ""
486
487 msgid ""
410 488 "A plain integer is treated as a revision number. Negative integers are\n"
411 489 "treated as sequential offsets from the tip, with -1 denoting the tip,\n"
412 "-2 denoting the revision prior to the tip, and so forth.\n"
413 "\n"
490 "-2 denoting the revision prior to the tip, and so forth."
491 msgstr ""
492
493 msgid ""
414 494 "A 40-digit hexadecimal string is treated as a unique revision\n"
415 "identifier.\n"
416 "\n"
495 "identifier."
496 msgstr ""
497
498 msgid ""
417 499 "A hexadecimal string less than 40 characters long is treated as a\n"
418 500 "unique revision identifier and is referred to as a short-form\n"
419 501 "identifier. A short-form identifier is only valid if it is the prefix\n"
420 "of exactly one full-length identifier.\n"
421 "\n"
502 "of exactly one full-length identifier."
503 msgstr ""
504
505 msgid ""
422 506 "Any other string is treated as a tag or branch name. A tag name is a\n"
423 507 "symbolic name associated with a revision identifier. A branch name\n"
424 508 "denotes the tipmost revision of that branch. Tag and branch names must\n"
425 "not contain the \":\" character.\n"
426 "\n"
509 "not contain the \":\" character."
510 msgstr ""
511
512 msgid ""
427 513 "The reserved name \"tip\" is a special tag that always identifies the\n"
428 "most recent revision.\n"
429 "\n"
514 "most recent revision."
515 msgstr ""
516
517 msgid ""
430 518 "The reserved name \"null\" indicates the null revision. This is the\n"
431 "revision of an empty repository, and the parent of revision 0.\n"
432 "\n"
519 "revision of an empty repository, and the parent of revision 0."
520 msgstr ""
521
522 msgid ""
433 523 "The reserved name \".\" indicates the working directory parent. If no\n"
434 524 "working directory is checked out, it is equivalent to null. If an\n"
435 525 "uncommitted merge is in progress, \".\" is the revision of the first\n"
@@ -440,26 +530,38 b' msgid ""'
440 530 "Mercurial allows you to customize output of commands through\n"
441 531 "templates. You can either pass in a template from the command\n"
442 532 "line, via the --template option, or select an existing\n"
443 "template-style (--style).\n"
444 "\n"
533 "template-style (--style)."
534 msgstr ""
535
536 msgid ""
445 537 "You can customize output for any \"log-like\" command: log,\n"
446 "outgoing, incoming, tip, parents, heads and glog.\n"
447 "\n"
538 "outgoing, incoming, tip, parents, heads and glog."
539 msgstr ""
540
541 msgid ""
448 542 "Three styles are packaged with Mercurial: default (the style used\n"
449 543 "when no explicit preference is passed), compact and changelog.\n"
450 "Usage::\n"
451 "\n"
452 " $ hg log -r1 --style changelog\n"
453 "\n"
544 "Usage::"
545 msgstr ""
546
547 msgid " $ hg log -r1 --style changelog"
548 msgstr ""
549
550 msgid ""
454 551 "A template is a piece of text, with markup to invoke variable\n"
455 "expansion::\n"
456 "\n"
457 " $ hg log -r1 --template \"{node}\\n\"\\n b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
458 "\n"
552 "expansion::"
553 msgstr ""
554
555 msgid " $ hg log -r1 --template \"{node}\\n\"\\n b56ce7b07c52de7d5fd79fb89701ea538af65746"
556 msgstr ""
557
558 msgid ""
459 559 "Strings in curly braces are called keywords. The availability of\n"
460 560 "keywords depends on the exact context of the templater. These\n"
461 "keywords are usually available for templating a log-like command:\n"
462 "\n"
561 "keywords are usually available for templating a log-like command:"
562 msgstr ""
563
564 msgid ""
463 565 ":author: String. The unmodified author of the changeset.\n"
464 566 ":branches: String. The name of the branch on which the changeset\n"
465 567 " was committed. Will be empty if the branch name was\n"
@@ -483,18 +585,24 b' msgid ""'
483 585 " changeset.\n"
484 586 ":latesttag: String. Most recent global tag in the ancestors of this\n"
485 587 " changeset.\n"
486 ":latesttagdistance: Integer. Longest path to the latest tag.\n"
487 "\n"
588 ":latesttagdistance: Integer. Longest path to the latest tag."
589 msgstr ""
590
591 msgid ""
488 592 "The \"date\" keyword does not produce human-readable output. If you\n"
489 593 "want to use a date in your output, you can use a filter to process\n"
490 594 "it. Filters are functions which return a string based on the input\n"
491 595 "variable. You can also use a chain of filters to get the desired\n"
492 "output::\n"
493 "\n"
494 " $ hg tip --template \"{date|isodate}\\n\"\\n 2008-08-21 18:22 +0000\n"
495 "\n"
496 "List of filters:\n"
497 "\n"
596 "output::"
597 msgstr ""
598
599 msgid " $ hg tip --template \"{date|isodate}\\n\"\\n 2008-08-21 18:22 +0000"
600 msgstr ""
601
602 msgid "List of filters:"
603 msgstr ""
604
605 msgid ""
498 606 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
499 607 " every line except the last.\n"
500 608 ":age: Date. Returns a human-readable date/time difference\n"
@@ -550,113 +658,160 b' msgid ""'
550 658 " address.\n"
551 659 msgstr ""
552 660
553 msgid ""
554 "Valid URLs are of the form::\n"
555 "\n"
661 msgid "Valid URLs are of the form::"
662 msgstr ""
663
664 msgid ""
556 665 " local/filesystem/path[#revision]\n"
557 666 " file://local/filesystem/path[#revision]\n"
558 667 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
559 668 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
560 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
561 "\n"
669 " ssh://[user[:pass]@]host[:port]/[path][#revision]"
670 msgstr ""
671
672 msgid ""
562 673 "Paths in the local filesystem can either point to Mercurial\n"
563 674 "repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
564 "incoming --bundle').\n"
565 "\n"
675 "incoming --bundle')."
676 msgstr ""
677
678 msgid ""
566 679 "An optional identifier after # indicates a particular branch, tag, or\n"
567 680 "changeset to use from the remote repository. See also 'hg help\n"
568 "revisions'.\n"
569 "\n"
681 "revisions'."
682 msgstr ""
683
684 msgid ""
570 685 "Some features, such as pushing to http:// and https:// URLs are only\n"
571 686 "possible if the feature is explicitly enabled on the remote Mercurial\n"
572 "server.\n"
573 "\n"
574 "Some notes about using SSH with Mercurial:\n"
575 "\n"
687 "server."
688 msgstr ""
689
690 msgid "Some notes about using SSH with Mercurial:"
691 msgstr ""
692
693 msgid ""
576 694 "- SSH requires an accessible shell account on the destination machine\n"
577 695 " and a copy of hg in the remote path or specified with as remotecmd.\n"
578 696 "- path is relative to the remote user's home directory by default. Use\n"
579 " an extra slash at the start of a path to specify an absolute path::\n"
580 "\n"
581 " ssh://example.com//tmp/repository\n"
582 "\n"
697 " an extra slash at the start of a path to specify an absolute path::"
698 msgstr ""
699
700 msgid " ssh://example.com//tmp/repository"
701 msgstr ""
702
703 msgid ""
583 704 "- Mercurial doesn't use its own compression via SSH; the right thing\n"
584 " to do is to configure it in your ~/.ssh/config, e.g.::\n"
585 "\n"
705 " to do is to configure it in your ~/.ssh/config, e.g.::"
706 msgstr ""
707
708 msgid ""
586 709 " Host *.mylocalnetwork.example.com\n"
587 710 " Compression no\n"
588 711 " Host *\n"
589 " Compression yes\n"
590 "\n"
712 " Compression yes"
713 msgstr ""
714
715 msgid ""
591 716 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
592 " with the --ssh command line option.\n"
593 "\n"
717 " with the --ssh command line option."
718 msgstr ""
719
720 msgid ""
594 721 "These URLs can all be stored in your hgrc with path aliases under the\n"
595 "[paths] section like so::\n"
596 "\n"
722 "[paths] section like so::"
723 msgstr ""
724
725 msgid ""
597 726 " [paths]\n"
598 727 " alias1 = URL1\n"
599 728 " alias2 = URL2\n"
600 " ...\n"
601 "\n"
729 " ..."
730 msgstr ""
731
732 msgid ""
602 733 "You can then use the alias for any command that uses a URL (for\n"
603 "example 'hg pull alias1' would pull from the 'alias1' path).\n"
604 "\n"
734 "example 'hg pull alias1' would pull from the 'alias1' path)."
735 msgstr ""
736
737 msgid ""
605 738 "Two path aliases are special because they are used as defaults when\n"
606 "you do not provide the URL to a command:\n"
607 "\n"
739 "you do not provide the URL to a command:"
740 msgstr ""
741
742 msgid ""
608 743 "default:\n"
609 744 " When you create a repository with hg clone, the clone command saves\n"
610 745 " the location of the source repository as the new repository's\n"
611 746 " 'default' path. This is then used when you omit path from push- and\n"
612 " pull-like commands (including incoming and outgoing).\n"
613 "\n"
747 " pull-like commands (including incoming and outgoing)."
748 msgstr ""
749
750 msgid ""
614 751 "default-push:\n"
615 752 " The push command will look for a path named 'default-push', and\n"
616 753 " prefer it over 'default' if both are defined.\n"
617 754 msgstr ""
618 755
619 msgid ""
620 "hooks for controlling repository access\n"
621 "\n"
756 msgid "hooks for controlling repository access"
757 msgstr ""
758
759 msgid ""
622 760 "This hook makes it possible to allow or deny write access to portions\n"
623 "of a repository when receiving incoming changesets.\n"
624 "\n"
761 "of a repository when receiving incoming changesets."
762 msgstr ""
763
764 msgid ""
625 765 "The authorization is matched based on the local user name on the\n"
626 766 "system where the hook runs, and not the committer of the original\n"
627 "changeset (since the latter is merely informative).\n"
628 "\n"
767 "changeset (since the latter is merely informative)."
768 msgstr ""
769
770 msgid ""
629 771 "The acl hook is best used along with a restricted shell like hgsh,\n"
630 772 "preventing authenticating users from doing anything other than\n"
631 773 "pushing or pulling. The hook is not safe to use if users have\n"
632 774 "interactive shell access, as they can then disable the hook.\n"
633 775 "Nor is it safe if remote users share an account, because then there\n"
634 "is no way to distinguish them.\n"
635 "\n"
636 "To use this hook, configure the acl extension in your hgrc like this::\n"
637 "\n"
776 "is no way to distinguish them."
777 msgstr ""
778
779 msgid "To use this hook, configure the acl extension in your hgrc like this::"
780 msgstr ""
781
782 msgid ""
638 783 " [extensions]\n"
639 " acl =\n"
640 "\n"
784 " acl ="
785 msgstr ""
786
787 msgid ""
641 788 " [hooks]\n"
642 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
643 "\n"
789 " pretxnchangegroup.acl = python:hgext.acl.hook"
790 msgstr ""
791
792 msgid ""
644 793 " [acl]\n"
645 794 " # Check whether the source of incoming changes is in this list\n"
646 795 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
647 " sources = serve\n"
648 "\n"
796 " sources = serve"
797 msgstr ""
798
799 msgid ""
649 800 "The allow and deny sections take a subtree pattern as key (with a glob\n"
650 801 "syntax by default), and a comma separated list of users as the\n"
651 802 "corresponding value. The deny list is checked before the allow list\n"
652 "is. ::\n"
653 "\n"
803 "is. ::"
804 msgstr ""
805
806 msgid ""
654 807 " [acl.allow]\n"
655 808 " # If acl.allow is not present, all users are allowed by default.\n"
656 809 " # An empty acl.allow section means no users allowed.\n"
657 810 " docs/** = doc_writer\n"
658 " .hgtags = release_engineer\n"
659 "\n"
811 " .hgtags = release_engineer"
812 msgstr ""
813
814 msgid ""
660 815 " [acl.deny]\n"
661 816 " # If acl.deny is not present, no users are refused by default.\n"
662 817 " # An empty acl.deny section means all users allowed.\n"
@@ -672,38 +827,47 b' msgstr ""'
672 827 msgid "acl: access denied for changeset %s"
673 828 msgstr ""
674 829
675 msgid ""
676 "track a line of development with movable markers\n"
677 "\n"
830 msgid "track a line of development with movable markers"
831 msgstr ""
832
833 msgid ""
678 834 "Bookmarks are local movable markers to changesets. Every bookmark\n"
679 835 "points to a changeset identified by its hash. If you commit a\n"
680 836 "changeset that is based on a changeset that has a bookmark on it, the\n"
681 "bookmark shifts to the new changeset.\n"
682 "\n"
837 "bookmark shifts to the new changeset."
838 msgstr ""
839
840 msgid ""
683 841 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
684 "merge, hg update).\n"
685 "\n"
842 "merge, hg update)."
843 msgstr ""
844
845 msgid ""
686 846 "By default, when several bookmarks point to the same changeset, they\n"
687 847 "will all move forward together. It is possible to obtain a more\n"
688 848 "git-like experience by adding the following configuration option to\n"
689 "your .hgrc::\n"
690 "\n"
849 "your .hgrc::"
850 msgstr ""
851
852 msgid ""
691 853 " [bookmarks]\n"
692 " track.current = True\n"
693 "\n"
854 " track.current = True"
855 msgstr ""
856
857 msgid ""
694 858 "This will cause Mercurial to track the bookmark that you are currently\n"
695 859 "using, and only update it. This is similar to git's approach to\n"
696 860 "branching.\n"
697 861 msgstr ""
698 862
699 863 msgid ""
700 "track a line of development with movable markers\n"
701 "\n"
702 864 " Bookmarks are pointers to certain commits that move when\n"
703 865 " committing. Bookmarks are local. They can be renamed, copied and\n"
704 866 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
705 " 'hg update' to merge and update respectively to a given bookmark.\n"
706 "\n"
867 " 'hg update' to merge and update respectively to a given bookmark."
868 msgstr ""
869
870 msgid ""
707 871 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
708 872 " directory's parent revision with the given name. If you specify\n"
709 873 " a revision using -r REV (where REV may be an existing bookmark),\n"
@@ -745,116 +909,168 b' msgstr "Renommer un signet donn\xc3\xa9"'
745 909 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
746 910 msgstr ""
747 911
748 msgid ""
749 "hooks for integrating with the Bugzilla bug tracker\n"
750 "\n"
912 msgid "hooks for integrating with the Bugzilla bug tracker"
913 msgstr ""
914
915 msgid ""
751 916 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
752 917 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
753 "bug status.\n"
754 "\n"
918 "bug status."
919 msgstr ""
920
921 msgid ""
755 922 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
756 "installations using MySQL are supported.\n"
757 "\n"
923 "installations using MySQL are supported."
924 msgstr ""
925
926 msgid ""
758 927 "The hook relies on a Bugzilla script to send bug change notification\n"
759 928 "emails. That script changes between Bugzilla versions; the\n"
760 929 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
761 930 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
762 931 "be run by Mercurial as the user pushing the change; you will need to\n"
763 "ensure the Bugzilla install file permissions are set appropriately.\n"
764 "\n"
932 "ensure the Bugzilla install file permissions are set appropriately."
933 msgstr ""
934
935 msgid ""
765 936 "The extension is configured through three different configuration\n"
766 "sections. These keys are recognized in the [bugzilla] section:\n"
767 "\n"
937 "sections. These keys are recognized in the [bugzilla] section:"
938 msgstr ""
939
940 msgid ""
768 941 "host\n"
769 " Hostname of the MySQL server holding the Bugzilla database.\n"
770 "\n"
942 " Hostname of the MySQL server holding the Bugzilla database."
943 msgstr ""
944
945 msgid ""
771 946 "db\n"
772 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
773 "\n"
947 " Name of the Bugzilla database in MySQL. Default 'bugs'."
948 msgstr ""
949
950 msgid ""
774 951 "user\n"
775 " Username to use to access MySQL server. Default 'bugs'.\n"
776 "\n"
952 " Username to use to access MySQL server. Default 'bugs'."
953 msgstr ""
954
955 msgid ""
777 956 "password\n"
778 " Password to use to access MySQL server.\n"
779 "\n"
957 " Password to use to access MySQL server."
958 msgstr ""
959
960 msgid ""
780 961 "timeout\n"
781 " Database connection timeout (seconds). Default 5.\n"
782 "\n"
962 " Database connection timeout (seconds). Default 5."
963 msgstr ""
964
965 msgid ""
783 966 "version\n"
784 967 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
785 968 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
786 " to 2.18.\n"
787 "\n"
969 " to 2.18."
970 msgstr ""
971
972 msgid ""
788 973 "bzuser\n"
789 974 " Fallback Bugzilla user name to record comments with, if changeset\n"
790 " committer cannot be found as a Bugzilla user.\n"
791 "\n"
975 " committer cannot be found as a Bugzilla user."
976 msgstr ""
977
978 msgid ""
792 979 "bzdir\n"
793 980 " Bugzilla install directory. Used by default notify. Default\n"
794 " '/var/www/html/bugzilla'.\n"
795 "\n"
981 " '/var/www/html/bugzilla'."
982 msgstr ""
983
984 msgid ""
796 985 "notify\n"
797 986 " The command to run to get Bugzilla to send bug change notification\n"
798 987 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
799 988 " and 'user' (committer bugzilla email). Default depends on version;\n"
800 989 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
801 " %(id)s %(user)s\".\n"
802 "\n"
990 " %(id)s %(user)s\"."
991 msgstr ""
992
993 msgid ""
803 994 "regexp\n"
804 995 " Regular expression to match bug IDs in changeset commit message.\n"
805 996 " Must contain one \"()\" group. The default expression matches 'Bug\n"
806 997 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
807 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
808 "\n"
998 " 1234 and 5678' and variations thereof. Matching is case insensitive."
999 msgstr ""
1000
1001 msgid ""
809 1002 "style\n"
810 " The style file to use when formatting comments.\n"
811 "\n"
1003 " The style file to use when formatting comments."
1004 msgstr ""
1005
1006 msgid ""
812 1007 "template\n"
813 1008 " Template to use when formatting comments. Overrides style if\n"
814 1009 " specified. In addition to the usual Mercurial keywords, the\n"
815 " extension specifies::\n"
816 "\n"
1010 " extension specifies::"
1011 msgstr ""
1012
1013 msgid ""
817 1014 " {bug} The Bugzilla bug ID.\n"
818 1015 " {root} The full pathname of the Mercurial repository.\n"
819 1016 " {webroot} Stripped pathname of the Mercurial repository.\n"
820 " {hgweb} Base URL for browsing Mercurial repositories.\n"
821 "\n"
1017 " {hgweb} Base URL for browsing Mercurial repositories."
1018 msgstr ""
1019
1020 msgid ""
822 1021 " Default 'changeset {node|short} in repo {root} refers '\n"
823 1022 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\\n\n"
824 1023 "strip\n"
825 1024 " The number of slashes to strip from the front of {root} to produce\n"
826 " {webroot}. Default 0.\n"
827 "\n"
1025 " {webroot}. Default 0."
1026 msgstr ""
1027
1028 msgid ""
828 1029 "usermap\n"
829 1030 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
830 1031 " mappings. If specified, the file should contain one mapping per\n"
831 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
832 "\n"
1032 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
1033 msgstr ""
1034
1035 msgid ""
833 1036 "The [usermap] section is used to specify mappings of Mercurial\n"
834 1037 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
835 "\"committer\"=\"Bugzilla user\"\n"
836 "\n"
837 "Finally, the [web] section supports one entry:\n"
838 "\n"
1038 "\"committer\"=\"Bugzilla user\""
1039 msgstr ""
1040
1041 msgid "Finally, the [web] section supports one entry:"
1042 msgstr ""
1043
1044 msgid ""
839 1045 "baseurl\n"
840 1046 " Base URL for browsing Mercurial repositories. Reference from\n"
841 " templates as {hgweb}.\n"
842 "\n"
843 "Activating the extension::\n"
844 "\n"
1047 " templates as {hgweb}."
1048 msgstr ""
1049
1050 msgid "Activating the extension::"
1051 msgstr ""
1052
1053 msgid ""
845 1054 " [extensions]\n"
846 " bugzilla =\n"
847 "\n"
1055 " bugzilla ="
1056 msgstr ""
1057
1058 msgid ""
848 1059 " [hooks]\n"
849 1060 " # run bugzilla hook on every change pulled or pushed in here\n"
850 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
851 "\n"
852 "Example configuration:\n"
853 "\n"
1061 " incoming.bugzilla = python:hgext.bugzilla.hook"
1062 msgstr ""
1063
1064 msgid "Example configuration:"
1065 msgstr ""
1066
1067 msgid ""
854 1068 "This example configuration is for a collection of Mercurial\n"
855 1069 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
856 "installation in /opt/bugzilla-3.2. ::\n"
857 "\n"
1070 "installation in /opt/bugzilla-3.2. ::"
1071 msgstr ""
1072
1073 msgid ""
858 1074 " [bugzilla]\n"
859 1075 " host=localhost\n"
860 1076 " password=XYZZY\n"
@@ -862,20 +1078,28 b' msgid ""'
862 1078 " bzuser=unknown@domain.com\n"
863 1079 " bzdir=/opt/bugzilla-3.2\n"
864 1080 " template=Changeset {node|short} in {root|basename}.\n"
865 " {hgweb}/{webroot}/rev/{node|short}\\n\\n {desc}\\n\\n strip=5\n"
866 "\n"
1081 " {hgweb}/{webroot}/rev/{node|short}\\n\\n {desc}\\n\\n strip=5"
1082 msgstr ""
1083
1084 msgid ""
867 1085 " [web]\n"
868 " baseurl=http://dev.domain.com/hg\n"
869 "\n"
1086 " baseurl=http://dev.domain.com/hg"
1087 msgstr ""
1088
1089 msgid ""
870 1090 " [usermap]\n"
871 " user@emaildomain.com=user.name@bugzilladomain.com\n"
872 "\n"
873 "Commits add a comment to the Bugzilla bug record of the form::\n"
874 "\n"
1091 " user@emaildomain.com=user.name@bugzilladomain.com"
1092 msgstr ""
1093
1094 msgid "Commits add a comment to the Bugzilla bug record of the form::"
1095 msgstr ""
1096
1097 msgid ""
875 1098 " Changeset 3b16791d6642 in repository-name.\n"
876 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
877 "\n"
878 " Changeset commit comment. Bug 1234.\n"
1099 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
1100 msgstr ""
1101
1102 msgid " Changeset commit comment. Bug 1234.\n"
879 1103 msgstr ""
880 1104
881 1105 #, python-format
@@ -952,9 +1176,10 b' msgstr ""'
952 1176 msgid "command to display child changesets"
953 1177 msgstr ""
954 1178
955 msgid ""
956 "show the children of the given or working directory revision\n"
957 "\n"
1179 msgid "show the children of the given or working directory revision"
1180 msgstr ""
1181
1182 msgid ""
958 1183 " Print the children of the working directory's revisions. If a\n"
959 1184 " revision is given via -r/--rev, the children of that revision will\n"
960 1185 " be printed. If a file argument is given, revision in which the\n"
@@ -981,38 +1206,55 b' msgstr ""'
981 1206 msgid "generating stats: %d%%"
982 1207 msgstr ""
983 1208
984 msgid ""
985 "histogram of changes to the repository\n"
986 "\n"
1209 msgid "histogram of changes to the repository"
1210 msgstr ""
1211
1212 msgid ""
987 1213 " This command will display a histogram representing the number\n"
988 1214 " of changed lines or revisions, grouped according to the given\n"
989 1215 " template. The default template will group changes by author.\n"
990 1216 " The --dateformat option may be used to group the results by\n"
991 " date instead.\n"
992 "\n"
1217 " date instead."
1218 msgstr ""
1219
1220 msgid ""
993 1221 " Statistics are based on the number of changed lines, or\n"
994 1222 " alternatively the number of matching revisions if the\n"
995 " --changesets option is specified.\n"
996 "\n"
997 " Examples::\n"
998 "\n"
1223 " --changesets option is specified."
1224 msgstr ""
1225
1226 msgid " Examples::"
1227 msgstr ""
1228
1229 msgid ""
999 1230 " # display count of changed lines for every committer\n"
1000 " hg churn -t '{author|email}'\n"
1001 "\n"
1231 " hg churn -t '{author|email}'"
1232 msgstr ""
1233
1234 msgid ""
1002 1235 " # display daily activity graph\n"
1003 " hg churn -f '%H' -s -c\n"
1004 "\n"
1236 " hg churn -f '%H' -s -c"
1237 msgstr ""
1238
1239 msgid ""
1005 1240 " # display activity of developers by month\n"
1006 " hg churn -f '%Y-%m' -s -c\n"
1007 "\n"
1241 " hg churn -f '%Y-%m' -s -c"
1242 msgstr ""
1243
1244 msgid ""
1008 1245 " # display count of lines changed in every year\n"
1009 " hg churn -f '%Y' -s\n"
1010 "\n"
1246 " hg churn -f '%Y' -s"
1247 msgstr ""
1248
1249 msgid ""
1011 1250 " It is possible to map alternate email addresses to a main address\n"
1012 " by providing a file using the following format::\n"
1013 "\n"
1014 " <alias email> <actual email>\n"
1015 "\n"
1251 " by providing a file using the following format::"
1252 msgstr ""
1253
1254 msgid " <alias email> <actual email>"
1255 msgstr ""
1256
1257 msgid ""
1016 1258 " Such a file may be specified with the --aliases option, otherwise\n"
1017 1259 " a .hgchurn file will be looked for in the working directory root.\n"
1018 1260 " "
@@ -1045,38 +1287,50 b' msgstr ""'
1045 1287 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
1046 1288 msgstr ""
1047 1289
1048 msgid ""
1049 "colorize output from some commands\n"
1050 "\n"
1290 msgid "colorize output from some commands"
1291 msgstr ""
1292
1293 msgid ""
1051 1294 "This extension modifies the status command to add color to its output\n"
1052 1295 "to reflect file status, the qseries command to add color to reflect\n"
1053 1296 "patch status (applied, unapplied, missing), and to diff-related\n"
1054 1297 "commands to highlight additions, removals, diff headers, and trailing\n"
1055 "whitespace.\n"
1056 "\n"
1298 "whitespace."
1299 msgstr ""
1300
1301 msgid ""
1057 1302 "Other effects in addition to color, like bold and underlined text, are\n"
1058 1303 "also available. Effects are rendered with the ECMA-48 SGR control\n"
1059 1304 "function (aka ANSI escape codes). This module also provides the\n"
1060 "render_text function, which can be used to add effects to any text.\n"
1061 "\n"
1062 "Default effects may be overridden from the .hgrc file::\n"
1063 "\n"
1305 "render_text function, which can be used to add effects to any text."
1306 msgstr ""
1307
1308 msgid "Default effects may be overridden from the .hgrc file::"
1309 msgstr ""
1310
1311 msgid ""
1064 1312 " [color]\n"
1065 1313 " status.modified = blue bold underline red_background\n"
1066 1314 " status.added = green bold\n"
1067 1315 " status.removed = red bold blue_background\n"
1068 1316 " status.deleted = cyan bold underline\n"
1069 1317 " status.unknown = magenta bold underline\n"
1070 " status.ignored = black bold\n"
1071 "\n"
1318 " status.ignored = black bold"
1319 msgstr ""
1320
1321 msgid ""
1072 1322 " # 'none' turns off all effects\n"
1073 1323 " status.clean = none\n"
1074 " status.copied = none\n"
1075 "\n"
1324 " status.copied = none"
1325 msgstr ""
1326
1327 msgid ""
1076 1328 " qseries.applied = blue bold underline\n"
1077 1329 " qseries.unapplied = black bold\n"
1078 " qseries.missing = red bold\n"
1079 "\n"
1330 " qseries.missing = red bold"
1331 msgstr ""
1332
1333 msgid ""
1080 1334 " diff.diffline = bold\n"
1081 1335 " diff.extended = cyan bold\n"
1082 1336 " diff.file_a = red bold\n"
@@ -1101,11 +1355,13 b' msgstr ""'
1101 1355 msgid "import revisions from foreign VCS repositories into Mercurial"
1102 1356 msgstr ""
1103 1357
1104 msgid ""
1105 "convert a foreign SCM repository to a Mercurial one.\n"
1106 "\n"
1107 " Accepted source formats [identifiers]:\n"
1108 "\n"
1358 msgid "convert a foreign SCM repository to a Mercurial one."
1359 msgstr ""
1360
1361 msgid " Accepted source formats [identifiers]:"
1362 msgstr ""
1363
1364 msgid ""
1109 1365 " - Mercurial [hg]\n"
1110 1366 " - CVS [cvs]\n"
1111 1367 " - Darcs [darcs]\n"
@@ -1114,72 +1370,103 b' msgid ""'
1114 1370 " - Monotone [mtn]\n"
1115 1371 " - GNU Arch [gnuarch]\n"
1116 1372 " - Bazaar [bzr]\n"
1117 " - Perforce [p4]\n"
1118 "\n"
1119 " Accepted destination formats [identifiers]:\n"
1120 "\n"
1373 " - Perforce [p4]"
1374 msgstr ""
1375
1376 msgid " Accepted destination formats [identifiers]:"
1377 msgstr ""
1378
1379 msgid ""
1121 1380 " - Mercurial [hg]\n"
1122 " - Subversion [svn] (history on branches is not preserved)\n"
1123 "\n"
1381 " - Subversion [svn] (history on branches is not preserved)"
1382 msgstr ""
1383
1384 msgid ""
1124 1385 " If no revision is given, all revisions will be converted.\n"
1125 1386 " Otherwise, convert will only import up to the named revision\n"
1126 " (given in a format understood by the source).\n"
1127 "\n"
1387 " (given in a format understood by the source)."
1388 msgstr ""
1389
1390 msgid ""
1128 1391 " If no destination directory name is specified, it defaults to the\n"
1129 1392 " basename of the source with '-hg' appended. If the destination\n"
1130 " repository doesn't exist, it will be created.\n"
1131 "\n"
1393 " repository doesn't exist, it will be created."
1394 msgstr ""
1395
1396 msgid ""
1132 1397 " By default, all sources except Mercurial will use --branchsort.\n"
1133 1398 " Mercurial uses --sourcesort to preserve original revision numbers\n"
1134 " order. Sort modes have the following effects:\n"
1135 "\n"
1399 " order. Sort modes have the following effects:"
1400 msgstr ""
1401
1402 msgid ""
1136 1403 " --branchsort convert from parent to child revision when possible,\n"
1137 1404 " which means branches are usually converted one after\n"
1138 " the other. It generates more compact repositories.\n"
1139 "\n"
1405 " the other. It generates more compact repositories."
1406 msgstr ""
1407
1408 msgid ""
1140 1409 " --datesort sort revisions by date. Converted repositories have\n"
1141 1410 " good-looking changelogs but are often an order of\n"
1142 1411 " magnitude larger than the same ones generated by\n"
1143 " --branchsort.\n"
1144 "\n"
1412 " --branchsort."
1413 msgstr ""
1414
1415 msgid ""
1145 1416 " --sourcesort try to preserve source revisions order, only\n"
1146 " supported by Mercurial sources.\n"
1147 "\n"
1417 " supported by Mercurial sources."
1418 msgstr ""
1419
1420 msgid ""
1148 1421 " If <REVMAP> isn't given, it will be put in a default location\n"
1149 1422 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
1150 1423 " that maps each source commit ID to the destination ID for that\n"
1151 " revision, like so::\n"
1152 "\n"
1153 " <source ID> <destination ID>\n"
1154 "\n"
1424 " revision, like so::"
1425 msgstr ""
1426
1427 msgid " <source ID> <destination ID>"
1428 msgstr ""
1429
1430 msgid ""
1155 1431 " If the file doesn't exist, it's automatically created. It's\n"
1156 1432 " updated on each commit copied, so convert-repo can be interrupted\n"
1157 " and can be run repeatedly to copy new commits.\n"
1158 "\n"
1433 " and can be run repeatedly to copy new commits."
1434 msgstr ""
1435
1436 msgid ""
1159 1437 " The [username mapping] file is a simple text file that maps each\n"
1160 1438 " source commit author to a destination commit author. It is handy\n"
1161 1439 " for source SCMs that use unix logins to identify authors (eg:\n"
1162 1440 " CVS). One line per author mapping and the line format is:\n"
1163 " srcauthor=whatever string you want\n"
1164 "\n"
1441 " srcauthor=whatever string you want"
1442 msgstr ""
1443
1444 msgid ""
1165 1445 " The filemap is a file that allows filtering and remapping of files\n"
1166 1446 " and directories. Comment lines start with '#'. Each line can\n"
1167 " contain one of the following directives::\n"
1168 "\n"
1169 " include path/to/file\n"
1170 "\n"
1171 " exclude path/to/file\n"
1172 "\n"
1173 " rename from/file to/file\n"
1174 "\n"
1447 " contain one of the following directives::"
1448 msgstr ""
1449
1450 msgid " include path/to/file"
1451 msgstr ""
1452
1453 msgid " exclude path/to/file"
1454 msgstr ""
1455
1456 msgid " rename from/file to/file"
1457 msgstr ""
1458
1459 msgid ""
1175 1460 " The 'include' directive causes a file, or all files under a\n"
1176 1461 " directory, to be included in the destination repository, and the\n"
1177 1462 " exclusion of all other files and directories not explicitly\n"
1178 1463 " included. The 'exclude' directive causes files or directories to\n"
1179 1464 " be omitted. The 'rename' directive renames a file or directory. To\n"
1180 1465 " rename from a subdirectory into the root of the repository, use\n"
1181 " '.' as the path to rename to.\n"
1182 "\n"
1466 " '.' as the path to rename to."
1467 msgstr ""
1468
1469 msgid ""
1183 1470 " The splicemap is a file that allows insertion of synthetic\n"
1184 1471 " history, letting you specify the parents of a revision. This is\n"
1185 1472 " useful if you want to e.g. give a Subversion merge two parents, or\n"
@@ -1189,8 +1476,10 b' msgid ""'
1189 1476 " revision control system whose parents should be modified (same\n"
1190 1477 " format as a key in .hg/shamap). The values are the revision IDs\n"
1191 1478 " (in either the source or destination revision control system) that\n"
1192 " should be used as the new parents for that node.\n"
1193 "\n"
1479 " should be used as the new parents for that node."
1480 msgstr ""
1481
1482 msgid ""
1194 1483 " The branchmap is a file that allows you to rename a branch when it is\n"
1195 1484 " being brought in from whatever external repository. When used in\n"
1196 1485 " conjunction with a splicemap, it allows for a powerful combination\n"
@@ -1200,11 +1489,15 b' msgid ""'
1200 1489 " \"original_branch_name\" is the name of the branch in the source\n"
1201 1490 " repository, and \"new_branch_name\" is the name of the branch is the\n"
1202 1491 " destination repository. This can be used to (for instance) move code\n"
1203 " in one repository from \"default\" to a named branch.\n"
1204 "\n"
1492 " in one repository from \"default\" to a named branch."
1493 msgstr ""
1494
1495 msgid ""
1205 1496 " Mercurial Source\n"
1206 " ----------------\n"
1207 "\n"
1497 " ----------------"
1498 msgstr ""
1499
1500 msgid ""
1208 1501 " --config convert.hg.ignoreerrors=False (boolean)\n"
1209 1502 " ignore integrity errors when reading. Use it to fix Mercurial\n"
1210 1503 " repositories with missing revlogs, by converting from and to\n"
@@ -1213,11 +1506,15 b' msgid ""'
1213 1506 " store original revision ID in changeset (forces target IDs to\n"
1214 1507 " change)\n"
1215 1508 " --config convert.hg.startrev=0 (hg revision identifier)\n"
1216 " convert start revision and its descendants\n"
1217 "\n"
1509 " convert start revision and its descendants"
1510 msgstr ""
1511
1512 msgid ""
1218 1513 " CVS Source\n"
1219 " ----------\n"
1220 "\n"
1514 " ----------"
1515 msgstr ""
1516
1517 msgid ""
1221 1518 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
1222 1519 " to indicate the starting point of what will be converted. Direct\n"
1223 1520 " access to the repository files is not needed, unless of course the\n"
@@ -1226,10 +1523,13 b' msgid ""'
1226 1523 " commands to find files to convert. This means that unless a\n"
1227 1524 " filemap is given, all files under the starting directory will be\n"
1228 1525 " converted, and that any directory reorganization in the CVS\n"
1229 " sandbox is ignored.\n"
1230 "\n"
1231 " The options shown are the defaults.\n"
1232 "\n"
1526 " sandbox is ignored."
1527 msgstr ""
1528
1529 msgid " The options shown are the defaults."
1530 msgstr ""
1531
1532 msgid ""
1233 1533 " --config convert.cvsps.cache=True (boolean)\n"
1234 1534 " Set to False to disable remote log caching, for testing and\n"
1235 1535 " debugging purposes.\n"
@@ -1247,16 +1547,22 b' msgid ""'
1247 1547 " Specify a regular expression to which commit log messages are\n"
1248 1548 " matched. If a match occurs, then the conversion process will\n"
1249 1549 " add the most recent revision on the branch indicated in the\n"
1250 " regex as the second parent of the changeset.\n"
1251 "\n"
1550 " regex as the second parent of the changeset."
1551 msgstr ""
1552
1553 msgid ""
1252 1554 " An additional \"debugcvsps\" Mercurial command allows the builtin\n"
1253 1555 " changeset merging code to be run without doing a conversion. Its\n"
1254 1556 " parameters and output are similar to that of cvsps 2.1. Please see\n"
1255 " the command help for more details.\n"
1256 "\n"
1557 " the command help for more details."
1558 msgstr ""
1559
1560 msgid ""
1257 1561 " Subversion Source\n"
1258 " -----------------\n"
1259 "\n"
1562 " -----------------"
1563 msgstr ""
1564
1565 msgid ""
1260 1566 " Subversion source detects classical trunk/branches/tags layouts.\n"
1261 1567 " By default, the supplied \"svn://repo/path/\" source URL is\n"
1262 1568 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
@@ -1266,58 +1572,80 b' msgid ""'
1266 1572 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
1267 1573 " can be overridden with following options. Set them to paths\n"
1268 1574 " relative to the source URL, or leave them blank to disable auto\n"
1269 " detection.\n"
1270 "\n"
1575 " detection."
1576 msgstr ""
1577
1578 msgid ""
1271 1579 " --config convert.svn.branches=branches (directory name)\n"
1272 1580 " specify the directory containing branches\n"
1273 1581 " --config convert.svn.tags=tags (directory name)\n"
1274 1582 " specify the directory containing tags\n"
1275 1583 " --config convert.svn.trunk=trunk (directory name)\n"
1276 " specify the name of the trunk branch\n"
1277 "\n"
1584 " specify the name of the trunk branch"
1585 msgstr ""
1586
1587 msgid ""
1278 1588 " Source history can be retrieved starting at a specific revision,\n"
1279 1589 " instead of being integrally converted. Only single branch\n"
1280 " conversions are supported.\n"
1281 "\n"
1590 " conversions are supported."
1591 msgstr ""
1592
1593 msgid ""
1282 1594 " --config convert.svn.startrev=0 (svn revision number)\n"
1283 " specify start Subversion revision.\n"
1284 "\n"
1595 " specify start Subversion revision."
1596 msgstr ""
1597
1598 msgid ""
1285 1599 " Perforce Source\n"
1286 " ---------------\n"
1287 "\n"
1600 " ---------------"
1601 msgstr ""
1602
1603 msgid ""
1288 1604 " The Perforce (P4) importer can be given a p4 depot path or a\n"
1289 1605 " client specification as source. It will convert all files in the\n"
1290 1606 " source to a flat Mercurial repository, ignoring labels, branches\n"
1291 1607 " and integrations. Note that when a depot path is given you then\n"
1292 1608 " usually should specify a target directory, because otherwise the\n"
1293 " target may be named ...-hg.\n"
1294 "\n"
1609 " target may be named ...-hg."
1610 msgstr ""
1611
1612 msgid ""
1295 1613 " It is possible to limit the amount of source history to be\n"
1296 " converted by specifying an initial Perforce revision.\n"
1297 "\n"
1614 " converted by specifying an initial Perforce revision."
1615 msgstr ""
1616
1617 msgid ""
1298 1618 " --config convert.p4.startrev=0 (perforce changelist number)\n"
1299 " specify initial Perforce revision.\n"
1300 "\n"
1619 " specify initial Perforce revision."
1620 msgstr ""
1621
1622 msgid ""
1301 1623 " Mercurial Destination\n"
1302 " ---------------------\n"
1303 "\n"
1624 " ---------------------"
1625 msgstr ""
1626
1627 msgid ""
1304 1628 " --config convert.hg.clonebranches=False (boolean)\n"
1305 1629 " dispatch source branches in separate clones.\n"
1306 1630 " --config convert.hg.tagsbranch=default (branch name)\n"
1307 1631 " tag revisions branch name\n"
1308 1632 " --config convert.hg.usebranchnames=True (boolean)\n"
1309 " preserve branch names\n"
1310 "\n"
1311 " "
1312 msgstr ""
1313
1314 msgid ""
1315 "create changeset information from CVS\n"
1316 "\n"
1633 " preserve branch names"
1634 msgstr ""
1635
1636 msgid " "
1637 msgstr ""
1638
1639 msgid "create changeset information from CVS"
1640 msgstr ""
1641
1642 msgid ""
1317 1643 " This command is intended as a debugging tool for the CVS to\n"
1318 1644 " Mercurial converter, and can be used as a direct replacement for\n"
1319 " cvsps.\n"
1320 "\n"
1645 " cvsps."
1646 msgstr ""
1647
1648 msgid ""
1321 1649 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
1322 1650 " named directory) in the CVS repository, and converts the log to a\n"
1323 1651 " series of changesets based on matching commit log entries and\n"
@@ -1745,37 +2073,50 b' msgstr ""'
1745 2073 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1746 2074 msgstr "XXX TAGS PAS ENCORE IMPLÉMENTÉ\n"
1747 2075
1748 msgid ""
1749 "command to allow external programs to compare revisions\n"
1750 "\n"
2076 msgid "command to allow external programs to compare revisions"
2077 msgstr ""
2078
2079 msgid ""
1751 2080 "The extdiff Mercurial extension allows you to use external programs\n"
1752 2081 "to compare revisions, or revision with working directory. The external\n"
1753 2082 "diff programs are called with a configurable set of options and two\n"
1754 2083 "non-option arguments: paths to directories containing snapshots of\n"
1755 "files to compare.\n"
1756 "\n"
2084 "files to compare."
2085 msgstr ""
2086
2087 msgid ""
1757 2088 "The extdiff extension also allows to configure new diff commands, so\n"
1758 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
1759 "\n"
2089 "you do not need to type \"hg extdiff -p kdiff3\" always. ::"
2090 msgstr ""
2091
2092 msgid ""
1760 2093 " [extdiff]\n"
1761 2094 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1762 2095 " cdiff = gdiff -Nprc5\n"
1763 2096 " ## or the old way:\n"
1764 2097 " #cmd.cdiff = gdiff\n"
1765 " #opts.cdiff = -Nprc5\n"
1766 "\n"
2098 " #opts.cdiff = -Nprc5"
2099 msgstr ""
2100
2101 msgid ""
1767 2102 " # add new command called vdiff, runs kdiff3\n"
1768 " vdiff = kdiff3\n"
1769 "\n"
2103 " vdiff = kdiff3"
2104 msgstr ""
2105
2106 msgid ""
1770 2107 " # add new command called meld, runs meld (no need to name twice)\n"
1771 " meld =\n"
1772 "\n"
2108 " meld ="
2109 msgstr ""
2110
2111 msgid ""
1773 2112 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1774 2113 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1775 2114 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1776 2115 " # your .vimrc\n"
1777 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1778 "\n"
2116 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
2117 msgstr ""
2118
2119 msgid ""
1779 2120 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1780 2121 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1781 2122 "files, so running the external diff program will actually be pretty\n"
@@ -1796,18 +2137,23 b' msgstr ""'
1796 2137 msgid "cleaning up temp directory\n"
1797 2138 msgstr "nettoyage du dossier temporaire\n"
1798 2139
1799 msgid ""
1800 "use external program to diff repository (or selected files)\n"
1801 "\n"
2140 msgid "use external program to diff repository (or selected files)"
2141 msgstr ""
2142
2143 msgid ""
1802 2144 " Show differences between revisions for the specified files, using\n"
1803 2145 " an external program. The default program used is diff, with\n"
1804 " default options \"-Npru\".\n"
1805 "\n"
2146 " default options \"-Npru\"."
2147 msgstr ""
2148
2149 msgid ""
1806 2150 " To select a different program, use the -p/--program option. The\n"
1807 2151 " program will be passed the names of two directories to compare. To\n"
1808 2152 " pass additional options to the program, use -o/--option. These\n"
1809 " will be passed before the names of the directories to compare.\n"
1810 "\n"
2153 " will be passed before the names of the directories to compare."
2154 msgstr ""
2155
2156 msgid ""
1811 2157 " When two revision arguments are given, then changes are shown\n"
1812 2158 " between those revisions. If only one revision is specified then\n"
1813 2159 " that revision is compared to the working directory, and, when no\n"
@@ -1828,12 +2174,17 b' msgid "hg extdiff [OPT]... [FILE]..."'
1828 2174 msgstr ""
1829 2175
1830 2176 #, python-format
1831 msgid ""
1832 "use %(path)s to diff repository (or selected files)\n"
1833 "\n"
2177 msgid "use %(path)s to diff repository (or selected files)"
2178 msgstr ""
2179
2180 #, python-format
2181 msgid ""
1834 2182 " Show differences between revisions for the specified files, using the\n"
1835 " %(path)s program.\n"
1836 "\n"
2183 " %(path)s program."
2184 msgstr ""
2185
2186 #, python-format
2187 msgid ""
1837 2188 " When two revision arguments are given, then changes are shown between\n"
1838 2189 " those revisions. If only one revision is specified then that revision is\n"
1839 2190 " compared to the working directory, and, when no revisions are specified,\n"
@@ -1847,22 +2198,29 b' msgstr ""'
1847 2198 msgid "pull, update and merge in one command"
1848 2199 msgstr ""
1849 2200
1850 msgid ""
1851 "pull changes from a remote repository, merge new changes if needed.\n"
1852 "\n"
2201 msgid "pull changes from a remote repository, merge new changes if needed."
2202 msgstr ""
2203
2204 msgid ""
1853 2205 " This finds all changes from the repository at the specified path\n"
1854 " or URL and adds them to the local repository.\n"
1855 "\n"
2206 " or URL and adds them to the local repository."
2207 msgstr ""
2208
2209 msgid ""
1856 2210 " If the pulled changes add a new branch head, the head is\n"
1857 2211 " automatically merged, and the result of the merge is committed.\n"
1858 2212 " Otherwise, the working directory is updated to include the new\n"
1859 " changes.\n"
1860 "\n"
2213 " changes."
2214 msgstr ""
2215
2216 msgid ""
1861 2217 " When a merge occurs, the newly pulled changes are assumed to be\n"
1862 2218 " \"authoritative\". The head of the new changes is used as the first\n"
1863 2219 " parent, with local changes as the second. To switch the merge\n"
1864 " order, use --switch-parent.\n"
1865 "\n"
2220 " order, use --switch-parent."
2221 msgstr ""
2222
2223 msgid ""
1866 2224 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1867 2225 " "
1868 2226 msgstr ""
@@ -1952,14 +2310,12 b' msgstr ""'
1952 2310 msgid "No valid signature for %s\n"
1953 2311 msgstr "Signature invalide pour %s\n"
1954 2312
1955 msgid ""
1956 "add a signature for the current or given revision\n"
1957 "\n"
2313 msgid "add a signature for the current or given revision"
2314 msgstr ""
2315
2316 msgid ""
1958 2317 " If no revision is given, the parent of the working directory is used,\n"
1959 " or tip if no revision is checked out.\n"
1960 "\n"
1961 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1962 " "
2318 " or tip if no revision is checked out."
1963 2319 msgstr ""
1964 2320
1965 2321 msgid "uncommitted merge - please provide a specific revision"
@@ -1998,9 +2354,10 b' msgstr ""'
1998 2354 msgid "hg sigs"
1999 2355 msgstr ""
2000 2356
2001 msgid ""
2002 "command to view revision graphs from a shell\n"
2003 "\n"
2357 msgid "command to view revision graphs from a shell"
2358 msgstr ""
2359
2360 msgid ""
2004 2361 "This extension adds a --graph option to the incoming, outgoing and log\n"
2005 2362 "commands. When this options is given, an ASCII representation of the\n"
2006 2363 "revision graph is also shown.\n"
@@ -2010,12 +2367,15 b' msgstr ""'
2010 2367 msgid "--graph option is incompatible with --%s"
2011 2368 msgstr ""
2012 2369
2013 msgid ""
2014 "show revision history alongside an ASCII revision graph\n"
2015 "\n"
2370 msgid "show revision history alongside an ASCII revision graph"
2371 msgstr ""
2372
2373 msgid ""
2016 2374 " Print a revision history alongside a revision graph drawn with\n"
2017 " ASCII characters.\n"
2018 "\n"
2375 " ASCII characters."
2376 msgstr ""
2377
2378 msgid ""
2019 2379 " Nodes printed as an @ character are parents of the working\n"
2020 2380 " directory.\n"
2021 2381 " "
@@ -2043,12 +2403,15 b' msgstr ""'
2043 2403 msgid "hg glog [OPTION]... [FILE]"
2044 2404 msgstr ""
2045 2405
2046 msgid ""
2047 "hooks for integrating with the CIA.vc notification service\n"
2048 "\n"
2406 msgid "hooks for integrating with the CIA.vc notification service"
2407 msgstr ""
2408
2409 msgid ""
2049 2410 "This is meant to be run as a changegroup or incoming hook. To\n"
2050 "configure it, set the following options in your hgrc::\n"
2051 "\n"
2411 "configure it, set the following options in your hgrc::"
2412 msgstr ""
2413
2414 msgid ""
2052 2415 " [cia]\n"
2053 2416 " # your registered CIA user name\n"
2054 2417 " user = foo\n"
@@ -2067,13 +2430,17 b' msgid ""'
2067 2430 " # Make sure to set email.from if you do this.\n"
2068 2431 " #url = http://cia.vc/\n"
2069 2432 " # print message instead of sending it (optional)\n"
2070 " #test = False\n"
2071 "\n"
2433 " #test = False"
2434 msgstr ""
2435
2436 msgid ""
2072 2437 " [hooks]\n"
2073 2438 " # one of these:\n"
2074 2439 " changegroup.cia = python:hgcia.hook\n"
2075 " #incoming.cia = python:hgcia.hook\n"
2076 "\n"
2440 " #incoming.cia = python:hgcia.hook"
2441 msgstr ""
2442
2443 msgid ""
2077 2444 " [web]\n"
2078 2445 " # If you want hyperlinks (optional)\n"
2079 2446 " baseurl = http://server/path/to/repo\n"
@@ -2086,32 +2453,45 b' msgstr ""'
2086 2453 msgid "email.from must be defined when sending by email"
2087 2454 msgstr ""
2088 2455
2089 msgid ""
2090 "browse the repository in a graphical way\n"
2091 "\n"
2456 msgid "browse the repository in a graphical way"
2457 msgstr ""
2458
2459 msgid ""
2092 2460 "The hgk extension allows browsing the history of a repository in a\n"
2093 2461 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
2094 "distributed with Mercurial.)\n"
2095 "\n"
2462 "distributed with Mercurial.)"
2463 msgstr ""
2464
2465 msgid ""
2096 2466 "hgk consists of two parts: a Tcl script that does the displaying and\n"
2097 2467 "querying of information, and an extension to Mercurial named hgk.py,\n"
2098 2468 "which provides hooks for hgk to get information. hgk can be found in\n"
2099 2469 "the contrib directory, and the extension is shipped in the hgext\n"
2100 "repository, and needs to be enabled.\n"
2101 "\n"
2470 "repository, and needs to be enabled."
2471 msgstr ""
2472
2473 msgid ""
2102 2474 "The hg view command will launch the hgk Tcl script. For this command\n"
2103 2475 "to work, hgk must be in your search path. Alternately, you can specify\n"
2104 "the path to hgk in your .hgrc file::\n"
2105 "\n"
2476 "the path to hgk in your .hgrc file::"
2477 msgstr ""
2478
2479 msgid ""
2106 2480 " [hgk]\n"
2107 " path=/location/of/hgk\n"
2108 "\n"
2481 " path=/location/of/hgk"
2482 msgstr ""
2483
2484 msgid ""
2109 2485 "hgk can make use of the extdiff extension to visualize revisions.\n"
2110 "Assuming you had already configured extdiff vdiff command, just add::\n"
2111 "\n"
2486 "Assuming you had already configured extdiff vdiff command, just add::"
2487 msgstr ""
2488
2489 msgid ""
2112 2490 " [hgk]\n"
2113 " vdiff=vdiff\n"
2114 "\n"
2491 " vdiff=vdiff"
2492 msgstr ""
2493
2494 msgid ""
2115 2495 "Revisions context menu will now display additional entries to fire\n"
2116 2496 "vdiff on hovered and selected revisions.\n"
2117 2497 msgstr ""
@@ -2197,18 +2577,23 b' msgstr ""'
2197 2577 msgid "hg debug-rev-list [OPTION]... REV..."
2198 2578 msgstr "hg debug-rev-list [OPTION]... REV..."
2199 2579
2200 msgid ""
2201 "syntax highlighting for hgweb (requires Pygments)\n"
2202 "\n"
2580 msgid "syntax highlighting for hgweb (requires Pygments)"
2581 msgstr ""
2582
2583 msgid ""
2203 2584 "It depends on the Pygments syntax highlighting library:\n"
2204 "http://pygments.org/\n"
2205 "\n"
2206 "There is a single configuration option::\n"
2207 "\n"
2585 "http://pygments.org/"
2586 msgstr ""
2587
2588 msgid "There is a single configuration option::"
2589 msgstr ""
2590
2591 msgid ""
2208 2592 " [web]\n"
2209 " pygments_style = <style>\n"
2210 "\n"
2211 "The default is 'colorful'.\n"
2593 " pygments_style = <style>"
2594 msgstr ""
2595
2596 msgid "The default is 'colorful'.\n"
2212 2597 msgstr ""
2213 2598
2214 2599 msgid "accelerate status report using Linux's inotify service"
@@ -2217,9 +2602,10 b' msgstr ""'
2217 2602 msgid "start an inotify server for this repository"
2218 2603 msgstr ""
2219 2604
2220 msgid ""
2221 "debugging information for inotify extension\n"
2222 "\n"
2605 msgid "debugging information for inotify extension"
2606 msgstr ""
2607
2608 msgid ""
2223 2609 " Prints the list of directories being watched by the inotify server.\n"
2224 2610 " "
2225 2611 msgstr ""
@@ -2375,16 +2761,21 b' msgstr ""'
2375 2761 msgid "finished setup\n"
2376 2762 msgstr ""
2377 2763
2378 msgid ""
2379 "expand expressions into changelog and summaries\n"
2380 "\n"
2764 msgid "expand expressions into changelog and summaries"
2765 msgstr ""
2766
2767 msgid ""
2381 2768 "This extension allows the use of a special syntax in summaries, which\n"
2382 2769 "will be automatically expanded into links or any other arbitrary\n"
2383 "expression, much like InterWiki does.\n"
2384 "\n"
2770 "expression, much like InterWiki does."
2771 msgstr ""
2772
2773 msgid ""
2385 2774 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2386 "in your hgrc::\n"
2387 "\n"
2775 "in your hgrc::"
2776 msgstr ""
2777
2778 msgid ""
2388 2779 " [interhg]\n"
2389 2780 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2390 2781 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n"
@@ -2399,52 +2790,76 b' msgstr ""'
2399 2790 msgid "interhg: invalid regexp for %s: %s\n"
2400 2791 msgstr ""
2401 2792
2402 msgid ""
2403 "expand keywords in tracked files\n"
2404 "\n"
2793 msgid "expand keywords in tracked files"
2794 msgstr ""
2795
2796 msgid ""
2405 2797 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2406 "tracked text files selected by your configuration.\n"
2407 "\n"
2798 "tracked text files selected by your configuration."
2799 msgstr ""
2800
2801 msgid ""
2408 2802 "Keywords are only expanded in local repositories and not stored in the\n"
2409 2803 "change history. The mechanism can be regarded as a convenience for the\n"
2410 "current user or for archive distribution.\n"
2411 "\n"
2804 "current user or for archive distribution."
2805 msgstr ""
2806
2807 msgid ""
2412 2808 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2413 "hgrc files.\n"
2414 "\n"
2415 "Example::\n"
2416 "\n"
2809 "hgrc files."
2810 msgstr ""
2811
2812 msgid "Example::"
2813 msgstr ""
2814
2815 msgid ""
2417 2816 " [keyword]\n"
2418 2817 " # expand keywords in every python file except those matching \"x*\"\n"
2419 2818 " **.py =\n"
2420 " x* = ignore\n"
2421 "\n"
2819 " x* = ignore"
2820 msgstr ""
2821
2822 msgid ""
2422 2823 "NOTE: the more specific you are in your filename patterns the less you\n"
2423 "lose speed in huge repositories.\n"
2424 "\n"
2824 "lose speed in huge repositories."
2825 msgstr ""
2826
2827 msgid ""
2425 2828 "For [keywordmaps] template mapping and expansion demonstration and\n"
2426 2829 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2427 "available templates and filters.\n"
2428 "\n"
2830 "available templates and filters."
2831 msgstr ""
2832
2833 msgid ""
2429 2834 "An additional date template filter {date|utcdate} is provided. It\n"
2430 "returns a date like \"2006/09/18 15:13:13\".\n"
2431 "\n"
2835 "returns a date like \"2006/09/18 15:13:13\"."
2836 msgstr ""
2837
2838 msgid ""
2432 2839 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2433 2840 "replaced with customized keywords and templates. Again, run \"hg\n"
2434 "kwdemo\" to control the results of your config changes.\n"
2435 "\n"
2841 "kwdemo\" to control the results of your config changes."
2842 msgstr ""
2843
2844 msgid ""
2436 2845 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2437 2846 "the risk of inadvertently storing expanded keywords in the change\n"
2438 "history.\n"
2439 "\n"
2847 "history."
2848 msgstr ""
2849
2850 msgid ""
2440 2851 "To force expansion after enabling it, or a configuration change, run\n"
2441 "\"hg kwexpand\".\n"
2442 "\n"
2852 "\"hg kwexpand\"."
2853 msgstr ""
2854
2855 msgid ""
2443 2856 "Also, when committing with the record extension or using mq's qrecord,\n"
2444 2857 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2445 2858 "the files in question to update keyword expansions after all changes\n"
2446 "have been checked in.\n"
2447 "\n"
2859 "have been checked in."
2860 msgstr ""
2861
2862 msgid ""
2448 2863 "Expansions spanning more than one line and incremental expansions,\n"
2449 2864 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2450 2865 "{desc}\" expands to the first line of the changeset description.\n"
@@ -2464,17 +2879,23 b' msgstr ""'
2464 2879 msgid "no [keyword] patterns configured"
2465 2880 msgstr ""
2466 2881
2467 msgid ""
2468 "print [keywordmaps] configuration and an expansion example\n"
2469 "\n"
2882 msgid "print [keywordmaps] configuration and an expansion example"
2883 msgstr ""
2884
2885 msgid ""
2470 2886 " Show current, custom, or default keyword template maps and their\n"
2471 " expansions.\n"
2472 "\n"
2887 " expansions."
2888 msgstr ""
2889
2890 msgid ""
2473 2891 " Extend the current configuration by specifying maps as arguments\n"
2474 " and using -f/--rcfile to source an external hgrc file.\n"
2475 "\n"
2476 " Use -d/--default to disable current configuration.\n"
2477 "\n"
2892 " and using -f/--rcfile to source an external hgrc file."
2893 msgstr ""
2894
2895 msgid " Use -d/--default to disable current configuration."
2896 msgstr ""
2897
2898 msgid ""
2478 2899 " See \"hg help templates\" for information on templates and filters.\n"
2479 2900 " "
2480 2901 msgstr ""
@@ -2521,31 +2942,42 b' msgid ""'
2521 2942 "\tkeywords expanded\n"
2522 2943 msgstr ""
2523 2944
2524 msgid ""
2525 "expand keywords in the working directory\n"
2526 "\n"
2527 " Run after (re)enabling keyword expansion.\n"
2528 "\n"
2945 msgid "expand keywords in the working directory"
2946 msgstr ""
2947
2948 msgid " Run after (re)enabling keyword expansion."
2949 msgstr ""
2950
2951 msgid ""
2529 2952 " kwexpand refuses to run if given files contain local changes.\n"
2530 2953 " "
2531 2954 msgstr ""
2532 2955
2533 msgid ""
2534 "show files configured for keyword expansion\n"
2535 "\n"
2956 msgid "show files configured for keyword expansion"
2957 msgstr ""
2958
2959 msgid ""
2536 2960 " List which files in the working directory are matched by the\n"
2537 " [keyword] configuration patterns.\n"
2538 "\n"
2961 " [keyword] configuration patterns."
2962 msgstr ""
2963
2964 msgid ""
2539 2965 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2540 2966 " execution by including only files that are actual candidates for\n"
2541 " expansion.\n"
2542 "\n"
2967 " expansion."
2968 msgstr ""
2969
2970 msgid ""
2543 2971 " See \"hg help keyword\" on how to construct patterns both for\n"
2544 " inclusion and exclusion of files.\n"
2545 "\n"
2972 " inclusion and exclusion of files."
2973 msgstr ""
2974
2975 msgid ""
2546 2976 " With -A/--all and -v/--verbose the codes used to show the status\n"
2547 " of files are::\n"
2548 "\n"
2977 " of files are::"
2978 msgstr ""
2979
2980 msgid ""
2549 2981 " K = keyword expansion candidate\n"
2550 2982 " k = keyword expansion candidate (not tracked)\n"
2551 2983 " I = ignored\n"
@@ -2553,12 +2985,15 b' msgid ""'
2553 2985 " "
2554 2986 msgstr ""
2555 2987
2556 msgid ""
2557 "revert expanded keywords in the working directory\n"
2558 "\n"
2988 msgid "revert expanded keywords in the working directory"
2989 msgstr ""
2990
2991 msgid ""
2559 2992 " Run before changing/disabling active keywords or if you experience\n"
2560 " problems with \"hg import\" or \"hg merge\".\n"
2561 "\n"
2993 " problems with \"hg import\" or \"hg merge\"."
2994 msgstr ""
2995
2996 msgid ""
2562 2997 " kwshrink refuses to run if given files contain local changes.\n"
2563 2998 " "
2564 2999 msgstr ""
@@ -2597,51 +3032,59 b' msgid "hg kwshrink [OPTION]... [FILE]...'
2597 3032 msgstr ""
2598 3033
2599 3034 #, fuzzy
2600 msgid ""
2601 "manage a stack of patches\n"
2602 "\n"
3035 msgid "manage a stack of patches"
3036 msgstr "gestion et utilisation d'une pile de patchs"
3037
3038 #, fuzzy
3039 msgid ""
2603 3040 "This extension lets you work with a stack of patches in a Mercurial\n"
2604 3041 "repository. It manages two stacks of patches - all known patches, and\n"
2605 "applied patches (subset of known patches).\n"
2606 "\n"
3042 "applied patches (subset of known patches)."
3043 msgstr ""
3044 "Cette extension permet de travailler avec une pile de patchs au\n"
3045 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n"
3046 "l'ensemble des patchs référencés, et le sous-ensemble des patchs\n"
3047 "qui ont été appliqués."
3048
3049 #, fuzzy
3050 msgid ""
2607 3051 "Known patches are represented as patch files in the .hg/patches\n"
2608 "directory. Applied patches are both patch files and changesets.\n"
2609 "\n"
2610 "Common tasks (use \"hg help command\" for more details)::\n"
2611 "\n"
3052 "directory. Applied patches are both patch files and changesets."
3053 msgstr ""
3054 "Les patchs référencés sont stockés en tant que fichiers au format\n"
3055 "patch au sein du répertoire .hg/patches, tandis que les patchs\n"
3056 "appliqués sont présents à la fois sous forme de fichier et de\n"
3057 "\"changesets\"."
3058
3059 #, fuzzy
3060 msgid "Common tasks (use \"hg help command\" for more details)::"
3061 msgstr "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):"
3062
3063 #, fuzzy
3064 msgid ""
2612 3065 " prepare repository to work with patches qinit\n"
2613 3066 " create new patch qnew\n"
2614 " import existing patch qimport\n"
2615 "\n"
3067 " import existing patch qimport"
3068 msgstr ""
3069 "préparer un dépôt pour utilisation avec des patchs qinit\n"
3070 "créer un nouveau patch qnew\n"
3071 "importer un patch existant qimport"
3072
3073 #, fuzzy
3074 msgid ""
2616 3075 " print patch series qseries\n"
2617 " print applied patches qapplied\n"
2618 "\n"
3076 " print applied patches qapplied"
3077 msgstr ""
3078 "afficher la série de patchs complète qseries\n"
3079 "afficher les patchs appliqués qapplied\n"
3080 "afficher le nom du dernier patch appliqué qtop"
3081
3082 #, fuzzy
3083 msgid ""
2619 3084 " add known patch to applied stack qpush\n"
2620 3085 " remove patch from applied stack qpop\n"
2621 3086 " refresh contents of top applied patch qrefresh\n"
2622 3087 msgstr ""
2623 "gestion et utilisation d'une pile de patchs\n"
2624 "\n"
2625 "Cette extension permet de travailler avec une pile de patchs au\n"
2626 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n"
2627 "l'ensemble des patchs référencés, et le sous-ensemble des patchs\n"
2628 "qui ont été appliqués.\n"
2629 "\n"
2630 "Les patchs référencés sont stockés en tant que fichiers au format\n"
2631 "patch au sein du répertoire .hg/patches, tandis que les patchs\n"
2632 "appliqués sont présents à la fois sous forme de fichier et de\n"
2633 "\"changesets\".\n"
2634 "\n"
2635 "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n"
2636 "\n"
2637 "préparer un dépôt pour utilisation avec des patchs qinit\n"
2638 "créer un nouveau patch qnew\n"
2639 "importer un patch existant qimport\n"
2640 "\n"
2641 "afficher la série de patchs complète qseries\n"
2642 "afficher les patchs appliqués qapplied\n"
2643 "afficher le nom du dernier patch appliqué qtop\n"
2644 "\n"
2645 3088 "empiler/appliquer un patch référencé sur la pile qpush\n"
2646 3089 "dépiler/ôter un patch de la pile qpop\n"
2647 3090 "rafraîchir le contenu du dernier patch appliqué qrefresh\n"
@@ -2885,7 +3328,6 b' msgstr "la pile de patchs est maintenant'
2885 3328 msgid "cannot refresh a revision with children"
2886 3329 msgstr "impossible de rafraîchir une révision possédant des révisions filles"
2887 3330
2888 # restaurer/récupérer ? pas satisfait...
2889 3331 msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
2890 3332 msgstr "rafraîchissement interrompu alors qu'un patch était en cours de dépilement (utiliser revert --all, ou qpush pour restaurer l'état)\n"
2891 3333
@@ -2942,7 +3384,6 b' msgstr "l\'option \\"-r\\" n\'est pas utilis'
2942 3384 msgid "option \"-n\" not valid when importing multiple patches"
2943 3385 msgstr "l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs patchs"
2944 3386
2945 # origine/base/racine ?
2946 3387 #, python-format
2947 3388 msgid "revision %d is the root of more than one branch"
2948 3389 msgstr "la révision %d est à l'origine de plus d'une branche"
@@ -2981,12 +3422,40 b' msgstr "il est n\xc3\xa9cessaire d\'utiliser --name pour importer un patch depuis -"'
2981 3422 msgid "adding %s to series file\n"
2982 3423 msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n"
2983 3424
2984 msgid ""
2985 "remove patches from queue\n"
2986 "\n"
3425 #, fuzzy
3426 msgid "remove patches from queue"
3427 msgstr ""
3428 "supprime des patchs de la pile\n"
3429 "\n"
3430 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
3431 " nécessaire de fournir au moins un patch.\n"
3432 "\n"
3433 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
3434 " de patchs.\n"
3435 "\n"
3436 " Pour arrêter de gérer un patch et le déplacer de manière\n"
3437 " permanente vers l'historique du dépôt, utilisez la commande\n"
3438 " qfinish."
3439
3440 #, fuzzy
3441 msgid ""
2987 3442 " The patches must not be applied, and at least one patch is required. With\n"
2988 " -k/--keep, the patch files are preserved in the patch directory.\n"
2989 "\n"
3443 " -k/--keep, the patch files are preserved in the patch directory."
3444 msgstr ""
3445 "supprime des patchs de la pile\n"
3446 "\n"
3447 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
3448 " nécessaire de fournir au moins un patch.\n"
3449 "\n"
3450 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
3451 " de patchs.\n"
3452 "\n"
3453 " Pour arrêter de gérer un patch et le déplacer de manière\n"
3454 " permanente vers l'historique du dépôt, utilisez la commande\n"
3455 " qfinish."
3456
3457 #, fuzzy
3458 msgid ""
2990 3459 " To stop managing a patch and move it into permanent history,\n"
2991 3460 " use the qfinish command."
2992 3461 msgstr ""
@@ -3014,48 +3483,45 b' msgstr "affiche les patchs non encore appliqu\xc3\xa9s"'
3014 3483 msgid "all patches applied\n"
3015 3484 msgstr "tous les patchs ont été appliqués\n"
3016 3485
3017 msgid ""
3018 "import a patch\n"
3019 "\n"
3486 msgid "import a patch"
3487 msgstr "importe un patch"
3488
3489 msgid ""
3020 3490 " The patch is inserted into the series after the last applied\n"
3021 3491 " patch. If no patches have been applied, qimport prepends the patch\n"
3022 " to the series.\n"
3023 "\n"
3492 " to the series."
3493 msgstr ""
3494 " Le patch est inséré dans la série à la suite du dernier patch\n"
3495 " appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n"
3496 " ajouté en tête de série."
3497
3498 msgid ""
3024 3499 " The patch will have the same name as its source file unless you\n"
3025 " give it a new one with -n/--name.\n"
3026 "\n"
3500 " give it a new one with -n/--name."
3501 msgstr ""
3502 " Le patch portera le même nom que le fichier dont il provient,\n"
3503 " à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name."
3504
3505 msgid ""
3027 3506 " You can register an existing patch inside the patch directory with\n"
3028 " the -e/--existing flag.\n"
3029 "\n"
3507 " the -e/--existing flag."
3508 msgstr ""
3509 " Vous pouvez enregistrer un patch déjà présent dans le répertoire\n"
3510 " de patchs à l'aide de l'option -e/--existing."
3511
3512 msgid ""
3030 3513 " With -f/--force, an existing patch of the same name will be\n"
3031 " overwritten.\n"
3032 "\n"
3514 " overwritten."
3515 msgstr " Avec -f/--force, un patch déjà présent du même nom sera écrasé."
3516
3517 msgid ""
3033 3518 " An existing changeset may be placed under mq control with -r/--rev\n"
3034 3519 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
3035 3520 " With -g/--git, patches imported with --rev will use the git diff\n"
3036 3521 " format. See the diffs help topic for information on why this is\n"
3037 3522 " important for preserving rename/copy information and permission\n"
3038 " changes.\n"
3039 "\n"
3040 " To import a patch from standard input, pass - as the patch file.\n"
3041 " When importing from standard input, a patch name must be specified\n"
3042 " using the --name flag.\n"
3043 " "
3044 msgstr ""
3045 "importe un patch\n"
3046 "\n"
3047 " Le patch est inséré dans la série à la suite du dernier patch\n"
3048 " appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n"
3049 " ajouté en tête de série.\n"
3050 "\n"
3051 " Le patch portera le même nom que le fichier dont il provient,\n"
3052 " à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name.\n"
3053 "\n"
3054 " Vous pouvez enregistrer un patch déjà présent dans le répertoire\n"
3055 " de patchs à l'aide de l'option -e/--existing.\n"
3056 "\n"
3057 " Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n"
3058 "\n"
3523 " changes."
3524 msgstr ""
3059 3525 " Un \"changeset\" existant peut-être placé sous le contrôle de mq\n"
3060 3526 " à l'aide de -r/--rev (par exemple qimport --rev tip -n patch\n"
3061 3527 " placera la révision tip sous le contrôle de mq).\n"
@@ -3063,16 +3529,23 b' msgstr ""'
3063 3529 " enregistrés au format \"git diff\". La section \"diffs\" de\n"
3064 3530 " l'aide explique l'importance de cette option pour la\n"
3065 3531 " préservation des informations de copie/renommage et des\n"
3066 " modifications de permissions.\n"
3067 "\n"
3532 " modifications de permissions."
3533
3534 msgid ""
3535 " To import a patch from standard input, pass - as the patch file.\n"
3536 " When importing from standard input, a patch name must be specified\n"
3537 " using the --name flag.\n"
3538 " "
3539 msgstr ""
3068 3540 " Pour importer un patch depuis l'entrée standard, utilisez -\n"
3069 3541 " comme nom de fichier. Il sera alors nécessaire de nommer le\n"
3070 3542 " patch à l'aide de l'option --name.\n"
3071 3543 " "
3072 3544
3073 msgid ""
3074 "init a new queue repository\n"
3075 "\n"
3545 msgid "init a new queue repository"
3546 msgstr ""
3547
3548 msgid ""
3076 3549 " The queue repository is unversioned by default. If\n"
3077 3550 " -c/--create-repo is specified, qinit will create a separate nested\n"
3078 3551 " repository for patches (qinit -c may also be run later to convert\n"
@@ -3080,36 +3553,37 b' msgid ""'
3080 3553 " qcommit to commit changes to this queue repository."
3081 3554 msgstr ""
3082 3555
3083 msgid ""
3084 "clone main and patch repository at same time\n"
3085 "\n"
3556 msgid "clone main and patch repository at same time"
3557 msgstr "clône simultanément le dépôt principal et le dépôt des patchs"
3558
3559 msgid ""
3086 3560 " If source is local, destination will have no patches applied. If\n"
3087 3561 " source is remote, this command can not check if patches are\n"
3088 3562 " applied in source, so cannot guarantee that patches are not\n"
3089 3563 " applied in destination. If you clone remote repository, be sure\n"
3090 " before that it has no patches applied.\n"
3091 "\n"
3092 " Source patch repository is looked for in <src>/.hg/patches by\n"
3093 " default. Use -p <url> to change.\n"
3094 "\n"
3095 " The patch directory must be a nested Mercurial repository, as\n"
3096 " would be created by qinit -c.\n"
3097 " "
3098 msgstr ""
3099 "clône simultanément le dépôt principal et le dépôt des patchs\n"
3100 "\n"
3564 " before that it has no patches applied."
3565 msgstr ""
3101 3566 " Si la source est locale, aucun patch ne sera appliqué sur la\n"
3102 3567 " cible. En revanche, si la source est distante, cette commande\n"
3103 3568 " n'est pas en mesure de vérifier si des patchs y ont été\n"
3104 3569 " empilés, et par conséquent ne peut garantir qu'aucun patch\n"
3105 3570 " ne sera appliqué au dessus de la cible. Autrement dit, si vous\n"
3106 3571 " clônez un dépôt distant, assurez-vous auparavant qu'il n'ait\n"
3107 " aucun patch d'appliqué.\n"
3108 "\n"
3572 " aucun patch d'appliqué."
3573
3574 msgid ""
3575 " Source patch repository is looked for in <src>/.hg/patches by\n"
3576 " default. Use -p <url> to change."
3577 msgstr ""
3109 3578 " Le dépôt de patchs est recherché dans <src>/.hg/patches par\n"
3110 3579 " défaut, à moins que -p <url> ne soit utilisé pour spécifier\n"
3111 " un chemin différent.\n"
3112 "\n"
3580 " un chemin différent."
3581
3582 msgid ""
3583 " The patch directory must be a nested Mercurial repository, as\n"
3584 " would be created by qinit -c.\n"
3585 " "
3586 msgstr ""
3113 3587 " Le répertoire de patchs doit être contenu dans le dépôt\n"
3114 3588 " principal, tel que créé par qinit -c.\n"
3115 3589 " "
@@ -3144,33 +3618,18 b' msgstr "affiche le nom du prochain patch'
3144 3618 msgid "print the name of the previous patch"
3145 3619 msgstr "affiche le nom du patch précédent"
3146 3620
3147 msgid ""
3148 "create a new patch\n"
3149 "\n"
3621 msgid "create a new patch"
3622 msgstr "crée un nouveau patch"
3623
3624 msgid ""
3150 3625 " qnew creates a new patch on top of the currently-applied patch (if\n"
3151 3626 " any). It will refuse to run if there are any outstanding changes\n"
3152 3627 " unless -f/--force is specified, in which case the patch will be\n"
3153 3628 " initialized with them. You may also use -I/--include,\n"
3154 3629 " -X/--exclude, and/or a list of files after the patch name to add\n"
3155 3630 " only changes to matching files to the new patch, leaving the rest\n"
3156 " as uncommitted modifications.\n"
3157 "\n"
3158 " -u/--user and -d/--date can be used to set the (given) user and\n"
3159 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
3160 " to current user and date to current date.\n"
3161 "\n"
3162 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
3163 " well as the commit message. If none is specified, the header is\n"
3164 " empty and the commit message is '[mq]: PATCH'.\n"
3165 "\n"
3166 " Use the -g/--git option to keep the patch in the git extended diff\n"
3167 " format. Read the diffs help topic for more information on why this\n"
3168 " is important for preserving permission changes and copy/rename\n"
3169 " information.\n"
3170 " "
3171 msgstr ""
3172 "crée un nouveau patch\n"
3173 "\n"
3631 " as uncommitted modifications."
3632 msgstr ""
3174 3633 " qnew crée un nouveau patch au-dessus du dernier patch\n"
3175 3634 " actuellement appliqué, le cas échéant. Si le répertoire\n"
3176 3635 " de travail comporte des modifications non enregistrées,\n"
@@ -3181,34 +3640,56 b' msgstr ""'
3181 3640 " de noms de fichiers après le nom du patch, afin de n'inclure\n"
3182 3641 " que les changements des fichiers concernés, et laisser le\n"
3183 3642 " reste dans le répertoire de travail en tant que modifications\n"
3184 " non enregistrées.\n"
3185 "\n"
3643 " non enregistrées."
3644
3645 msgid ""
3646 " -u/--user and -d/--date can be used to set the (given) user and\n"
3647 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
3648 " to current user and date to current date."
3649 msgstr ""
3186 3650 " Le nom d'utilisateur et la date peuvent être spécifiés à\n"
3187 3651 " l'aide de -u/--user et -d/--date respectivement.\n"
3188 3652 " -U/--currentuser et -D/--currentdate positionnent le nom\n"
3189 " d'utilisateur et la date à leur valeur actuelle.\n"
3190 "\n"
3653 " d'utilisateur et la date à leur valeur actuelle."
3654
3655 msgid ""
3656 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
3657 " well as the commit message. If none is specified, the header is\n"
3658 " empty and the commit message is '[mq]: PATCH'."
3659 msgstr ""
3191 3660 " L'en-tête du patch et le message de \"commit\" peuvent être\n"
3192 3661 " spécifiés à l'aide de -e/--edit, -m/--message ou -l/--logfile.\n"
3193 3662 " Si aucune de ces options n'est utilisée, l'en-tête restera\n"
3194 " vierge et le message de \"commit\" sera '[mq]: PATCH'.\n"
3195 "\n"
3663 " vierge et le message de \"commit\" sera '[mq]: PATCH'."
3664
3665 msgid ""
3666 " Use the -g/--git option to keep the patch in the git extended diff\n"
3667 " format. Read the diffs help topic for more information on why this\n"
3668 " is important for preserving permission changes and copy/rename\n"
3669 " information.\n"
3670 " "
3671 msgstr ""
3196 3672 " Utilisez -g/--git pour garder le patch au format étendu de\n"
3197 3673 " \"git\". La section \"diffs\" de l'aide explique l'importance\n"
3198 3674 " de cette option pour la préservation des informations de\n"
3199 3675 " copie/renommage et des modifications de permissions.\n"
3200 3676 " "
3201 3677
3202 msgid ""
3203 "update the current patch\n"
3204 "\n"
3678 msgid "update the current patch"
3679 msgstr ""
3680
3681 msgid ""
3205 3682 " If any file patterns are provided, the refreshed patch will\n"
3206 3683 " contain only the modifications that match those patterns; the\n"
3207 " remaining modifications will remain in the working directory.\n"
3208 "\n"
3684 " remaining modifications will remain in the working directory."
3685 msgstr ""
3686
3687 msgid ""
3209 3688 " If -s/--short is specified, files currently included in the patch\n"
3210 " will be refreshed just like matched files and remain in the patch.\n"
3211 "\n"
3689 " will be refreshed just like matched files and remain in the patch."
3690 msgstr ""
3691
3692 msgid ""
3212 3693 " hg add/remove/copy/rename work as usual, though you might want to\n"
3213 3694 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
3214 3695 " and renames. See the diffs help topic for more information on the\n"
@@ -3219,14 +3700,17 b' msgstr ""'
3219 3700 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
3220 3701 msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\""
3221 3702
3222 msgid ""
3223 "diff of the current patch and subsequent modifications\n"
3224 "\n"
3703 msgid "diff of the current patch and subsequent modifications"
3704 msgstr ""
3705
3706 msgid ""
3225 3707 " Shows a diff which includes the current patch as well as any\n"
3226 3708 " changes which have been made in the working directory since the\n"
3227 3709 " last refresh (thus showing what the current patch would become\n"
3228 " after a qrefresh).\n"
3229 "\n"
3710 " after a qrefresh)."
3711 msgstr ""
3712
3713 msgid ""
3230 3714 " Use 'hg diff' if you only want to see the changes made since the\n"
3231 3715 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
3232 3716 " by the current patch without including changes made since the\n"
@@ -3234,16 +3718,19 b' msgid ""'
3234 3718 " "
3235 3719 msgstr ""
3236 3720
3237 msgid ""
3238 "fold the named patches into the current patch\n"
3239 "\n"
3721 msgid "fold the named patches into the current patch"
3722 msgstr ""
3723
3724 msgid ""
3240 3725 " Patches must not yet be applied. Each patch will be successively\n"
3241 3726 " applied to the current patch in the order given. If all the\n"
3242 3727 " patches apply successfully, the current patch will be refreshed\n"
3243 3728 " with the new cumulative patch, and the folded patches will be\n"
3244 3729 " deleted. With -k/--keep, the folded patch files will not be\n"
3245 " removed afterwards.\n"
3246 "\n"
3730 " removed afterwards."
3731 msgstr ""
3732
3733 msgid ""
3247 3734 " The header for each folded patch will be concatenated with the\n"
3248 3735 " current patch header, separated by a line of '* * *'."
3249 3736 msgstr ""
@@ -3269,19 +3756,24 b' msgstr ""'
3269 3756 msgid "push or pop patches until named patch is at top of stack"
3270 3757 msgstr "empile ou dépile les patchs jusqu'à arriver au patch indiqué"
3271 3758
3272 msgid ""
3273 "set or print guards for a patch\n"
3274 "\n"
3759 msgid "set or print guards for a patch"
3760 msgstr ""
3761
3762 msgid ""
3275 3763 " Guards control whether a patch can be pushed. A patch with no\n"
3276 3764 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3277 3765 " pushed only if the qselect command has activated it. A patch with\n"
3278 3766 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3279 " has activated it.\n"
3280 "\n"
3767 " has activated it."
3768 msgstr ""
3769
3770 msgid ""
3281 3771 " With no arguments, print the currently active guards.\n"
3282 3772 " With arguments, set guards for the named patch.\n"
3283 " NOTE: Specifying negative guards now requires '--'.\n"
3284 "\n"
3773 " NOTE: Specifying negative guards now requires '--'."
3774 msgstr ""
3775
3776 msgid ""
3285 3777 " To set guards on another patch:\n"
3286 3778 " hg qguard -- other.patch +2.6.17 -stable\n"
3287 3779 " "
@@ -3300,15 +3792,14 b' msgstr "aucun patch du nom de %s"'
3300 3792 msgid "print the header of the topmost or specified patch"
3301 3793 msgstr "affiche l'en-tête du dernier patch appliqué"
3302 3794
3303 msgid ""
3304 "push the next patch onto the stack\n"
3305 "\n"
3795 msgid "push the next patch onto the stack"
3796 msgstr "applique le patch suivant sur la pile"
3797
3798 msgid ""
3306 3799 " When -f/--force is applied, all local changes in patched files\n"
3307 3800 " will be lost.\n"
3308 3801 " "
3309 3802 msgstr ""
3310 "applique le patch suivant sur la pile\n"
3311 "\n"
3312 3803 " Si -f/--force est utilisé, tout changement local dans les\n"
3313 3804 " fichiers concernés par le patch seront perdus.\n"
3314 3805 " "
@@ -3320,16 +3811,15 b' msgstr "aucune ssauvegarde de pile de patchs trouv\xc3\xa9e, veuillez utiliser -n\\n"'
3320 3811 msgid "merging with queue at: %s\n"
3321 3812 msgstr "fusion avec la pile située à %s\n"
3322 3813
3323 msgid ""
3324 "pop the current patch off the stack\n"
3325 "\n"
3814 msgid "pop the current patch off the stack"
3815 msgstr "dépile le dernier patch appliqué"
3816
3817 msgid ""
3326 3818 " By default, pops off the top of the patch stack. If given a patch\n"
3327 3819 " name, keeps popping off patches until the named patch is at the\n"
3328 3820 " top of the stack.\n"
3329 3821 " "
3330 3822 msgstr ""
3331 "dépile le dernier patch appliqué\n"
3332 "\n"
3333 3823 " Par défaut, le dernier patch appliqué est ôté de la pile. Si\n"
3334 3824 " un nom de patch est fourni, les patchs seront dépilés en\n"
3335 3825 " séquence jusqu'à arriver au patch demandé.\n"
@@ -3339,14 +3829,13 b' msgstr ""'
3339 3829 msgid "using patch queue: %s\n"
3340 3830 msgstr "utilisation de la pile de patchs %s\n"
3341 3831
3342 msgid ""
3343 "rename a patch\n"
3344 "\n"
3832 msgid "rename a patch"
3833 msgstr "renomme un patch"
3834
3835 msgid ""
3345 3836 " With one argument, renames the current patch to PATCH1.\n"
3346 3837 " With two arguments, renames PATCH1 to PATCH2."
3347 3838 msgstr ""
3348 "renomme un patch\n"
3349 "\n"
3350 3839 " Avec un seul argument, le patch actuel est renommé PATCH1.\n"
3351 3840 " Avec deux arguments, PATCH1 devient PATCH2."
3352 3841
@@ -3376,45 +3865,59 b' msgstr "%s: la cible existe, utilisez -f'
3376 3865 msgid "copy %s to %s\n"
3377 3866 msgstr "copie de %s vers %s\n"
3378 3867
3379 msgid ""
3380 "strip a revision and all its descendants from the repository\n"
3381 "\n"
3868 msgid "strip a revision and all its descendants from the repository"
3869 msgstr ""
3870
3871 msgid ""
3382 3872 " If one of the working directory's parent revisions is stripped, the\n"
3383 3873 " working directory will be updated to the parent of the stripped\n"
3384 3874 " revision.\n"
3385 3875 " "
3386 3876 msgstr ""
3387 3877
3388 msgid ""
3389 "set or print guarded patches to push\n"
3390 "\n"
3878 msgid "set or print guarded patches to push"
3879 msgstr ""
3880
3881 msgid ""
3391 3882 " Use the qguard command to set or print guards on patch, then use\n"
3392 3883 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3393 3884 " it has no guards or any positive guards match the currently\n"
3394 3885 " selected guard, but will not be pushed if any negative guards\n"
3395 " match the current guard. For example:\n"
3396 "\n"
3886 " match the current guard. For example:"
3887 msgstr ""
3888
3889 msgid ""
3397 3890 " qguard foo.patch -stable (negative guard)\n"
3398 3891 " qguard bar.patch +stable (positive guard)\n"
3399 " qselect stable\n"
3400 "\n"
3892 " qselect stable"
3893 msgstr ""
3894
3895 msgid ""
3401 3896 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3402 3897 " it has a negative match) but push bar.patch (because it has a\n"
3403 " positive match).\n"
3404 "\n"
3898 " positive match)."
3899 msgstr ""
3900
3901 msgid ""
3405 3902 " With no arguments, prints the currently active guards.\n"
3406 " With one argument, sets the active guard.\n"
3407 "\n"
3903 " With one argument, sets the active guard."
3904 msgstr ""
3905
3906 msgid ""
3408 3907 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3409 3908 " When no guards are active, patches with positive guards are\n"
3410 " skipped and patches with negative guards are pushed.\n"
3411 "\n"
3909 " skipped and patches with negative guards are pushed."
3910 msgstr ""
3911
3912 msgid ""
3412 3913 " qselect can change the guards on applied patches. It does not pop\n"
3413 3914 " guarded patches by default. Use --pop to pop back to the last\n"
3414 3915 " applied patch that is not guarded. Use --reapply (which implies\n"
3415 3916 " --pop) to push back to the current patch afterwards, but skip\n"
3416 " guarded patches.\n"
3417 "\n"
3917 " guarded patches."
3918 msgstr ""
3919
3920 msgid ""
3418 3921 " Use -s/--series to print a list of all guards in the series file\n"
3419 3922 " (no other arguments needed). Use -v for more information."
3420 3923 msgstr ""
@@ -3448,36 +3951,37 b' msgstr ""'
3448 3951 msgid "reapplying unguarded patches\n"
3449 3952 msgstr ""
3450 3953
3451 msgid ""
3452 "move applied patches into repository history\n"
3453 "\n"
3954 msgid "move applied patches into repository history"
3955 msgstr "déplacement des patchs vers l'historique du dépôt"
3956
3957 msgid ""
3454 3958 " Finishes the specified revisions (corresponding to applied\n"
3455 3959 " patches) by moving them out of mq control into regular repository\n"
3456 " history.\n"
3457 "\n"
3960 " history."
3961 msgstr ""
3962 " Achève le développement des révisions spécifiées (qui doivent\n"
3963 " correspondre à des patch appliqués) en les retirant du contrôle\n"
3964 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3965 " l'historique du dépôt."
3966
3967 msgid ""
3458 3968 " Accepts a revision range or the -a/--applied option. If --applied\n"
3459 3969 " is specified, all applied mq revisions are removed from mq\n"
3460 3970 " control. Otherwise, the given revisions must be at the base of the\n"
3461 " stack of applied patches.\n"
3462 "\n"
3463 " This can be especially useful if your changes have been applied to\n"
3464 " an upstream repository, or if you are about to push your changes\n"
3465 " to upstream.\n"
3466 " "
3467 msgstr ""
3468 "déplacement des patchs vers l'historique du dépôt\n"
3469 "\n"
3470 " Achève le développement des révisions spécifiées (qui doivent\n"
3471 " correspondre à des patch appliqués) en les retirant du contrôle\n"
3472 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3473 " l'historique du dépôt.\n"
3474 "\n"
3971 " stack of applied patches."
3972 msgstr ""
3475 3973 " Il est possible d'utiliser l'option -a/--applied, ou de fournir\n"
3476 3974 " une plage de révisions. Avec --applied, tous les patchs\n"
3477 3975 " appliqués seront retirés du contrôle de mq. Autrement, les\n"
3478 3976 " révisions fournies doivent être situées à la base de la pile de\n"
3479 " patchs appliqués.\n"
3480 "\n"
3977 " patchs appliqués."
3978
3979 msgid ""
3980 " This can be especially useful if your changes have been applied to\n"
3981 " an upstream repository, or if you are about to push your changes\n"
3982 " to upstream.\n"
3983 " "
3984 msgstr ""
3481 3985 " Ceci est utile en particulier si vos changements ont été adoptés\n"
3482 3986 " dans un dépôt amont, ou si vous vous apprêtez à les y envoyer.\n"
3483 3987 " "
@@ -3747,33 +4251,47 b' msgstr ""'
3747 4251 msgid "hg qfinish [-a] [REV]..."
3748 4252 msgstr "hg qfinish [-a] [REV]..."
3749 4253
3750 msgid ""
3751 "hooks for sending email notifications at commit/push time\n"
3752 "\n"
4254 msgid "hooks for sending email notifications at commit/push time"
4255 msgstr ""
4256
4257 msgid ""
3753 4258 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3754 "print messages to stdout, for testing and configuring.\n"
3755 "\n"
4259 "print messages to stdout, for testing and configuring."
4260 msgstr ""
4261
4262 msgid ""
3756 4263 "To use, configure the notify extension and enable it in hgrc like\n"
3757 "this::\n"
3758 "\n"
4264 "this::"
4265 msgstr ""
4266
4267 msgid ""
3759 4268 " [extensions]\n"
3760 " notify =\n"
3761 "\n"
4269 " notify ="
4270 msgstr ""
4271
4272 msgid ""
3762 4273 " [hooks]\n"
3763 4274 " # one email for each incoming changeset\n"
3764 4275 " incoming.notify = python:hgext.notify.hook\n"
3765 4276 " # batch emails when many changesets incoming at one time\n"
3766 " changegroup.notify = python:hgext.notify.hook\n"
3767 "\n"
4277 " changegroup.notify = python:hgext.notify.hook"
4278 msgstr ""
4279
4280 msgid ""
3768 4281 " [notify]\n"
3769 " # config items go here\n"
3770 "\n"
3771 "Required configuration items::\n"
3772 "\n"
3773 " config = /path/to/file # file containing subscriptions\n"
3774 "\n"
3775 "Optional configuration items::\n"
3776 "\n"
4282 " # config items go here"
4283 msgstr ""
4284
4285 msgid "Required configuration items::"
4286 msgstr ""
4287
4288 msgid " config = /path/to/file # file containing subscriptions"
4289 msgstr ""
4290
4291 msgid "Optional configuration items::"
4292 msgstr ""
4293
4294 msgid ""
3777 4295 " test = True # print messages to stdout for testing\n"
3778 4296 " strip = 3 # number of slashes to strip for url paths\n"
3779 4297 " domain = example.com # domain to use if committer missing domain\n"
@@ -3790,24 +4308,34 b' msgid ""'
3790 4308 " [email]\n"
3791 4309 " from = user@host.com # email address to send as if none given\n"
3792 4310 " [web]\n"
3793 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3794 "\n"
4311 " baseurl = http://hgserver/... # root of hg web site for browsing commits"
4312 msgstr ""
4313
4314 msgid ""
3795 4315 "The notify config file has same format as a regular hgrc file. It has\n"
3796 4316 "two sections so you can express subscriptions in whatever way is\n"
3797 "handier for you.\n"
3798 "\n"
3799 "::\n"
3800 "\n"
4317 "handier for you."
4318 msgstr ""
4319
4320 msgid "::"
4321 msgstr ""
4322
4323 msgid ""
3801 4324 " [usersubs]\n"
3802 4325 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3803 " user@host = pattern\n"
3804 "\n"
4326 " user@host = pattern"
4327 msgstr ""
4328
4329 msgid ""
3805 4330 " [reposubs]\n"
3806 4331 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3807 " pattern = user@host\n"
3808 "\n"
3809 "Glob patterns are matched against path to repository root.\n"
3810 "\n"
4332 " pattern = user@host"
4333 msgstr ""
4334
4335 msgid "Glob patterns are matched against path to repository root."
4336 msgstr ""
4337
4338 msgid ""
3811 4339 "If you like, you can put notify config file in repository that users\n"
3812 4340 "can push changes to, they can manage their own subscriptions.\n"
3813 4341 msgstr ""
@@ -3823,157 +4351,1295 b' msgstr ""'
3823 4351 #, python-format
3824 4352 msgid ""
3825 4353 "\n"
3826 "diffs (truncated from %d to %d lines):\n"
3827 "\n"
3828 msgstr ""
3829
3830 #, python-format
3831 msgid ""
3832 "\n"
3833 "diffs (%d lines):\n"
3834 "\n"
4354 "diffs (truncated from %d to %d lines):"
4355 msgstr ""
4356
4357 #, python-format
4358 msgid ""
4359 "\n"
4360 "diffs (%d lines):"
3835 4361 msgstr ""
3836 4362
3837 4363 #, python-format
3838 4364 msgid "notify: suppressing notification for merge %d:%s\n"
3839 4365 msgstr ""
3840 4366
3841 msgid ""
3842 "browse command output with an external pager\n"
3843 "\n"
3844 "To set the pager that should be used, set the application variable::\n"
3845 "\n"
4367 msgid "browse command output with an external pager"
4368 msgstr ""
4369
4370 msgid "To set the pager that should be used, set the application variable::"
4371 msgstr ""
4372
4373 msgid ""
3846 4374 " [pager]\n"
3847 " pager = LESS='FSRX' less\n"
3848 "\n"
4375 " pager = LESS='FSRX' less"
4376 msgstr ""
4377
4378 msgid ""
3849 4379 "If no pager is set, the pager extensions uses the environment variable\n"
3850 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3851 "\n"
4380 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used."
4381 msgstr ""
4382
4383 msgid ""
3852 4384 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3853 "setting::\n"
3854 "\n"
4385 "setting::"
4386 msgstr ""
4387
4388 msgid ""
3855 4389 " [pager]\n"
3856 " quiet = True\n"
3857 "\n"
4390 " quiet = True"
4391 msgstr ""
4392
4393 msgid ""
3858 4394 "You can disable the pager for certain commands by adding them to the\n"
3859 "pager.ignore list::\n"
3860 "\n"
4395 "pager.ignore list::"
4396 msgstr ""
4397
4398 msgid ""
3861 4399 " [pager]\n"
3862 " ignore = version, help, update\n"
3863 "\n"
4400 " ignore = version, help, update"
4401 msgstr ""
4402
4403 msgid ""
3864 4404 "You can also enable the pager only for certain commands using\n"
3865 "pager.attend::\n"
3866 "\n"
4405 "pager.attend::"
4406 msgstr ""
4407
4408 msgid ""
3867 4409 " [pager]\n"
3868 " attend = log\n"
3869 "\n"
3870 "If pager.attend is present, pager.ignore will be ignored.\n"
3871 "\n"
4410 " attend = log"
4411 msgstr ""
4412
4413 msgid "If pager.attend is present, pager.ignore will be ignored."
4414 msgstr ""
4415
4416 msgid ""
3872 4417 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3873 4418 "specify them in the global .hgrc\n"
3874 4419 msgstr ""
3875 4420
3876 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3877 # sera capable de replier automatiquement la première ligne d'aide)
3878 #, fuzzy
3879 msgid ""
3880 "interpret suffixes to refer to ancestor revisions\n"
3881 "\n"
4421 #, fuzzy
4422 msgid "interpret suffixes to refer to ancestor revisions"
4423 msgstr "suffixes faisant référence à des révisions antérieures"
4424
4425 #, fuzzy
4426 msgid ""
3882 4427 "This extension allows you to use git-style suffixes to refer to the\n"
3883 "ancestors of a specific revision.\n"
3884 "\n"
3885 "For example, if you can refer to a revision as \"foo\", then::\n"
3886 "\n"
4428 "ancestors of a specific revision."
4429 msgstr ""
4430 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
4431 "faire référence aux ancêtres d'une révision donnée."
4432
4433 #, fuzzy
4434 msgid "For example, if you can refer to a revision as \"foo\", then::"
4435 msgstr "Par exemple, si \"foo\" désigne une révision, alors :"
4436
4437 #, fuzzy
4438 msgid ""
3887 4439 " foo^N = Nth parent of foo\n"
3888 4440 " foo^0 = foo\n"
3889 4441 " foo^1 = first parent of foo\n"
3890 4442 " foo^2 = second parent of foo\n"
3891 " foo^ = foo^1\n"
3892 "\n"
4443 " foo^ = foo^1"
4444 msgstr ""
4445 "- foo^N = Nième parent de foo\n"
4446 " foo^0 = foo\n"
4447 " foo^1 = premier parent de foo\n"
4448 " foo^2 = second parent de foo\n"
4449 " foo^ = foo^1"
4450
4451 #, fuzzy
4452 msgid ""
3893 4453 " foo~N = Nth first grandparent of foo\n"
3894 4454 " foo~0 = foo\n"
3895 4455 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3896 4456 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3897 4457 msgstr ""
3898 "suffixes faisant référence à des révisions antérieures\n"
3899 "\n"
3900 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3901 "faire référence aux ancêtres d'une révision donnée.\n"
3902 "\n"
3903 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3904 "\n"
3905 "- foo^N = Nième parent de foo\n"
3906 " foo^0 = foo\n"
3907 " foo^1 = premier parent de foo\n"
3908 " foo^2 = second parent de foo\n"
3909 " foo^ = foo^1\n"
3910 "\n"
3911 4458 "- foo~N = Nième premier grand-parent de foo\n"
3912 4459 " foo~0 = foo\n"
3913 4460 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3914 4461 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3915 4462
3916 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3917 # sera capable de replier automatiquement la première ligne d'aide)
3918 #, fuzzy
3919 msgid ""
3920 "command to send changesets as (a series of) patch emails\n"
3921 "\n"
4463 #, fuzzy
4464 msgid "command to send changesets as (a series of) patch emails"
4465 msgstr ""
4466 "envoi d'une série de \"changesets\" par courrier électronique\n"
4467 "\n"
4468 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
4469 "décrivant dans son ensemble.\n"
4470 "\n"
4471 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
4472 "la première ligne du commentaire du \"changeset\", préfixée par\n"
4473 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
4474 "parties :\n"
4475 "\n"
4476 " La description du \"changeset\".\n"
4477 "\n"
4478 " Optionnellement, un résumé des modifications généré par le\n"
4479 " programme diffstat.\n"
4480 "\n"
4481 " Le patch proprement dit, tel que généré par \"hg export\".\n"
4482 "\n"
4483 "Chaque message fait référence au premier de la série (à l'aide\n"
4484 "des en-têtes de message In-Reply-To et References) de manière à\n"
4485 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4486 "électronique et de nouvelles, ainsi que dans les archives de\n"
4487 "messagerie.\n"
4488 "\n"
4489 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4490 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4491 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4492 "d'être certain de bien envoyer les bonnes modifications.\n"
4493 "\n"
4494 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4495 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4496 "\n"
4497 " [email]\n"
4498 " from = Mon Nom <mon@adresse_de_courriel>\n"
4499 " to = destinataire1, destinataire2, ...\n"
4500 " cc = cc1, cc2, ...\n"
4501 " bcc = bcc1, bcc2, ...\n"
4502 "\n"
4503 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4504 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4505 "\n"
4506 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4507 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4508 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4509 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4510 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4511 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4512 "l'affichage chaque message, permettant de vérifier que tout est\n"
4513 "correct.\n"
4514 "\n"
4515 "L'option -m/--mbox est également très utile : au lieu que les\n"
4516 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4517 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4518 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4519 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4520 "comme par exemple mutt :\n"
4521 "\n"
4522 " % mutt -R -f mbox\n"
4523 "\n"
4524 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4525 "utilisant formail (un outil généralement installé en même temps que\n"
4526 "procmail) :\n"
4527 "\n"
4528 " % formail -s sendmail -bm -t < mbox\n"
4529 "\n"
4530 "Et voilà, vos patchs sont en route vers leur destination.\n"
4531 "\n"
4532 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
4533 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
4534 "alors remplir la section [smtp] de telle sorte que l'extension\n"
4535 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
4536 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
4537 "page de manuel hgrc(5) pour plus de détails."
4538
4539 #, fuzzy
4540 msgid ""
3922 4541 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3923 "describes the series as a whole.\n"
3924 "\n"
4542 "describes the series as a whole."
4543 msgstr ""
4544 "envoi d'une série de \"changesets\" par courrier électronique\n"
4545 "\n"
4546 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
4547 "décrivant dans son ensemble.\n"
4548 "\n"
4549 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
4550 "la première ligne du commentaire du \"changeset\", préfixée par\n"
4551 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
4552 "parties :\n"
4553 "\n"
4554 " La description du \"changeset\".\n"
4555 "\n"
4556 " Optionnellement, un résumé des modifications généré par le\n"
4557 " programme diffstat.\n"
4558 "\n"
4559 " Le patch proprement dit, tel que généré par \"hg export\".\n"
4560 "\n"
4561 "Chaque message fait référence au premier de la série (à l'aide\n"
4562 "des en-têtes de message In-Reply-To et References) de manière à\n"
4563 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4564 "électronique et de nouvelles, ainsi que dans les archives de\n"
4565 "messagerie.\n"
4566 "\n"
4567 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4568 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4569 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4570 "d'être certain de bien envoyer les bonnes modifications.\n"
4571 "\n"
4572 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4573 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4574 "\n"
4575 " [email]\n"
4576 " from = Mon Nom <mon@adresse_de_courriel>\n"
4577 " to = destinataire1, destinataire2, ...\n"
4578 " cc = cc1, cc2, ...\n"
4579 " bcc = bcc1, bcc2, ...\n"
4580 "\n"
4581 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4582 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4583 "\n"
4584 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4585 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4586 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4587 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4588 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4589 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4590 "l'affichage chaque message, permettant de vérifier que tout est\n"
4591 "correct.\n"
4592 "\n"
4593 "L'option -m/--mbox est également très utile : au lieu que les\n"
4594 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4595 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4596 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4597 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4598 "comme par exemple mutt :\n"
4599 "\n"
4600 " % mutt -R -f mbox\n"
4601 "\n"
4602 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4603 "utilisant formail (un outil généralement installé en même temps que\n"
4604 "procmail) :\n"
4605 "\n"
4606 " % formail -s sendmail -bm -t < mbox\n"
4607 "\n"
4608 "Et voilà, vos patchs sont en route vers leur destination.\n"
4609 "\n"
4610 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
4611 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
4612 "alors remplir la section [smtp] de telle sorte que l'extension\n"
4613 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
4614 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
4615 "page de manuel hgrc(5) pour plus de détails."
4616
4617 #, fuzzy
4618 msgid ""
3925 4619 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3926 4620 "first line of the changeset description as the subject text. The\n"
3927 "message contains two or three body parts:\n"
3928 "\n"
4621 "message contains two or three body parts:"
4622 msgstr ""
4623 "envoi d'une série de \"changesets\" par courrier électronique\n"
4624 "\n"
4625 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
4626 "décrivant dans son ensemble.\n"
4627 "\n"
4628 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
4629 "la première ligne du commentaire du \"changeset\", préfixée par\n"
4630 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
4631 "parties :\n"
4632 "\n"
4633 " La description du \"changeset\".\n"
4634 "\n"
4635 " Optionnellement, un résumé des modifications généré par le\n"
4636 " programme diffstat.\n"
4637 "\n"
4638 " Le patch proprement dit, tel que généré par \"hg export\".\n"
4639 "\n"
4640 "Chaque message fait référence au premier de la série (à l'aide\n"
4641 "des en-têtes de message In-Reply-To et References) de manière à\n"
4642 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4643 "électronique et de nouvelles, ainsi que dans les archives de\n"
4644 "messagerie.\n"
4645 "\n"
4646 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4647 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4648 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4649 "d'être certain de bien envoyer les bonnes modifications.\n"
4650 "\n"
4651 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4652 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4653 "\n"
4654 " [email]\n"
4655 " from = Mon Nom <mon@adresse_de_courriel>\n"
4656 " to = destinataire1, destinataire2, ...\n"
4657 " cc = cc1, cc2, ...\n"
4658 " bcc = bcc1, bcc2, ...\n"
4659 "\n"
4660 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4661 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4662 "\n"
4663 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4664 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4665 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4666 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4667 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4668 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4669 "l'affichage chaque message, permettant de vérifier que tout est\n"
4670 "correct.\n"
4671 "\n"
4672 "L'option -m/--mbox est également très utile : au lieu que les\n"
4673 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4674 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4675 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4676 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4677 "comme par exemple mutt :\n"
4678 "\n"
4679 " % mutt -R -f mbox\n"
4680 "\n"
4681 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4682 "utilisant formail (un outil généralement installé en même temps que\n"
4683 "procmail) :\n"
4684 "\n"
4685 " % formail -s sendmail -bm -t < mbox\n"
4686 "\n"
4687 "Et voilà, vos patchs sont en route vers leur destination.\n"
4688 "\n"
4689 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
4690 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
4691 "alors remplir la section [smtp] de telle sorte que l'extension\n"
4692 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
4693 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
4694 "page de manuel hgrc(5) pour plus de détails."
4695
4696 #, fuzzy
4697 msgid ""
3929 4698 "- The changeset description.\n"
3930 4699 "- [Optional] The result of running diffstat on the patch.\n"
3931 "- The patch itself, as generated by \"hg export\".\n"
3932 "\n"
4700 "- The patch itself, as generated by \"hg export\"."
4701 msgstr ""
4702 "envoi d'une série de \"changesets\" par courrier électronique\n"
4703 "\n"
4704 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
4705 "décrivant dans son ensemble.\n"
4706 "\n"
4707 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
4708 "la première ligne du commentaire du \"changeset\", préfixée par\n"
4709 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
4710 "parties :\n"
4711 "\n"
4712 " La description du \"changeset\".\n"
4713 "\n"
4714 " Optionnellement, un résumé des modifications généré par le\n"
4715 " programme diffstat.\n"
4716 "\n"
4717 " Le patch proprement dit, tel que généré par \"hg export\".\n"
4718 "\n"
4719 "Chaque message fait référence au premier de la série (à l'aide\n"
4720 "des en-têtes de message In-Reply-To et References) de manière à\n"
4721 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4722 "électronique et de nouvelles, ainsi que dans les archives de\n"
4723 "messagerie.\n"
4724 "\n"
4725 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4726 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4727 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4728 "d'être certain de bien envoyer les bonnes modifications.\n"
4729 "\n"
4730 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4731 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4732 "\n"
4733 " [email]\n"
4734 " from = Mon Nom <mon@adresse_de_courriel>\n"
4735 " to = destinataire1, destinataire2, ...\n"
4736 " cc = cc1, cc2, ...\n"
4737 " bcc = bcc1, bcc2, ...\n"
4738 "\n"
4739 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4740 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4741 "\n"
4742 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4743 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4744 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4745 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4746 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4747 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4748 "l'affichage chaque message, permettant de vérifier que tout est\n"
4749 "correct.\n"
4750 "\n"
4751 "L'option -m/--mbox est également très utile : au lieu que les\n"
4752 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4753 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4754 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4755 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4756 "comme par exemple mutt :\n"
4757 "\n"
4758 " % mutt -R -f mbox\n"
4759 "\n"
4760 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4761 "utilisant formail (un outil généralement installé en même temps que\n"
4762 "procmail) :\n"
4763 "\n"
4764 " % formail -s sendmail -bm -t < mbox\n"
4765 "\n"
4766 "Et voilà, vos patchs sont en route vers leur destination.\n"
4767 "\n"
4768 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
4769 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
4770 "alors remplir la section [smtp] de telle sorte que l'extension\n"
4771 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
4772 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
4773 "page de manuel hgrc(5) pour plus de détails."
4774
4775 #, fuzzy
4776 msgid ""
3933 4777 "Each message refers to the first in the series using the In-Reply-To\n"
3934 4778 "and References headers, so they will show up as a sequence in threaded\n"
3935 "mail and news readers, and in mail archives.\n"
3936 "\n"
4779 "mail and news readers, and in mail archives."
4780 msgstr ""
4781 "envoi d'une série de \"changesets\" par courrier électronique\n"
4782 "\n"
4783 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
4784 "décrivant dans son ensemble.\n"
4785 "\n"
4786 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
4787 "la première ligne du commentaire du \"changeset\", préfixée par\n"
4788 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
4789 "parties :\n"
4790 "\n"
4791 " La description du \"changeset\".\n"
4792 "\n"
4793 " Optionnellement, un résumé des modifications généré par le\n"
4794 " programme diffstat.\n"
4795 "\n"
4796 " Le patch proprement dit, tel que généré par \"hg export\".\n"
4797 "\n"
4798 "Chaque message fait référence au premier de la série (à l'aide\n"
4799 "des en-têtes de message In-Reply-To et References) de manière à\n"
4800 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4801 "électronique et de nouvelles, ainsi que dans les archives de\n"
4802 "messagerie.\n"
4803 "\n"
4804 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4805 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4806 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4807 "d'être certain de bien envoyer les bonnes modifications.\n"
4808 "\n"
4809 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4810 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4811 "\n"
4812 " [email]\n"
4813 " from = Mon Nom <mon@adresse_de_courriel>\n"
4814 " to = destinataire1, destinataire2, ...\n"
4815 " cc = cc1, cc2, ...\n"
4816 " bcc = bcc1, bcc2, ...\n"
4817 "\n"
4818 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4819 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4820 "\n"
4821 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4822 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4823 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4824 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4825 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4826 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4827 "l'affichage chaque message, permettant de vérifier que tout est\n"
4828 "correct.\n"
4829 "\n"
4830 "L'option -m/--mbox est également très utile : au lieu que les\n"
4831 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4832 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4833 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4834 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4835 "comme par exemple mutt :\n"
4836 "\n"
4837 " % mutt -R -f mbox\n"
4838 "\n"
4839 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4840 "utilisant formail (un outil généralement installé en même temps que\n"
4841 "procmail) :\n"
4842 "\n"
4843 " % formail -s sendmail -bm -t < mbox\n"
4844 "\n"
4845 "Et voilà, vos patchs sont en route vers leur destination.\n"
4846 "\n"
4847 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
4848 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
4849 "alors remplir la section [smtp] de telle sorte que l'extension\n"
4850 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
4851 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
4852 "page de manuel hgrc(5) pour plus de détails."
4853
4854 #, fuzzy
4855 msgid ""
3937 4856 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3938 4857 "with a diffstat summary and the changeset summary, so you can be sure\n"
3939 "you are sending the right changes.\n"
3940 "\n"
4858 "you are sending the right changes."
4859 msgstr ""
4860 "envoi d'une série de \"changesets\" par courrier électronique\n"
4861 "\n"
4862 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
4863 "décrivant dans son ensemble.\n"
4864 "\n"
4865 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
4866 "la première ligne du commentaire du \"changeset\", préfixée par\n"
4867 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
4868 "parties :\n"
4869 "\n"
4870 " La description du \"changeset\".\n"
4871 "\n"
4872 " Optionnellement, un résumé des modifications généré par le\n"
4873 " programme diffstat.\n"
4874 "\n"
4875 " Le patch proprement dit, tel que généré par \"hg export\".\n"
4876 "\n"
4877 "Chaque message fait référence au premier de la série (à l'aide\n"
4878 "des en-têtes de message In-Reply-To et References) de manière à\n"
4879 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4880 "électronique et de nouvelles, ainsi que dans les archives de\n"
4881 "messagerie.\n"
4882 "\n"
4883 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4884 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4885 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4886 "d'être certain de bien envoyer les bonnes modifications.\n"
4887 "\n"
4888 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4889 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4890 "\n"
4891 " [email]\n"
4892 " from = Mon Nom <mon@adresse_de_courriel>\n"
4893 " to = destinataire1, destinataire2, ...\n"
4894 " cc = cc1, cc2, ...\n"
4895 " bcc = bcc1, bcc2, ...\n"
4896 "\n"
4897 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4898 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4899 "\n"
4900 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4901 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4902 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4903 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4904 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4905 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4906 "l'affichage chaque message, permettant de vérifier que tout est\n"
4907 "correct.\n"
4908 "\n"
4909 "L'option -m/--mbox est également très utile : au lieu que les\n"
4910 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4911 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4912 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4913 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4914 "comme par exemple mutt :\n"
4915 "\n"
4916 " % mutt -R -f mbox\n"
4917 "\n"
4918 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4919 "utilisant formail (un outil généralement installé en même temps que\n"
4920 "procmail) :\n"
4921 "\n"
4922 " % formail -s sendmail -bm -t < mbox\n"
4923 "\n"
4924 "Et voilà, vos patchs sont en route vers leur destination.\n"
4925 "\n"
4926 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
4927 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
4928 "alors remplir la section [smtp] de telle sorte que l'extension\n"
4929 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
4930 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
4931 "page de manuel hgrc(5) pour plus de détails."
4932
4933 #, fuzzy
4934 msgid ""
3941 4935 "To configure other defaults, add a section like this to your hgrc\n"
3942 "file::\n"
3943 "\n"
4936 "file::"
4937 msgstr ""
4938 "envoi d'une série de \"changesets\" par courrier électronique\n"
4939 "\n"
4940 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
4941 "décrivant dans son ensemble.\n"
4942 "\n"
4943 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
4944 "la première ligne du commentaire du \"changeset\", préfixée par\n"
4945 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
4946 "parties :\n"
4947 "\n"
4948 " La description du \"changeset\".\n"
4949 "\n"
4950 " Optionnellement, un résumé des modifications généré par le\n"
4951 " programme diffstat.\n"
4952 "\n"
4953 " Le patch proprement dit, tel que généré par \"hg export\".\n"
4954 "\n"
4955 "Chaque message fait référence au premier de la série (à l'aide\n"
4956 "des en-têtes de message In-Reply-To et References) de manière à\n"
4957 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4958 "électronique et de nouvelles, ainsi que dans les archives de\n"
4959 "messagerie.\n"
4960 "\n"
4961 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4962 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4963 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4964 "d'être certain de bien envoyer les bonnes modifications.\n"
4965 "\n"
4966 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4967 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4968 "\n"
4969 " [email]\n"
4970 " from = Mon Nom <mon@adresse_de_courriel>\n"
4971 " to = destinataire1, destinataire2, ...\n"
4972 " cc = cc1, cc2, ...\n"
4973 " bcc = bcc1, bcc2, ...\n"
4974 "\n"
4975 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4976 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4977 "\n"
4978 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4979 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4980 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4981 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4982 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4983 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4984 "l'affichage chaque message, permettant de vérifier que tout est\n"
4985 "correct.\n"
4986 "\n"
4987 "L'option -m/--mbox est également très utile : au lieu que les\n"
4988 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4989 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4990 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4991 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4992 "comme par exemple mutt :\n"
4993 "\n"
4994 " % mutt -R -f mbox\n"
4995 "\n"
4996 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4997 "utilisant formail (un outil généralement installé en même temps que\n"
4998 "procmail) :\n"
4999 "\n"
5000 " % formail -s sendmail -bm -t < mbox\n"
5001 "\n"
5002 "Et voilà, vos patchs sont en route vers leur destination.\n"
5003 "\n"
5004 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5005 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5006 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5007 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5008 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5009 "page de manuel hgrc(5) pour plus de détails."
5010
5011 #, fuzzy
5012 msgid ""
3944 5013 " [email]\n"
3945 5014 " from = My Name <my@email>\n"
3946 5015 " to = recipient1, recipient2, ...\n"
3947 5016 " cc = cc1, cc2, ...\n"
5017 " bcc = bcc1, bcc2, ..."
5018 msgstr ""
5019 "envoi d'une série de \"changesets\" par courrier électronique\n"
5020 "\n"
5021 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
5022 "décrivant dans son ensemble.\n"
5023 "\n"
5024 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
5025 "la première ligne du commentaire du \"changeset\", préfixée par\n"
5026 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
5027 "parties :\n"
5028 "\n"
5029 " La description du \"changeset\".\n"
5030 "\n"
5031 " Optionnellement, un résumé des modifications généré par le\n"
5032 " programme diffstat.\n"
5033 "\n"
5034 " Le patch proprement dit, tel que généré par \"hg export\".\n"
5035 "\n"
5036 "Chaque message fait référence au premier de la série (à l'aide\n"
5037 "des en-têtes de message In-Reply-To et References) de manière à\n"
5038 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
5039 "électronique et de nouvelles, ainsi que dans les archives de\n"
5040 "messagerie.\n"
5041 "\n"
5042 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
5043 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
5044 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
5045 "d'être certain de bien envoyer les bonnes modifications.\n"
5046 "\n"
5047 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
5048 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
5049 "\n"
5050 " [email]\n"
5051 " from = Mon Nom <mon@adresse_de_courriel>\n"
5052 " to = destinataire1, destinataire2, ...\n"
5053 " cc = cc1, cc2, ...\n"
3948 5054 " bcc = bcc1, bcc2, ...\n"
3949 5055 "\n"
5056 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
5057 "pour envoyer par courrier électronique une série de \"changesets\".\n"
5058 "\n"
5059 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
5060 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
5061 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
5062 "message d'introduction pour la série de patchs. Lorsque tout est\n"
5063 "prêt, les messages seront affichés. Si la variable d'environnement\n"
5064 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
5065 "l'affichage chaque message, permettant de vérifier que tout est\n"
5066 "correct.\n"
5067 "\n"
5068 "L'option -m/--mbox est également très utile : au lieu que les\n"
5069 "messages soient affichés ou envoyés directement, ils seront écrits\n"
5070 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
5071 "aux lettres peut alors être consultée pour vérification par n'importe\n"
5072 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
5073 "comme par exemple mutt :\n"
5074 "\n"
5075 " % mutt -R -f mbox\n"
5076 "\n"
5077 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
5078 "utilisant formail (un outil généralement installé en même temps que\n"
5079 "procmail) :\n"
5080 "\n"
5081 " % formail -s sendmail -bm -t < mbox\n"
5082 "\n"
5083 "Et voilà, vos patchs sont en route vers leur destination.\n"
5084 "\n"
5085 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5086 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5087 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5088 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5089 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5090 "page de manuel hgrc(5) pour plus de détails."
5091
5092 #, fuzzy
5093 msgid ""
3950 5094 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3951 "as a patchbomb.\n"
3952 "\n"
5095 "as a patchbomb."
5096 msgstr ""
5097 "envoi d'une série de \"changesets\" par courrier électronique\n"
5098 "\n"
5099 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
5100 "décrivant dans son ensemble.\n"
5101 "\n"
5102 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
5103 "la première ligne du commentaire du \"changeset\", préfixée par\n"
5104 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
5105 "parties :\n"
5106 "\n"
5107 " La description du \"changeset\".\n"
5108 "\n"
5109 " Optionnellement, un résumé des modifications généré par le\n"
5110 " programme diffstat.\n"
5111 "\n"
5112 " Le patch proprement dit, tel que généré par \"hg export\".\n"
5113 "\n"
5114 "Chaque message fait référence au premier de la série (à l'aide\n"
5115 "des en-têtes de message In-Reply-To et References) de manière à\n"
5116 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
5117 "électronique et de nouvelles, ainsi que dans les archives de\n"
5118 "messagerie.\n"
5119 "\n"
5120 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
5121 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
5122 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
5123 "d'être certain de bien envoyer les bonnes modifications.\n"
5124 "\n"
5125 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
5126 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
5127 "\n"
5128 " [email]\n"
5129 " from = Mon Nom <mon@adresse_de_courriel>\n"
5130 " to = destinataire1, destinataire2, ...\n"
5131 " cc = cc1, cc2, ...\n"
5132 " bcc = bcc1, bcc2, ...\n"
5133 "\n"
5134 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
5135 "pour envoyer par courrier électronique une série de \"changesets\".\n"
5136 "\n"
5137 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
5138 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
5139 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
5140 "message d'introduction pour la série de patchs. Lorsque tout est\n"
5141 "prêt, les messages seront affichés. Si la variable d'environnement\n"
5142 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
5143 "l'affichage chaque message, permettant de vérifier que tout est\n"
5144 "correct.\n"
5145 "\n"
5146 "L'option -m/--mbox est également très utile : au lieu que les\n"
5147 "messages soient affichés ou envoyés directement, ils seront écrits\n"
5148 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
5149 "aux lettres peut alors être consultée pour vérification par n'importe\n"
5150 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
5151 "comme par exemple mutt :\n"
5152 "\n"
5153 " % mutt -R -f mbox\n"
5154 "\n"
5155 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
5156 "utilisant formail (un outil généralement installé en même temps que\n"
5157 "procmail) :\n"
5158 "\n"
5159 " % formail -s sendmail -bm -t < mbox\n"
5160 "\n"
5161 "Et voilà, vos patchs sont en route vers leur destination.\n"
5162 "\n"
5163 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5164 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5165 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5166 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5167 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5168 "page de manuel hgrc(5) pour plus de détails."
5169
5170 #, fuzzy
5171 msgid ""
3953 5172 "To avoid sending patches prematurely, it is a good idea to first run\n"
3954 5173 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3955 5174 "prompted for an email recipient address, a subject and an introductory\n"
3956 5175 "message describing the patches of your patchbomb. Then when all is\n"
3957 5176 "done, patchbomb messages are displayed. If the PAGER environment\n"
3958 5177 "variable is set, your pager will be fired up once for each patchbomb\n"
3959 "message, so you can verify everything is alright.\n"
3960 "\n"
5178 "message, so you can verify everything is alright."
5179 msgstr ""
5180 "envoi d'une série de \"changesets\" par courrier électronique\n"
5181 "\n"
5182 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
5183 "décrivant dans son ensemble.\n"
5184 "\n"
5185 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
5186 "la première ligne du commentaire du \"changeset\", préfixée par\n"
5187 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
5188 "parties :\n"
5189 "\n"
5190 " La description du \"changeset\".\n"
5191 "\n"
5192 " Optionnellement, un résumé des modifications généré par le\n"
5193 " programme diffstat.\n"
5194 "\n"
5195 " Le patch proprement dit, tel que généré par \"hg export\".\n"
5196 "\n"
5197 "Chaque message fait référence au premier de la série (à l'aide\n"
5198 "des en-têtes de message In-Reply-To et References) de manière à\n"
5199 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
5200 "électronique et de nouvelles, ainsi que dans les archives de\n"
5201 "messagerie.\n"
5202 "\n"
5203 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
5204 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
5205 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
5206 "d'être certain de bien envoyer les bonnes modifications.\n"
5207 "\n"
5208 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
5209 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
5210 "\n"
5211 " [email]\n"
5212 " from = Mon Nom <mon@adresse_de_courriel>\n"
5213 " to = destinataire1, destinataire2, ...\n"
5214 " cc = cc1, cc2, ...\n"
5215 " bcc = bcc1, bcc2, ...\n"
5216 "\n"
5217 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
5218 "pour envoyer par courrier électronique une série de \"changesets\".\n"
5219 "\n"
5220 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
5221 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
5222 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
5223 "message d'introduction pour la série de patchs. Lorsque tout est\n"
5224 "prêt, les messages seront affichés. Si la variable d'environnement\n"
5225 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
5226 "l'affichage chaque message, permettant de vérifier que tout est\n"
5227 "correct.\n"
5228 "\n"
5229 "L'option -m/--mbox est également très utile : au lieu que les\n"
5230 "messages soient affichés ou envoyés directement, ils seront écrits\n"
5231 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
5232 "aux lettres peut alors être consultée pour vérification par n'importe\n"
5233 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
5234 "comme par exemple mutt :\n"
5235 "\n"
5236 " % mutt -R -f mbox\n"
5237 "\n"
5238 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
5239 "utilisant formail (un outil généralement installé en même temps que\n"
5240 "procmail) :\n"
5241 "\n"
5242 " % formail -s sendmail -bm -t < mbox\n"
5243 "\n"
5244 "Et voilà, vos patchs sont en route vers leur destination.\n"
5245 "\n"
5246 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5247 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5248 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5249 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5250 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5251 "page de manuel hgrc(5) pour plus de détails."
5252
5253 #, fuzzy
5254 msgid ""
3961 5255 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3962 5256 "patchbomb message in a pager or sending the messages directly, it will\n"
3963 5257 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3964 5258 "can be previewed with any mail user agent which supports UNIX mbox\n"
3965 "files, e.g. with mutt::\n"
5259 "files, e.g. with mutt::"
5260 msgstr ""
5261 "envoi d'une série de \"changesets\" par courrier électronique\n"
5262 "\n"
5263 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
5264 "décrivant dans son ensemble.\n"
5265 "\n"
5266 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
5267 "la première ligne du commentaire du \"changeset\", préfixée par\n"
5268 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
5269 "parties :\n"
5270 "\n"
5271 " La description du \"changeset\".\n"
5272 "\n"
5273 " Optionnellement, un résumé des modifications généré par le\n"
5274 " programme diffstat.\n"
5275 "\n"
5276 " Le patch proprement dit, tel que généré par \"hg export\".\n"
5277 "\n"
5278 "Chaque message fait référence au premier de la série (à l'aide\n"
5279 "des en-têtes de message In-Reply-To et References) de manière à\n"
5280 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
5281 "électronique et de nouvelles, ainsi que dans les archives de\n"
5282 "messagerie.\n"
5283 "\n"
5284 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
5285 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
5286 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
5287 "d'être certain de bien envoyer les bonnes modifications.\n"
5288 "\n"
5289 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
5290 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
5291 "\n"
5292 " [email]\n"
5293 " from = Mon Nom <mon@adresse_de_courriel>\n"
5294 " to = destinataire1, destinataire2, ...\n"
5295 " cc = cc1, cc2, ...\n"
5296 " bcc = bcc1, bcc2, ...\n"
5297 "\n"
5298 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
5299 "pour envoyer par courrier électronique une série de \"changesets\".\n"
5300 "\n"
5301 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
5302 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
5303 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
5304 "message d'introduction pour la série de patchs. Lorsque tout est\n"
5305 "prêt, les messages seront affichés. Si la variable d'environnement\n"
5306 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
5307 "l'affichage chaque message, permettant de vérifier que tout est\n"
5308 "correct.\n"
5309 "\n"
5310 "L'option -m/--mbox est également très utile : au lieu que les\n"
5311 "messages soient affichés ou envoyés directement, ils seront écrits\n"
5312 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
5313 "aux lettres peut alors être consultée pour vérification par n'importe\n"
5314 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
5315 "comme par exemple mutt :\n"
3966 5316 "\n"
3967 5317 " % mutt -R -f mbox\n"
3968 5318 "\n"
5319 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
5320 "utilisant formail (un outil généralement installé en même temps que\n"
5321 "procmail) :\n"
5322 "\n"
5323 " % formail -s sendmail -bm -t < mbox\n"
5324 "\n"
5325 "Et voilà, vos patchs sont en route vers leur destination.\n"
5326 "\n"
5327 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5328 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5329 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5330 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5331 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5332 "page de manuel hgrc(5) pour plus de détails."
5333
5334 #, fuzzy
5335 msgid " % mutt -R -f mbox"
5336 msgstr ""
5337 "envoi d'une série de \"changesets\" par courrier électronique\n"
5338 "\n"
5339 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
5340 "décrivant dans son ensemble.\n"
5341 "\n"
5342 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
5343 "la première ligne du commentaire du \"changeset\", préfixée par\n"
5344 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
5345 "parties :\n"
5346 "\n"
5347 " La description du \"changeset\".\n"
5348 "\n"
5349 " Optionnellement, un résumé des modifications généré par le\n"
5350 " programme diffstat.\n"
5351 "\n"
5352 " Le patch proprement dit, tel que généré par \"hg export\".\n"
5353 "\n"
5354 "Chaque message fait référence au premier de la série (à l'aide\n"
5355 "des en-têtes de message In-Reply-To et References) de manière à\n"
5356 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
5357 "électronique et de nouvelles, ainsi que dans les archives de\n"
5358 "messagerie.\n"
5359 "\n"
5360 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
5361 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
5362 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
5363 "d'être certain de bien envoyer les bonnes modifications.\n"
5364 "\n"
5365 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
5366 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
5367 "\n"
5368 " [email]\n"
5369 " from = Mon Nom <mon@adresse_de_courriel>\n"
5370 " to = destinataire1, destinataire2, ...\n"
5371 " cc = cc1, cc2, ...\n"
5372 " bcc = bcc1, bcc2, ...\n"
5373 "\n"
5374 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
5375 "pour envoyer par courrier électronique une série de \"changesets\".\n"
5376 "\n"
5377 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
5378 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
5379 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
5380 "message d'introduction pour la série de patchs. Lorsque tout est\n"
5381 "prêt, les messages seront affichés. Si la variable d'environnement\n"
5382 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
5383 "l'affichage chaque message, permettant de vérifier que tout est\n"
5384 "correct.\n"
5385 "\n"
5386 "L'option -m/--mbox est également très utile : au lieu que les\n"
5387 "messages soient affichés ou envoyés directement, ils seront écrits\n"
5388 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
5389 "aux lettres peut alors être consultée pour vérification par n'importe\n"
5390 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
5391 "comme par exemple mutt :\n"
5392 "\n"
5393 " % mutt -R -f mbox\n"
5394 "\n"
5395 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
5396 "utilisant formail (un outil généralement installé en même temps que\n"
5397 "procmail) :\n"
5398 "\n"
5399 " % formail -s sendmail -bm -t < mbox\n"
5400 "\n"
5401 "Et voilà, vos patchs sont en route vers leur destination.\n"
5402 "\n"
5403 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5404 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5405 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5406 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5407 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5408 "page de manuel hgrc(5) pour plus de détails."
5409
5410 #, fuzzy
5411 msgid ""
3969 5412 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3970 5413 "(a utility that is commonly installed as part of the procmail\n"
3971 "package), to send each message out::\n"
5414 "package), to send each message out::"
5415 msgstr ""
5416 "envoi d'une série de \"changesets\" par courrier électronique\n"
5417 "\n"
5418 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
5419 "décrivant dans son ensemble.\n"
5420 "\n"
5421 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
5422 "la première ligne du commentaire du \"changeset\", préfixée par\n"
5423 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
5424 "parties :\n"
5425 "\n"
5426 " La description du \"changeset\".\n"
5427 "\n"
5428 " Optionnellement, un résumé des modifications généré par le\n"
5429 " programme diffstat.\n"
5430 "\n"
5431 " Le patch proprement dit, tel que généré par \"hg export\".\n"
5432 "\n"
5433 "Chaque message fait référence au premier de la série (à l'aide\n"
5434 "des en-têtes de message In-Reply-To et References) de manière à\n"
5435 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
5436 "électronique et de nouvelles, ainsi que dans les archives de\n"
5437 "messagerie.\n"
5438 "\n"
5439 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
5440 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
5441 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
5442 "d'être certain de bien envoyer les bonnes modifications.\n"
5443 "\n"
5444 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
5445 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
5446 "\n"
5447 " [email]\n"
5448 " from = Mon Nom <mon@adresse_de_courriel>\n"
5449 " to = destinataire1, destinataire2, ...\n"
5450 " cc = cc1, cc2, ...\n"
5451 " bcc = bcc1, bcc2, ...\n"
5452 "\n"
5453 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
5454 "pour envoyer par courrier électronique une série de \"changesets\".\n"
5455 "\n"
5456 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
5457 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
5458 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
5459 "message d'introduction pour la série de patchs. Lorsque tout est\n"
5460 "prêt, les messages seront affichés. Si la variable d'environnement\n"
5461 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
5462 "l'affichage chaque message, permettant de vérifier que tout est\n"
5463 "correct.\n"
5464 "\n"
5465 "L'option -m/--mbox est également très utile : au lieu que les\n"
5466 "messages soient affichés ou envoyés directement, ils seront écrits\n"
5467 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
5468 "aux lettres peut alors être consultée pour vérification par n'importe\n"
5469 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
5470 "comme par exemple mutt :\n"
5471 "\n"
5472 " % mutt -R -f mbox\n"
5473 "\n"
5474 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
5475 "utilisant formail (un outil généralement installé en même temps que\n"
5476 "procmail) :\n"
3972 5477 "\n"
3973 5478 " % formail -s sendmail -bm -t < mbox\n"
3974 5479 "\n"
3975 "That should be all. Now your patchbomb is on its way out.\n"
3976 "\n"
5480 "Et voilà, vos patchs sont en route vers leur destination.\n"
5481 "\n"
5482 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5483 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5484 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5485 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5486 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5487 "page de manuel hgrc(5) pour plus de détails."
5488
5489 #, fuzzy
5490 msgid " % formail -s sendmail -bm -t < mbox"
5491 msgstr ""
5492 "envoi d'une série de \"changesets\" par courrier électronique\n"
5493 "\n"
5494 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
5495 "décrivant dans son ensemble.\n"
5496 "\n"
5497 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
5498 "la première ligne du commentaire du \"changeset\", préfixée par\n"
5499 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
5500 "parties :\n"
5501 "\n"
5502 " La description du \"changeset\".\n"
5503 "\n"
5504 " Optionnellement, un résumé des modifications généré par le\n"
5505 " programme diffstat.\n"
5506 "\n"
5507 " Le patch proprement dit, tel que généré par \"hg export\".\n"
5508 "\n"
5509 "Chaque message fait référence au premier de la série (à l'aide\n"
5510 "des en-têtes de message In-Reply-To et References) de manière à\n"
5511 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
5512 "électronique et de nouvelles, ainsi que dans les archives de\n"
5513 "messagerie.\n"
5514 "\n"
5515 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
5516 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
5517 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
5518 "d'être certain de bien envoyer les bonnes modifications.\n"
5519 "\n"
5520 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
5521 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
5522 "\n"
5523 " [email]\n"
5524 " from = Mon Nom <mon@adresse_de_courriel>\n"
5525 " to = destinataire1, destinataire2, ...\n"
5526 " cc = cc1, cc2, ...\n"
5527 " bcc = bcc1, bcc2, ...\n"
5528 "\n"
5529 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
5530 "pour envoyer par courrier électronique une série de \"changesets\".\n"
5531 "\n"
5532 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
5533 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
5534 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
5535 "message d'introduction pour la série de patchs. Lorsque tout est\n"
5536 "prêt, les messages seront affichés. Si la variable d'environnement\n"
5537 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
5538 "l'affichage chaque message, permettant de vérifier que tout est\n"
5539 "correct.\n"
5540 "\n"
5541 "L'option -m/--mbox est également très utile : au lieu que les\n"
5542 "messages soient affichés ou envoyés directement, ils seront écrits\n"
5543 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
5544 "aux lettres peut alors être consultée pour vérification par n'importe\n"
5545 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
5546 "comme par exemple mutt :\n"
5547 "\n"
5548 " % mutt -R -f mbox\n"
5549 "\n"
5550 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
5551 "utilisant formail (un outil généralement installé en même temps que\n"
5552 "procmail) :\n"
5553 "\n"
5554 " % formail -s sendmail -bm -t < mbox\n"
5555 "\n"
5556 "Et voilà, vos patchs sont en route vers leur destination.\n"
5557 "\n"
5558 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5559 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5560 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5561 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5562 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5563 "page de manuel hgrc(5) pour plus de détails."
5564
5565 #, fuzzy
5566 msgid "That should be all. Now your patchbomb is on its way out."
5567 msgstr ""
5568 "envoi d'une série de \"changesets\" par courrier électronique\n"
5569 "\n"
5570 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
5571 "décrivant dans son ensemble.\n"
5572 "\n"
5573 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
5574 "la première ligne du commentaire du \"changeset\", préfixée par\n"
5575 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
5576 "parties :\n"
5577 "\n"
5578 " La description du \"changeset\".\n"
5579 "\n"
5580 " Optionnellement, un résumé des modifications généré par le\n"
5581 " programme diffstat.\n"
5582 "\n"
5583 " Le patch proprement dit, tel que généré par \"hg export\".\n"
5584 "\n"
5585 "Chaque message fait référence au premier de la série (à l'aide\n"
5586 "des en-têtes de message In-Reply-To et References) de manière à\n"
5587 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
5588 "électronique et de nouvelles, ainsi que dans les archives de\n"
5589 "messagerie.\n"
5590 "\n"
5591 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
5592 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
5593 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
5594 "d'être certain de bien envoyer les bonnes modifications.\n"
5595 "\n"
5596 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
5597 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
5598 "\n"
5599 " [email]\n"
5600 " from = Mon Nom <mon@adresse_de_courriel>\n"
5601 " to = destinataire1, destinataire2, ...\n"
5602 " cc = cc1, cc2, ...\n"
5603 " bcc = bcc1, bcc2, ...\n"
5604 "\n"
5605 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
5606 "pour envoyer par courrier électronique une série de \"changesets\".\n"
5607 "\n"
5608 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
5609 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
5610 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
5611 "message d'introduction pour la série de patchs. Lorsque tout est\n"
5612 "prêt, les messages seront affichés. Si la variable d'environnement\n"
5613 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
5614 "l'affichage chaque message, permettant de vérifier que tout est\n"
5615 "correct.\n"
5616 "\n"
5617 "L'option -m/--mbox est également très utile : au lieu que les\n"
5618 "messages soient affichés ou envoyés directement, ils seront écrits\n"
5619 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
5620 "aux lettres peut alors être consultée pour vérification par n'importe\n"
5621 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
5622 "comme par exemple mutt :\n"
5623 "\n"
5624 " % mutt -R -f mbox\n"
5625 "\n"
5626 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
5627 "utilisant formail (un outil généralement installé en même temps que\n"
5628 "procmail) :\n"
5629 "\n"
5630 " % formail -s sendmail -bm -t < mbox\n"
5631 "\n"
5632 "Et voilà, vos patchs sont en route vers leur destination.\n"
5633 "\n"
5634 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
5635 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
5636 "alors remplir la section [smtp] de telle sorte que l'extension\n"
5637 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
5638 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
5639 "page de manuel hgrc(5) pour plus de détails."
5640
5641 #, fuzzy
5642 msgid ""
3977 5643 "You can also either configure the method option in the email section\n"
3978 5644 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3979 5645 "that the patchbomb extension can automatically send patchbombs\n"
@@ -4067,51 +5733,516 b' msgid "diffstat rejected"'
4067 5733 msgstr "résumé des modifications rejeté"
4068 5734
4069 5735 #, fuzzy
4070 msgid ""
4071 "send changesets by email\n"
4072 "\n"
5736 msgid "send changesets by email"
5737 msgstr ""
5738 "envoi de \"changesets\" par courrier électronique\n"
5739 "\n"
5740 " Par défaut, les modifications sont envoyées au format généré par\n"
5741 " \"hg export\", une par message. La série débute par un message\n"
5742 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
5743 "\n"
5744 " Chaque courriel a pour sujet un résumé des modifications\n"
5745 " apportées par le patch (pris en première ligne de la description\n"
5746 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
5747 " Le message est constitué de deux ou trois parties. D'abord,\n"
5748 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
5749 " un résumé des modifications généré par le programme diffstat si\n"
5750 " celui-ci est installé et que l'option -d/--diffstat a été\n"
5751 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
5752 "\n"
5753 " Par défaut le patch est inclus textuellement dans le corps du\n"
5754 " message afin de faciliter les relectures et commentaires.\n"
5755 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
5756 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
5757 " insère celle-ci dans le corps.\n"
5758 "\n"
5759 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
5760 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
5761 " ancêtres des révisions spécifiées, le cas échéant).\n"
5762 "\n"
5763 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
5764 " même manière que pour --outgoing, mais il seront envoyés via\n"
5765 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
5766 "\n"
5767 " Exemples :\n"
5768 "\n"
5769 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
5770 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
5771 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
5772 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
5773 "\n"
5774 " hg email -o # envoyer les patchs absents de la\n"
5775 " destination par défaut\n"
5776 " hg email -o DEST # envoyer les patchs absents de DEST\n"
5777 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
5778 " de la destination par défaut\n"
5779 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
5780 " de DEST\n"
5781 "\n"
5782 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
5783 " d'activer préalablement l'envoi de courriel dans le fichier\n"
5784 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
5785 " [email] pour plus de détails.\n"
5786 " "
5787
5788 #, fuzzy
5789 msgid ""
4073 5790 " By default, diffs are sent in the format generated by hg export,\n"
4074 5791 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
4075 " introduction, which describes the series as a whole.\n"
4076 "\n"
5792 " introduction, which describes the series as a whole."
5793 msgstr ""
5794 "envoi de \"changesets\" par courrier électronique\n"
5795 "\n"
5796 " Par défaut, les modifications sont envoyées au format généré par\n"
5797 " \"hg export\", une par message. La série débute par un message\n"
5798 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
5799 "\n"
5800 " Chaque courriel a pour sujet un résumé des modifications\n"
5801 " apportées par le patch (pris en première ligne de la description\n"
5802 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
5803 " Le message est constitué de deux ou trois parties. D'abord,\n"
5804 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
5805 " un résumé des modifications généré par le programme diffstat si\n"
5806 " celui-ci est installé et que l'option -d/--diffstat a été\n"
5807 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
5808 "\n"
5809 " Par défaut le patch est inclus textuellement dans le corps du\n"
5810 " message afin de faciliter les relectures et commentaires.\n"
5811 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
5812 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
5813 " insère celle-ci dans le corps.\n"
5814 "\n"
5815 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
5816 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
5817 " ancêtres des révisions spécifiées, le cas échéant).\n"
5818 "\n"
5819 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
5820 " même manière que pour --outgoing, mais il seront envoyés via\n"
5821 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
5822 "\n"
5823 " Exemples :\n"
5824 "\n"
5825 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
5826 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
5827 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
5828 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
5829 "\n"
5830 " hg email -o # envoyer les patchs absents de la\n"
5831 " destination par défaut\n"
5832 " hg email -o DEST # envoyer les patchs absents de DEST\n"
5833 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
5834 " de la destination par défaut\n"
5835 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
5836 " de DEST\n"
5837 "\n"
5838 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
5839 " d'activer préalablement l'envoi de courriel dans le fichier\n"
5840 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
5841 " [email] pour plus de détails.\n"
5842 " "
5843
5844 #, fuzzy
5845 msgid ""
4077 5846 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
4078 5847 " the first line of the changeset description as the subject text.\n"
4079 5848 " The message contains two or three parts. First, the changeset\n"
4080 5849 " description. Next, (optionally) if the diffstat program is\n"
4081 5850 " installed and -d/--diffstat is used, the result of running\n"
4082 5851 " diffstat on the patch. Finally, the patch itself, as generated by\n"
4083 " \"hg export\".\n"
4084 "\n"
5852 " \"hg export\"."
5853 msgstr ""
5854 "envoi de \"changesets\" par courrier électronique\n"
5855 "\n"
5856 " Par défaut, les modifications sont envoyées au format généré par\n"
5857 " \"hg export\", une par message. La série débute par un message\n"
5858 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
5859 "\n"
5860 " Chaque courriel a pour sujet un résumé des modifications\n"
5861 " apportées par le patch (pris en première ligne de la description\n"
5862 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
5863 " Le message est constitué de deux ou trois parties. D'abord,\n"
5864 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
5865 " un résumé des modifications généré par le programme diffstat si\n"
5866 " celui-ci est installé et que l'option -d/--diffstat a été\n"
5867 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
5868 "\n"
5869 " Par défaut le patch est inclus textuellement dans le corps du\n"
5870 " message afin de faciliter les relectures et commentaires.\n"
5871 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
5872 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
5873 " insère celle-ci dans le corps.\n"
5874 "\n"
5875 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
5876 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
5877 " ancêtres des révisions spécifiées, le cas échéant).\n"
5878 "\n"
5879 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
5880 " même manière que pour --outgoing, mais il seront envoyés via\n"
5881 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
5882 "\n"
5883 " Exemples :\n"
5884 "\n"
5885 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
5886 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
5887 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
5888 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
5889 "\n"
5890 " hg email -o # envoyer les patchs absents de la\n"
5891 " destination par défaut\n"
5892 " hg email -o DEST # envoyer les patchs absents de DEST\n"
5893 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
5894 " de la destination par défaut\n"
5895 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
5896 " de DEST\n"
5897 "\n"
5898 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
5899 " d'activer préalablement l'envoi de courriel dans le fichier\n"
5900 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
5901 " [email] pour plus de détails.\n"
5902 " "
5903
5904 #, fuzzy
5905 msgid ""
4085 5906 " By default the patch is included as text in the email body for\n"
4086 5907 " easy reviewing. Using the -a/--attach option will instead create\n"
4087 5908 " an attachment for the patch. With -i/--inline an inline attachment\n"
4088 " will be created.\n"
4089 "\n"
5909 " will be created."
5910 msgstr ""
5911 "envoi de \"changesets\" par courrier électronique\n"
5912 "\n"
5913 " Par défaut, les modifications sont envoyées au format généré par\n"
5914 " \"hg export\", une par message. La série débute par un message\n"
5915 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
5916 "\n"
5917 " Chaque courriel a pour sujet un résumé des modifications\n"
5918 " apportées par le patch (pris en première ligne de la description\n"
5919 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
5920 " Le message est constitué de deux ou trois parties. D'abord,\n"
5921 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
5922 " un résumé des modifications généré par le programme diffstat si\n"
5923 " celui-ci est installé et que l'option -d/--diffstat a été\n"
5924 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
5925 "\n"
5926 " Par défaut le patch est inclus textuellement dans le corps du\n"
5927 " message afin de faciliter les relectures et commentaires.\n"
5928 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
5929 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
5930 " insère celle-ci dans le corps.\n"
5931 "\n"
5932 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
5933 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
5934 " ancêtres des révisions spécifiées, le cas échéant).\n"
5935 "\n"
5936 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
5937 " même manière que pour --outgoing, mais il seront envoyés via\n"
5938 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
5939 "\n"
5940 " Exemples :\n"
5941 "\n"
5942 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
5943 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
5944 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
5945 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
5946 "\n"
5947 " hg email -o # envoyer les patchs absents de la\n"
5948 " destination par défaut\n"
5949 " hg email -o DEST # envoyer les patchs absents de DEST\n"
5950 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
5951 " de la destination par défaut\n"
5952 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
5953 " de DEST\n"
5954 "\n"
5955 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
5956 " d'activer préalablement l'envoi de courriel dans le fichier\n"
5957 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
5958 " [email] pour plus de détails.\n"
5959 " "
5960
5961 #, fuzzy
5962 msgid ""
4090 5963 " With -o/--outgoing, emails will be generated for patches not found\n"
4091 5964 " in the destination repository (or only those which are ancestors\n"
4092 " of the specified revisions if any are provided)\n"
4093 "\n"
5965 " of the specified revisions if any are provided)"
5966 msgstr ""
5967 "envoi de \"changesets\" par courrier électronique\n"
5968 "\n"
5969 " Par défaut, les modifications sont envoyées au format généré par\n"
5970 " \"hg export\", une par message. La série débute par un message\n"
5971 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
5972 "\n"
5973 " Chaque courriel a pour sujet un résumé des modifications\n"
5974 " apportées par le patch (pris en première ligne de la description\n"
5975 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
5976 " Le message est constitué de deux ou trois parties. D'abord,\n"
5977 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
5978 " un résumé des modifications généré par le programme diffstat si\n"
5979 " celui-ci est installé et que l'option -d/--diffstat a été\n"
5980 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
5981 "\n"
5982 " Par défaut le patch est inclus textuellement dans le corps du\n"
5983 " message afin de faciliter les relectures et commentaires.\n"
5984 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
5985 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
5986 " insère celle-ci dans le corps.\n"
5987 "\n"
5988 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
5989 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
5990 " ancêtres des révisions spécifiées, le cas échéant).\n"
5991 "\n"
5992 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
5993 " même manière que pour --outgoing, mais il seront envoyés via\n"
5994 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
5995 "\n"
5996 " Exemples :\n"
5997 "\n"
5998 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
5999 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
6000 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
6001 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
6002 "\n"
6003 " hg email -o # envoyer les patchs absents de la\n"
6004 " destination par défaut\n"
6005 " hg email -o DEST # envoyer les patchs absents de DEST\n"
6006 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
6007 " de la destination par défaut\n"
6008 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
6009 " de DEST\n"
6010 "\n"
6011 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
6012 " d'activer préalablement l'envoi de courriel dans le fichier\n"
6013 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
6014 " [email] pour plus de détails.\n"
6015 " "
6016
6017 #, fuzzy
6018 msgid ""
4094 6019 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
4095 6020 " single email containing a binary Mercurial bundle as an attachment\n"
4096 " will be sent.\n"
4097 "\n"
4098 " Examples::\n"
4099 "\n"
6021 " will be sent."
6022 msgstr ""
6023 "envoi de \"changesets\" par courrier électronique\n"
6024 "\n"
6025 " Par défaut, les modifications sont envoyées au format généré par\n"
6026 " \"hg export\", une par message. La série débute par un message\n"
6027 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
6028 "\n"
6029 " Chaque courriel a pour sujet un résumé des modifications\n"
6030 " apportées par le patch (pris en première ligne de la description\n"
6031 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
6032 " Le message est constitué de deux ou trois parties. D'abord,\n"
6033 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
6034 " un résumé des modifications généré par le programme diffstat si\n"
6035 " celui-ci est installé et que l'option -d/--diffstat a été\n"
6036 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
6037 "\n"
6038 " Par défaut le patch est inclus textuellement dans le corps du\n"
6039 " message afin de faciliter les relectures et commentaires.\n"
6040 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
6041 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
6042 " insère celle-ci dans le corps.\n"
6043 "\n"
6044 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
6045 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
6046 " ancêtres des révisions spécifiées, le cas échéant).\n"
6047 "\n"
6048 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
6049 " même manière que pour --outgoing, mais il seront envoyés via\n"
6050 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
6051 "\n"
6052 " Exemples :\n"
6053 "\n"
6054 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
6055 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
6056 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
6057 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
6058 "\n"
6059 " hg email -o # envoyer les patchs absents de la\n"
6060 " destination par défaut\n"
6061 " hg email -o DEST # envoyer les patchs absents de DEST\n"
6062 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
6063 " de la destination par défaut\n"
6064 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
6065 " de DEST\n"
6066 "\n"
6067 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
6068 " d'activer préalablement l'envoi de courriel dans le fichier\n"
6069 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
6070 " [email] pour plus de détails.\n"
6071 " "
6072
6073 #, fuzzy
6074 msgid ""
4100 6075 " hg email -r 3000 # send patch 3000 only\n"
4101 6076 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
4102 6077 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
4103 " hg email 3000 # send patch 3000 (deprecated)\n"
4104 "\n"
6078 " hg email 3000 # send patch 3000 (deprecated)"
6079 msgstr ""
6080 "envoi de \"changesets\" par courrier électronique\n"
6081 "\n"
6082 " Par défaut, les modifications sont envoyées au format généré par\n"
6083 " \"hg export\", une par message. La série débute par un message\n"
6084 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
6085 "\n"
6086 " Chaque courriel a pour sujet un résumé des modifications\n"
6087 " apportées par le patch (pris en première ligne de la description\n"
6088 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
6089 " Le message est constitué de deux ou trois parties. D'abord,\n"
6090 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
6091 " un résumé des modifications généré par le programme diffstat si\n"
6092 " celui-ci est installé et que l'option -d/--diffstat a été\n"
6093 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
6094 "\n"
6095 " Par défaut le patch est inclus textuellement dans le corps du\n"
6096 " message afin de faciliter les relectures et commentaires.\n"
6097 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
6098 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
6099 " insère celle-ci dans le corps.\n"
6100 "\n"
6101 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
6102 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
6103 " ancêtres des révisions spécifiées, le cas échéant).\n"
6104 "\n"
6105 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
6106 " même manière que pour --outgoing, mais il seront envoyés via\n"
6107 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
6108 "\n"
6109 " Exemples :\n"
6110 "\n"
6111 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
6112 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
6113 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
6114 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
6115 "\n"
6116 " hg email -o # envoyer les patchs absents de la\n"
6117 " destination par défaut\n"
6118 " hg email -o DEST # envoyer les patchs absents de DEST\n"
6119 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
6120 " de la destination par défaut\n"
6121 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
6122 " de DEST\n"
6123 "\n"
6124 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
6125 " d'activer préalablement l'envoi de courriel dans le fichier\n"
6126 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
6127 " [email] pour plus de détails.\n"
6128 " "
6129
6130 #, fuzzy
6131 msgid ""
4105 6132 " hg email -o # send all patches not in default\n"
4106 6133 " hg email -o DEST # send all patches not in DEST\n"
4107 6134 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
4108 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
4109 "\n"
6135 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST"
6136 msgstr ""
6137 "envoi de \"changesets\" par courrier électronique\n"
6138 "\n"
6139 " Par défaut, les modifications sont envoyées au format généré par\n"
6140 " \"hg export\", une par message. La série débute par un message\n"
6141 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
6142 "\n"
6143 " Chaque courriel a pour sujet un résumé des modifications\n"
6144 " apportées par le patch (pris en première ligne de la description\n"
6145 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
6146 " Le message est constitué de deux ou trois parties. D'abord,\n"
6147 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
6148 " un résumé des modifications généré par le programme diffstat si\n"
6149 " celui-ci est installé et que l'option -d/--diffstat a été\n"
6150 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
6151 "\n"
6152 " Par défaut le patch est inclus textuellement dans le corps du\n"
6153 " message afin de faciliter les relectures et commentaires.\n"
6154 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
6155 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
6156 " insère celle-ci dans le corps.\n"
6157 "\n"
6158 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
6159 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
6160 " ancêtres des révisions spécifiées, le cas échéant).\n"
6161 "\n"
6162 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
6163 " même manière que pour --outgoing, mais il seront envoyés via\n"
6164 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
6165 "\n"
6166 " Exemples :\n"
6167 "\n"
6168 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
6169 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
6170 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
6171 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
6172 "\n"
6173 " hg email -o # envoyer les patchs absents de la\n"
6174 " destination par défaut\n"
6175 " hg email -o DEST # envoyer les patchs absents de DEST\n"
6176 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
6177 " de la destination par défaut\n"
6178 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
6179 " de DEST\n"
6180 "\n"
6181 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
6182 " d'activer préalablement l'envoi de courriel dans le fichier\n"
6183 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
6184 " [email] pour plus de détails.\n"
6185 " "
6186
6187 #, fuzzy
6188 msgid ""
4110 6189 " hg email -b # send bundle of all patches not in default\n"
4111 6190 " hg email -b DEST # send bundle of all patches not in DEST\n"
4112 6191 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n"
4113 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
4114 "\n"
6192 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST"
6193 msgstr ""
6194 "envoi de \"changesets\" par courrier électronique\n"
6195 "\n"
6196 " Par défaut, les modifications sont envoyées au format généré par\n"
6197 " \"hg export\", une par message. La série débute par un message\n"
6198 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
6199 "\n"
6200 " Chaque courriel a pour sujet un résumé des modifications\n"
6201 " apportées par le patch (pris en première ligne de la description\n"
6202 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
6203 " Le message est constitué de deux ou trois parties. D'abord,\n"
6204 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
6205 " un résumé des modifications généré par le programme diffstat si\n"
6206 " celui-ci est installé et que l'option -d/--diffstat a été\n"
6207 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
6208 "\n"
6209 " Par défaut le patch est inclus textuellement dans le corps du\n"
6210 " message afin de faciliter les relectures et commentaires.\n"
6211 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
6212 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
6213 " insère celle-ci dans le corps.\n"
6214 "\n"
6215 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
6216 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
6217 " ancêtres des révisions spécifiées, le cas échéant).\n"
6218 "\n"
6219 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
6220 " même manière que pour --outgoing, mais il seront envoyés via\n"
6221 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
6222 "\n"
6223 " Exemples :\n"
6224 "\n"
6225 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
6226 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
6227 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
6228 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
6229 "\n"
6230 " hg email -o # envoyer les patchs absents de la\n"
6231 " destination par défaut\n"
6232 " hg email -o DEST # envoyer les patchs absents de DEST\n"
6233 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
6234 " de la destination par défaut\n"
6235 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
6236 " de DEST\n"
6237 "\n"
6238 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
6239 " d'activer préalablement l'envoi de courriel dans le fichier\n"
6240 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
6241 " [email] pour plus de détails.\n"
6242 " "
6243
6244 #, fuzzy
6245 msgid ""
4115 6246 " Before using this command, you will need to enable email in your\n"
4116 6247 " hgrc. See the [email] section in hgrc(5) for details.\n"
4117 6248 " "
@@ -4180,34 +6311,24 b' msgstr "veuillez ne sp\xc3\xa9cifier les r\xc3\xa9visions que d\'une seule mani\xc3\xa8re"'
4180 6311
4181 6312 msgid ""
4182 6313 "\n"
4183 "Write the introductory message for the patch series.\n"
4184 "\n"
4185 msgstr ""
4186 "\n"
4187 "Veuillez écrire le message d'introduction de la série de patchs.\n"
4188 "\n"
4189
4190 #, python-format
4191 msgid ""
4192 "This patch series consists of %d patches.\n"
4193 "\n"
4194 msgstr ""
4195 "Cette série comporte %d patchs.\n"
4196 "\n"
4197
4198 # diffstat sur l'ensemble des patchs
6314 "Write the introductory message for the patch series."
6315 msgstr ""
6316 "\n"
6317 "Veuillez écrire le message d'introduction de la série de patchs."
6318
6319 #, python-format
6320 msgid "This patch series consists of %d patches."
6321 msgstr "Cette série comporte %d patchs."
6322
4199 6323 msgid "Final summary:\n"
4200 6324 msgstr "Résumé complet des modifications :\n"
4201 6325
4202 # mode --test
4203 6326 msgid "Displaying "
4204 6327 msgstr "Affichage de "
4205 6328
4206 # mode --mbox
4207 6329 msgid "Writing "
4208 6330 msgstr "Écriture de "
4209 6331
4210 # mode d'envoi par défaut
4211 6332 msgid "Sending "
4212 6333 msgstr "Envoi de "
4213 6334
@@ -4284,27 +6405,227 b' msgid "command to delete untracked files'
4284 6405 msgstr ""
4285 6406
4286 6407 #, fuzzy
4287 msgid ""
4288 "removes files not tracked by Mercurial\n"
4289 "\n"
6408 msgid "removes files not tracked by Mercurial"
6409 msgstr ""
6410 "retire les fichiers non suivis par Mercurial\n"
6411 "\n"
6412 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
6413 " utile pour tester des changements locaux non enregistrés à\n"
6414 " l'intérieur d'une arborescence de sources propre.\n"
6415 "\n"
6416 " Ainsi, purge effacera :\n"
6417 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
6418 " par un point d'interrogation\n"
6419 " - les répertoires vides : en fait Mercurial ignore complètement\n"
6420 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
6421 " sous son contrôle\n"
6422 " Seront par contre laissés intacts :\n"
6423 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
6424 " ou non\n"
6425 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
6426 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
6427 "\n"
6428 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
6429 " seuls les fichiers qu'ils contiennent seront considérés.\n"
6430 "\n"
6431 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
6432 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
6433 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
6434 " seraient effacés par purge, utilisez l'option --print.\n"
6435 " "
6436
6437 #, fuzzy
6438 msgid ""
4290 6439 " Delete files not known to Mercurial. This is useful to test local\n"
4291 " and uncommitted changes in an otherwise-clean source tree.\n"
4292 "\n"
4293 " This means that purge will delete:\n"
4294 "\n"
6440 " and uncommitted changes in an otherwise-clean source tree."
6441 msgstr ""
6442 "retire les fichiers non suivis par Mercurial\n"
6443 "\n"
6444 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
6445 " utile pour tester des changements locaux non enregistrés à\n"
6446 " l'intérieur d'une arborescence de sources propre.\n"
6447 "\n"
6448 " Ainsi, purge effacera :\n"
6449 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
6450 " par un point d'interrogation\n"
6451 " - les répertoires vides : en fait Mercurial ignore complètement\n"
6452 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
6453 " sous son contrôle\n"
6454 " Seront par contre laissés intacts :\n"
6455 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
6456 " ou non\n"
6457 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
6458 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
6459 "\n"
6460 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
6461 " seuls les fichiers qu'ils contiennent seront considérés.\n"
6462 "\n"
6463 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
6464 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
6465 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
6466 " seraient effacés par purge, utilisez l'option --print.\n"
6467 " "
6468
6469 #, fuzzy
6470 msgid " This means that purge will delete:"
6471 msgstr ""
6472 "retire les fichiers non suivis par Mercurial\n"
6473 "\n"
6474 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
6475 " utile pour tester des changements locaux non enregistrés à\n"
6476 " l'intérieur d'une arborescence de sources propre.\n"
6477 "\n"
6478 " Ainsi, purge effacera :\n"
6479 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
6480 " par un point d'interrogation\n"
6481 " - les répertoires vides : en fait Mercurial ignore complètement\n"
6482 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
6483 " sous son contrôle\n"
6484 " Seront par contre laissés intacts :\n"
6485 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
6486 " ou non\n"
6487 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
6488 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
6489 "\n"
6490 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
6491 " seuls les fichiers qu'ils contiennent seront considérés.\n"
6492 "\n"
6493 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
6494 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
6495 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
6496 " seraient effacés par purge, utilisez l'option --print.\n"
6497 " "
6498
6499 #, fuzzy
6500 msgid ""
4295 6501 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
4296 6502 " - Empty directories: in fact Mercurial ignores directories unless\n"
4297 " they contain files under source control management\n"
4298 "\n"
4299 " But it will leave untouched:\n"
4300 "\n"
6503 " they contain files under source control management"
6504 msgstr ""
6505 "retire les fichiers non suivis par Mercurial\n"
6506 "\n"
6507 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
6508 " utile pour tester des changements locaux non enregistrés à\n"
6509 " l'intérieur d'une arborescence de sources propre.\n"
6510 "\n"
6511 " Ainsi, purge effacera :\n"
6512 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
6513 " par un point d'interrogation\n"
6514 " - les répertoires vides : en fait Mercurial ignore complètement\n"
6515 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
6516 " sous son contrôle\n"
6517 " Seront par contre laissés intacts :\n"
6518 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
6519 " ou non\n"
6520 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
6521 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
6522 "\n"
6523 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
6524 " seuls les fichiers qu'ils contiennent seront considérés.\n"
6525 "\n"
6526 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
6527 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
6528 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
6529 " seraient effacés par purge, utilisez l'option --print.\n"
6530 " "
6531
6532 #, fuzzy
6533 msgid " But it will leave untouched:"
6534 msgstr ""
6535 "retire les fichiers non suivis par Mercurial\n"
6536 "\n"
6537 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
6538 " utile pour tester des changements locaux non enregistrés à\n"
6539 " l'intérieur d'une arborescence de sources propre.\n"
6540 "\n"
6541 " Ainsi, purge effacera :\n"
6542 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
6543 " par un point d'interrogation\n"
6544 " - les répertoires vides : en fait Mercurial ignore complètement\n"
6545 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
6546 " sous son contrôle\n"
6547 " Seront par contre laissés intacts :\n"
6548 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
6549 " ou non\n"
6550 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
6551 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
6552 "\n"
6553 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
6554 " seuls les fichiers qu'ils contiennent seront considérés.\n"
6555 "\n"
6556 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
6557 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
6558 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
6559 " seraient effacés par purge, utilisez l'option --print.\n"
6560 " "
6561
6562 #, fuzzy
6563 msgid ""
4301 6564 " - Modified and unmodified tracked files\n"
4302 6565 " - Ignored files (unless --all is specified)\n"
4303 " - New files added to the repository (with \"hg add\")\n"
4304 "\n"
6566 " - New files added to the repository (with \"hg add\")"
6567 msgstr ""
6568 "retire les fichiers non suivis par Mercurial\n"
6569 "\n"
6570 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
6571 " utile pour tester des changements locaux non enregistrés à\n"
6572 " l'intérieur d'une arborescence de sources propre.\n"
6573 "\n"
6574 " Ainsi, purge effacera :\n"
6575 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
6576 " par un point d'interrogation\n"
6577 " - les répertoires vides : en fait Mercurial ignore complètement\n"
6578 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
6579 " sous son contrôle\n"
6580 " Seront par contre laissés intacts :\n"
6581 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
6582 " ou non\n"
6583 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
6584 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
6585 "\n"
6586 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
6587 " seuls les fichiers qu'ils contiennent seront considérés.\n"
6588 "\n"
6589 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
6590 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
6591 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
6592 " seraient effacés par purge, utilisez l'option --print.\n"
6593 " "
6594
6595 #, fuzzy
6596 msgid ""
4305 6597 " If directories are given on the command line, only files in these\n"
4306 " directories are considered.\n"
4307 "\n"
6598 " directories are considered."
6599 msgstr ""
6600 "retire les fichiers non suivis par Mercurial\n"
6601 "\n"
6602 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
6603 " utile pour tester des changements locaux non enregistrés à\n"
6604 " l'intérieur d'une arborescence de sources propre.\n"
6605 "\n"
6606 " Ainsi, purge effacera :\n"
6607 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
6608 " par un point d'interrogation\n"
6609 " - les répertoires vides : en fait Mercurial ignore complètement\n"
6610 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
6611 " sous son contrôle\n"
6612 " Seront par contre laissés intacts :\n"
6613 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
6614 " ou non\n"
6615 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
6616 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
6617 "\n"
6618 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
6619 " seuls les fichiers qu'ils contiennent seront considérés.\n"
6620 "\n"
6621 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
6622 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
6623 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
6624 " seraient effacés par purge, utilisez l'option --print.\n"
6625 " "
6626
6627 #, fuzzy
6628 msgid ""
4308 6629 " Be careful with purge, as you could irreversibly delete some files\n"
4309 6630 " you forgot to add to the repository. If you only want to print the\n"
4310 6631 " list of files that this program would delete, use the --print\n"
@@ -4369,23 +6690,29 b' msgstr "terminer les noms de fichiers par un caract\xc3\xa8re nul, pour utilisation avec xargs (implique -p/--print)"'
4369 6690 msgid "hg purge [OPTION]... [DIR]..."
4370 6691 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
4371 6692
4372 msgid ""
4373 "command to move sets of revisions to a different ancestor\n"
4374 "\n"
6693 msgid "command to move sets of revisions to a different ancestor"
6694 msgstr ""
6695
6696 msgid ""
4375 6697 "This extension lets you rebase changesets in an existing Mercurial\n"
4376 "repository.\n"
4377 "\n"
6698 "repository."
6699 msgstr ""
6700
6701 msgid ""
4378 6702 "For more information:\n"
4379 6703 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
4380 6704 msgstr ""
4381 6705
4382 msgid ""
4383 "move changeset (and descendants) to a different branch\n"
4384 "\n"
6706 msgid "move changeset (and descendants) to a different branch"
6707 msgstr ""
6708
6709 msgid ""
4385 6710 " Rebase uses repeated merging to graft changesets from one part of\n"
4386 6711 " history onto another. This can be useful for linearizing local\n"
4387 " changes relative to a master development tree.\n"
4388 "\n"
6712 " changes relative to a master development tree."
6713 msgstr ""
6714
6715 msgid ""
4389 6716 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4390 6717 " continued with --continue/-c or aborted with --abort/-a.\n"
4391 6718 " "
@@ -4551,30 +6878,41 b' msgstr ""'
4551 6878 msgid "record change %d/%d to %r?"
4552 6879 msgstr ""
4553 6880
4554 msgid ""
4555 "interactively select changes to commit\n"
4556 "\n"
6881 msgid "interactively select changes to commit"
6882 msgstr ""
6883
6884 msgid ""
4557 6885 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4558 " will be candidates for recording.\n"
4559 "\n"
4560 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4561 "\n"
6886 " will be candidates for recording."
6887 msgstr ""
6888
6889 msgid " See 'hg help dates' for a list of formats valid for -d/--date."
6890 msgstr ""
6891
6892 msgid ""
4562 6893 " You will be prompted for whether to record changes to each\n"
4563 6894 " modified file, and for files with multiple changes, for each\n"
4564 6895 " change to use. For each query, the following responses are\n"
4565 " possible::\n"
4566 "\n"
6896 " possible::"
6897 msgstr ""
6898
6899 msgid ""
4567 6900 " y - record this change\n"
4568 " n - skip this change\n"
4569 "\n"
6901 " n - skip this change"
6902 msgstr ""
6903
6904 msgid ""
4570 6905 " s - skip remaining changes to this file\n"
4571 " f - record remaining changes to this file\n"
4572 "\n"
6906 " f - record remaining changes to this file"
6907 msgstr ""
6908
6909 msgid ""
4573 6910 " d - done, skip remaining changes and files\n"
4574 6911 " a - record all changes to all remaining files\n"
4575 " q - quit, recording no changes\n"
4576 "\n"
4577 " ? - display help"
6912 " q - quit, recording no changes"
6913 msgstr ""
6914
6915 msgid " ? - display help"
4578 6916 msgstr ""
4579 6917
4580 6918 msgid "'mq' extension not loaded"
@@ -4598,12 +6936,15 b' msgstr ""'
4598 6936 msgid "share a common history between several working directories"
4599 6937 msgstr ""
4600 6938
4601 msgid ""
4602 "create a new shared repository (experimental)\n"
4603 "\n"
6939 msgid "create a new shared repository (experimental)"
6940 msgstr ""
6941
6942 msgid ""
4604 6943 " Initialize a new repository and working directory that shares its\n"
4605 " history with another repository.\n"
4606 "\n"
6944 " history with another repository."
6945 msgstr ""
6946
6947 msgid ""
4607 6948 " NOTE: actions that change history such as rollback or moving the\n"
4608 6949 " source may confuse sharers.\n"
4609 6950 " "
@@ -4615,11 +6956,13 b' msgstr ""'
4615 6956 msgid "[-U] SOURCE [DEST]"
4616 6957 msgstr ""
4617 6958
4618 msgid ""
4619 "command to transplant changesets from another branch\n"
4620 "\n"
4621 "This extension allows you to transplant patches from another branch.\n"
4622 "\n"
6959 msgid "command to transplant changesets from another branch"
6960 msgstr ""
6961
6962 msgid "This extension allows you to transplant patches from another branch."
6963 msgstr ""
6964
6965 msgid ""
4623 6966 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4624 6967 "map from a changeset hash to its hash in the source repository.\n"
4625 6968 msgstr ""
@@ -4674,38 +7017,52 b' msgstr ""'
4674 7017 msgid "apply changeset? [ynmpcq?]:"
4675 7018 msgstr ""
4676 7019
4677 msgid ""
4678 "transplant changesets from another branch\n"
4679 "\n"
7020 msgid "transplant changesets from another branch"
7021 msgstr ""
7022
7023 msgid ""
4680 7024 " Selected changesets will be applied on top of the current working\n"
4681 7025 " directory with the log of the original changeset. If --log is\n"
4682 " specified, log messages will have a comment appended of the form::\n"
4683 "\n"
4684 " (transplanted from CHANGESETHASH)\n"
4685 "\n"
7026 " specified, log messages will have a comment appended of the form::"
7027 msgstr ""
7028
7029 msgid " (transplanted from CHANGESETHASH)"
7030 msgstr ""
7031
7032 msgid ""
4686 7033 " You can rewrite the changelog message with the --filter option.\n"
4687 7034 " Its argument will be invoked with the current changelog message as\n"
4688 " $1 and the patch as $2.\n"
4689 "\n"
7035 " $1 and the patch as $2."
7036 msgstr ""
7037
7038 msgid ""
4690 7039 " If --source/-s is specified, selects changesets from the named\n"
4691 7040 " repository. If --branch/-b is specified, selects changesets from\n"
4692 7041 " the branch holding the named revision, up to that revision. If\n"
4693 7042 " --all/-a is specified, all changesets on the branch will be\n"
4694 7043 " transplanted, otherwise you will be prompted to select the\n"
4695 " changesets you want.\n"
4696 "\n"
7044 " changesets you want."
7045 msgstr ""
7046
7047 msgid ""
4697 7048 " hg transplant --branch REVISION --all will rebase the selected\n"
4698 7049 " branch (up to the named revision) onto your current working\n"
4699 " directory.\n"
4700 "\n"
7050 " directory."
7051 msgstr ""
7052
7053 msgid ""
4701 7054 " You can optionally mark selected transplanted changesets as merge\n"
4702 7055 " changesets. You will not be prompted to transplant any ancestors\n"
4703 7056 " of a merged transplant, and you can merge descendants of them\n"
4704 " normally instead of transplanting them.\n"
4705 "\n"
7057 " normally instead of transplanting them."
7058 msgstr ""
7059
7060 msgid ""
4706 7061 " If no merges or revisions are provided, hg transplant will start\n"
4707 " an interactive changeset browser.\n"
4708 "\n"
7062 " an interactive changeset browser."
7063 msgstr ""
7064
7065 msgid ""
4709 7066 " If a changeset application fails, you can fix the merge by hand\n"
4710 7067 " and then resume where you left off by calling hg transplant\n"
4711 7068 " --continue/-c.\n"
@@ -4760,34 +7117,46 b' msgstr ""'
4760 7117 msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4761 7118 msgstr ""
4762 7119
4763 msgid ""
4764 "allow the use of MBCS paths with problematic encodings\n"
4765 "\n"
7120 msgid "allow the use of MBCS paths with problematic encodings"
7121 msgstr ""
7122
7123 msgid ""
4766 7124 "Some MBCS encodings are not good for some path operations (i.e.\n"
4767 7125 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4768 7126 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4769 7127 "This extension can be used to fix the issue with those encodings by\n"
4770 7128 "wrapping some functions to convert to Unicode string before path\n"
4771 "operation.\n"
4772 "\n"
4773 "This extension is useful for:\n"
4774 "\n"
7129 "operation."
7130 msgstr ""
7131
7132 msgid "This extension is useful for:"
7133 msgstr ""
7134
7135 msgid ""
4775 7136 "- Japanese Windows users using shift_jis encoding.\n"
4776 7137 "- Chinese Windows users using big5 encoding.\n"
4777 7138 "- All users who use a repository with one of problematic encodings on\n"
4778 " case-insensitive file system.\n"
4779 "\n"
4780 "This extension is not needed for:\n"
4781 "\n"
7139 " case-insensitive file system."
7140 msgstr ""
7141
7142 msgid "This extension is not needed for:"
7143 msgstr ""
7144
7145 msgid ""
4782 7146 "- Any user who use only ASCII chars in path.\n"
4783 "- Any user who do not use any of problematic encodings.\n"
4784 "\n"
4785 "Note that there are some limitations on using this extension:\n"
4786 "\n"
7147 "- Any user who do not use any of problematic encodings."
7148 msgstr ""
7149
7150 msgid "Note that there are some limitations on using this extension:"
7151 msgstr ""
7152
7153 msgid ""
4787 7154 "- You should use single encoding in one repository.\n"
4788 7155 "- You should set same encoding for the repository by locale or\n"
4789 " HGENCODING.\n"
4790 "\n"
7156 " HGENCODING."
7157 msgstr ""
7158
7159 msgid ""
4791 7160 "Path encoding conversion are done between Unicode and\n"
4792 7161 "encoding.encoding which is decided by Mercurial from current locale\n"
4793 7162 "setting or HGENCODING.\n"
@@ -4800,30 +7169,41 b' msgstr ""'
4800 7169 msgid "[win32mbcs] cannot activate on this platform.\n"
4801 7170 msgstr ""
4802 7171
4803 msgid ""
4804 "perform automatic newline conversion\n"
4805 "\n"
4806 "To perform automatic newline conversion, use::\n"
4807 "\n"
7172 msgid "perform automatic newline conversion"
7173 msgstr ""
7174
7175 msgid "To perform automatic newline conversion, use::"
7176 msgstr ""
7177
7178 msgid ""
4808 7179 " [extensions]\n"
4809 7180 " win32text =\n"
4810 7181 " [encode]\n"
4811 7182 " ** = cleverencode:\n"
4812 " # or ** = macencode:\n"
4813 "\n"
7183 " # or ** = macencode:"
7184 msgstr ""
7185
7186 msgid ""
4814 7187 " [decode]\n"
4815 7188 " ** = cleverdecode:\n"
4816 " # or ** = macdecode:\n"
4817 "\n"
4818 "If not doing conversion, to make sure you do not commit CRLF/CR by accident::\n"
4819 "\n"
7189 " # or ** = macdecode:"
7190 msgstr ""
7191
7192 msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
7193 msgstr ""
7194
7195 msgid ""
4820 7196 " [hooks]\n"
4821 7197 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4822 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4823 "\n"
7198 " # or pretxncommit.cr = python:hgext.win32text.forbidcr"
7199 msgstr ""
7200
7201 msgid ""
4824 7202 "To do the same check on a server to prevent CRLF/CR from being\n"
4825 "pushed or pulled::\n"
4826 "\n"
7203 "pushed or pulled::"
7204 msgstr ""
7205
7206 msgid ""
4827 7207 " [hooks]\n"
4828 7208 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4829 7209 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
@@ -4849,13 +7229,21 b' msgstr ""'
4849 7229 msgid ""
4850 7230 "\n"
4851 7231 "To prevent this mistake in your local repository,\n"
4852 "add to Mercurial.ini or .hg/hgrc:\n"
4853 "\n"
7232 "add to Mercurial.ini or .hg/hgrc:"
7233 msgstr ""
7234
7235 #, python-format
7236 msgid ""
4854 7237 "[hooks]\n"
4855 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4856 "\n"
4857 "and also consider adding:\n"
4858 "\n"
7238 "pretxncommit.%s = python:hgext.win32text.forbid%s"
7239 msgstr ""
7240
7241 #, python-format
7242 msgid "and also consider adding:"
7243 msgstr ""
7244
7245 #, python-format
7246 msgid ""
4859 7247 "[extensions]\n"
4860 7248 "win32text =\n"
4861 7249 "[encode]\n"
@@ -4865,40 +7253,47 b' msgid ""'
4865 7253 msgstr ""
4866 7254
4867 7255 #, fuzzy
4868 msgid ""
4869 "discover and advertise repositories on the local network\n"
4870 "\n"
7256 msgid "discover and advertise repositories on the local network"
7257 msgstr "découverte et annonce de dépôts sur le réseau local"
7258
7259 #, fuzzy
7260 msgid ""
4871 7261 "Zeroconf enabled repositories will be announced in a network without\n"
4872 7262 "the need to configure a server or a service. They can be discovered\n"
4873 "without knowing their actual IP address.\n"
4874 "\n"
4875 "To allow other people to discover your repository using run \"hg serve\"\n"
4876 "in your repository::\n"
4877 "\n"
4878 " $ cd test\n"
4879 " $ hg serve\n"
4880 "\n"
4881 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4882 "\n"
4883 " $ hg paths\n"
4884 " zc-test = http://example.com:8000/test\n"
4885 msgstr ""
4886 "découverte et annonce de dépôts sur le réseau local\n"
4887 "\n"
7263 "without knowing their actual IP address."
7264 msgstr ""
4888 7265 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n"
4889 7266 "qu'il n'y ait besoin de configurer un serveur ou service\n"
4890 7267 "particuliers, et ils peuvent être accédés simplement, sans\n"
4891 "connaissance de leur adresse IP.\n"
4892 "\n"
7268 "connaissance de leur adresse IP."
7269
7270 #, fuzzy
7271 msgid ""
7272 "To allow other people to discover your repository using run \"hg serve\"\n"
7273 "in your repository::"
7274 msgstr ""
4893 7275 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4894 "lancez-y la commande \"hg serve\" :\n"
4895 "\n"
7276 "lancez-y la commande \"hg serve\" :"
7277
7278 #, fuzzy
7279 msgid ""
4896 7280 " $ cd test\n"
4897 " $ hg serve\n"
4898 "\n"
7281 " $ hg serve"
7282 msgstr ""
7283 " $ cd test\n"
7284 " $ hg serve"
7285
7286 #, fuzzy
7287 msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::"
7288 msgstr ""
4899 7289 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4900 "la commande \"hg paths\", par exemple :\n"
4901 "\n"
7290 "la commande \"hg paths\", par exemple :"
7291
7292 #, fuzzy
7293 msgid ""
7294 " $ hg paths\n"
7295 " zc-test = http://example.com:8000/test\n"
7296 msgstr ""
4902 7297 " $ hg paths\n"
4903 7298 " zc-test = http://example.com:8000/test\n"
4904 7299
@@ -5156,29 +7551,39 b' msgstr ""'
5156 7551 msgid "empty commit message"
5157 7552 msgstr ""
5158 7553
5159 msgid ""
5160 "add the specified files on the next commit\n"
5161 "\n"
7554 msgid "add the specified files on the next commit"
7555 msgstr ""
7556
7557 msgid ""
5162 7558 " Schedule files to be version controlled and added to the\n"
5163 " repository.\n"
5164 "\n"
7559 " repository."
7560 msgstr ""
7561
7562 msgid ""
5165 7563 " The files will be added to the repository at the next commit. To\n"
5166 " undo an add before that, see hg forget.\n"
5167 "\n"
7564 " undo an add before that, see hg forget."
7565 msgstr ""
7566
7567 msgid ""
5168 7568 " If no names are given, add all files to the repository.\n"
5169 7569 " "
5170 7570 msgstr ""
5171 7571
5172 msgid ""
5173 "add all new files, delete all missing files\n"
5174 "\n"
7572 msgid "add all new files, delete all missing files"
7573 msgstr ""
7574
7575 msgid ""
5175 7576 " Add all new files and remove all missing files from the\n"
5176 " repository.\n"
5177 "\n"
7577 " repository."
7578 msgstr ""
7579
7580 msgid ""
5178 7581 " New files are ignored if they match any of the patterns in\n"
5179 7582 " .hgignore. As with add, these changes take effect at the next\n"
5180 " commit.\n"
5181 "\n"
7583 " commit."
7584 msgstr ""
7585
7586 msgid ""
5182 7587 " Use the -s/--similarity option to detect renamed files. With a\n"
5183 7588 " parameter greater than 0, this compares every removed file with\n"
5184 7589 " every added file and records those similar enough as renames. This\n"
@@ -5194,15 +7599,20 b' msgstr ""'
5194 7599 msgid "similarity must be between 0 and 100"
5195 7600 msgstr ""
5196 7601
5197 msgid ""
5198 "show changeset information by line for each file\n"
5199 "\n"
7602 msgid "show changeset information by line for each file"
7603 msgstr ""
7604
7605 msgid ""
5200 7606 " List changes in files, showing the revision id responsible for\n"
5201 " each line\n"
5202 "\n"
7607 " each line"
7608 msgstr ""
7609
7610 msgid ""
5203 7611 " This command is useful for discovering when a change was made and\n"
5204 " by whom.\n"
5205 "\n"
7612 " by whom."
7613 msgstr ""
7614
7615 msgid ""
5206 7616 " Without the -a/--text option, annotate will avoid processing files\n"
5207 7617 " it detects as binary. With -a, annotate will annotate the file\n"
5208 7618 " anyway, although the results will probably be neither useful\n"
@@ -5221,50 +7631,57 b' msgid "%s: binary file\\n"'
5221 7631 msgstr ""
5222 7632
5223 7633 #, fuzzy
5224 msgid ""
5225 "create an unversioned archive of a repository revision\n"
5226 "\n"
7634 msgid "create an unversioned archive of a repository revision"
7635 msgstr "crée une archive du dépôt à une révision donnée, sans conserver l'historique"
7636
7637 #, fuzzy
7638 msgid ""
5227 7639 " By default, the revision used is the parent of the working\n"
5228 " directory; use -r/--rev to specify a different revision.\n"
5229 "\n"
7640 " directory; use -r/--rev to specify a different revision."
7641 msgstr ""
7642 " Par défaut l'archive est créée à partir de la révision parente\n"
7643 " du répertoire de travail. Une autre révision peut être spécifiée\n"
7644 " à l'aide de -r/--rev."
7645
7646 #, fuzzy
7647 msgid ""
5230 7648 " To specify the type of archive to create, use -t/--type. Valid\n"
5231 " types are::\n"
5232 "\n"
7649 " types are::"
7650 msgstr " -t/--type permet de spécifier le type d'archive à créer, parmi :"
7651
7652 #, fuzzy
7653 msgid ""
5233 7654 " \"files\" (default): a directory full of files\n"
5234 7655 " \"tar\": tar archive, uncompressed\n"
5235 7656 " \"tbz2\": tar archive, compressed using bzip2\n"
5236 7657 " \"tgz\": tar archive, compressed using gzip\n"
5237 7658 " \"uzip\": zip archive, uncompressed\n"
5238 " \"zip\": zip archive, compressed using deflate\n"
5239 "\n"
5240 " The exact name of the destination archive or directory is given\n"
5241 " using a format string; see 'hg help export' for details.\n"
5242 "\n"
5243 " Each member added to an archive file has a directory prefix\n"
5244 " prepended. Use -p/--prefix to specify a format string for the\n"
5245 " prefix. The default is the basename of the archive, with suffixes\n"
5246 " removed.\n"
5247 " "
5248 msgstr ""
5249 "crée une archive du dépôt à une révision donnée, sans conserver l'historique\n"
5250 "\n"
5251 " Par défaut l'archive est créée à partir de la révision parente\n"
5252 " du répertoire de travail. Une autre révision peut être spécifiée\n"
5253 " à l'aide de -r/--rev.\n"
5254 "\n"
5255 " -t/--type permet de spécifier le type d'archive à créer, parmi :\n"
5256 "\n"
7659 " \"zip\": zip archive, compressed using deflate"
7660 msgstr ""
5257 7661 " \"files\" (par défaut) : un répertoire rempli de fichiers\n"
5258 7662 " \"tar\" : une archive tar non compressée\n"
5259 7663 " \"tbz2\" : une archive tar compressée avec bzip2\n"
5260 7664 " \"tgz\" : une archive tar compressée avec gzip\n"
5261 7665 " \"uzip\" : une archive zip non compressée\n"
5262 " \"zip\" : une archive zip compressée avec l'algorithme deflate\n"
5263 "\n"
7666 " \"zip\" : une archive zip compressée avec l'algorithme deflate"
7667
7668 #, fuzzy
7669 msgid ""
7670 " The exact name of the destination archive or directory is given\n"
7671 " using a format string; see 'hg help export' for details."
7672 msgstr ""
5264 7673 " Le nom exact de l'archive ou du répertoire de destination est\n"
5265 7674 " donné à l'aide d'une chaîne de format. Consulter 'hg help export'\n"
5266 " pour plus de détails.\n"
5267 "\n"
7675 " pour plus de détails."
7676
7677 #, fuzzy
7678 msgid ""
7679 " Each member added to an archive file has a directory prefix\n"
7680 " prepended. Use -p/--prefix to specify a format string for the\n"
7681 " prefix. The default is the basename of the archive, with suffixes\n"
7682 " removed.\n"
7683 " "
7684 msgstr ""
5268 7685 " Un chemin relatif est ajouté devant chaque membre de l'archive,\n"
5269 7686 " par défaut le nom du fichier d'archive (sans répertoires ni\n"
5270 7687 " suffixes). Un préfixe différent peut être spécifié avec\n"
@@ -5280,23 +7697,25 b' msgstr "le r\xc3\xa9pertoire racine ne peut servir de destination"'
5280 7697 msgid "cannot archive plain files to stdout"
5281 7698 msgstr "impossible d'envoyer une archive de simples fichiers vers la sortie standard"
5282 7699
5283 msgid ""
5284 "reverse effect of earlier changeset\n"
5285 "\n"
7700 msgid "reverse effect of earlier changeset"
7701 msgstr ""
7702
7703 msgid ""
5286 7704 " Commit the backed out changes as a new changeset. The new\n"
5287 " changeset is a child of the backed out changeset.\n"
5288 "\n"
7705 " changeset is a child of the backed out changeset."
7706 msgstr ""
7707
7708 msgid ""
5289 7709 " If you backout a changeset other than the tip, a new head is\n"
5290 7710 " created. This head will be the new tip and you should merge this\n"
5291 " backout changeset with another head.\n"
5292 "\n"
7711 " backout changeset with another head."
7712 msgstr ""
7713
7714 msgid ""
5293 7715 " The --merge option remembers the parent of the working directory\n"
5294 7716 " before starting the backout, then merges the new head with that\n"
5295 7717 " changeset afterwards. This saves you from doing the merge by hand.\n"
5296 " The result of this merge is not committed, as with a normal merge.\n"
5297 "\n"
5298 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5299 " "
7718 " The result of this merge is not committed, as with a normal merge."
5300 7719 msgstr ""
5301 7720
5302 7721 msgid "please specify just one revision"
@@ -5335,9 +7754,10 b' msgstr ""'
5335 7754 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5336 7755 msgstr ""
5337 7756
5338 msgid ""
5339 "subdivision search of changesets\n"
5340 "\n"
7757 msgid "subdivision search of changesets"
7758 msgstr "recherche de \"changesets\" par dichotomie"
7759
7760 msgid ""
5341 7761 " This command helps to find changesets which introduce problems. To\n"
5342 7762 " use, mark the earliest changeset you know exhibits the problem as\n"
5343 7763 " bad, then mark the latest changeset which is free from the problem\n"
@@ -5345,20 +7765,8 b' msgid ""'
5345 7765 " for testing (unless the -U/--noupdate option is specified). Once\n"
5346 7766 " you have performed tests, mark the working directory as good or\n"
5347 7767 " bad, and bisect will either update to another candidate changeset\n"
5348 " or announce that it has found the bad revision.\n"
5349 "\n"
5350 " As a shortcut, you can also use the revision argument to mark a\n"
5351 " revision as good or bad without checking it out first.\n"
5352 "\n"
5353 " If you supply a command, it will be used for automatic bisection.\n"
5354 " Its exit status will be used to mark revisions as good or bad:\n"
5355 " status 0 means good, 125 means to skip the revision, 127\n"
5356 " (command not found) will abort the bisection, and any other\n"
5357 " non-zero exit status means the revision is bad.\n"
5358 " "
5359 msgstr ""
5360 "recherche de \"changesets\" par dichotomie\n"
5361 "\n"
7768 " or announce that it has found the bad revision."
7769 msgstr ""
5362 7770 " Cette commande aide à trouver les \"changesets\" étant à\n"
5363 7771 " l'origine de problèmes. Pour l'utiliser, marquez comme étant\n"
5364 7772 " mauvaise la première révision pour laquelle vous avez relevé les\n"
@@ -5368,12 +7776,24 b' msgstr ""'
5368 7776 " -U/--noupdate n'ait été spécifié). Une fois vos tests réalisés,\n"
5369 7777 " indiquez si le problème était présent ou non. Bisect\n"
5370 7778 " recommencera alors pour une autre révision candidate jusqu'à\n"
5371 " être en mesure d'annoncer la révision fautive.\n"
5372 "\n"
7779 " être en mesure d'annoncer la révision fautive."
7780
7781 msgid ""
7782 " As a shortcut, you can also use the revision argument to mark a\n"
7783 " revision as good or bad without checking it out first."
7784 msgstr ""
5373 7785 " Vous pouvez aussi passer une révision en argument lors du\n"
5374 7786 " marquage afin d'éviter l'étape manuelle de mise à jour du\n"
5375 " répertoire de travail à cette révision.\n"
5376 "\n"
7787 " répertoire de travail à cette révision."
7788
7789 msgid ""
7790 " If you supply a command, it will be used for automatic bisection.\n"
7791 " Its exit status will be used to mark revisions as good or bad:\n"
7792 " status 0 means good, 125 means to skip the revision, 127\n"
7793 " (command not found) will abort the bisection, and any other\n"
7794 " non-zero exit status means the revision is bad.\n"
7795 " "
7796 msgstr ""
5377 7797 " Vous pouvez fournir une commande pour automatiser la recherche\n"
5378 7798 " par dichotomie. Son code de retour sera utilisé pour marquer les\n"
5379 7799 " révisions : 0 indique une révision sans problème, 125 qu'il ne\n"
@@ -5427,22 +7847,29 b' msgstr "\\"Changeset\\" %d:%s: %s\\n"'
5427 7847 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
5428 7848 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n"
5429 7849
5430 msgid ""
5431 "set or show the current branch name\n"
5432 "\n"
7850 msgid "set or show the current branch name"
7851 msgstr ""
7852
7853 msgid ""
5433 7854 " With no argument, show the current branch name. With one argument,\n"
5434 7855 " set the working directory branch name (the branch will not exist\n"
5435 7856 " in the repository until the next commit). Standard practice\n"
5436 7857 " recommends that primary development take place on the 'default'\n"
5437 " branch.\n"
5438 "\n"
7858 " branch."
7859 msgstr ""
7860
7861 msgid ""
5439 7862 " Unless -f/--force is specified, branch will not let you set a\n"
5440 " branch name that already exists, even if it's inactive.\n"
5441 "\n"
7863 " branch name that already exists, even if it's inactive."
7864 msgstr ""
7865
7866 msgid ""
5442 7867 " Use -C/--clean to reset the working directory branch to that of\n"
5443 7868 " the parent of the working directory, negating a previous branch\n"
5444 " change.\n"
5445 "\n"
7869 " change."
7870 msgstr ""
7871
7872 msgid ""
5446 7873 " Use the command 'hg update' to switch to an existing branch. Use\n"
5447 7874 " 'hg commit --close-branch' to mark this branch as closed.\n"
5448 7875 " "
@@ -5459,40 +7886,54 b' msgstr ""'
5459 7886 msgid "marked working directory as branch %s\n"
5460 7887 msgstr ""
5461 7888
5462 msgid ""
5463 "list repository named branches\n"
5464 "\n"
7889 msgid "list repository named branches"
7890 msgstr ""
7891
7892 msgid ""
5465 7893 " List the repository's named branches, indicating which ones are\n"
5466 7894 " inactive. If -c/--closed is specified, also list branches which have\n"
5467 " been marked closed (see hg commit --close-branch).\n"
5468 "\n"
7895 " been marked closed (see hg commit --close-branch)."
7896 msgstr ""
7897
7898 msgid ""
5469 7899 " If -a/--active is specified, only show active branches. A branch\n"
5470 " is considered active if it contains repository heads.\n"
5471 "\n"
7900 " is considered active if it contains repository heads."
7901 msgstr ""
7902
7903 msgid ""
5472 7904 " Use the command 'hg update' to switch to an existing branch.\n"
5473 7905 " "
5474 7906 msgstr ""
5475 7907
5476 msgid ""
5477 "create a changegroup file\n"
5478 "\n"
7908 msgid "create a changegroup file"
7909 msgstr ""
7910
7911 msgid ""
5479 7912 " Generate a compressed changegroup file collecting changesets not\n"
5480 " known to be in another repository.\n"
5481 "\n"
7913 " known to be in another repository."
7914 msgstr ""
7915
7916 msgid ""
5482 7917 " If no destination repository is specified the destination is\n"
5483 7918 " assumed to have all the nodes specified by one or more --base\n"
5484 7919 " parameters. To create a bundle containing all changesets, use\n"
5485 " -a/--all (or --base null).\n"
5486 "\n"
7920 " -a/--all (or --base null)."
7921 msgstr ""
7922
7923 msgid ""
5487 7924 " You can change compression method with the -t/--type option.\n"
5488 7925 " The available compression methods are: none, bzip2, and\n"
5489 " gzip (by default, bundles are compressed using bzip2).\n"
5490 "\n"
7926 " gzip (by default, bundles are compressed using bzip2)."
7927 msgstr ""
7928
7929 msgid ""
5491 7930 " The bundle file can then be transferred using conventional means\n"
5492 7931 " and applied to another repository with the unbundle or pull\n"
5493 7932 " command. This is useful when direct push and pull are not\n"
5494 " available or when exporting an entire repository is undesirable.\n"
5495 "\n"
7933 " available or when exporting an entire repository is undesirable."
7934 msgstr ""
7935
7936 msgid ""
5496 7937 " Applying bundles preserves all changeset contents including\n"
5497 7938 " permissions, copy/rename information, and revision history.\n"
5498 7939 " "
@@ -5504,62 +7945,85 b' msgstr ""'
5504 7945 msgid "unknown bundle type specified with --type"
5505 7946 msgstr ""
5506 7947
5507 msgid ""
5508 "output the current or given revision of files\n"
5509 "\n"
7948 msgid "output the current or given revision of files"
7949 msgstr ""
7950
7951 msgid ""
5510 7952 " Print the specified files as they were at the given revision. If\n"
5511 7953 " no revision is given, the parent of the working directory is used,\n"
5512 " or tip if no revision is checked out.\n"
5513 "\n"
7954 " or tip if no revision is checked out."
7955 msgstr ""
7956
7957 msgid ""
5514 7958 " Output may be to a file, in which case the name of the file is\n"
5515 7959 " given using a format string. The formatting rules are the same as\n"
5516 " for the export command, with the following additions::\n"
5517 "\n"
7960 " for the export command, with the following additions::"
7961 msgstr ""
7962
7963 msgid ""
5518 7964 " %s basename of file being printed\n"
5519 7965 " %d dirname of file being printed, or '.' if in repository root\n"
5520 7966 " %p root-relative path name of file being printed\n"
5521 7967 " "
5522 7968 msgstr ""
5523 7969
5524 msgid ""
5525 "make a copy of an existing repository\n"
5526 "\n"
5527 " Create a copy of an existing repository in a new directory.\n"
5528 "\n"
7970 msgid "make a copy of an existing repository"
7971 msgstr ""
7972
7973 msgid " Create a copy of an existing repository in a new directory."
7974 msgstr ""
7975
7976 msgid ""
5529 7977 " If no destination directory name is specified, it defaults to the\n"
5530 " basename of the source.\n"
5531 "\n"
7978 " basename of the source."
7979 msgstr ""
7980
7981 msgid ""
5532 7982 " The location of the source is added to the new repository's\n"
5533 " .hg/hgrc file, as the default to be used for future pulls.\n"
5534 "\n"
7983 " .hg/hgrc file, as the default to be used for future pulls."
7984 msgstr ""
7985
7986 msgid ""
5535 7987 " If you use the -r/--rev option to clone up to a specific revision,\n"
5536 7988 " no subsequent revisions (including subsequent tags) will be\n"
5537 7989 " present in the cloned repository. This option implies --pull, even\n"
5538 " on local repositories.\n"
5539 "\n"
7990 " on local repositories."
7991 msgstr ""
7992
7993 msgid ""
5540 7994 " By default, clone will check out the head of the 'default' branch.\n"
5541 7995 " If the -U/--noupdate option is used, the new clone will contain\n"
5542 7996 " only a repository (.hg) and no working copy (the working copy\n"
5543 " parent is the null revision).\n"
5544 "\n"
5545 " See 'hg help urls' for valid source format details.\n"
5546 "\n"
7997 " parent is the null revision)."
7998 msgstr ""
7999
8000 msgid " See 'hg help urls' for valid source format details."
8001 msgstr ""
8002
8003 msgid ""
5547 8004 " It is possible to specify an ssh:// URL as the destination, but no\n"
5548 8005 " .hg/hgrc and working directory will be created on the remote side.\n"
5549 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5550 "\n"
8006 " Please see 'hg help urls' for important details about ssh:// URLs."
8007 msgstr ""
8008
8009 msgid ""
5551 8010 " For efficiency, hardlinks are used for cloning whenever the source\n"
5552 8011 " and destination are on the same filesystem (note this applies only\n"
5553 8012 " to the repository data, not to the checked out files). Some\n"
5554 8013 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5555 8014 " do not report errors. In these cases, use the --pull option to\n"
5556 " avoid hardlinking.\n"
5557 "\n"
8015 " avoid hardlinking."
8016 msgstr ""
8017
8018 msgid ""
5558 8019 " In some cases, you can clone repositories and checked out files\n"
5559 " using full hardlinks with ::\n"
5560 "\n"
5561 " $ cp -al REPO REPOCLONE\n"
5562 "\n"
8020 " using full hardlinks with ::"
8021 msgstr ""
8022
8023 msgid " $ cp -al REPO REPOCLONE"
8024 msgstr ""
8025
8026 msgid ""
5563 8027 " This is the fastest way to clone, but it is not always safe. The\n"
5564 8028 " operation is not atomic (making sure REPO is not modified during\n"
5565 8029 " the operation is up to you) and you have to make sure your editor\n"
@@ -5569,24 +8033,28 b' msgid ""'
5569 8033 " "
5570 8034 msgstr ""
5571 8035
5572 msgid ""
5573 "commit the specified files or all outstanding changes\n"
5574 "\n"
8036 msgid "commit the specified files or all outstanding changes"
8037 msgstr ""
8038
8039 msgid ""
5575 8040 " Commit changes to the given files into the repository. Unlike a\n"
5576 8041 " centralized RCS, this operation is a local operation. See hg push\n"
5577 " for a way to actively distribute your changes.\n"
5578 "\n"
8042 " for a way to actively distribute your changes."
8043 msgstr ""
8044
8045 msgid ""
5579 8046 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5580 " will be committed.\n"
5581 "\n"
8047 " will be committed."
8048 msgstr ""
8049
8050 msgid ""
5582 8051 " If you are committing the result of a merge, do not provide any\n"
5583 " filenames or -I/-X filters.\n"
5584 "\n"
8052 " filenames or -I/-X filters."
8053 msgstr ""
8054
8055 msgid ""
5585 8056 " If no commit message is specified, the configured editor is\n"
5586 " started to prompt you for a message.\n"
5587 "\n"
5588 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5589 " "
8057 " started to prompt you for a message."
5590 8058 msgstr ""
5591 8059
5592 8060 msgid "nothing changed\n"
@@ -5599,17 +8067,22 b' msgstr ""'
5599 8067 msgid "committed changeset %d:%s\n"
5600 8068 msgstr ""
5601 8069
5602 msgid ""
5603 "mark files as copied for the next commit\n"
5604 "\n"
8070 msgid "mark files as copied for the next commit"
8071 msgstr ""
8072
8073 msgid ""
5605 8074 " Mark dest as having copies of source files. If dest is a\n"
5606 8075 " directory, copies are put in that directory. If dest is a file,\n"
5607 " the source must be a single file.\n"
5608 "\n"
8076 " the source must be a single file."
8077 msgstr ""
8078
8079 msgid ""
5609 8080 " By default, this command copies the contents of files as they\n"
5610 8081 " exist in the working directory. If invoked with -A/--after, the\n"
5611 " operation is recorded, but no copying is performed.\n"
5612 "\n"
8082 " operation is recorded, but no copying is performed."
8083 msgstr ""
8084
8085 msgid ""
5613 8086 " This command takes effect with the next commit. To undo a copy\n"
5614 8087 " before that, see hg revert.\n"
5615 8088 " "
@@ -5652,17 +8125,23 b' msgstr ""'
5652 8125 msgid ".hg/dirstate inconsistent with current parent's manifest"
5653 8126 msgstr ""
5654 8127
5655 msgid ""
5656 "show combined config settings from all hgrc files\n"
5657 "\n"
5658 " With no arguments, print names and values of all config items.\n"
5659 "\n"
8128 msgid "show combined config settings from all hgrc files"
8129 msgstr ""
8130
8131 msgid " With no arguments, print names and values of all config items."
8132 msgstr ""
8133
8134 msgid ""
5660 8135 " With one argument of the form section.name, print just the value\n"
5661 " of that config item.\n"
5662 "\n"
8136 " of that config item."
8137 msgstr ""
8138
8139 msgid ""
5663 8140 " With multiple arguments, print names and values of all config\n"
5664 " items with matching section names.\n"
5665 "\n"
8141 " items with matching section names."
8142 msgstr ""
8143
8144 msgid ""
5666 8145 " With --debug, the source (filename and line number) is printed\n"
5667 8146 " for each config item.\n"
5668 8147 " "
@@ -5671,9 +8150,10 b' msgstr ""'
5671 8150 msgid "only one config item permitted"
5672 8151 msgstr ""
5673 8152
5674 msgid ""
5675 "manually set the parents of the current working directory\n"
5676 "\n"
8153 msgid "manually set the parents of the current working directory"
8154 msgstr ""
8155
8156 msgid ""
5677 8157 " This is useful for writing repository conversion tools, but should\n"
5678 8158 " be used with care.\n"
5679 8159 " "
@@ -5785,47 +8265,56 b' msgstr ""'
5785 8265 msgid "show how files match on given patterns"
5786 8266 msgstr ""
5787 8267
5788 msgid ""
5789 "diff repository (or selected files)\n"
5790 "\n"
5791 " Show differences between revisions for the specified files.\n"
5792 "\n"
5793 " Differences between files are shown using the unified diff format.\n"
5794 "\n"
8268 msgid "diff repository (or selected files)"
8269 msgstr ""
8270
8271 msgid " Show differences between revisions for the specified files."
8272 msgstr ""
8273
8274 msgid " Differences between files are shown using the unified diff format."
8275 msgstr ""
8276
8277 msgid ""
5795 8278 " NOTE: diff may generate unexpected results for merges, as it will\n"
5796 8279 " default to comparing against the working directory's first parent\n"
5797 " changeset if no revisions are specified.\n"
5798 "\n"
5799 " When two revision arguments are given, then changes are shown\n"
5800 " between those revisions. If only one revision is specified then\n"
5801 " that revision is compared to the working directory, and, when no\n"
5802 " revisions are specified, the working directory files are compared\n"
5803 " to its parent.\n"
5804 "\n"
8280 " changeset if no revisions are specified."
8281 msgstr ""
8282
8283 msgid ""
5805 8284 " Without the -a/--text option, diff will avoid generating diffs of\n"
5806 8285 " files it detects as binary. With -a, diff will generate a diff\n"
5807 " anyway, probably with undesirable results.\n"
5808 "\n"
8286 " anyway, probably with undesirable results."
8287 msgstr ""
8288
8289 msgid ""
5809 8290 " Use the -g/--git option to generate diffs in the git extended diff\n"
5810 8291 " format. For more information, read 'hg help diffs'.\n"
5811 8292 " "
5812 8293 msgstr ""
5813 8294
5814 msgid ""
5815 "dump the header and diffs for one or more changesets\n"
5816 "\n"
5817 " Print the changeset header and diffs for one or more revisions.\n"
5818 "\n"
8295 msgid "dump the header and diffs for one or more changesets"
8296 msgstr ""
8297
8298 msgid " Print the changeset header and diffs for one or more revisions."
8299 msgstr ""
8300
8301 msgid ""
5819 8302 " The information shown in the changeset header is: author,\n"
5820 " changeset hash, parent(s) and commit comment.\n"
5821 "\n"
8303 " changeset hash, parent(s) and commit comment."
8304 msgstr ""
8305
8306 msgid ""
5822 8307 " NOTE: export may generate unexpected diff output for merge\n"
5823 8308 " changesets, as it will compare the merge changeset against its\n"
5824 " first parent only.\n"
5825 "\n"
8309 " first parent only."
8310 msgstr ""
8311
8312 msgid ""
5826 8313 " Output may be to a file, in which case the name of the file is\n"
5827 " given using a format string. The formatting rules are as follows::\n"
5828 "\n"
8314 " given using a format string. The formatting rules are as follows::"
8315 msgstr ""
8316
8317 msgid ""
5829 8318 " %% literal \"%\" character\n"
5830 8319 " %H changeset hash (40 bytes of hexadecimal)\n"
5831 8320 " %N number of patches being generated\n"
@@ -5833,15 +8322,21 b' msgid ""'
5833 8322 " %b basename of the exporting repository\n"
5834 8323 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5835 8324 " %n zero-padded sequence number, starting at 1\n"
5836 " %r zero-padded changeset revision number\n"
5837 "\n"
8325 " %r zero-padded changeset revision number"
8326 msgstr ""
8327
8328 msgid ""
5838 8329 " Without the -a/--text option, export will avoid generating diffs\n"
5839 8330 " of files it detects as binary. With -a, export will generate a\n"
5840 " diff anyway, probably with undesirable results.\n"
5841 "\n"
8331 " diff anyway, probably with undesirable results."
8332 msgstr ""
8333
8334 msgid ""
5842 8335 " Use the -g/--git option to generate diffs in the git extended diff\n"
5843 " format. See 'hg help diffs' for more information.\n"
5844 "\n"
8336 " format. See 'hg help diffs' for more information."
8337 msgstr ""
8338
8339 msgid ""
5845 8340 " With the --switch-parent option, the diff will be against the\n"
5846 8341 " second parent. It can be useful to review a merge.\n"
5847 8342 " "
@@ -5856,16 +8351,21 b' msgstr ""'
5856 8351 msgid "exporting patch:\n"
5857 8352 msgstr ""
5858 8353
5859 msgid ""
5860 "forget the specified files on the next commit\n"
5861 "\n"
8354 msgid "forget the specified files on the next commit"
8355 msgstr ""
8356
8357 msgid ""
5862 8358 " Mark the specified files so they will no longer be tracked\n"
5863 " after the next commit.\n"
5864 "\n"
8359 " after the next commit."
8360 msgstr ""
8361
8362 msgid ""
5865 8363 " This only removes files from the current branch, not from the\n"
5866 8364 " entire project history, and it does not delete them from the\n"
5867 " working directory.\n"
5868 "\n"
8365 " working directory."
8366 msgstr ""
8367
8368 msgid ""
5869 8369 " To undo a forget before the next commit, see hg add.\n"
5870 8370 " "
5871 8371 msgstr ""
@@ -5877,16 +8377,20 b' msgstr ""'
5877 8377 msgid "not removing %s: file is already untracked\n"
5878 8378 msgstr ""
5879 8379
5880 msgid ""
5881 "search for a pattern in specified files and revisions\n"
5882 "\n"
5883 " Search revisions of files for a regular expression.\n"
5884 "\n"
8380 msgid "search for a pattern in specified files and revisions"
8381 msgstr ""
8382
8383 msgid " Search revisions of files for a regular expression."
8384 msgstr ""
8385
8386 msgid ""
5885 8387 " This command behaves differently than Unix grep. It only accepts\n"
5886 8388 " Python/Perl regexps. It searches repository history, not the\n"
5887 8389 " working directory. It always prints the revision number in which a\n"
5888 " match appears.\n"
5889 "\n"
8390 " match appears."
8391 msgstr ""
8392
8393 msgid ""
5890 8394 " By default, grep only prints output for the first revision of a\n"
5891 8395 " file in which it finds a match. To get it to print every revision\n"
5892 8396 " that contains a change in match status (\"-\" for a match that\n"
@@ -5899,28 +8403,38 b' msgstr ""'
5899 8403 msgid "grep: invalid match pattern: %s\n"
5900 8404 msgstr ""
5901 8405
5902 msgid ""
5903 "show current repository heads or show branch heads\n"
5904 "\n"
5905 " With no arguments, show all repository head changesets.\n"
5906 "\n"
8406 msgid "show current repository heads or show branch heads"
8407 msgstr ""
8408
8409 msgid " With no arguments, show all repository head changesets."
8410 msgstr ""
8411
8412 msgid ""
5907 8413 " Repository \"heads\" are changesets with no child changesets. They are\n"
5908 8414 " where development generally takes place and are the usual targets\n"
5909 " for update and merge operations.\n"
5910 "\n"
8415 " for update and merge operations."
8416 msgstr ""
8417
8418 msgid ""
5911 8419 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5912 " the named branch associated with the specified changeset(s).\n"
5913 "\n"
8420 " the named branch associated with the specified changeset(s)."
8421 msgstr ""
8422
8423 msgid ""
5914 8424 " Branch heads are changesets on a named branch with no descendants on\n"
5915 8425 " the same branch. A branch head could be a \"true\" (repository) head,\n"
5916 8426 " or it could be the last changeset on that branch before it was\n"
5917 8427 " merged into another branch, or it could be the last changeset on the\n"
5918 8428 " branch before a new branch was created. If none of the branch heads\n"
5919 " are true heads, the branch is considered inactive.\n"
5920 "\n"
8429 " are true heads, the branch is considered inactive."
8430 msgstr ""
8431
8432 msgid ""
5921 8433 " If -c/--closed is specified, also show branch heads marked closed\n"
5922 " (see hg commit --close-branch).\n"
5923 "\n"
8434 " (see hg commit --close-branch)."
8435 msgstr ""
8436
8437 msgid ""
5924 8438 " If STARTREV is specified, only those heads that are descendants of\n"
5925 8439 " STARTREV will be displayed.\n"
5926 8440 " "
@@ -5941,11 +8455,13 b' msgstr ""'
5941 8455 msgid "no changes on branch %s are reachable from %s\n"
5942 8456 msgstr ""
5943 8457
5944 msgid ""
5945 "show help for a given topic or a help overview\n"
5946 "\n"
5947 " With no arguments, print a list of commands with short help messages.\n"
5948 "\n"
8458 msgid "show help for a given topic or a help overview"
8459 msgstr ""
8460
8461 msgid " With no arguments, print a list of commands with short help messages."
8462 msgstr ""
8463
8464 msgid ""
5949 8465 " Given a topic, extension, or command name, print help for that\n"
5950 8466 " topic."
5951 8467 msgstr ""
@@ -5959,7 +8475,6 b' msgstr "utiliser \\"hg help\\" pour la liste compl\xc3\xa8te des commandes"'
5959 8475 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5960 8476 msgstr "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour plus de détails"
5961 8477
5962 # la chaîne passée est préfixée par un espace
5963 8478 #, python-format
5964 8479 msgid "use \"hg -v help%s\" to show aliases and global options"
5965 8480 msgstr "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
@@ -5968,12 +8483,8 b' msgstr "utiliser \\"hg -v help%s\\" pour a'
5968 8483 msgid "use \"hg -v help %s\" to show global options"
5969 8484 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5970 8485
5971 msgid ""
5972 "list of commands:\n"
5973 "\n"
5974 msgstr ""
5975 "liste des commandes :\n"
5976 "\n"
8486 msgid "list of commands:"
8487 msgstr "liste des commandes :"
5977 8488
5978 8489 #, python-format
5979 8490 msgid ""
@@ -5999,39 +8510,36 b' msgid "no help text available"'
5999 8510 msgstr "pas d'aide disponible"
6000 8511
6001 8512 #, fuzzy, python-format
6002 msgid ""
6003 "%s extension - %s\n"
6004 "\n"
8513 msgid "%s extension - %s"
6005 8514 msgstr "extension %s - %s\n"
6006 8515
6007 8516 msgid "Mercurial Distributed SCM\n"
6008 8517 msgstr "Mercurial, système de gestion de sources distribué\n"
6009 8518
6010 msgid ""
6011 "basic commands:\n"
6012 "\n"
6013 msgstr ""
6014 "commandes de base :\n"
6015 "\n"
6016
6017 msgid ""
6018 "\n"
6019 "additional help topics:\n"
6020 "\n"
6021 msgstr ""
6022 "\n"
6023 "sujets d'aide supplémentaires :\n"
6024 "\n"
6025
6026 msgid ""
6027 "identify the working copy or specified revision\n"
6028 "\n"
8519 msgid "basic commands:"
8520 msgstr "commandes de base :"
8521
8522 msgid ""
8523 "\n"
8524 "additional help topics:"
8525 msgstr ""
8526 "\n"
8527 "sujets d'aide supplémentaires :"
8528
8529 msgid "identify the working copy or specified revision"
8530 msgstr ""
8531
8532 msgid ""
6029 8533 " With no revision, print a summary of the current state of the\n"
6030 " repository.\n"
6031 "\n"
8534 " repository."
8535 msgstr ""
8536
8537 msgid ""
6032 8538 " Specifying a path to a repository root or Mercurial bundle will\n"
6033 " cause lookup to operate on that repository/bundle.\n"
6034 "\n"
8539 " cause lookup to operate on that repository/bundle."
8540 msgstr ""
8541
8542 msgid ""
6035 8543 " This summary identifies the repository state using one or two\n"
6036 8544 " parent hash identifiers, followed by a \"+\" if there are\n"
6037 8545 " uncommitted changes in the working directory, a list of tags for\n"
@@ -6039,35 +8547,47 b' msgid ""'
6039 8547 " "
6040 8548 msgstr ""
6041 8549
6042 msgid ""
6043 "import an ordered set of patches\n"
6044 "\n"
6045 " Import a list of patches and commit them individually.\n"
6046 "\n"
8550 msgid "import an ordered set of patches"
8551 msgstr ""
8552
8553 msgid " Import a list of patches and commit them individually."
8554 msgstr ""
8555
8556 msgid ""
6047 8557 " If there are outstanding changes in the working directory, import\n"
6048 " will abort unless given the -f/--force flag.\n"
6049 "\n"
8558 " will abort unless given the -f/--force flag."
8559 msgstr ""
8560
8561 msgid ""
6050 8562 " You can import a patch straight from a mail message. Even patches\n"
6051 8563 " as attachments work (to use the body part, it must have type\n"
6052 8564 " text/plain or text/x-patch). From and Subject headers of email\n"
6053 8565 " message are used as default committer and commit message. All\n"
6054 8566 " text/plain body parts before first diff are added to commit\n"
6055 " message.\n"
6056 "\n"
8567 " message."
8568 msgstr ""
8569
8570 msgid ""
6057 8571 " If the imported patch was generated by hg export, user and\n"
6058 8572 " description from patch override values from message headers and\n"
6059 8573 " body. Values given on command line with -m/--message and -u/--user\n"
6060 " override these.\n"
6061 "\n"
8574 " override these."
8575 msgstr ""
8576
8577 msgid ""
6062 8578 " If --exact is specified, import will set the working directory to\n"
6063 8579 " the parent of each patch before applying it, and will abort if the\n"
6064 8580 " resulting changeset has a different ID than the one recorded in\n"
6065 8581 " the patch. This may happen due to character set problems or other\n"
6066 " deficiencies in the text patch format.\n"
6067 "\n"
8582 " deficiencies in the text patch format."
8583 msgstr ""
8584
8585 msgid ""
6068 8586 " With -s/--similarity, hg will attempt to discover renames and\n"
6069 " copies in the patch in the same way as 'addremove'.\n"
6070 "\n"
8587 " copies in the patch in the same way as 'addremove'."
8588 msgstr ""
8589
8590 msgid ""
6071 8591 " To read a patch from standard input, use \"-\" as the patch name. If\n"
6072 8592 " a URL is specified, the patch will be downloaded from it.\n"
6073 8593 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
@@ -6086,46 +8606,62 b' msgstr ""'
6086 8606 msgid "patch is damaged or loses information"
6087 8607 msgstr ""
6088 8608
6089 msgid ""
6090 "show new changesets found in source\n"
6091 "\n"
8609 msgid "show new changesets found in source"
8610 msgstr ""
8611
8612 msgid ""
6092 8613 " Show new changesets found in the specified path/URL or the default\n"
6093 8614 " pull location. These are the changesets that would have been pulled\n"
6094 " if a pull at the time you issued this command.\n"
6095 "\n"
8615 " if a pull at the time you issued this command."
8616 msgstr ""
8617
8618 msgid ""
6096 8619 " For remote repository, using --bundle avoids downloading the\n"
6097 " changesets twice if the incoming is followed by a pull.\n"
6098 "\n"
8620 " changesets twice if the incoming is followed by a pull."
8621 msgstr ""
8622
8623 msgid ""
6099 8624 " See pull for valid source format details.\n"
6100 8625 " "
6101 8626 msgstr ""
6102 8627
6103 msgid ""
6104 "create a new repository in the given directory\n"
6105 "\n"
8628 msgid "create a new repository in the given directory"
8629 msgstr ""
8630
8631 msgid ""
6106 8632 " Initialize a new repository in the given directory. If the given\n"
6107 " directory does not exist, it will be created.\n"
6108 "\n"
6109 " If no directory is given, the current directory is used.\n"
6110 "\n"
8633 " directory does not exist, it will be created."
8634 msgstr ""
8635
8636 msgid " If no directory is given, the current directory is used."
8637 msgstr ""
8638
8639 msgid ""
6111 8640 " It is possible to specify an ssh:// URL as the destination.\n"
6112 8641 " See 'hg help urls' for more information.\n"
6113 8642 " "
6114 8643 msgstr ""
6115 8644
6116 msgid ""
6117 "locate files matching specific patterns\n"
6118 "\n"
8645 msgid "locate files matching specific patterns"
8646 msgstr ""
8647
8648 msgid ""
6119 8649 " Print files under Mercurial control in the working directory whose\n"
6120 " names match the given patterns.\n"
6121 "\n"
8650 " names match the given patterns."
8651 msgstr ""
8652
8653 msgid ""
6122 8654 " By default, this command searches all directories in the working\n"
6123 8655 " directory. To search just the current directory and its\n"
6124 " subdirectories, use \"--include .\".\n"
6125 "\n"
8656 " subdirectories, use \"--include .\"."
8657 msgstr ""
8658
8659 msgid ""
6126 8660 " If no patterns are given to match, this command prints the names\n"
6127 " of all files under Mercurial control in the working directory.\n"
6128 "\n"
8661 " of all files under Mercurial control in the working directory."
8662 msgstr ""
8663
8664 msgid ""
6129 8665 " If you want to feed the output of this command into the \"xargs\"\n"
6130 8666 " command, use the -0 option to both this command and \"xargs\". This\n"
6131 8667 " will avoid the problem of \"xargs\" treating single filenames that\n"
@@ -6133,29 +8669,36 b' msgid ""'
6133 8669 " "
6134 8670 msgstr ""
6135 8671
6136 msgid ""
6137 "show revision history of entire repository or files\n"
6138 "\n"
8672 msgid "show revision history of entire repository or files"
8673 msgstr ""
8674
8675 msgid ""
6139 8676 " Print the revision history of the specified files or the entire\n"
6140 " project.\n"
6141 "\n"
8677 " project."
8678 msgstr ""
8679
8680 msgid ""
6142 8681 " File history is shown without following rename or copy history of\n"
6143 8682 " files. Use -f/--follow with a filename to follow history across\n"
6144 8683 " renames and copies. --follow without a filename will only show\n"
6145 8684 " ancestors or descendants of the starting revision. --follow-first\n"
6146 " only follows the first parent of merge revisions.\n"
6147 "\n"
8685 " only follows the first parent of merge revisions."
8686 msgstr ""
8687
8688 msgid ""
6148 8689 " If no revision range is specified, the default is tip:0 unless\n"
6149 8690 " --follow is set, in which case the working directory parent is\n"
6150 " used as the starting revision.\n"
6151 "\n"
6152 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6153 "\n"
8691 " used as the starting revision."
8692 msgstr ""
8693
8694 msgid ""
6154 8695 " By default this command prints revision number and changeset id,\n"
6155 8696 " tags, non-trivial parents, user, date and time, and a summary for\n"
6156 8697 " each commit. When the -v/--verbose switch is used, the list of\n"
6157 " changed files and full commit message are shown.\n"
6158 "\n"
8698 " changed files and full commit message are shown."
8699 msgstr ""
8700
8701 msgid ""
6159 8702 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
6160 8703 " changesets, as it will only compare the merge changeset against\n"
6161 8704 " its first parent. Also, only files different from BOTH parents\n"
@@ -6163,29 +8706,37 b' msgid ""'
6163 8706 " "
6164 8707 msgstr ""
6165 8708
6166 msgid ""
6167 "output the current or given revision of the project manifest\n"
6168 "\n"
8709 msgid "output the current or given revision of the project manifest"
8710 msgstr ""
8711
8712 msgid ""
6169 8713 " Print a list of version controlled files for the given revision.\n"
6170 8714 " If no revision is given, the first parent of the working directory\n"
6171 " is used, or the null revision if no revision is checked out.\n"
6172 "\n"
8715 " is used, or the null revision if no revision is checked out."
8716 msgstr ""
8717
8718 msgid ""
6173 8719 " With -v, print file permissions, symlink and executable bits.\n"
6174 8720 " With --debug, print file revision hashes.\n"
6175 8721 " "
6176 8722 msgstr ""
6177 8723
6178 msgid ""
6179 "merge working directory with another revision\n"
6180 "\n"
8724 msgid "merge working directory with another revision"
8725 msgstr ""
8726
8727 msgid ""
6181 8728 " The current working directory is updated with all changes made in\n"
6182 " the requested revision since the last common predecessor revision.\n"
6183 "\n"
8729 " the requested revision since the last common predecessor revision."
8730 msgstr ""
8731
8732 msgid ""
6184 8733 " Files that changed between either parent are marked as changed for\n"
6185 8734 " the next commit and a commit must be performed before any further\n"
6186 8735 " updates to the repository are allowed. The next commit will have\n"
6187 " two parents.\n"
6188 "\n"
8736 " two parents."
8737 msgstr ""
8738
8739 msgid ""
6189 8740 " If no revision is specified, the working directory's parent is a\n"
6190 8741 " head revision, and the current branch contains exactly one other\n"
6191 8742 " head, the other head is merged with by default. Otherwise, an\n"
@@ -6211,20 +8762,24 b' msgstr ""'
6211 8762 msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
6212 8763 msgstr ""
6213 8764
6214 msgid ""
6215 "show changesets not found in destination\n"
6216 "\n"
8765 msgid "show changesets not found in destination"
8766 msgstr ""
8767
8768 msgid ""
6217 8769 " Show changesets not found in the specified destination repository\n"
6218 8770 " or the default push location. These are the changesets that would\n"
6219 " be pushed if a push was requested.\n"
6220 "\n"
8771 " be pushed if a push was requested."
8772 msgstr ""
8773
8774 msgid ""
6221 8775 " See pull for valid destination format details.\n"
6222 8776 " "
6223 8777 msgstr ""
6224 8778
6225 msgid ""
6226 "show the parents of the working directory or revision\n"
6227 "\n"
8779 msgid "show the parents of the working directory or revision"
8780 msgstr ""
8781
8782 msgid ""
6228 8783 " Print the working directory's parent revisions. If a revision is\n"
6229 8784 " given via -r/--rev, the parent of that revision will be printed.\n"
6230 8785 " If a file argument is given, the revision in which the file was\n"
@@ -6240,15 +8795,20 b' msgstr ""'
6240 8795 msgid "'%s' not found in manifest!"
6241 8796 msgstr ""
6242 8797
6243 msgid ""
6244 "show aliases for remote repositories\n"
6245 "\n"
8798 msgid "show aliases for remote repositories"
8799 msgstr ""
8800
8801 msgid ""
6246 8802 " Show definition of symbolic path name NAME. If no name is given,\n"
6247 " show definition of all available names.\n"
6248 "\n"
8803 " show definition of all available names."
8804 msgstr ""
8805
8806 msgid ""
6249 8807 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6250 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
6251 "\n"
8808 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
8809 msgstr ""
8810
8811 msgid ""
6252 8812 " See 'hg help urls' for more information.\n"
6253 8813 " "
6254 8814 msgstr ""
@@ -6265,43 +8825,57 b' msgstr ""'
6265 8825 msgid "(run 'hg update' to get a working copy)\n"
6266 8826 msgstr ""
6267 8827
6268 msgid ""
6269 "pull changes from the specified source\n"
6270 "\n"
6271 " Pull changes from a remote repository to a local one.\n"
6272 "\n"
8828 msgid "pull changes from the specified source"
8829 msgstr ""
8830
8831 msgid " Pull changes from a remote repository to a local one."
8832 msgstr ""
8833
8834 msgid ""
6273 8835 " This finds all changes from the repository at the specified path\n"
6274 8836 " or URL and adds them to a local repository (the current one unless\n"
6275 8837 " -R is specified). By default, this does not update the copy of the\n"
6276 " project in the working directory.\n"
6277 "\n"
8838 " project in the working directory."
8839 msgstr ""
8840
8841 msgid ""
6278 8842 " Use hg incoming if you want to see what would have been added by a\n"
6279 8843 " pull at the time you issued this command. If you then decide to\n"
6280 8844 " added those changes to the repository, you should use pull -r X\n"
6281 " where X is the last changeset listed by hg incoming.\n"
6282 "\n"
8845 " where X is the last changeset listed by hg incoming."
8846 msgstr ""
8847
8848 msgid ""
6283 8849 " If SOURCE is omitted, the 'default' path will be used.\n"
6284 8850 " See 'hg help urls' for more information.\n"
6285 8851 " "
6286 8852 msgstr ""
6287 8853
6288 msgid ""
6289 "push changes to the specified destination\n"
6290 "\n"
6291 " Push changes from the local repository to the given destination.\n"
6292 "\n"
8854 msgid "push changes to the specified destination"
8855 msgstr ""
8856
8857 msgid " Push changes from the local repository to the given destination."
8858 msgstr ""
8859
8860 msgid ""
6293 8861 " This is the symmetrical operation for pull. It moves changes from\n"
6294 8862 " the current repository to a different one. If the destination is\n"
6295 8863 " local this is identical to a pull in that directory from the\n"
6296 " current one.\n"
6297 "\n"
8864 " current one."
8865 msgstr ""
8866
8867 msgid ""
6298 8868 " By default, push will refuse to run if it detects the result would\n"
6299 8869 " increase the number of remote heads. This generally indicates the\n"
6300 " user forgot to pull and merge before pushing.\n"
6301 "\n"
8870 " user forgot to pull and merge before pushing."
8871 msgstr ""
8872
8873 msgid ""
6302 8874 " If -r/--rev is used, the named revision and all its ancestors will\n"
6303 " be pushed to the remote repository.\n"
6304 "\n"
8875 " be pushed to the remote repository."
8876 msgstr ""
8877
8878 msgid ""
6305 8879 " Please see 'hg help urls' for important details about ssh://\n"
6306 8880 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6307 8881 " "
@@ -6311,40 +8885,50 b' msgstr ""'
6311 8885 msgid "pushing to %s\n"
6312 8886 msgstr ""
6313 8887
6314 msgid ""
6315 "roll back an interrupted transaction\n"
6316 "\n"
6317 " Recover from an interrupted commit or pull.\n"
6318 "\n"
8888 msgid "roll back an interrupted transaction"
8889 msgstr ""
8890
8891 msgid " Recover from an interrupted commit or pull."
8892 msgstr ""
8893
8894 msgid ""
6319 8895 " This command tries to fix the repository status after an\n"
6320 8896 " interrupted operation. It should only be necessary when Mercurial\n"
6321 8897 " suggests it.\n"
6322 8898 " "
6323 8899 msgstr ""
6324 8900
6325 msgid ""
6326 "remove the specified files on the next commit\n"
6327 "\n"
6328 " Schedule the indicated files for removal from the repository.\n"
6329 "\n"
8901 msgid "remove the specified files on the next commit"
8902 msgstr ""
8903
8904 msgid " Schedule the indicated files for removal from the repository."
8905 msgstr ""
8906
8907 msgid ""
6330 8908 " This only removes files from the current branch, not from the\n"
6331 8909 " entire project history. -A/--after can be used to remove only\n"
6332 8910 " files that have already been deleted, -f/--force can be used to\n"
6333 8911 " force deletion, and -Af can be used to remove files from the next\n"
6334 " revision without deleting them from the working directory.\n"
6335 "\n"
8912 " revision without deleting them from the working directory."
8913 msgstr ""
8914
8915 msgid ""
6336 8916 " The following table details the behavior of remove for different\n"
6337 8917 " file states (columns) and option combinations (rows). The file\n"
6338 8918 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6339 8919 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6340 " and Delete (from disk)::\n"
6341 "\n"
8920 " and Delete (from disk)::"
8921 msgstr ""
8922
8923 msgid ""
6342 8924 " A C M !\n"
6343 8925 " none W RD W R\n"
6344 8926 " -f R RD RD R\n"
6345 8927 " -A W W W R\n"
6346 " -Af R R R R\n"
6347 "\n"
8928 " -Af R R R R"
8929 msgstr ""
8930
8931 msgid ""
6348 8932 " This command schedules the files to be removed at the next commit.\n"
6349 8933 " To undo a remove before that, see hg revert.\n"
6350 8934 " "
@@ -6367,39 +8951,46 b' msgstr ""'
6367 8951 msgid "has been marked for add"
6368 8952 msgstr ""
6369 8953
6370 msgid ""
6371 "rename files; equivalent of copy + remove\n"
6372 "\n"
8954 msgid "rename files; equivalent of copy + remove"
8955 msgstr ""
8956
8957 msgid ""
6373 8958 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6374 8959 " is a directory, copies are put in that directory. If dest is a\n"
6375 " file, there can only be one source.\n"
6376 "\n"
6377 " By default, this command copies the contents of files as they\n"
6378 " exist in the working directory. If invoked with -A/--after, the\n"
6379 " operation is recorded, but no copying is performed.\n"
6380 "\n"
8960 " file, there can only be one source."
8961 msgstr ""
8962
8963 msgid ""
6381 8964 " This command takes effect at the next commit. To undo a rename\n"
6382 8965 " before that, see hg revert.\n"
6383 8966 " "
6384 8967 msgstr ""
6385 8968
6386 msgid ""
6387 "retry file merges from a merge or update\n"
6388 "\n"
8969 msgid "retry file merges from a merge or update"
8970 msgstr ""
8971
8972 msgid ""
6389 8973 " This command will cleanly retry unresolved file merges using file\n"
6390 8974 " revisions preserved from the last update or merge. To attempt to\n"
6391 " resolve all unresolved files, use the -a/--all switch.\n"
6392 "\n"
8975 " resolve all unresolved files, use the -a/--all switch."
8976 msgstr ""
8977
8978 msgid ""
6393 8979 " If a conflict is resolved manually, please note that the changes\n"
6394 8980 " will be overwritten if the merge is retried with resolve. The\n"
6395 " -m/--mark switch should be used to mark the file as resolved.\n"
6396 "\n"
8981 " -m/--mark switch should be used to mark the file as resolved."
8982 msgstr ""
8983
8984 msgid ""
6397 8985 " This command also allows listing resolved files and manually\n"
6398 8986 " indicating whether or not files are resolved. All files must be\n"
6399 " marked as resolved before a commit is permitted.\n"
6400 "\n"
6401 " The codes used to show the status of files are::\n"
6402 "\n"
8987 " marked as resolved before a commit is permitted."
8988 msgstr ""
8989
8990 msgid " The codes used to show the status of files are::"
8991 msgstr ""
8992
8993 msgid ""
6403 8994 " U = unresolved\n"
6404 8995 " R = resolved\n"
6405 8996 " "
@@ -6414,36 +9005,49 b' msgstr ""'
6414 9005 msgid "no files or directories specified; use --all to remerge all files"
6415 9006 msgstr ""
6416 9007
6417 msgid ""
6418 "restore individual files or directories to an earlier state\n"
6419 "\n"
9008 msgid "restore individual files or directories to an earlier state"
9009 msgstr ""
9010
9011 msgid ""
6420 9012 " (Use update -r to check out earlier revisions, revert does not\n"
6421 " change the working directory parents.)\n"
6422 "\n"
9013 " change the working directory parents.)"
9014 msgstr ""
9015
9016 msgid ""
6423 9017 " With no revision specified, revert the named files or directories\n"
6424 9018 " to the contents they had in the parent of the working directory.\n"
6425 9019 " This restores the contents of the affected files to an unmodified\n"
6426 9020 " state and unschedules adds, removes, copies, and renames. If the\n"
6427 9021 " working directory has two parents, you must explicitly specify the\n"
6428 " revision to revert to.\n"
6429 "\n"
9022 " revision to revert to."
9023 msgstr ""
9024
9025 msgid ""
6430 9026 " Using the -r/--rev option, revert the given files or directories\n"
6431 9027 " to their contents as of a specific revision. This can be helpful\n"
6432 9028 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6433 " dates' for a list of formats valid for -d/--date.\n"
6434 "\n"
9029 " dates' for a list of formats valid for -d/--date."
9030 msgstr ""
9031
9032 msgid ""
6435 9033 " Revert modifies the working directory. It does not commit any\n"
6436 9034 " changes, or change the parent of the working directory. If you\n"
6437 9035 " revert to a revision other than the parent of the working\n"
6438 9036 " directory, the reverted files will thus appear modified\n"
6439 " afterwards.\n"
6440 "\n"
9037 " afterwards."
9038 msgstr ""
9039
9040 msgid ""
6441 9041 " If a file has been deleted, it is restored. If the executable mode\n"
6442 " of a file was changed, it is reset.\n"
6443 "\n"
9042 " of a file was changed, it is reset."
9043 msgstr ""
9044
9045 msgid ""
6444 9046 " If names are given, all files matching the names are reverted.\n"
6445 " If no arguments are given, no files are reverted.\n"
6446 "\n"
9047 " If no arguments are given, no files are reverted."
9048 msgstr ""
9049
9050 msgid ""
6447 9051 " Modified files are saved with a .orig suffix before reverting.\n"
6448 9052 " To disable these backups, use --no-backup.\n"
6449 9053 " "
@@ -6479,26 +9083,33 b' msgstr ""'
6479 9083 msgid "no changes needed to %s\n"
6480 9084 msgstr ""
6481 9085
6482 msgid ""
6483 "roll back the last transaction\n"
6484 "\n"
9086 msgid "roll back the last transaction"
9087 msgstr ""
9088
9089 msgid ""
6485 9090 " This command should be used with care. There is only one level of\n"
6486 9091 " rollback, and there is no way to undo a rollback. It will also\n"
6487 9092 " restore the dirstate at the time of the last transaction, losing\n"
6488 9093 " any dirstate changes since that time. This command does not alter\n"
6489 " the working directory.\n"
6490 "\n"
9094 " the working directory."
9095 msgstr ""
9096
9097 msgid ""
6491 9098 " Transactions are used to encapsulate the effects of all commands\n"
6492 9099 " that create new changesets or propagate existing changesets into a\n"
6493 9100 " repository. For example, the following commands are transactional,\n"
6494 " and their effects can be rolled back::\n"
6495 "\n"
9101 " and their effects can be rolled back::"
9102 msgstr ""
9103
9104 msgid ""
6496 9105 " commit\n"
6497 9106 " import\n"
6498 9107 " pull\n"
6499 9108 " push (with this repository as destination)\n"
6500 " unbundle\n"
6501 "\n"
9109 " unbundle"
9110 msgstr ""
9111
9112 msgid ""
6502 9113 " This command is not intended for use on public repositories. Once\n"
6503 9114 " changes are visible for pull by other users, rolling a transaction\n"
6504 9115 " back locally is ineffective (someone else may already have pulled\n"
@@ -6508,18 +9119,21 b' msgid ""'
6508 9119 " "
6509 9120 msgstr ""
6510 9121
6511 msgid ""
6512 "print the root (top) of the current working directory\n"
6513 "\n"
9122 msgid "print the root (top) of the current working directory"
9123 msgstr ""
9124
9125 msgid ""
6514 9126 " Print the root directory of the current repository.\n"
6515 9127 " "
6516 9128 msgstr ""
6517 9129
6518 msgid ""
6519 "export the repository via HTTP\n"
6520 "\n"
6521 " Start a local HTTP repository browser and pull server.\n"
6522 "\n"
9130 msgid "export the repository via HTTP"
9131 msgstr ""
9132
9133 msgid " Start a local HTTP repository browser and pull server."
9134 msgstr ""
9135
9136 msgid ""
6523 9137 " By default, the server logs accesses to stdout and errors to\n"
6524 9138 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6525 9139 " files.\n"
@@ -6530,30 +9144,37 b' msgstr ""'
6530 9144 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6531 9145 msgstr ""
6532 9146
6533 msgid ""
6534 "show changed files in the working directory\n"
6535 "\n"
9147 msgid "show changed files in the working directory"
9148 msgstr ""
9149
9150 msgid ""
6536 9151 " Show status of files in the repository. If names are given, only\n"
6537 9152 " files that match are shown. Files that are clean or ignored or\n"
6538 9153 " the source of a copy/move operation, are not listed unless\n"
6539 9154 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6540 9155 " Unless options described with \"show only ...\" are given, the\n"
6541 " options -mardu are used.\n"
6542 "\n"
9156 " options -mardu are used."
9157 msgstr ""
9158
9159 msgid ""
6543 9160 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6544 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6545 "\n"
9161 " unless explicitly requested with -u/--unknown or -i/--ignored."
9162 msgstr ""
9163
9164 msgid ""
6546 9165 " NOTE: status may appear to disagree with diff if permissions have\n"
6547 9166 " changed or a merge has occurred. The standard diff format does not\n"
6548 9167 " report permission changes and diff only reports changes relative\n"
6549 " to one merge parent.\n"
6550 "\n"
9168 " to one merge parent."
9169 msgstr ""
9170
9171 msgid ""
6551 9172 " If one revision is given, it is used as the base revision.\n"
6552 9173 " If two revisions are given, the differences between them are\n"
6553 " shown.\n"
6554 "\n"
6555 " The codes used to show the status of files are::\n"
6556 "\n"
9174 " shown."
9175 msgstr ""
9176
9177 msgid ""
6557 9178 " M = modified\n"
6558 9179 " A = added\n"
6559 9180 " R = removed\n"
@@ -6565,12 +9186,15 b' msgid ""'
6565 9186 " "
6566 9187 msgstr ""
6567 9188
6568 msgid ""
6569 "summarize working directory state\n"
6570 "\n"
9189 msgid "summarize working directory state"
9190 msgstr ""
9191
9192 msgid ""
6571 9193 " This generates a brief summary of the working directory state,\n"
6572 " including parents, branch, commit status, and available updates.\n"
6573 "\n"
9194 " including parents, branch, commit status, and available updates."
9195 msgstr ""
9196
9197 msgid ""
6574 9198 " With the --remote option, this will check the default paths for\n"
6575 9199 " incoming and outgoing changes. This can be time-consuming.\n"
6576 9200 " "
@@ -6661,26 +9285,29 b' msgstr "suppression de %s\\n"'
6661 9285 msgid "remote: (synced)\n"
6662 9286 msgstr ""
6663 9287
6664 msgid ""
6665 "add one or more tags for the current or given revision\n"
6666 "\n"
6667 " Name a particular revision using <name>.\n"
6668 "\n"
9288 msgid "add one or more tags for the current or given revision"
9289 msgstr ""
9290
9291 msgid " Name a particular revision using <name>."
9292 msgstr ""
9293
9294 msgid ""
6669 9295 " Tags are used to name particular revisions of the repository and are\n"
6670 9296 " very useful to compare different revisions, to go back to significant\n"
6671 " earlier versions or to mark branch points as releases, etc.\n"
6672 "\n"
9297 " earlier versions or to mark branch points as releases, etc."
9298 msgstr ""
9299
9300 msgid ""
6673 9301 " If no revision is given, the parent of the working directory is\n"
6674 " used, or tip if no revision is checked out.\n"
6675 "\n"
9302 " used, or tip if no revision is checked out."
9303 msgstr ""
9304
9305 msgid ""
6676 9306 " To facilitate version control, distribution, and merging of tags,\n"
6677 9307 " they are stored as a file named \".hgtags\" which is managed\n"
6678 9308 " similarly to other project files and can be hand-edited if\n"
6679 9309 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6680 " shared among repositories).\n"
6681 "\n"
6682 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6683 " "
9310 " shared among repositories)."
6684 9311 msgstr ""
6685 9312
6686 9313 msgid "tag names must be unique"
@@ -6709,21 +9336,25 b' msgstr ""'
6709 9336 msgid "tag '%s' already exists (use -f to force)"
6710 9337 msgstr ""
6711 9338
6712 msgid ""
6713 "list repository tags\n"
6714 "\n"
9339 msgid "list repository tags"
9340 msgstr ""
9341
9342 msgid ""
6715 9343 " This lists both regular and local tags. When the -v/--verbose\n"
6716 9344 " switch is used, a third column \"local\" is printed for local tags.\n"
6717 9345 " "
6718 9346 msgstr ""
6719 9347
6720 msgid ""
6721 "show the tip revision\n"
6722 "\n"
9348 msgid "show the tip revision"
9349 msgstr ""
9350
9351 msgid ""
6723 9352 " The tip revision (usually just called the tip) is the changeset\n"
6724 9353 " most recently added to the repository (and therefore the most\n"
6725 " recently changed head).\n"
6726 "\n"
9354 " recently changed head)."
9355 msgstr ""
9356
9357 msgid ""
6727 9358 " If you have just made a commit, that commit will be the tip. If\n"
6728 9359 " you have just pulled changes from another repository, the tip of\n"
6729 9360 " that repository becomes the current tip. The \"tip\" tag is special\n"
@@ -6731,45 +9362,52 b' msgid ""'
6731 9362 " "
6732 9363 msgstr ""
6733 9364
6734 msgid ""
6735 "apply one or more changegroup files\n"
6736 "\n"
9365 msgid "apply one or more changegroup files"
9366 msgstr ""
9367
9368 msgid ""
6737 9369 " Apply one or more compressed changegroup files generated by the\n"
6738 9370 " bundle command.\n"
6739 9371 " "
6740 9372 msgstr ""
6741 9373
6742 msgid ""
6743 "update working directory\n"
6744 "\n"
9374 msgid "update working directory"
9375 msgstr ""
9376
9377 msgid ""
6745 9378 " Update the repository's working directory to the specified\n"
6746 9379 " revision, or the tip of the current branch if none is specified.\n"
6747 9380 " Use null as the revision to remove the working copy (like 'hg\n"
6748 " clone -U').\n"
6749 "\n"
9381 " clone -U')."
9382 msgstr ""
9383
9384 msgid ""
6750 9385 " When the working directory contains no uncommitted changes, it\n"
6751 9386 " will be replaced by the state of the requested revision from the\n"
6752 9387 " repository. When the requested revision is on a different branch,\n"
6753 9388 " the working directory will additionally be switched to that\n"
6754 " branch.\n"
6755 "\n"
9389 " branch."
9390 msgstr ""
9391
9392 msgid ""
6756 9393 " When there are uncommitted changes, use option -C/--clean to\n"
6757 9394 " discard them, forcibly replacing the state of the working\n"
6758 9395 " directory with the requested revision. Alternately, use -c/--check\n"
6759 " to abort.\n"
6760 "\n"
9396 " to abort."
9397 msgstr ""
9398
9399 msgid ""
6761 9400 " When there are uncommitted changes and option -C/--clean is not\n"
6762 9401 " used, and the parent revision and requested revision are on the\n"
6763 9402 " same branch, and one of them is an ancestor of the other, then the\n"
6764 9403 " new working directory will contain the requested revision merged\n"
6765 9404 " with the uncommitted changes. Otherwise, the update will fail with\n"
6766 " a suggestion to use 'merge' or 'update -C' instead.\n"
6767 "\n"
9405 " a suggestion to use 'merge' or 'update -C' instead."
9406 msgstr ""
9407
9408 msgid ""
6768 9409 " If you want to update just one file to an older revision, use\n"
6769 " revert.\n"
6770 "\n"
6771 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6772 " "
9410 " revert."
6773 9411 msgstr ""
6774 9412
6775 9413 msgid "cannot specify both -c/--check and -C/--clean"
@@ -6778,11 +9416,13 b' msgstr ""'
6778 9416 msgid "uncommitted local changes"
6779 9417 msgstr ""
6780 9418
6781 msgid ""
6782 "verify the integrity of the repository\n"
6783 "\n"
6784 " Verify the integrity of the current repository.\n"
6785 "\n"
9419 msgid "verify the integrity of the repository"
9420 msgstr ""
9421
9422 msgid " Verify the integrity of the current repository."
9423 msgstr ""
9424
9425 msgid ""
6786 9426 " This will perform an extensive check of the repository's\n"
6787 9427 " integrity, validating the hashes and checksums of each entry in\n"
6788 9428 " the changelog, manifest, and tracked files, as well as the\n"
@@ -7565,14 +10205,12 b' msgstr "(votre installation de Python es'
7565 10205 msgid "abort: error: %s\n"
7566 10206 msgstr "abandon : erreur : %s\n"
7567 10207
7568 # traduction utilisée par la glibc...
7569 10208 msgid "broken pipe\n"
7570 10209 msgstr "relais brisé (pipe)\n"
7571 10210
7572 10211 msgid "interrupted!\n"
7573 10212 msgstr "interrompu !\n"
7574 10213
7575 # traduction utilisée par la glibc...
7576 10214 msgid ""
7577 10215 "\n"
7578 10216 "broken pipe\n"
General Comments 0
You need to be logged in to leave comments. Login now