Mercurial > hg
comparison i18n/fr.po @ 9765:70c4060bf312
i18n-fr: synchronized with e06c940d554d
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 25 Oct 2009 12:44:57 +0100 |
parents | 2ab9ec0f9703 |
children | c5c969e9eefb |
comparison
equal
deleted
inserted
replaced
9764:bab3c013beb9 | 9765:70c4060bf312 |
---|---|
84 # | 84 # |
85 msgid "" | 85 msgid "" |
86 msgstr "" | 86 msgstr "" |
87 "Project-Id-Version: Mercurial\n" | 87 "Project-Id-Version: Mercurial\n" |
88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | 88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
89 "POT-Creation-Date: 2009-07-18 22:46+0200\n" | 89 "POT-Creation-Date: 2009-10-25 12:38+0100\n" |
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n" | 90 "PO-Revision-Date: 2009-10-25 12:43+0100\n" |
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n" | 91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n" |
92 "Language-Team: French\n" | 92 "Language-Team: French\n" |
93 "MIME-Version: 1.0\n" | 93 "MIME-Version: 1.0\n" |
94 "Content-Type: text/plain; charset=UTF-8\n" | 94 "Content-Type: text/plain; charset=UTF-8\n" |
95 "Content-Transfer-Encoding: 8bit\n" | 95 "Content-Transfer-Encoding: 8bit\n" |
103 msgstr "" | 103 msgstr "" |
104 | 104 |
105 msgid "COMMANDS" | 105 msgid "COMMANDS" |
106 msgstr "" | 106 msgstr "" |
107 | 107 |
108 msgid " options:\n" | 108 #, fuzzy |
109 msgstr "" | 109 msgid "" |
110 " options:\n" | |
111 "\n" | |
112 msgstr "options :\n" | |
110 | 113 |
111 #, python-format | 114 #, python-format |
112 msgid "" | 115 msgid "" |
113 " aliases: %s\n" | 116 " aliases: %s\n" |
114 "\n" | 117 "\n" |
118 msgstr "" | |
119 | |
120 msgid "" | |
121 "Some commands allow the user to specify a date, e.g.:\n" | |
122 "\n" | |
123 "- 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" | |
128 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" | |
129 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" | |
130 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" | |
131 " \"Dec 6\" (midnight)\n" | |
132 " \"13:18\" (today assumed)\n" | |
133 " \"3:39\" (3:39AM assumed)\n" | |
134 " \"3:39pm\" (15:39)\n" | |
135 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n" | |
136 " \"2006-12-6 13:18\"\n" | |
137 " \"2006-12-6\"\n" | |
138 " \"12-6\"\n" | |
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" | |
146 "This is the internal representation format for dates. unixtime is the\n" | |
147 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" | |
148 "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 " \"<{datetime}\" - at or before a given date/time\n" | |
154 " \">{datetime}\" - on or after a given date/time\n" | |
155 " \"{datetime} to {datetime}\" - a date range, inclusive\n" | |
156 " \"-{days}\" - within a given number of days of today\n" | |
157 msgstr "" | |
158 | |
159 msgid "" | |
160 "Mercurial's default format for showing changes between two versions of\n" | |
161 "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" | |
164 "While this standard format is often enough, it does not encode the\n" | |
165 "following information:\n" | |
166 "\n" | |
167 "- executable status and other permission bits\n" | |
168 "- copy or rename information\n" | |
169 "- changes in binary files\n" | |
170 "- creation or deletion of empty files\n" | |
171 "\n" | |
172 "Mercurial also supports the extended diff format from the git VCS\n" | |
173 "which addresses these limitations. The git diff format is not produced\n" | |
174 "by default because a few widespread tools still do not understand this\n" | |
175 "format.\n" | |
176 "\n" | |
177 "This means that when generating diffs from a Mercurial repository\n" | |
178 "(e.g. with \"hg export\"), you should be careful about things like file\n" | |
179 "copies and renames or other things mentioned above, because when\n" | |
180 "applying a standard diff to a different repository, this extra\n" | |
181 "information is lost. Mercurial's internal operations (like push and\n" | |
182 "pull) are not affected by this, because they use an internal binary\n" | |
183 "format for communicating changes.\n" | |
184 "\n" | |
185 "To make Mercurial produce the git extended diff format, use the --git\n" | |
186 "option available for many commands, or set 'git = True' in the [diff]\n" | |
187 "section of your hgrc. You do not need to set this option when\n" | |
188 "importing diffs in this format or using them in the mq extension.\n" | |
189 msgstr "" | |
190 | |
191 msgid "" | |
192 "HG\n" | |
193 " Path to the 'hg' executable, automatically passed when running\n" | |
194 " hooks, extensions or external tools. If unset or empty, this is\n" | |
195 " the hg executable's name if it's frozen, or an executable named\n" | |
196 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
197 " Windows) is searched.\n" | |
198 "\n" | |
199 "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" | |
204 "HGENCODING\n" | |
205 " This overrides the default locale setting detected by Mercurial.\n" | |
206 " This setting is used to convert data including usernames,\n" | |
207 " changeset descriptions, tag names, and branches. This setting can\n" | |
208 " be overridden with the --encoding command-line option.\n" | |
209 "\n" | |
210 "HGENCODINGMODE\n" | |
211 " This sets Mercurial's behavior for handling unknown characters\n" | |
212 " while transcoding user input. The default is \"strict\", which\n" | |
213 " causes Mercurial to abort if it can't map a character. Other\n" | |
214 " settings include \"replace\", which replaces unknown characters, and\n" | |
215 " \"ignore\", which drops them. This setting can be overridden with\n" | |
216 " the --encodingmode command-line option.\n" | |
217 "\n" | |
218 "HGMERGE\n" | |
219 " An executable to use for resolving merge conflicts. The program\n" | |
220 " will be executed with three arguments: local file, remote file,\n" | |
221 " ancestor file.\n" | |
222 "\n" | |
223 " (deprecated, use .hgrc)\n" | |
224 "\n" | |
225 "HGRCPATH\n" | |
226 " A list of files or directories to search for hgrc files. Item\n" | |
227 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" | |
228 " 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" | |
233 " - if it's a directory, all files ending with .rc are added\n" | |
234 " - otherwise, the file itself will be added\n" | |
235 "\n" | |
236 "HGUSER\n" | |
237 " 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" | |
240 " - HGUSER (deprecated)\n" | |
241 " - hgrc files from the HGRCPATH\n" | |
242 " - EMAIL\n" | |
243 " - interactive prompt\n" | |
244 " - LOGNAME (with '@hostname' appended)\n" | |
245 "\n" | |
246 " (deprecated, use .hgrc)\n" | |
247 "\n" | |
248 "EMAIL\n" | |
249 " May be used as the author of a commit; see HGUSER.\n" | |
250 "\n" | |
251 "LOGNAME\n" | |
252 " May be used as the author of a commit; see HGUSER.\n" | |
253 "\n" | |
254 "VISUAL\n" | |
255 " This is the name of the editor to use when committing. See EDITOR.\n" | |
256 "\n" | |
257 "EDITOR\n" | |
258 " Sometimes Mercurial needs to open a text file in an editor for a\n" | |
259 " user to modify, for example when writing commit messages. The\n" | |
260 " editor it uses is determined by looking at the environment\n" | |
261 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" | |
262 " non-empty one is chosen. If all of them are empty, the editor\n" | |
263 " defaults to 'vi'.\n" | |
264 "\n" | |
265 "PYTHONPATH\n" | |
266 " This is used by Python to find imported modules and may need to be\n" | |
267 " set appropriately if this Mercurial is not installed system-wide.\n" | |
268 msgstr "" | |
269 | |
270 #, fuzzy | |
271 msgid "" | |
272 "Mercurial has the ability to add new features through the use of\n" | |
273 "extensions. Extensions may add new commands, add options to\n" | |
274 "existing commands, change the default behavior of commands, or\n" | |
275 "implement hooks.\n" | |
276 "\n" | |
277 "Extensions are not loaded by default for a variety of reasons:\n" | |
278 "they can increase startup overhead; they may be meant for advanced\n" | |
279 "usage only; they may provide potentially dangerous abilities (such\n" | |
280 "as letting you destroy or modify history); they might not be ready\n" | |
281 "for prime time; or they may alter some usual behaviors of stock\n" | |
282 "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 " hgext.bar = !/path/to/extension/bar.py\n" | |
303 " # ditto, but no path was supplied for extension baz\n" | |
304 " hgext.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" | |
313 " Les extensions ne sont pas chargées automatiquement par défaut\n" | |
314 " pour diverses raisons : elles peuvent accroître la latence\n" | |
315 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n" | |
316 " une utilisation avancée ; elle peuvent fournir des\n" | |
317 " fonctionnalités potentiellement dangereuses, comme de vous\n" | |
318 " permettre de modifier ou détruire l'historique du dépôt ; elles\n" | |
319 " peuvent ne pas être encore prêtes à être utilisées par le plus\n" | |
320 " grand nombre ; ou encore elles peuvent modifier certains des\n" | |
321 " comportements habituels de Mercurial.\n" | |
322 " Il appartient donc à l'utilisateur de les activer en fonction\n" | |
323 " de ses besoins.\n" | |
324 "\n" | |
325 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n" | |
326 " 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" | |
329 " [extensions]\n" | |
330 " truc =\n" | |
331 "\n" | |
332 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n" | |
333 "\n" | |
334 " [extensions]\n" | |
335 " monbidule = ~/.hgext/monbidule.py\n" | |
336 "\n" | |
337 " 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" | |
340 " [extensions]\n" | |
341 " # désactivation de machin qui se trouve dans /vers/machin.py\n" | |
342 " hgext.bar = !/vers/machin.py\n" | |
343 " # idem, mais aucun chemin n'avait été donné pour chose \n" | |
344 " hgext.chose = !\n" | |
345 " " | |
346 | |
347 msgid "" | |
348 "When Mercurial accepts more than one revision, they may be specified\n" | |
349 "individually, or provided as a topologically continuous range,\n" | |
350 "separated by the \":\" character.\n" | |
351 "\n" | |
352 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" | |
353 "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" | |
354 "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" | |
359 "A range acts as a closed interval. This means that a range of 3:5\n" | |
360 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" | |
361 msgstr "" | |
362 | |
363 msgid "" | |
364 "Mercurial accepts several notations for identifying one or more files\n" | |
365 "at a time.\n" | |
366 "\n" | |
367 "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" | |
372 "To use a plain path name without any pattern matching, start it with\n" | |
373 "``path:``. These path names must completely match starting at the\n" | |
374 "current repository root.\n" | |
375 "\n" | |
376 "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" | |
377 "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" | |
380 "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" | |
383 "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" | |
388 " path:foo/bar a name bar in a directory named foo in the root\n" | |
389 " of the repository\n" | |
390 " path:path:name a file or directory named \"path:name\"\n" | |
391 "\n" | |
392 "Glob examples::\n" | |
393 "\n" | |
394 " glob:*.c any name ending in \".c\" in the current directory\n" | |
395 " *.c any name ending in \".c\" in the current directory\n" | |
396 " **.c any name ending in \".c\" in any subdirectory of the\n" | |
397 " current directory including itself.\n" | |
398 " foo/*.c any name ending in \".c\" in the directory foo\n" | |
399 " 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" | |
410 "A plain integer is treated as a revision number. Negative integers are\n" | |
411 "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" | |
414 "A 40-digit hexadecimal string is treated as a unique revision\n" | |
415 "identifier.\n" | |
416 "\n" | |
417 "A hexadecimal string less than 40 characters long is treated as a\n" | |
418 "unique revision identifier and is referred to as a short-form\n" | |
419 "identifier. A short-form identifier is only valid if it is the prefix\n" | |
420 "of exactly one full-length identifier.\n" | |
421 "\n" | |
422 "Any other string is treated as a tag or branch name. A tag name is a\n" | |
423 "symbolic name associated with a revision identifier. A branch name\n" | |
424 "denotes the tipmost revision of that branch. Tag and branch names must\n" | |
425 "not contain the \":\" character.\n" | |
426 "\n" | |
427 "The reserved name \"tip\" is a special tag that always identifies the\n" | |
428 "most recent revision.\n" | |
429 "\n" | |
430 "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" | |
433 "The reserved name \".\" indicates the working directory parent. If no\n" | |
434 "working directory is checked out, it is equivalent to null. If an\n" | |
435 "uncommitted merge is in progress, \".\" is the revision of the first\n" | |
436 "parent.\n" | |
437 msgstr "" | |
438 | |
439 msgid "" | |
440 "Mercurial allows you to customize output of commands through\n" | |
441 "templates. You can either pass in a template from the command\n" | |
442 "line, via the --template option, or select an existing\n" | |
443 "template-style (--style).\n" | |
444 "\n" | |
445 "You can customize output for any \"log-like\" command: log,\n" | |
446 "outgoing, incoming, tip, parents, heads and glog.\n" | |
447 "\n" | |
448 "Three styles are packaged with Mercurial: default (the style used\n" | |
449 "when no explicit preference is passed), compact and changelog.\n" | |
450 "Usage::\n" | |
451 "\n" | |
452 " $ hg log -r1 --style changelog\n" | |
453 "\n" | |
454 "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" | |
458 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |
459 "\n" | |
460 "Strings in curly braces are called keywords. The availability of\n" | |
461 "keywords depends on the exact context of the templater. These\n" | |
462 "keywords are usually available for templating a log-like command:\n" | |
463 "\n" | |
464 ":author: String. The unmodified author of the changeset.\n" | |
465 ":branches: String. The name of the branch on which the changeset\n" | |
466 " was committed. Will be empty if the branch name was\n" | |
467 " default.\n" | |
468 ":date: Date information. The date when the changeset was\n" | |
469 " committed.\n" | |
470 ":desc: String. The text of the changeset description.\n" | |
471 ":diffstat: String. Statistics of changes with the following\n" | |
472 " format: \"modified files: +added/-removed lines\"\n" | |
473 ":files: List of strings. All files modified, added, or removed\n" | |
474 " by this changeset.\n" | |
475 ":file_adds: List of strings. Files added by this changeset.\n" | |
476 ":file_mods: List of strings. Files modified by this changeset.\n" | |
477 ":file_dels: List of strings. Files removed by this changeset.\n" | |
478 ":node: String. The changeset identification hash, as a\n" | |
479 " 40-character hexadecimal string.\n" | |
480 ":parents: List of strings. The parents of the changeset.\n" | |
481 ":rev: Integer. The repository-local changeset revision\n" | |
482 " number.\n" | |
483 ":tags: List of strings. Any tags associated with the\n" | |
484 " changeset.\n" | |
485 ":latesttag: String. Most recent global tag in the ancestors of this\n" | |
486 " changeset.\n" | |
487 ":latesttagdistance: Integer. Longest path to the latest tag.\n" | |
488 "\n" | |
489 "The \"date\" keyword does not produce human-readable output. If you\n" | |
490 "want to use a date in your output, you can use a filter to process\n" | |
491 "it. Filters are functions which return a string based on the input\n" | |
492 "variable. You can also use a chain of filters to get the desired\n" | |
493 "output::\n" | |
494 "\n" | |
495 " $ hg tip --template \"{date|isodate}\\n\"\n" | |
496 " 2008-08-21 18:22 +0000\n" | |
497 "\n" | |
498 "List of filters:\n" | |
499 "\n" | |
500 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
501 " every line except the last.\n" | |
502 ":age: Date. Returns a human-readable date/time difference\n" | |
503 " between the given date/time and the current\n" | |
504 " date/time.\n" | |
505 ":basename: Any text. Treats the text as a path, and returns the\n" | |
506 " last component of the path after splitting by the\n" | |
507 " path separator (ignoring trailing separators). For\n" | |
508 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" | |
509 " becomes \"bar\".\n" | |
510 ":stripdir: Treat the text as path and strip a directory level,\n" | |
511 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n" | |
512 " \"foo\".\n" | |
513 ":date: Date. Returns a date in a Unix date format, including\n" | |
514 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |
515 ":domain: Any text. Finds the first string that looks like an\n" | |
516 " email address, and extracts just the domain\n" | |
517 " component. Example: 'User <user@example.com>' becomes\n" | |
518 " 'example.com'.\n" | |
519 ":email: Any text. Extracts the first string that looks like\n" | |
520 " an email address. Example: 'User <user@example.com>'\n" | |
521 " becomes 'user@example.com'.\n" | |
522 ":escape: Any text. Replaces the special XML/XHTML characters\n" | |
523 " \"&\", \"<\" and \">\" with XML entities.\n" | |
524 ":fill68: Any text. Wraps the text to fit in 68 columns.\n" | |
525 ":fill76: Any text. Wraps the text to fit in 76 columns.\n" | |
526 ":firstline: Any text. Returns the first line of text.\n" | |
527 ":nonempty: Any text. Returns '(none)' if the string is empty.\n" | |
528 ":hgdate: Date. Returns the date as a pair of numbers:\n" | |
529 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" | |
530 ":isodate: Date. Returns the date in ISO 8601 format:\n" | |
531 " \"2009-08-18 13:00 +0200\".\n" | |
532 ":isodatesec: Date. Returns the date in ISO 8601 format, including\n" | |
533 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" | |
534 " rfc3339date filter.\n" | |
535 ":localdate: Date. Converts a date to local date.\n" | |
536 ":obfuscate: Any text. Returns the input text rendered as a\n" | |
537 " sequence of XML entities.\n" | |
538 ":person: Any text. Returns the text before an email address.\n" | |
539 ":rfc822date: Date. Returns a date using the same format used in\n" | |
540 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" | |
541 ":rfc3339date: Date. Returns a date using the Internet date format\n" | |
542 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" | |
543 ":short: Changeset hash. Returns the short form of a changeset\n" | |
544 " hash, i.e. a 12-byte hexadecimal string.\n" | |
545 ":shortdate: Date. Returns a date like \"2006-09-18\".\n" | |
546 ":strip: Any text. Strips all leading and trailing whitespace.\n" | |
547 ":tabindent: Any text. Returns the text, with every line except\n" | |
548 " the first starting with a tab character.\n" | |
549 ":urlescape: Any text. Escapes all \"special\" characters. For\n" | |
550 " example, \"foo bar\" becomes \"foo%20bar\".\n" | |
551 ":user: Any text. Returns the user portion of an email\n" | |
552 " address.\n" | |
553 msgstr "" | |
554 | |
555 msgid "" | |
556 "Valid URLs are of the form::\n" | |
557 "\n" | |
558 " local/filesystem/path[#revision]\n" | |
559 " file://local/filesystem/path[#revision]\n" | |
560 " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
561 " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
562 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n" | |
563 "\n" | |
564 "Paths in the local filesystem can either point to Mercurial\n" | |
565 "repositories or to bundle files (as created by 'hg bundle' or 'hg\n" | |
566 "incoming --bundle').\n" | |
567 "\n" | |
568 "An optional identifier after # indicates a particular branch, tag, or\n" | |
569 "changeset to use from the remote repository. See also 'hg help\n" | |
570 "revisions'.\n" | |
571 "\n" | |
572 "Some features, such as pushing to http:// and https:// URLs are only\n" | |
573 "possible if the feature is explicitly enabled on the remote Mercurial\n" | |
574 "server.\n" | |
575 "\n" | |
576 "Some notes about using SSH with Mercurial:\n" | |
577 "\n" | |
578 "- SSH requires an accessible shell account on the destination machine\n" | |
579 " and a copy of hg in the remote path or specified with as remotecmd.\n" | |
580 "- path is relative to the remote user's home directory by default. Use\n" | |
581 " an extra slash at the start of a path to specify an absolute path::\n" | |
582 "\n" | |
583 " ssh://example.com//tmp/repository\n" | |
584 "\n" | |
585 "- Mercurial doesn't use its own compression via SSH; the right thing\n" | |
586 " to do is to configure it in your ~/.ssh/config, e.g.::\n" | |
587 "\n" | |
588 " Host *.mylocalnetwork.example.com\n" | |
589 " Compression no\n" | |
590 " Host *\n" | |
591 " Compression yes\n" | |
592 "\n" | |
593 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" | |
594 " with the --ssh command line option.\n" | |
595 "\n" | |
596 "These URLs can all be stored in your hgrc with path aliases under the\n" | |
597 "[paths] section like so::\n" | |
598 "\n" | |
599 " [paths]\n" | |
600 " alias1 = URL1\n" | |
601 " alias2 = URL2\n" | |
602 " ...\n" | |
603 "\n" | |
604 "You can then use the alias for any command that uses a URL (for\n" | |
605 "example 'hg pull alias1' would pull from the 'alias1' path).\n" | |
606 "\n" | |
607 "Two path aliases are special because they are used as defaults when\n" | |
608 "you do not provide the URL to a command:\n" | |
609 "\n" | |
610 "default:\n" | |
611 " When you create a repository with hg clone, the clone command saves\n" | |
612 " the location of the source repository as the new repository's\n" | |
613 " 'default' path. This is then used when you omit path from push- and\n" | |
614 " pull-like commands (including incoming and outgoing).\n" | |
615 "\n" | |
616 "default-push:\n" | |
617 " The push command will look for a path named 'default-push', and\n" | |
618 " prefer it over 'default' if both are defined.\n" | |
115 msgstr "" | 619 msgstr "" |
116 | 620 |
117 msgid "" | 621 msgid "" |
118 "hooks for controlling repository access\n" | 622 "hooks for controlling repository access\n" |
119 "\n" | 623 "\n" |
129 "pushing or pulling. The hook is not safe to use if users have\n" | 633 "pushing or pulling. The hook is not safe to use if users have\n" |
130 "interactive shell access, as they can then disable the hook.\n" | 634 "interactive shell access, as they can then disable the hook.\n" |
131 "Nor is it safe if remote users share an account, because then there\n" | 635 "Nor is it safe if remote users share an account, because then there\n" |
132 "is no way to distinguish them.\n" | 636 "is no way to distinguish them.\n" |
133 "\n" | 637 "\n" |
134 "To use this hook, configure the acl extension in your hgrc like this:\n" | 638 "To use this hook, configure the acl extension in your hgrc like this::\n" |
135 "\n" | 639 "\n" |
136 " [extensions]\n" | 640 " [extensions]\n" |
137 " hgext.acl =\n" | 641 " hgext.acl =\n" |
138 "\n" | 642 "\n" |
139 " [hooks]\n" | 643 " [hooks]\n" |
142 " [acl]\n" | 646 " [acl]\n" |
143 " # Check whether the source of incoming changes is in this list\n" | 647 " # Check whether the source of incoming changes is in this list\n" |
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" | 648 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" |
145 " sources = serve\n" | 649 " sources = serve\n" |
146 "\n" | 650 "\n" |
147 "The allow and deny sections take a subtree pattern as key (with a\n" | 651 "The allow and deny sections take a subtree pattern as key (with a glob\n" |
148 "glob syntax by default), and a comma separated list of users as\n" | 652 "syntax by default), and a comma separated list of users as the\n" |
149 "the corresponding value. The deny list is checked before the allow\n" | 653 "corresponding value. The deny list is checked before the allow list\n" |
150 "list is.\n" | 654 "is. ::\n" |
151 "\n" | 655 "\n" |
152 " [acl.allow]\n" | 656 " [acl.allow]\n" |
153 " # If acl.allow is not present, all users are allowed by default.\n" | 657 " # If acl.allow is not present, all users are allowed by default.\n" |
154 " # An empty acl.allow section means no users allowed.\n" | 658 " # An empty acl.allow section means no users allowed.\n" |
155 " docs/** = doc_writer\n" | 659 " docs/** = doc_writer\n" |
161 " glob pattern = user4, user5\n" | 665 " glob pattern = user4, user5\n" |
162 " ** = user6\n" | 666 " ** = user6\n" |
163 msgstr "" | 667 msgstr "" |
164 | 668 |
165 #, python-format | 669 #, python-format |
166 msgid "acl: %s not enabled\n" | |
167 msgstr "" | |
168 | |
169 #, python-format | |
170 msgid "acl: %s enabled, %d entries for user %s\n" | |
171 msgstr "" | |
172 | |
173 #, python-format | |
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets" | 670 msgid "config error - hook type \"%s\" cannot stop incoming changesets" |
175 msgstr "" | 671 msgstr "" |
176 | 672 |
177 #, python-format | 673 #, python-format |
178 msgid "acl: changes have source \"%s\" - skipping\n" | |
179 msgstr "" | |
180 | |
181 #, python-format | |
182 msgid "acl: user %s denied on %s\n" | |
183 msgstr "" | |
184 | |
185 #, python-format | |
186 msgid "acl: access denied for changeset %s" | 674 msgid "acl: access denied for changeset %s" |
187 msgstr "" | |
188 | |
189 #, python-format | |
190 msgid "acl: user %s not allowed on %s\n" | |
191 msgstr "" | |
192 | |
193 #, python-format | |
194 msgid "acl: allowing changeset %s\n" | |
195 msgstr "" | 675 msgstr "" |
196 | 676 |
197 msgid "" | 677 msgid "" |
198 "track a line of development with movable markers\n" | 678 "track a line of development with movable markers\n" |
199 "\n" | 679 "\n" |
200 "Bookmarks are local movable markers to changesets. Every bookmark\n" | 680 "Bookmarks are local movable markers to changesets. Every bookmark\n" |
201 "points to a changeset identified by its hash. If you commit a\n" | 681 "points to a changeset identified by its hash. If you commit a\n" |
202 "changeset that is based on a changeset that has a bookmark on it,\n" | 682 "changeset that is based on a changeset that has a bookmark on it, the\n" |
203 "the bookmark shifts to the new changeset.\n" | 683 "bookmark shifts to the new changeset.\n" |
204 "\n" | 684 "\n" |
205 "It is possible to use bookmark names in every revision lookup\n" | 685 "It is possible to use bookmark names in every revision lookup (e.g. hg\n" |
206 "(e.g. hg merge, hg update).\n" | 686 "merge, hg update).\n" |
207 "\n" | 687 "\n" |
208 "By default, when several bookmarks point to the same changeset, they\n" | 688 "By default, when several bookmarks point to the same changeset, they\n" |
209 "will all move forward together. It is possible to obtain a more\n" | 689 "will all move forward together. It is possible to obtain a more\n" |
210 "git-like experience by adding the following configuration option to\n" | 690 "git-like experience by adding the following configuration option to\n" |
211 "your .hgrc:\n" | 691 "your .hgrc::\n" |
212 "\n" | 692 "\n" |
213 " [bookmarks]\n" | 693 " [bookmarks]\n" |
214 " track.current = True\n" | 694 " track.current = True\n" |
215 "\n" | 695 "\n" |
216 "This will cause Mercurial to track the bookmark that you are currently\n" | 696 "This will cause Mercurial to track the bookmark that you are currently\n" |
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n" | 761 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n" |
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" | 762 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" |
283 "be run by Mercurial as the user pushing the change; you will need to\n" | 763 "be run by Mercurial as the user pushing the change; you will need to\n" |
284 "ensure the Bugzilla install file permissions are set appropriately.\n" | 764 "ensure the Bugzilla install file permissions are set appropriately.\n" |
285 "\n" | 765 "\n" |
286 "Configuring the extension:\n" | 766 "The extension is configured through three different configuration\n" |
287 "\n" | 767 "sections. These keys are recognized in the [bugzilla] section:\n" |
288 " [bugzilla]\n" | 768 "\n" |
289 "\n" | 769 "host\n" |
290 " host Hostname of the MySQL server holding the Bugzilla\n" | 770 " Hostname of the MySQL server holding the Bugzilla database.\n" |
291 " database.\n" | 771 "\n" |
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" | 772 "db\n" |
293 " user Username to use to access MySQL server. Default 'bugs'.\n" | 773 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n" |
294 " password Password to use to access MySQL server.\n" | 774 "\n" |
295 " timeout Database connection timeout (seconds). Default 5.\n" | 775 "user\n" |
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n" | 776 " Username to use to access MySQL server. Default 'bugs'.\n" |
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" | 777 "\n" |
298 " and '2.16' for versions prior to 2.18.\n" | 778 "password\n" |
299 " bzuser Fallback Bugzilla user name to record comments with, if\n" | 779 " Password to use to access MySQL server.\n" |
300 " changeset committer cannot be found as a Bugzilla user.\n" | 780 "\n" |
301 " bzdir Bugzilla install directory. Used by default notify.\n" | 781 "timeout\n" |
302 " Default '/var/www/html/bugzilla'.\n" | 782 " Database connection timeout (seconds). Default 5.\n" |
303 " notify The command to run to get Bugzilla to send bug change\n" | 783 "\n" |
304 " notification emails. Substitutes from a map with 3\n" | 784 "version\n" |
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" | 785 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n" |
306 " bugzilla email). Default depends on version; from 2.18\n" | 786 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n" |
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" | 787 " to 2.18.\n" |
308 " %(id)s %(user)s\".\n" | 788 "\n" |
309 " regexp Regular expression to match bug IDs in changeset commit\n" | 789 "bzuser\n" |
310 " message. Must contain one \"()\" group. The default\n" | 790 " Fallback Bugzilla user name to record comments with, if changeset\n" |
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" | 791 " committer cannot be found as a Bugzilla user.\n" |
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" | 792 "\n" |
313 " variations thereof. Matching is case insensitive.\n" | 793 "bzdir\n" |
314 " style The style file to use when formatting comments.\n" | 794 " Bugzilla install directory. Used by default notify. Default\n" |
315 " template Template to use when formatting comments. Overrides\n" | 795 " '/var/www/html/bugzilla'.\n" |
316 " style if specified. In addition to the usual Mercurial\n" | 796 "\n" |
317 " keywords, the extension specifies:\n" | 797 "notify\n" |
318 " {bug} The Bugzilla bug ID.\n" | 798 " The command to run to get Bugzilla to send bug change notification\n" |
319 " {root} The full pathname of the Mercurial\n" | 799 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n" |
320 " repository.\n" | 800 " and 'user' (committer bugzilla email). Default depends on version;\n" |
321 " {webroot} Stripped pathname of the Mercurial\n" | 801 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" |
322 " repository.\n" | 802 " %(id)s %(user)s\".\n" |
323 " {hgweb} Base URL for browsing Mercurial\n" | 803 "\n" |
324 " repositories.\n" | 804 "regexp\n" |
325 " Default 'changeset {node|short} in repo {root} refers '\n" | 805 " Regular expression to match bug IDs in changeset commit message.\n" |
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" | 806 " Must contain one \"()\" group. The default expression matches 'Bug\n" |
327 " strip The number of slashes to strip from the front of {root}\n" | 807 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n" |
328 " to produce {webroot}. Default 0.\n" | 808 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n" |
329 " usermap Path of file containing Mercurial committer ID to\n" | 809 "\n" |
330 " Bugzilla user ID mappings. If specified, the file\n" | 810 "style\n" |
331 " should contain one mapping per line,\n" | 811 " The style file to use when formatting comments.\n" |
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n" | 812 "\n" |
333 " section.\n" | 813 "template\n" |
334 "\n" | 814 " Template to use when formatting comments. Overrides style if\n" |
335 " [usermap]\n" | 815 " specified. In addition to the usual Mercurial keywords, the\n" |
336 " Any entries in this section specify mappings of Mercurial\n" | 816 " extension specifies::\n" |
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" | 817 "\n" |
338 " \"committer\"=\"Bugzilla user\"\n" | 818 " {bug} The Bugzilla bug ID.\n" |
339 "\n" | 819 " {root} The full pathname of the Mercurial repository.\n" |
340 " [web]\n" | 820 " {webroot} Stripped pathname of the Mercurial repository.\n" |
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n" | 821 " {hgweb} Base URL for browsing Mercurial repositories.\n" |
342 " from templates as {hgweb}.\n" | 822 "\n" |
343 "\n" | 823 " Default 'changeset {node|short} in repo {root} refers '\n" |
344 "Activating the extension:\n" | 824 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" |
825 "\n" | |
826 "strip\n" | |
827 " The number of slashes to strip from the front of {root} to produce\n" | |
828 " {webroot}. Default 0.\n" | |
829 "\n" | |
830 "usermap\n" | |
831 " Path of file containing Mercurial committer ID to Bugzilla user ID\n" | |
832 " mappings. If specified, the file should contain one mapping per\n" | |
833 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n" | |
834 "\n" | |
835 "The [usermap] section is used to specify mappings of Mercurial\n" | |
836 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" | |
837 "\"committer\"=\"Bugzilla user\"\n" | |
838 "\n" | |
839 "Finally, the [web] section supports one entry:\n" | |
840 "\n" | |
841 "baseurl\n" | |
842 " Base URL for browsing Mercurial repositories. Reference from\n" | |
843 " templates as {hgweb}.\n" | |
844 "\n" | |
845 "Activating the extension::\n" | |
345 "\n" | 846 "\n" |
346 " [extensions]\n" | 847 " [extensions]\n" |
347 " hgext.bugzilla =\n" | 848 " hgext.bugzilla =\n" |
348 "\n" | 849 "\n" |
349 " [hooks]\n" | 850 " [hooks]\n" |
352 "\n" | 853 "\n" |
353 "Example configuration:\n" | 854 "Example configuration:\n" |
354 "\n" | 855 "\n" |
355 "This example configuration is for a collection of Mercurial\n" | 856 "This example configuration is for a collection of Mercurial\n" |
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" | 857 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" |
357 "installation in /opt/bugzilla-3.2.\n" | 858 "installation in /opt/bugzilla-3.2. ::\n" |
358 "\n" | 859 "\n" |
359 " [bugzilla]\n" | 860 " [bugzilla]\n" |
360 " host=localhost\n" | 861 " host=localhost\n" |
361 " password=XYZZY\n" | 862 " password=XYZZY\n" |
362 " version=3.0\n" | 863 " version=3.0\n" |
363 " bzuser=unknown@domain.com\n" | 864 " bzuser=unknown@domain.com\n" |
364 " bzdir=/opt/bugzilla-3.2\n" | 865 " bzdir=/opt/bugzilla-3.2\n" |
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/" | 866 " template=Changeset {node|short} in {root|basename}.\n" |
366 "rev/{node|short}\\n\\n{desc}\\n\n" | 867 " {hgweb}/{webroot}/rev/{node|short}\\n\n" |
868 " {desc}\\n\n" | |
367 " strip=5\n" | 869 " strip=5\n" |
368 "\n" | 870 "\n" |
369 " [web]\n" | 871 " [web]\n" |
370 " baseurl=http://dev.domain.com/hg\n" | 872 " baseurl=http://dev.domain.com/hg\n" |
371 "\n" | 873 "\n" |
372 " [usermap]\n" | 874 " [usermap]\n" |
373 " user@emaildomain.com=user.name@bugzilladomain.com\n" | 875 " user@emaildomain.com=user.name@bugzilladomain.com\n" |
374 "\n" | 876 "\n" |
375 "Commits add a comment to the Bugzilla bug record of the form:\n" | 877 "Commits add a comment to the Bugzilla bug record of the form::\n" |
376 "\n" | 878 "\n" |
377 " Changeset 3b16791d6642 in repository-name.\n" | 879 " Changeset 3b16791d6642 in repository-name.\n" |
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" | 880 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" |
379 "\n" | 881 "\n" |
380 " Changeset commit comment. Bug 1234.\n" | 882 " Changeset commit comment. Bug 1234.\n" |
493 "\n" | 995 "\n" |
494 " Statistics are based on the number of changed lines, or\n" | 996 " Statistics are based on the number of changed lines, or\n" |
495 " alternatively the number of matching revisions if the\n" | 997 " alternatively the number of matching revisions if the\n" |
496 " --changesets option is specified.\n" | 998 " --changesets option is specified.\n" |
497 "\n" | 999 "\n" |
498 " Examples:\n" | 1000 " Examples::\n" |
499 "\n" | 1001 "\n" |
500 " # display count of changed lines for every committer\n" | 1002 " # display count of changed lines for every committer\n" |
501 " hg churn -t '{author|email}'\n" | 1003 " hg churn -t '{author|email}'\n" |
502 "\n" | 1004 "\n" |
503 " # display daily activity graph\n" | 1005 " # display daily activity graph\n" |
508 "\n" | 1010 "\n" |
509 " # display count of lines changed in every year\n" | 1011 " # display count of lines changed in every year\n" |
510 " hg churn -f '%Y' -s\n" | 1012 " hg churn -f '%Y' -s\n" |
511 "\n" | 1013 "\n" |
512 " It is possible to map alternate email addresses to a main address\n" | 1014 " It is possible to map alternate email addresses to a main address\n" |
513 " by providing a file using the following format:\n" | 1015 " by providing a file using the following format::\n" |
514 "\n" | 1016 "\n" |
515 " <alias email> <actual email>\n" | 1017 " <alias email> <actual email>\n" |
516 "\n" | 1018 "\n" |
517 " Such a file may be specified with the --aliases option, otherwise a\n" | 1019 " Such a file may be specified with the --aliases option, otherwise\n" |
518 " .hgchurn file will be looked for in the working directory root.\n" | 1020 " a .hgchurn file will be looked for in the working directory root.\n" |
519 " " | 1021 " " |
520 msgstr "" | |
521 | |
522 #, python-format | |
523 msgid "assuming %i character terminal\n" | |
524 msgstr "" | 1022 msgstr "" |
525 | 1023 |
526 msgid "count rate for the specified revision or range" | 1024 msgid "count rate for the specified revision or range" |
527 msgstr "" | 1025 msgstr "" |
528 | 1026 |
562 "Other effects in addition to color, like bold and underlined text, are\n" | 1060 "Other effects in addition to color, like bold and underlined text, are\n" |
563 "also available. Effects are rendered with the ECMA-48 SGR control\n" | 1061 "also available. Effects are rendered with the ECMA-48 SGR control\n" |
564 "function (aka ANSI escape codes). This module also provides the\n" | 1062 "function (aka ANSI escape codes). This module also provides the\n" |
565 "render_text function, which can be used to add effects to any text.\n" | 1063 "render_text function, which can be used to add effects to any text.\n" |
566 "\n" | 1064 "\n" |
567 "Default effects may be overridden from the .hgrc file:\n" | 1065 "Default effects may be overridden from the .hgrc file::\n" |
568 "\n" | 1066 "\n" |
569 "[color]\n" | 1067 " [color]\n" |
570 "status.modified = blue bold underline red_background\n" | 1068 " status.modified = blue bold underline red_background\n" |
571 "status.added = green bold\n" | 1069 " status.added = green bold\n" |
572 "status.removed = red bold blue_background\n" | 1070 " status.removed = red bold blue_background\n" |
573 "status.deleted = cyan bold underline\n" | 1071 " status.deleted = cyan bold underline\n" |
574 "status.unknown = magenta bold underline\n" | 1072 " status.unknown = magenta bold underline\n" |
575 "status.ignored = black bold\n" | 1073 " status.ignored = black bold\n" |
576 "\n" | 1074 "\n" |
577 "# 'none' turns off all effects\n" | 1075 " # 'none' turns off all effects\n" |
578 "status.clean = none\n" | 1076 " status.clean = none\n" |
579 "status.copied = none\n" | 1077 " status.copied = none\n" |
580 "\n" | 1078 "\n" |
581 "qseries.applied = blue bold underline\n" | 1079 " qseries.applied = blue bold underline\n" |
582 "qseries.unapplied = black bold\n" | 1080 " qseries.unapplied = black bold\n" |
583 "qseries.missing = red bold\n" | 1081 " qseries.missing = red bold\n" |
584 "\n" | 1082 "\n" |
585 "diff.diffline = bold\n" | 1083 " diff.diffline = bold\n" |
586 "diff.extended = cyan bold\n" | 1084 " diff.extended = cyan bold\n" |
587 "diff.file_a = red bold\n" | 1085 " diff.file_a = red bold\n" |
588 "diff.file_b = green bold\n" | 1086 " diff.file_b = green bold\n" |
589 "diff.hunk = magenta\n" | 1087 " diff.hunk = magenta\n" |
590 "diff.deleted = red\n" | 1088 " diff.deleted = red\n" |
591 "diff.inserted = green\n" | 1089 " diff.inserted = green\n" |
592 "diff.changed = white\n" | 1090 " diff.changed = white\n" |
593 "diff.trailingwhitespace = bold red_background\n" | 1091 " diff.trailingwhitespace = bold red_background\n" |
594 msgstr "" | 1092 msgstr "" |
595 | 1093 |
596 msgid "when to colorize (always, auto, or never)" | 1094 msgid "when to colorize (always, auto, or never)" |
597 msgstr "" | 1095 msgstr "" |
598 | 1096 |
599 msgid "don't colorize output" | 1097 msgid "don't colorize output (DEPRECATED)" |
600 msgstr "" | 1098 msgstr "" |
601 | 1099 |
602 #, python-format | 1100 #, python-format |
603 msgid "ignoring unknown color/effect %r (configured in color.%s)\n" | 1101 msgid "ignoring unknown color/effect %r (configured in color.%s)\n" |
604 msgstr "" | 1102 msgstr "" |
608 | 1106 |
609 msgid "" | 1107 msgid "" |
610 "convert a foreign SCM repository to a Mercurial one.\n" | 1108 "convert a foreign SCM repository to a Mercurial one.\n" |
611 "\n" | 1109 "\n" |
612 " Accepted source formats [identifiers]:\n" | 1110 " Accepted source formats [identifiers]:\n" |
1111 "\n" | |
613 " - Mercurial [hg]\n" | 1112 " - Mercurial [hg]\n" |
614 " - CVS [cvs]\n" | 1113 " - CVS [cvs]\n" |
615 " - Darcs [darcs]\n" | 1114 " - Darcs [darcs]\n" |
616 " - git [git]\n" | 1115 " - git [git]\n" |
617 " - Subversion [svn]\n" | 1116 " - Subversion [svn]\n" |
619 " - GNU Arch [gnuarch]\n" | 1118 " - GNU Arch [gnuarch]\n" |
620 " - Bazaar [bzr]\n" | 1119 " - Bazaar [bzr]\n" |
621 " - Perforce [p4]\n" | 1120 " - Perforce [p4]\n" |
622 "\n" | 1121 "\n" |
623 " Accepted destination formats [identifiers]:\n" | 1122 " Accepted destination formats [identifiers]:\n" |
1123 "\n" | |
624 " - Mercurial [hg]\n" | 1124 " - Mercurial [hg]\n" |
625 " - Subversion [svn] (history on branches is not preserved)\n" | 1125 " - Subversion [svn] (history on branches is not preserved)\n" |
626 "\n" | 1126 "\n" |
627 " If no revision is given, all revisions will be converted.\n" | 1127 " If no revision is given, all revisions will be converted.\n" |
628 " Otherwise, convert will only import up to the named revision\n" | 1128 " Otherwise, convert will only import up to the named revision\n" |
630 "\n" | 1130 "\n" |
631 " If no destination directory name is specified, it defaults to the\n" | 1131 " If no destination directory name is specified, it defaults to the\n" |
632 " basename of the source with '-hg' appended. If the destination\n" | 1132 " basename of the source with '-hg' appended. If the destination\n" |
633 " repository doesn't exist, it will be created.\n" | 1133 " repository doesn't exist, it will be created.\n" |
634 "\n" | 1134 "\n" |
635 " By default, all sources except Mercurial will use\n" | 1135 " By default, all sources except Mercurial will use --branchsort.\n" |
636 " --branchsort. Mercurial uses --sourcesort to preserve original\n" | 1136 " Mercurial uses --sourcesort to preserve original revision numbers\n" |
637 " revision numbers order. Sort modes have the following effects:\n" | 1137 " order. Sort modes have the following effects:\n" |
638 " --branchsort: convert from parent to child revision when\n" | 1138 "\n" |
639 " possible, which means branches are usually converted one after\n" | 1139 " --branchsort convert from parent to child revision when possible,\n" |
640 " the other. It generates more compact repositories.\n" | 1140 " which means branches are usually converted one after\n" |
641 " --datesort: sort revisions by date. Converted repositories have\n" | 1141 " the other. It generates more compact repositories.\n" |
642 " good-looking changelogs but are often an order of magnitude\n" | 1142 "\n" |
643 " larger than the same ones generated by --branchsort.\n" | 1143 " --datesort sort revisions by date. Converted repositories have\n" |
644 " --sourcesort: try to preserve source revisions order, only\n" | 1144 " good-looking changelogs but are often an order of\n" |
645 " supported by Mercurial sources.\n" | 1145 " magnitude larger than the same ones generated by\n" |
1146 " --branchsort.\n" | |
1147 "\n" | |
1148 " --sourcesort try to preserve source revisions order, only\n" | |
1149 " supported by Mercurial sources.\n" | |
646 "\n" | 1150 "\n" |
647 " If <REVMAP> isn't given, it will be put in a default location\n" | 1151 " If <REVMAP> isn't given, it will be put in a default location\n" |
648 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" | 1152 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" |
649 " that maps each source commit ID to the destination ID for that\n" | 1153 " that maps each source commit ID to the destination ID for that\n" |
650 " revision, like so:\n" | 1154 " revision, like so::\n" |
651 " <source ID> <destination ID>\n" | 1155 "\n" |
1156 " <source ID> <destination ID>\n" | |
652 "\n" | 1157 "\n" |
653 " If the file doesn't exist, it's automatically created. It's\n" | 1158 " If the file doesn't exist, it's automatically created. It's\n" |
654 " updated on each commit copied, so convert-repo can be interrupted\n" | 1159 " updated on each commit copied, so convert-repo can be interrupted\n" |
655 " and can be run repeatedly to copy new commits.\n" | 1160 " and can be run repeatedly to copy new commits.\n" |
656 "\n" | 1161 "\n" |
660 " CVS). One line per author mapping and the line format is:\n" | 1165 " CVS). One line per author mapping and the line format is:\n" |
661 " srcauthor=whatever string you want\n" | 1166 " srcauthor=whatever string you want\n" |
662 "\n" | 1167 "\n" |
663 " The filemap is a file that allows filtering and remapping of files\n" | 1168 " The filemap is a file that allows filtering and remapping of files\n" |
664 " and directories. Comment lines start with '#'. Each line can\n" | 1169 " and directories. Comment lines start with '#'. Each line can\n" |
665 " contain one of the following directives:\n" | 1170 " contain one of the following directives::\n" |
666 "\n" | 1171 "\n" |
667 " include path/to/file\n" | 1172 " include path/to/file\n" |
668 "\n" | 1173 "\n" |
669 " exclude path/to/file\n" | 1174 " exclude path/to/file\n" |
670 "\n" | 1175 "\n" |
671 " rename from/file to/file\n" | 1176 " rename from/file to/file\n" |
672 "\n" | 1177 "\n" |
673 " The 'include' directive causes a file, or all files under a\n" | 1178 " The 'include' directive causes a file, or all files under a\n" |
674 " directory, to be included in the destination repository, and the\n" | 1179 " directory, to be included in the destination repository, and the\n" |
675 " exclusion of all other files and directories not explicitly included.\n" | 1180 " exclusion of all other files and directories not explicitly\n" |
676 " The 'exclude' directive causes files or directories to be omitted.\n" | 1181 " included. The 'exclude' directive causes files or directories to\n" |
677 " The 'rename' directive renames a file or directory. To rename from\n" | 1182 " be omitted. The 'rename' directive renames a file or directory. To\n" |
678 " a subdirectory into the root of the repository, use '.' as the\n" | 1183 " rename from a subdirectory into the root of the repository, use\n" |
679 " path to rename to.\n" | 1184 " '.' as the path to rename to.\n" |
680 "\n" | 1185 "\n" |
681 " The splicemap is a file that allows insertion of synthetic\n" | 1186 " The splicemap is a file that allows insertion of synthetic\n" |
682 " history, letting you specify the parents of a revision. This is\n" | 1187 " history, letting you specify the parents of a revision. This is\n" |
683 " useful if you want to e.g. give a Subversion merge two parents, or\n" | 1188 " useful if you want to e.g. give a Subversion merge two parents, or\n" |
684 " graft two disconnected series of history together. Each entry\n" | 1189 " graft two disconnected series of history together. Each entry\n" |
699 " repository, and \"new_branch_name\" is the name of the branch is the\n" | 1204 " repository, and \"new_branch_name\" is the name of the branch is the\n" |
700 " destination repository. This can be used to (for instance) move code\n" | 1205 " destination repository. This can be used to (for instance) move code\n" |
701 " in one repository from \"default\" to a named branch.\n" | 1206 " in one repository from \"default\" to a named branch.\n" |
702 "\n" | 1207 "\n" |
703 " Mercurial Source\n" | 1208 " Mercurial Source\n" |
704 " -----------------\n" | 1209 " ----------------\n" |
705 "\n" | 1210 "\n" |
706 " --config convert.hg.ignoreerrors=False (boolean)\n" | 1211 " --config convert.hg.ignoreerrors=False (boolean)\n" |
707 " ignore integrity errors when reading. Use it to fix Mercurial\n" | 1212 " ignore integrity errors when reading. Use it to fix Mercurial\n" |
708 " repositories with missing revlogs, by converting from and to\n" | 1213 " repositories with missing revlogs, by converting from and to\n" |
709 " Mercurial.\n" | 1214 " Mercurial.\n" |
724 " commands to find files to convert. This means that unless a\n" | 1229 " commands to find files to convert. This means that unless a\n" |
725 " filemap is given, all files under the starting directory will be\n" | 1230 " filemap is given, all files under the starting directory will be\n" |
726 " converted, and that any directory reorganization in the CVS\n" | 1231 " converted, and that any directory reorganization in the CVS\n" |
727 " sandbox is ignored.\n" | 1232 " sandbox is ignored.\n" |
728 "\n" | 1233 "\n" |
729 " Because CVS does not have changesets, it is necessary to collect\n" | |
730 " individual commits to CVS and merge them into changesets. CVS\n" | |
731 " source uses its internal changeset merging code by default but can\n" | |
732 " be configured to call the external 'cvsps' program by setting:\n" | |
733 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" | |
734 " This option is deprecated and will be removed in Mercurial 1.4.\n" | |
735 "\n" | |
736 " The options shown are the defaults.\n" | 1234 " The options shown are the defaults.\n" |
737 "\n" | 1235 "\n" |
738 " Internal cvsps is selected by setting\n" | 1236 " --config convert.cvsps.cache=True (boolean)\n" |
739 " --config convert.cvsps=builtin\n" | 1237 " Set to False to disable remote log caching, for testing and\n" |
740 " and has a few more configurable options:\n" | 1238 " debugging purposes.\n" |
741 " --config convert.cvsps.cache=True (boolean)\n" | 1239 " --config convert.cvsps.fuzz=60 (integer)\n" |
742 " Set to False to disable remote log caching, for testing and\n" | 1240 " Specify the maximum time (in seconds) that is allowed between\n" |
743 " debugging purposes.\n" | 1241 " commits with identical user and log message in a single\n" |
744 " --config convert.cvsps.fuzz=60 (integer)\n" | 1242 " changeset. When very large files were checked in as part of a\n" |
745 " Specify the maximum time (in seconds) that is allowed\n" | 1243 " changeset then the default may not be long enough.\n" |
746 " between commits with identical user and log message in a\n" | 1244 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" |
747 " single changeset. When very large files were checked in as\n" | 1245 " Specify a regular expression to which commit log messages are\n" |
748 " part of a changeset then the default may not be long\n" | 1246 " matched. If a match occurs, then the conversion process will\n" |
749 " enough.\n" | 1247 " insert a dummy revision merging the branch on which this log\n" |
750 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" | 1248 " message occurs to the branch indicated in the regex.\n" |
751 " Specify a regular expression to which commit log messages\n" | 1249 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" |
752 " are matched. If a match occurs, then the conversion\n" | 1250 " Specify a regular expression to which commit log messages are\n" |
753 " process will insert a dummy revision merging the branch on\n" | 1251 " matched. If a match occurs, then the conversion process will\n" |
754 " which this log message occurs to the branch indicated in\n" | 1252 " add the most recent revision on the branch indicated in the\n" |
755 " the regex.\n" | 1253 " regex as the second parent of the changeset.\n" |
756 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" | 1254 "\n" |
757 " Specify a regular expression to which commit log messages\n" | 1255 " An additional \"debugcvsps\" Mercurial command allows the builtin\n" |
758 " are matched. If a match occurs, then the conversion\n" | |
759 " process will add the most recent revision on the branch\n" | |
760 " indicated in the regex as the second parent of the\n" | |
761 " changeset.\n" | |
762 "\n" | |
763 " The hgext/convert/cvsps wrapper script allows the builtin\n" | |
764 " changeset merging code to be run without doing a conversion. Its\n" | 1256 " changeset merging code to be run without doing a conversion. Its\n" |
765 " parameters and output are similar to that of cvsps 2.1.\n" | 1257 " parameters and output are similar to that of cvsps 2.1. Please see\n" |
1258 " the command help for more details.\n" | |
766 "\n" | 1259 "\n" |
767 " Subversion Source\n" | 1260 " Subversion Source\n" |
768 " -----------------\n" | 1261 " -----------------\n" |
769 "\n" | 1262 "\n" |
770 " Subversion source detects classical trunk/branches/tags layouts.\n" | 1263 " Subversion source detects classical trunk/branches/tags layouts.\n" |
806 " converted by specifying an initial Perforce revision.\n" | 1299 " converted by specifying an initial Perforce revision.\n" |
807 "\n" | 1300 "\n" |
808 " --config convert.p4.startrev=0 (perforce changelist number)\n" | 1301 " --config convert.p4.startrev=0 (perforce changelist number)\n" |
809 " specify initial Perforce revision.\n" | 1302 " specify initial Perforce revision.\n" |
810 "\n" | 1303 "\n" |
811 "\n" | |
812 " Mercurial Destination\n" | 1304 " Mercurial Destination\n" |
813 " ---------------------\n" | 1305 " ---------------------\n" |
814 "\n" | 1306 "\n" |
815 " --config convert.hg.clonebranches=False (boolean)\n" | 1307 " --config convert.hg.clonebranches=False (boolean)\n" |
816 " dispatch source branches in separate clones.\n" | 1308 " dispatch source branches in separate clones.\n" |
924 #, python-format | 1416 #, python-format |
925 msgid "cannot find required \"%s\" tool" | 1417 msgid "cannot find required \"%s\" tool" |
926 msgstr "" | 1418 msgstr "" |
927 | 1419 |
928 #, python-format | 1420 #, python-format |
929 msgid "running: %s\n" | |
930 msgstr "" | |
931 | |
932 #, python-format | |
933 msgid "%s error:\n" | 1421 msgid "%s error:\n" |
934 msgstr "" | 1422 msgstr "" |
935 | 1423 |
936 #, python-format | 1424 #, python-format |
937 msgid "syntax error in %s(%d): key/value pair expected" | 1425 msgid "syntax error in %s(%d): key/value pair expected" |
1005 msgstr "" | 1493 msgstr "" |
1006 | 1494 |
1007 msgid "--sourcesort is not supported by this data source" | 1495 msgid "--sourcesort is not supported by this data source" |
1008 msgstr "" | 1496 msgstr "" |
1009 | 1497 |
1010 msgid "" | 1498 #, fuzzy, python-format |
1011 "warning: support for external cvsps is deprecated and will be removed in " | 1499 msgid "revision %s is not a patchset number" |
1012 "Mercurial 1.4\n" | 1500 msgstr "la révision %d n'est pas parente de la pile" |
1013 msgstr "" | |
1014 | |
1015 #, python-format | |
1016 msgid "revision %s is not a patchset number or date" | |
1017 msgstr "" | |
1018 | |
1019 msgid "using builtin cvsps\n" | |
1020 msgstr "" | |
1021 | 1501 |
1022 #, python-format | 1502 #, python-format |
1023 msgid "connecting to %s\n" | 1503 msgid "connecting to %s\n" |
1024 msgstr "" | 1504 msgstr "" |
1025 | 1505 |
1060 | 1540 |
1061 #, python-format | 1541 #, python-format |
1062 msgid "running %s\n" | 1542 msgid "running %s\n" |
1063 msgstr "" | 1543 msgstr "" |
1064 | 1544 |
1065 #, python-format | |
1066 msgid "prefix=%r directory=%r root=%r\n" | |
1067 msgstr "" | |
1068 | |
1069 msgid "RCS file must be followed by working file" | 1545 msgid "RCS file must be followed by working file" |
1070 msgstr "" | 1546 msgstr "" |
1071 | 1547 |
1072 msgid "must have at least some revisions" | 1548 msgid "must have at least some revisions" |
1073 msgstr "" | 1549 msgstr "" |
1074 | 1550 |
1075 msgid "expected revision number" | 1551 msgid "expected revision number" |
1076 msgstr "" | 1552 msgstr "" |
1077 | 1553 |
1078 msgid "revision must be followed by date line" | 1554 msgid "revision must be followed by date line" |
1079 msgstr "" | |
1080 | |
1081 #, python-format | |
1082 msgid "found synthetic revision in %s: %r\n" | |
1083 msgstr "" | 1555 msgstr "" |
1084 | 1556 |
1085 #, python-format | 1557 #, python-format |
1086 msgid "writing cvs log cache %s\n" | 1558 msgid "writing cvs log cache %s\n" |
1087 msgstr "" | 1559 msgstr "" |
1104 | 1576 |
1105 #, python-format | 1577 #, python-format |
1106 msgid "%d changeset entries\n" | 1578 msgid "%d changeset entries\n" |
1107 msgstr "" | 1579 msgstr "" |
1108 | 1580 |
1581 #, python-format | |
1582 msgid "darcs version 2.1 or newer needed (found %r)" | |
1583 msgstr "" | |
1584 | |
1109 msgid "Python ElementTree module is not available" | 1585 msgid "Python ElementTree module is not available" |
1110 msgstr "" | 1586 msgstr "" |
1111 | 1587 |
1112 #, python-format | |
1113 msgid "cleaning up %s\n" | |
1114 msgstr "" | |
1115 | |
1116 msgid "internal calling inconsistency" | 1588 msgid "internal calling inconsistency" |
1117 msgstr "" | 1589 msgstr "" |
1118 | 1590 |
1119 msgid "errors in filemap" | 1591 msgid "errors in filemap" |
1120 msgstr "" | 1592 msgstr "" |
1145 msgid "" | 1617 msgid "" |
1146 "tree analysis stopped because it points to an unregistered archive %s...\n" | 1618 "tree analysis stopped because it points to an unregistered archive %s...\n" |
1147 msgstr "" | 1619 msgstr "" |
1148 | 1620 |
1149 #, python-format | 1621 #, python-format |
1150 msgid "applying revision %s...\n" | |
1151 msgstr "" | |
1152 | |
1153 #, python-format | |
1154 msgid "computing changeset between %s and %s...\n" | |
1155 msgstr "" | |
1156 | |
1157 #, python-format | |
1158 msgid "obtaining revision %s...\n" | |
1159 msgstr "" | |
1160 | |
1161 #, python-format | |
1162 msgid "analyzing revision %s...\n" | |
1163 msgstr "" | |
1164 | |
1165 #, python-format | |
1166 msgid "could not parse cat-log of %s" | 1622 msgid "could not parse cat-log of %s" |
1167 msgstr "" | 1623 msgstr "" |
1168 | 1624 |
1169 #, python-format | 1625 #, python-format |
1170 msgid "%s is not a local Mercurial repo" | 1626 msgid "%s is not a local Mercurial repo" |
1172 | 1628 |
1173 #, python-format | 1629 #, python-format |
1174 msgid "initializing destination %s repository\n" | 1630 msgid "initializing destination %s repository\n" |
1175 msgstr "" | 1631 msgstr "" |
1176 | 1632 |
1177 msgid "run hg sink pre-conversion action\n" | |
1178 msgstr "" | |
1179 | |
1180 msgid "run hg sink post-conversion action\n" | |
1181 msgstr "" | |
1182 | |
1183 #, python-format | 1633 #, python-format |
1184 msgid "pulling from %s into %s\n" | 1634 msgid "pulling from %s into %s\n" |
1185 msgstr "" | 1635 msgstr "" |
1186 | 1636 |
1187 msgid "filtering out empty revision\n" | 1637 msgid "filtering out empty revision\n" |
1196 | 1646 |
1197 #, python-format | 1647 #, python-format |
1198 msgid "ignoring: %s\n" | 1648 msgid "ignoring: %s\n" |
1199 msgstr "" | 1649 msgstr "" |
1200 | 1650 |
1201 msgid "run hg source pre-conversion action\n" | |
1202 msgstr "" | |
1203 | |
1204 msgid "run hg source post-conversion action\n" | |
1205 msgstr "" | |
1206 | |
1207 #, python-format | 1651 #, python-format |
1208 msgid "%s does not look like a monotone repo" | 1652 msgid "%s does not look like a monotone repo" |
1209 msgstr "" | 1653 msgstr "" |
1210 | 1654 |
1211 #, python-format | 1655 #, python-format |
1216 msgstr "" | 1660 msgstr "" |
1217 | 1661 |
1218 msgid "collecting p4 changelists\n" | 1662 msgid "collecting p4 changelists\n" |
1219 msgstr "" | 1663 msgstr "" |
1220 | 1664 |
1665 msgid "Mercurial failed to run itself, check hg executable is in PATH" | |
1666 msgstr "" | |
1667 | |
1221 msgid "Subversion python bindings could not be loaded" | 1668 msgid "Subversion python bindings could not be loaded" |
1222 msgstr "" | 1669 msgstr "" |
1223 | 1670 |
1224 #, python-format | 1671 #, python-format |
1225 msgid "Subversion python bindings %d.%d found, 1.4 or later required" | 1672 msgid "Subversion python bindings %d.%d found, 1.4 or later required" |
1266 #, python-format | 1713 #, python-format |
1267 msgid "no tags found at revision %d\n" | 1714 msgid "no tags found at revision %d\n" |
1268 msgstr "" | 1715 msgstr "" |
1269 | 1716 |
1270 #, python-format | 1717 #, python-format |
1271 msgid "ignoring foreign branch %r\n" | |
1272 msgstr "" | |
1273 | |
1274 #, python-format | |
1275 msgid "%s not found up to revision %d" | 1718 msgid "%s not found up to revision %d" |
1276 msgstr "" | 1719 msgstr "" |
1277 | 1720 |
1278 #, python-format | 1721 #, python-format |
1279 msgid "branch renamed from %s to %s at %d\n" | |
1280 msgstr "" | |
1281 | |
1282 #, python-format | |
1283 msgid "reparent to %s\n" | |
1284 msgstr "" | |
1285 | |
1286 #, python-format | |
1287 msgid "copied to %s from %s@%s\n" | |
1288 msgstr "" | |
1289 | |
1290 #, python-format | |
1291 msgid "gone from %s\n" | |
1292 msgstr "" | |
1293 | |
1294 #, python-format | |
1295 msgid "entry %s\n" | |
1296 msgstr "" | |
1297 | |
1298 #, python-format | |
1299 msgid "unknown path in revision %d: %s\n" | |
1300 msgstr "" | |
1301 | |
1302 #, python-format | |
1303 msgid "mark %s came from %s:%d\n" | |
1304 msgstr "" | |
1305 | |
1306 #, python-format | |
1307 msgid "parsing revision %d (%d changes)\n" | |
1308 msgstr "" | |
1309 | |
1310 #, python-format | |
1311 msgid "found parent of branch %s at %d: %s\n" | 1722 msgid "found parent of branch %s at %d: %s\n" |
1312 msgstr "" | 1723 msgstr "" |
1313 | 1724 |
1314 msgid "no copyfrom path, don't know what to do.\n" | |
1315 msgstr "" | |
1316 | |
1317 #, python-format | 1725 #, python-format |
1318 msgid "fetching revision log for \"%s\" from %d to %d\n" | 1726 msgid "fetching revision log for \"%s\" from %d to %d\n" |
1319 msgstr "" | 1727 msgstr "" |
1320 | 1728 |
1321 #, python-format | 1729 #, python-format |
1322 msgid "revision %d has no entries\n" | |
1323 msgstr "" | |
1324 | |
1325 #, python-format | |
1326 msgid "svn: branch has no revision %s" | 1730 msgid "svn: branch has no revision %s" |
1327 msgstr "" | 1731 msgstr "" |
1328 | 1732 |
1329 #, python-format | 1733 #, python-format |
1330 msgid "%r is not under %r, ignoring\n" | |
1331 msgstr "" | |
1332 | |
1333 #, python-format | |
1334 msgid "initializing svn repo %r\n" | 1734 msgid "initializing svn repo %r\n" |
1335 msgstr "" | 1735 msgstr "" |
1336 | 1736 |
1337 #, python-format | 1737 #, python-format |
1338 msgid "initializing svn wc %r\n" | 1738 msgid "initializing svn wc %r\n" |
1348 msgstr "" | 1748 msgstr "" |
1349 | 1749 |
1350 msgid "" | 1750 msgid "" |
1351 "command to allow external programs to compare revisions\n" | 1751 "command to allow external programs to compare revisions\n" |
1352 "\n" | 1752 "\n" |
1353 "The `extdiff' Mercurial extension allows you to use external programs\n" | 1753 "The extdiff Mercurial extension allows you to use external programs\n" |
1354 "to compare revisions, or revision with working directory. The external diff\n" | 1754 "to compare revisions, or revision with working directory. The external\n" |
1355 "programs are called with a configurable set of options and two\n" | 1755 "diff programs are called with a configurable set of options and two\n" |
1356 "non-option arguments: paths to directories containing snapshots of\n" | 1756 "non-option arguments: paths to directories containing snapshots of\n" |
1357 "files to compare.\n" | 1757 "files to compare.\n" |
1358 "\n" | 1758 "\n" |
1359 "The `extdiff' extension also allows to configure new diff commands, so\n" | 1759 "The extdiff extension also allows to configure new diff commands, so\n" |
1360 "you do not need to type \"hg extdiff -p kdiff3\" always.\n" | 1760 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n" |
1361 "\n" | 1761 "\n" |
1362 " [extdiff]\n" | 1762 " [extdiff]\n" |
1363 " # add new command that runs GNU diff(1) in 'context diff' mode\n" | 1763 " # add new command that runs GNU diff(1) in 'context diff' mode\n" |
1364 " cdiff = gdiff -Nprc5\n" | 1764 " cdiff = gdiff -Nprc5\n" |
1365 " ## or the old way:\n" | 1765 " ## or the old way:\n" |
1371 "\n" | 1771 "\n" |
1372 " # add new command called meld, runs meld (no need to name twice)\n" | 1772 " # add new command called meld, runs meld (no need to name twice)\n" |
1373 " meld =\n" | 1773 " meld =\n" |
1374 "\n" | 1774 "\n" |
1375 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" | 1775 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
1376 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n" | 1776 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" |
1377 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " | 1777 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" |
1378 "in\n" | |
1379 " # your .vimrc\n" | 1778 " # your .vimrc\n" |
1380 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" | 1779 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" |
1381 "\n" | 1780 "\n" |
1382 "You can use -I/-X and list of file or directory names like normal \"hg\n" | 1781 "You can use -I/-X and list of file or directory names like normal \"hg\n" |
1383 "diff\" command. The `extdiff' extension makes snapshots of only needed\n" | 1782 "diff\" command. The extdiff extension makes snapshots of only needed\n" |
1384 "files, so running the external diff program will actually be pretty\n" | 1783 "files, so running the external diff program will actually be pretty\n" |
1385 "fast (at least faster than having to compare the entire tree).\n" | 1784 "fast (at least faster than having to compare the entire tree).\n" |
1386 msgstr "" | 1785 msgstr "" |
1387 | 1786 |
1388 #, python-format | 1787 #, python-format |
1392 #, python-format | 1791 #, python-format |
1393 msgid "making snapshot of %d files from working directory\n" | 1792 msgid "making snapshot of %d files from working directory\n" |
1394 msgstr "" | 1793 msgstr "" |
1395 | 1794 |
1396 msgid "cannot specify --rev and --change at the same time" | 1795 msgid "cannot specify --rev and --change at the same time" |
1397 msgstr "" | |
1398 | |
1399 #, python-format | |
1400 msgid "running %r in %s\n" | |
1401 msgstr "" | |
1402 | |
1403 #, python-format | |
1404 msgid "file changed while diffing. Overwriting: %s (src: %s)\n" | |
1405 msgstr "" | 1796 msgstr "" |
1406 | 1797 |
1407 msgid "cleaning up temp directory\n" | 1798 msgid "cleaning up temp directory\n" |
1408 msgstr "" | 1799 msgstr "" |
1409 | 1800 |
1437 | 1828 |
1438 msgid "hg extdiff [OPT]... [FILE]..." | 1829 msgid "hg extdiff [OPT]... [FILE]..." |
1439 msgstr "" | 1830 msgstr "" |
1440 | 1831 |
1441 #, python-format | 1832 #, python-format |
1833 msgid "" | |
1834 "use %(path)s to diff repository (or selected files)\n" | |
1835 "\n" | |
1836 " Show differences between revisions for the specified files, using the\n" | |
1837 " %(path)s program.\n" | |
1838 "\n" | |
1839 " When two revision arguments are given, then changes are shown between\n" | |
1840 " those revisions. If only one revision is specified then that revision " | |
1841 "is\n" | |
1842 " compared to the working directory, and, when no revisions are " | |
1843 "specified,\n" | |
1844 " the working directory files are compared to its parent." | |
1845 msgstr "" | |
1846 | |
1847 #, python-format | |
1442 msgid "hg %s [OPTION]... [FILE]..." | 1848 msgid "hg %s [OPTION]... [FILE]..." |
1443 msgstr "" | 1849 msgstr "" |
1444 | 1850 |
1445 msgid "pull, update and merge in one command" | 1851 msgid "pull, update and merge in one command" |
1446 msgstr "" | 1852 msgstr "" |
1504 #, python-format | 1910 #, python-format |
1505 msgid "merging with %d:%s\n" | 1911 msgid "merging with %d:%s\n" |
1506 msgstr "" | 1912 msgstr "" |
1507 | 1913 |
1508 #, python-format | 1914 #, python-format |
1509 msgid "Automated merge with %s" | |
1510 msgstr "" | |
1511 | |
1512 #, python-format | |
1513 msgid "new changeset %d:%s merges remote changes with local\n" | 1915 msgid "new changeset %d:%s merges remote changes with local\n" |
1514 msgstr "" | 1916 msgstr "" |
1515 | 1917 |
1516 msgid "a specific revision you would like to pull" | 1918 msgid "a specific revision you would like to pull" |
1517 msgstr "" | 1919 msgstr "" |
1577 msgstr "" | 1979 msgstr "" |
1578 | 1980 |
1579 msgid "" | 1981 msgid "" |
1580 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" | 1982 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" |
1581 "force)" | 1983 "force)" |
1582 msgstr "" | |
1583 | |
1584 #, python-format | |
1585 msgid "Added signature for changeset %s" | |
1586 msgstr "" | 1984 msgstr "" |
1587 | 1985 |
1588 msgid "unknown signature version" | 1986 msgid "unknown signature version" |
1589 msgstr "" | 1987 msgstr "" |
1590 | 1988 |
1658 msgstr "" | 2056 msgstr "" |
1659 | 2057 |
1660 msgid "" | 2058 msgid "" |
1661 "hooks for integrating with the CIA.vc notification service\n" | 2059 "hooks for integrating with the CIA.vc notification service\n" |
1662 "\n" | 2060 "\n" |
1663 "This is meant to be run as a changegroup or incoming hook.\n" | 2061 "This is meant to be run as a changegroup or incoming hook. To\n" |
1664 "To configure it, set the following options in your hgrc:\n" | 2062 "configure it, set the following options in your hgrc::\n" |
1665 "\n" | 2063 "\n" |
1666 "[cia]\n" | 2064 " [cia]\n" |
1667 "# your registered CIA user name\n" | 2065 " # your registered CIA user name\n" |
1668 "user = foo\n" | 2066 " user = foo\n" |
1669 "# the name of the project in CIA\n" | 2067 " # the name of the project in CIA\n" |
1670 "project = foo\n" | 2068 " project = foo\n" |
1671 "# the module (subproject) (optional)\n" | 2069 " # the module (subproject) (optional)\n" |
1672 "#module = foo\n" | 2070 " #module = foo\n" |
1673 "# Append a diffstat to the log message (optional)\n" | 2071 " # Append a diffstat to the log message (optional)\n" |
1674 "#diffstat = False\n" | 2072 " #diffstat = False\n" |
1675 "# Template to use for log messages (optional)\n" | 2073 " # Template to use for log messages (optional)\n" |
1676 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" | 2074 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" |
1677 "# Style to use (optional)\n" | 2075 " # Style to use (optional)\n" |
1678 "#style = foo\n" | 2076 " #style = foo\n" |
1679 "# The URL of the CIA notification service (optional)\n" | 2077 " # The URL of the CIA notification service (optional)\n" |
1680 "# You can use mailto: URLs to send by email, eg\n" | 2078 " # You can use mailto: URLs to send by email, eg\n" |
1681 "# mailto:cia@cia.vc\n" | 2079 " # mailto:cia@cia.vc\n" |
1682 "# Make sure to set email.from if you do this.\n" | 2080 " # Make sure to set email.from if you do this.\n" |
1683 "#url = http://cia.vc/\n" | 2081 " #url = http://cia.vc/\n" |
1684 "# print message instead of sending it (optional)\n" | 2082 " # print message instead of sending it (optional)\n" |
1685 "#test = False\n" | 2083 " #test = False\n" |
1686 "\n" | 2084 "\n" |
1687 "[hooks]\n" | 2085 " [hooks]\n" |
1688 "# one of these:\n" | 2086 " # one of these:\n" |
1689 "changegroup.cia = python:hgcia.hook\n" | 2087 " changegroup.cia = python:hgcia.hook\n" |
1690 "#incoming.cia = python:hgcia.hook\n" | 2088 " #incoming.cia = python:hgcia.hook\n" |
1691 "\n" | 2089 "\n" |
1692 "[web]\n" | 2090 " [web]\n" |
1693 "# If you want hyperlinks (optional)\n" | 2091 " # If you want hyperlinks (optional)\n" |
1694 "baseurl = http://server/path/to/repo\n" | 2092 " baseurl = http://server/path/to/repo\n" |
1695 msgstr "" | 2093 msgstr "" |
1696 | 2094 |
1697 #, python-format | 2095 #, python-format |
1698 msgid "hgcia: sending update to %s\n" | 2096 msgid "hgcia: sending update to %s\n" |
1699 msgstr "" | 2097 msgstr "" |
1700 | 2098 |
1701 msgid "email.from must be defined when sending by email" | 2099 msgid "email.from must be defined when sending by email" |
1702 msgstr "" | |
1703 | |
1704 msgid "cia: no user specified" | |
1705 msgstr "" | |
1706 | |
1707 msgid "cia: no project specified" | |
1708 msgstr "" | 2100 msgstr "" |
1709 | 2101 |
1710 msgid "" | 2102 msgid "" |
1711 "browse the repository in a graphical way\n" | 2103 "browse the repository in a graphical way\n" |
1712 "\n" | 2104 "\n" |
1720 "the contrib directory, and the extension is shipped in the hgext\n" | 2112 "the contrib directory, and the extension is shipped in the hgext\n" |
1721 "repository, and needs to be enabled.\n" | 2113 "repository, and needs to be enabled.\n" |
1722 "\n" | 2114 "\n" |
1723 "The hg view command will launch the hgk Tcl script. For this command\n" | 2115 "The hg view command will launch the hgk Tcl script. For this command\n" |
1724 "to work, hgk must be in your search path. Alternately, you can specify\n" | 2116 "to work, hgk must be in your search path. Alternately, you can specify\n" |
1725 "the path to hgk in your .hgrc file:\n" | 2117 "the path to hgk in your .hgrc file::\n" |
1726 "\n" | 2118 "\n" |
1727 " [hgk]\n" | 2119 " [hgk]\n" |
1728 " path=/location/of/hgk\n" | 2120 " path=/location/of/hgk\n" |
1729 "\n" | 2121 "\n" |
1730 "hgk can make use of the extdiff extension to visualize revisions.\n" | 2122 "hgk can make use of the extdiff extension to visualize revisions.\n" |
1731 "Assuming you had already configured extdiff vdiff command, just add:\n" | 2123 "Assuming you had already configured extdiff vdiff command, just add::\n" |
1732 "\n" | 2124 "\n" |
1733 " [hgk]\n" | 2125 " [hgk]\n" |
1734 " vdiff=vdiff\n" | 2126 " vdiff=vdiff\n" |
1735 "\n" | 2127 "\n" |
1736 "Revisions context menu will now display additional entries to fire\n" | 2128 "Revisions context menu will now display additional entries to fire\n" |
1737 "vdiff on hovered and selected revisions." | 2129 "vdiff on hovered and selected revisions.\n" |
1738 msgstr "" | 2130 msgstr "" |
1739 | 2131 |
1740 msgid "diff trees from two commits" | 2132 msgid "diff trees from two commits" |
1741 msgstr "" | 2133 msgstr "" |
1742 | 2134 |
1822 "syntax highlighting for hgweb (requires Pygments)\n" | 2214 "syntax highlighting for hgweb (requires Pygments)\n" |
1823 "\n" | 2215 "\n" |
1824 "It depends on the Pygments syntax highlighting library:\n" | 2216 "It depends on the Pygments syntax highlighting library:\n" |
1825 "http://pygments.org/\n" | 2217 "http://pygments.org/\n" |
1826 "\n" | 2218 "\n" |
1827 "There is a single configuration option:\n" | 2219 "There is a single configuration option::\n" |
1828 "\n" | 2220 "\n" |
1829 "[web]\n" | 2221 " [web]\n" |
1830 "pygments_style = <style>\n" | 2222 " pygments_style = <style>\n" |
1831 "\n" | 2223 "\n" |
1832 "The default is 'colorful'.\n" | 2224 "The default is 'colorful'.\n" |
1833 msgstr "" | 2225 msgstr "" |
1834 | 2226 |
1835 msgid "accelerate status report using Linux's inotify service" | 2227 msgid "accelerate status report using Linux's inotify service" |
1864 msgstr "hg inserve [OPTION]..." | 2256 msgstr "hg inserve [OPTION]..." |
1865 | 2257 |
1866 msgid "(found dead inotify server socket; removing it)\n" | 2258 msgid "(found dead inotify server socket; removing it)\n" |
1867 msgstr "" | 2259 msgstr "" |
1868 | 2260 |
1869 msgid "(starting inotify server)\n" | |
1870 msgstr "" | |
1871 | |
1872 #, python-format | 2261 #, python-format |
1873 msgid "could not start inotify server: %s\n" | 2262 msgid "could not start inotify server: %s\n" |
1874 msgstr "" | 2263 msgstr "" |
1875 | 2264 |
1876 #, python-format | 2265 #, python-format |
1877 msgid "could not talk to new inotify server: %s\n" | 2266 msgid "could not talk to new inotify server: %s\n" |
1878 msgstr "" | 2267 msgstr "" |
1879 | 2268 |
1880 msgid "(inotify server not running)\n" | |
1881 msgstr "" | |
1882 | |
1883 #, python-format | 2269 #, python-format |
1884 msgid "failed to contact inotify server: %s\n" | 2270 msgid "failed to contact inotify server: %s\n" |
1885 msgstr "" | 2271 msgstr "" |
1886 | 2272 |
1887 msgid "received empty answer from inotify server" | 2273 msgid "received empty answer from inotify server" |
1935 #, python-format | 2321 #, python-format |
1936 msgid "watching directories under %r\n" | 2322 msgid "watching directories under %r\n" |
1937 msgstr "" | 2323 msgstr "" |
1938 | 2324 |
1939 #, python-format | 2325 #, python-format |
1940 msgid "status: %r dir(%d) -> %s\n" | |
1941 msgstr "" | |
1942 | |
1943 #, python-format | |
1944 msgid "status: %r %s -> %s\n" | 2326 msgid "status: %r %s -> %s\n" |
1945 msgstr "" | 2327 msgstr "" |
1946 | 2328 |
1947 #, python-format | 2329 #, python-format |
1948 msgid "%s dirstate reload\n" | 2330 msgid "%s dirstate reload\n" |
2007 msgstr "" | 2389 msgstr "" |
2008 | 2390 |
2009 msgid "" | 2391 msgid "" |
2010 "expand expressions into changelog and summaries\n" | 2392 "expand expressions into changelog and summaries\n" |
2011 "\n" | 2393 "\n" |
2012 "This extension allows the use of a special syntax in summaries,\n" | 2394 "This extension allows the use of a special syntax in summaries, which\n" |
2013 "which will be automatically expanded into links or any other\n" | 2395 "will be automatically expanded into links or any other arbitrary\n" |
2014 "arbitrary expression, much like InterWiki does.\n" | 2396 "expression, much like InterWiki does.\n" |
2015 "\n" | 2397 "\n" |
2016 "A few example patterns (link to bug tracking, etc.) that may\n" | 2398 "A few example patterns (link to bug tracking, etc.) that may be used\n" |
2017 "be used in your hgrc:\n" | 2399 "in your hgrc::\n" |
2018 "\n" | 2400 "\n" |
2019 " [interhg]\n" | 2401 " [interhg]\n" |
2020 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" | 2402 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" |
2021 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" | 2403 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" |
2022 "i\n" | 2404 "i\n" |
2042 "current user or for archive distribution.\n" | 2424 "current user or for archive distribution.\n" |
2043 "\n" | 2425 "\n" |
2044 "Configuration is done in the [keyword] and [keywordmaps] sections of\n" | 2426 "Configuration is done in the [keyword] and [keywordmaps] sections of\n" |
2045 "hgrc files.\n" | 2427 "hgrc files.\n" |
2046 "\n" | 2428 "\n" |
2047 "Example:\n" | 2429 "Example::\n" |
2048 "\n" | 2430 "\n" |
2049 " [keyword]\n" | 2431 " [keyword]\n" |
2050 " # expand keywords in every python file except those matching \"x*\"\n" | 2432 " # expand keywords in every python file except those matching \"x*\"\n" |
2051 " **.py =\n" | 2433 " **.py =\n" |
2052 " x* = ignore\n" | 2434 " x* = ignore\n" |
2053 "\n" | 2435 "\n" |
2054 "Note: the more specific you are in your filename patterns\n" | 2436 "NOTE: the more specific you are in your filename patterns the less you\n" |
2055 " the less you lose speed in huge repositories.\n" | 2437 "lose speed in huge repositories.\n" |
2056 "\n" | 2438 "\n" |
2057 "For [keywordmaps] template mapping and expansion demonstration and\n" | 2439 "For [keywordmaps] template mapping and expansion demonstration and\n" |
2058 "control run \"hg kwdemo\".\n" | 2440 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" |
2059 "\n" | 2441 "available templates and filters.\n" |
2060 "An additional date template filter {date|utcdate} is provided.\n" | 2442 "\n" |
2443 "An additional date template filter {date|utcdate} is provided. It\n" | |
2444 "returns a date like \"2006/09/18 15:13:13\".\n" | |
2061 "\n" | 2445 "\n" |
2062 "The default template mappings (view with \"hg kwdemo -d\") can be\n" | 2446 "The default template mappings (view with \"hg kwdemo -d\") can be\n" |
2063 "replaced with customized keywords and templates. Again, run \"hg\n" | 2447 "replaced with customized keywords and templates. Again, run \"hg\n" |
2064 "kwdemo\" to control the results of your config changes.\n" | 2448 "kwdemo\" to control the results of your config changes.\n" |
2065 "\n" | 2449 "\n" |
2074 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" | 2458 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" |
2075 "the files in question to update keyword expansions after all changes\n" | 2459 "the files in question to update keyword expansions after all changes\n" |
2076 "have been checked in.\n" | 2460 "have been checked in.\n" |
2077 "\n" | 2461 "\n" |
2078 "Expansions spanning more than one line and incremental expansions,\n" | 2462 "Expansions spanning more than one line and incremental expansions,\n" |
2079 "like CVS' $Log$, are not supported. A keyword template map\n" | 2463 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" |
2080 "\"Log = {desc}\" expands to the first line of the changeset description.\n" | 2464 "{desc}\" expands to the first line of the changeset description.\n" |
2081 msgstr "" | 2465 msgstr "" |
2082 | 2466 |
2083 #, python-format | 2467 #, python-format |
2084 msgid "overwriting %s expanding keywords\n" | 2468 msgid "overwriting %s expanding keywords\n" |
2085 msgstr "" | 2469 msgstr "" |
2098 "print [keywordmaps] configuration and an expansion example\n" | 2482 "print [keywordmaps] configuration and an expansion example\n" |
2099 "\n" | 2483 "\n" |
2100 " Show current, custom, or default keyword template maps and their\n" | 2484 " Show current, custom, or default keyword template maps and their\n" |
2101 " expansions.\n" | 2485 " expansions.\n" |
2102 "\n" | 2486 "\n" |
2103 " Extend current configuration by specifying maps as arguments and\n" | 2487 " Extend the current configuration by specifying maps as arguments\n" |
2104 " optionally by reading from an additional hgrc file.\n" | 2488 " and using -f/--rcfile to source an external hgrc file.\n" |
2105 "\n" | 2489 "\n" |
2106 " Override current keyword template maps with \"default\" option.\n" | 2490 " Use -d/--default to disable current configuration.\n" |
2491 "\n" | |
2492 " See \"hg help templates\" for information on templates and filters.\n" | |
2107 " " | 2493 " " |
2108 msgstr "" | 2494 msgstr "" |
2109 | 2495 |
2110 #, python-format | 2496 #, python-format |
2111 msgid "creating temporary repository at %s\n" | 2497 msgid "creating temporary repository at %s\n" |
2112 msgstr "" | 2498 msgstr "" |
2113 | 2499 |
2114 #, python-format | 2500 msgid "" |
2115 msgid "" | 2501 "\n" |
2116 "\n" | 2502 "\tconfiguration using custom keyword template maps\n" |
2117 "\tconfig using %s keyword template maps\n" | 2503 msgstr "" |
2118 msgstr "" | 2504 |
2119 | 2505 msgid "\textending current template maps\n" |
2120 #, python-format | 2506 msgstr "" |
2121 msgid "" | 2507 |
2122 "\n" | 2508 msgid "\toverriding default template maps\n" |
2123 "%s keywords written to %s:\n" | 2509 msgstr "" |
2510 | |
2511 msgid "" | |
2512 "\n" | |
2513 "\tconfiguration using default keyword template maps\n" | |
2514 msgstr "" | |
2515 | |
2516 msgid "\tdisabling current template maps\n" | |
2517 msgstr "" | |
2518 | |
2519 msgid "" | |
2520 "\n" | |
2521 "\tconfiguration using current keyword template maps\n" | |
2522 msgstr "" | |
2523 | |
2524 #, python-format | |
2525 msgid "" | |
2526 "\n" | |
2527 "keywords written to %s:\n" | |
2124 msgstr "" | 2528 msgstr "" |
2125 | 2529 |
2126 msgid "unhooked all commit hooks\n" | 2530 msgid "unhooked all commit hooks\n" |
2127 msgstr "" | 2531 msgstr "" |
2128 | 2532 |
2129 #, python-format | 2533 msgid "" |
2130 msgid "" | 2534 "\n" |
2131 "\n" | 2535 "\tkeywords expanded\n" |
2132 "\t%s keywords expanded%s\n" | |
2133 msgstr "" | |
2134 | |
2135 #, python-format | |
2136 msgid "" | |
2137 "\n" | |
2138 "removing temporary repository %s\n" | |
2139 msgstr "" | 2536 msgstr "" |
2140 | 2537 |
2141 msgid "" | 2538 msgid "" |
2142 "expand keywords in the working directory\n" | 2539 "expand keywords in the working directory\n" |
2143 "\n" | 2540 "\n" |
2152 "\n" | 2549 "\n" |
2153 " List which files in the working directory are matched by the\n" | 2550 " List which files in the working directory are matched by the\n" |
2154 " [keyword] configuration patterns.\n" | 2551 " [keyword] configuration patterns.\n" |
2155 "\n" | 2552 "\n" |
2156 " Useful to prevent inadvertent keyword expansion and to speed up\n" | 2553 " Useful to prevent inadvertent keyword expansion and to speed up\n" |
2157 " execution by including only files that are actual candidates\n" | 2554 " execution by including only files that are actual candidates for\n" |
2158 " for expansion.\n" | 2555 " expansion.\n" |
2159 "\n" | 2556 "\n" |
2160 " See \"hg help keyword\" on how to construct patterns both for\n" | 2557 " See \"hg help keyword\" on how to construct patterns both for\n" |
2161 " inclusion and exclusion of files.\n" | 2558 " inclusion and exclusion of files.\n" |
2162 "\n" | 2559 "\n" |
2163 " Use -u/--untracked to list untracked files as well.\n" | 2560 " With -A/--all and -v/--verbose the codes used to show the status\n" |
2164 "\n" | 2561 " of files are::\n" |
2165 " With -a/--all and -v/--verbose the codes used to show the status\n" | 2562 "\n" |
2166 " of files are:\n" | 2563 " K = keyword expansion candidate\n" |
2167 " K = keyword expansion candidate\n" | 2564 " k = keyword expansion candidate (not tracked)\n" |
2168 " k = keyword expansion candidate (untracked)\n" | 2565 " I = ignored\n" |
2169 " I = ignored\n" | 2566 " i = ignored (not tracked)\n" |
2170 " i = ignored (untracked)\n" | |
2171 " " | 2567 " " |
2172 msgstr "" | 2568 msgstr "" |
2173 | 2569 |
2174 msgid "" | 2570 msgid "" |
2175 "revert expanded keywords in the working directory\n" | 2571 "revert expanded keywords in the working directory\n" |
2197 msgstr "" | 2593 msgstr "" |
2198 | 2594 |
2199 msgid "show files excluded from expansion" | 2595 msgid "show files excluded from expansion" |
2200 msgstr "" | 2596 msgstr "" |
2201 | 2597 |
2202 msgid "additionally show untracked files" | 2598 msgid "only show unknown (not tracked) files" |
2599 msgstr "" | |
2600 | |
2601 msgid "show keyword status flags of all files (DEPRECATED)" | |
2602 msgstr "" | |
2603 | |
2604 msgid "only show untracked files (DEPRECATED)" | |
2203 msgstr "" | 2605 msgstr "" |
2204 | 2606 |
2205 msgid "hg kwfiles [OPTION]... [FILE]..." | 2607 msgid "hg kwfiles [OPTION]... [FILE]..." |
2206 msgstr "" | 2608 msgstr "" |
2207 | 2609 |
2208 msgid "hg kwshrink [OPTION]... [FILE]..." | 2610 msgid "hg kwshrink [OPTION]... [FILE]..." |
2209 msgstr "" | 2611 msgstr "" |
2210 | 2612 |
2613 #, fuzzy | |
2211 msgid "" | 2614 msgid "" |
2212 "manage a stack of patches\n" | 2615 "manage a stack of patches\n" |
2213 "\n" | 2616 "\n" |
2214 "This extension lets you work with a stack of patches in a Mercurial\n" | 2617 "This extension lets you work with a stack of patches in a Mercurial\n" |
2215 "repository. It manages two stacks of patches - all known patches, and\n" | 2618 "repository. It manages two stacks of patches - all known patches, and\n" |
2216 "applied patches (subset of known patches).\n" | 2619 "applied patches (subset of known patches).\n" |
2217 "\n" | 2620 "\n" |
2218 "Known patches are represented as patch files in the .hg/patches\n" | 2621 "Known patches are represented as patch files in the .hg/patches\n" |
2219 "directory. Applied patches are both patch files and changesets.\n" | 2622 "directory. Applied patches are both patch files and changesets.\n" |
2220 "\n" | 2623 "\n" |
2221 "Common tasks (use \"hg help command\" for more details):\n" | 2624 "Common tasks (use \"hg help command\" for more details)::\n" |
2222 "\n" | 2625 "\n" |
2223 "prepare repository to work with patches qinit\n" | 2626 " prepare repository to work with patches qinit\n" |
2224 "create new patch qnew\n" | 2627 " create new patch qnew\n" |
2225 "import existing patch qimport\n" | 2628 " import existing patch qimport\n" |
2226 "\n" | 2629 "\n" |
2227 "print patch series qseries\n" | 2630 " print patch series qseries\n" |
2228 "print applied patches qapplied\n" | 2631 " print applied patches qapplied\n" |
2229 "print name of top applied patch qtop\n" | 2632 "\n" |
2230 "\n" | 2633 " add known patch to applied stack qpush\n" |
2231 "add known patch to applied stack qpush\n" | 2634 " remove patch from applied stack qpop\n" |
2232 "remove patch from applied stack qpop\n" | 2635 " refresh contents of top applied patch qrefresh\n" |
2233 "refresh contents of top applied patch qrefresh\n" | |
2234 msgstr "" | 2636 msgstr "" |
2235 "gestion et utilisation d'une pile de patchs\n" | 2637 "gestion et utilisation d'une pile de patchs\n" |
2236 "\n" | 2638 "\n" |
2237 "Cette extension permet de travailler avec une pile de patchs au\n" | 2639 "Cette extension permet de travailler avec une pile de patchs au\n" |
2238 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n" | 2640 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n" |
2272 #, python-format | 2674 #, python-format |
2273 msgid "invalid character in guard %r: %r" | 2675 msgid "invalid character in guard %r: %r" |
2274 msgstr "" | 2676 msgstr "" |
2275 | 2677 |
2276 #, python-format | 2678 #, python-format |
2277 msgid "active guards: %s\n" | |
2278 msgstr "" | |
2279 | |
2280 #, python-format | |
2281 msgid "guard %r too short" | 2679 msgid "guard %r too short" |
2282 msgstr "" | 2680 msgstr "" |
2283 | 2681 |
2284 #, python-format | 2682 #, python-format |
2285 msgid "guard %r starts with invalid char" | 2683 msgid "guard %r starts with invalid char" |
2494 "le dépilement enlèverait une révision non gérée par cette pile de patchs" | 2892 "le dépilement enlèverait une révision non gérée par cette pile de patchs" |
2495 | 2893 |
2496 msgid "deletions found between repo revs" | 2894 msgid "deletions found between repo revs" |
2497 msgstr "suppressions trouvées entre des révisions du dépôt" | 2895 msgstr "suppressions trouvées entre des révisions du dépôt" |
2498 | 2896 |
2897 #, fuzzy, python-format | |
2898 msgid "popping %s\n" | |
2899 msgstr "application de %s\n" | |
2900 | |
2499 msgid "patch queue now empty\n" | 2901 msgid "patch queue now empty\n" |
2500 msgstr "la pile de patchs est maintenant vide\n" | 2902 msgstr "la pile de patchs est maintenant vide\n" |
2501 | 2903 |
2502 msgid "cannot refresh a revision with children" | 2904 msgid "cannot refresh a revision with children" |
2503 msgstr "impossible de rafraîchir une révision possédant des révisions filles" | 2905 msgstr "impossible de rafraîchir une révision possédant des révisions filles" |
2627 " qfinish." | 3029 " qfinish." |
2628 | 3030 |
2629 msgid "print the patches already applied" | 3031 msgid "print the patches already applied" |
2630 msgstr "affiche les patchs déjà appliqués" | 3032 msgstr "affiche les patchs déjà appliqués" |
2631 | 3033 |
3034 msgid "only one patch applied\n" | |
3035 msgstr "un seul patch d'appliqué\n" | |
3036 | |
2632 msgid "print the patches not yet applied" | 3037 msgid "print the patches not yet applied" |
2633 msgstr "affiche les patchs non encore appliqués" | 3038 msgstr "affiche les patchs non encore appliqués" |
3039 | |
3040 msgid "all patches applied\n" | |
3041 msgstr "tous les patchs ont été appliqués\n" | |
2634 | 3042 |
2635 msgid "" | 3043 msgid "" |
2636 "import a patch\n" | 3044 "import a patch\n" |
2637 "\n" | 3045 "\n" |
2638 " The patch is inserted into the series after the last applied\n" | 3046 " The patch is inserted into the series after the last applied\n" |
2757 msgstr "affiche le nom du dernier patch appliqué" | 3165 msgstr "affiche le nom du dernier patch appliqué" |
2758 | 3166 |
2759 msgid "print the name of the next patch" | 3167 msgid "print the name of the next patch" |
2760 msgstr "affiche le nom du prochain patch" | 3168 msgstr "affiche le nom du prochain patch" |
2761 | 3169 |
2762 msgid "all patches applied\n" | |
2763 msgstr "tous les patchs ont été appliqués\n" | |
2764 | |
2765 msgid "print the name of the previous patch" | 3170 msgid "print the name of the previous patch" |
2766 msgstr "affiche le nom du patch précédent" | 3171 msgstr "affiche le nom du patch précédent" |
2767 | |
2768 msgid "only one patch applied\n" | |
2769 msgstr "un seul patch d'appliqué\n" | |
2770 | 3172 |
2771 msgid "" | 3173 msgid "" |
2772 "create a new patch\n" | 3174 "create a new patch\n" |
2773 "\n" | 3175 "\n" |
2774 " qnew creates a new patch on top of the currently-applied patch (if\n" | 3176 " qnew creates a new patch on top of the currently-applied patch (if\n" |
3127 msgstr "impossible d'importer au-dessus d'un patch appliqué" | 3529 msgstr "impossible d'importer au-dessus d'un patch appliqué" |
3128 | 3530 |
3129 msgid "print first line of patch header" | 3531 msgid "print first line of patch header" |
3130 msgstr "affiche la première ligne de l'en-tête d'un patch" | 3532 msgstr "affiche la première ligne de l'en-tête d'un patch" |
3131 | 3533 |
3132 msgid "hg qapplied [-s] [PATCH]" | 3534 msgid "show only the last patch" |
3535 msgstr "" | |
3536 | |
3537 #, fuzzy | |
3538 msgid "hg qapplied [-1] [-s] [PATCH]" | |
3133 msgstr "hg qapplied [-s] [PATCH]" | 3539 msgstr "hg qapplied [-s] [PATCH]" |
3134 | 3540 |
3135 msgid "use pull protocol to copy metadata" | 3541 msgid "use pull protocol to copy metadata" |
3136 msgstr "" | 3542 msgstr "" |
3137 | 3543 |
3244 msgstr "dépiler tous les patchs" | 3650 msgstr "dépiler tous les patchs" |
3245 | 3651 |
3246 msgid "queue name to pop" | 3652 msgid "queue name to pop" |
3247 msgstr "nom de la pile à dépiler" | 3653 msgstr "nom de la pile à dépiler" |
3248 | 3654 |
3249 msgid "forget any local changes" | 3655 #, fuzzy |
3656 msgid "forget any local changes to patched files" | |
3250 msgstr "oublier toute modification locale" | 3657 msgstr "oublier toute modification locale" |
3251 | 3658 |
3252 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" | 3659 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" |
3253 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]" | 3660 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]" |
3254 | 3661 |
3273 msgid "refresh only files already in the patch and specified files" | 3680 msgid "refresh only files already in the patch and specified files" |
3274 msgstr "" | 3681 msgstr "" |
3275 "ne rafraîchir que les fichiers déjà présent dans le patch et ceux " | 3682 "ne rafraîchir que les fichiers déjà présent dans le patch et ceux " |
3276 "explicitement spécifiés" | 3683 "explicitement spécifiés" |
3277 | 3684 |
3278 msgid "add/update \"From: <current user>\" in patch" | 3685 msgid "add/update author field in patch with current user" |
3279 msgstr "ajouter/mettre à jour \"From: <utilisateur actuel>\" dans le patch" | 3686 msgstr "" |
3280 | 3687 |
3281 msgid "add/update \"From: <given user>\" in patch" | 3688 msgid "add/update author field in patch with given user" |
3282 msgstr "ajouter/mettre à jour \"From: <utilisateur spécifié>\" dans le patch" | 3689 msgstr "" |
3283 | 3690 |
3284 msgid "update \"Date: <current date>\" in patch (if present)" | 3691 #, fuzzy |
3285 msgstr "mettre à jour \"Date: <date actuelle>\" dans le patch (si présente)" | 3692 msgid "add/update date field in patch with current date" |
3286 | 3693 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)" |
3287 msgid "update \"Date: <given date>\" in patch (if present)" | 3694 |
3695 #, fuzzy | |
3696 msgid "add/update date field in patch with given date" | |
3288 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)" | 3697 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)" |
3289 | 3698 |
3290 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." | 3699 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." |
3291 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..." | 3700 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..." |
3292 | 3701 |
3351 msgstr "hg strip [-f] [-b] [-n] REV" | 3760 msgstr "hg strip [-f] [-b] [-n] REV" |
3352 | 3761 |
3353 msgid "hg qtop [-s]" | 3762 msgid "hg qtop [-s]" |
3354 msgstr "hg qtop [-s]" | 3763 msgstr "hg qtop [-s]" |
3355 | 3764 |
3356 msgid "hg qunapplied [-s] [PATCH]" | 3765 msgid "show only the first patch" |
3766 msgstr "" | |
3767 | |
3768 #, fuzzy | |
3769 msgid "hg qunapplied [-1] [-s] [PATCH]" | |
3357 msgstr "hg qunapplied [-s] [PATCH]" | 3770 msgstr "hg qunapplied [-s] [PATCH]" |
3358 | 3771 |
3359 msgid "finish all applied changesets" | 3772 msgid "finish all applied changesets" |
3360 msgstr "" | 3773 msgstr "" |
3361 | 3774 |
3363 msgstr "hg qfinish [-a] [REV]..." | 3776 msgstr "hg qfinish [-a] [REV]..." |
3364 | 3777 |
3365 msgid "" | 3778 msgid "" |
3366 "hooks for sending email notifications at commit/push time\n" | 3779 "hooks for sending email notifications at commit/push time\n" |
3367 "\n" | 3780 "\n" |
3368 "Subscriptions can be managed through hgrc. Default mode is to print\n" | 3781 "Subscriptions can be managed through a hgrc file. Default mode is to\n" |
3369 "messages to stdout, for testing and configuring.\n" | 3782 "print messages to stdout, for testing and configuring.\n" |
3370 "\n" | 3783 "\n" |
3371 "To use, configure notify extension and enable in hgrc like this:\n" | 3784 "To use, configure the notify extension and enable it in hgrc like\n" |
3372 "\n" | 3785 "this::\n" |
3373 " [extensions]\n" | 3786 "\n" |
3374 " hgext.notify =\n" | 3787 " [extensions]\n" |
3375 "\n" | 3788 " hgext.notify =\n" |
3376 " [hooks]\n" | 3789 "\n" |
3377 " # one email for each incoming changeset\n" | 3790 " [hooks]\n" |
3378 " incoming.notify = python:hgext.notify.hook\n" | 3791 " # one email for each incoming changeset\n" |
3379 " # batch emails when many changesets incoming at one time\n" | 3792 " incoming.notify = python:hgext.notify.hook\n" |
3380 " changegroup.notify = python:hgext.notify.hook\n" | 3793 " # batch emails when many changesets incoming at one time\n" |
3381 "\n" | 3794 " changegroup.notify = python:hgext.notify.hook\n" |
3382 " [notify]\n" | 3795 "\n" |
3383 " # config items go in here\n" | 3796 " [notify]\n" |
3384 "\n" | 3797 " # config items go here\n" |
3385 " config items:\n" | 3798 "\n" |
3386 "\n" | 3799 "Required configuration items::\n" |
3387 " REQUIRED:\n" | 3800 "\n" |
3388 " config = /path/to/file # file containing subscriptions\n" | 3801 " config = /path/to/file # file containing subscriptions\n" |
3389 "\n" | 3802 "\n" |
3390 " OPTIONAL:\n" | 3803 "Optional configuration items::\n" |
3391 " test = True # print messages to stdout for testing\n" | 3804 "\n" |
3392 " strip = 3 # number of slashes to strip for url paths\n" | 3805 " test = True # print messages to stdout for testing\n" |
3393 " domain = example.com # domain to use if committer missing domain\n" | 3806 " strip = 3 # number of slashes to strip for url paths\n" |
3394 " style = ... # style file to use when formatting email\n" | 3807 " domain = example.com # domain to use if committer missing domain\n" |
3395 " template = ... # template to use when formatting email\n" | 3808 " style = ... # style file to use when formatting email\n" |
3396 " incoming = ... # template to use when run as incoming hook\n" | 3809 " template = ... # template to use when formatting email\n" |
3397 " changegroup = ... # template when run as changegroup hook\n" | 3810 " incoming = ... # template to use when run as incoming hook\n" |
3398 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" | 3811 " changegroup = ... # template when run as changegroup hook\n" |
3399 " maxsubject = 67 # truncate subject line longer than this\n" | 3812 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" |
3400 " diffstat = True # add a diffstat before the diff content\n" | 3813 " maxsubject = 67 # truncate subject line longer than this\n" |
3401 " sources = serve # notify if source of incoming changes in this " | 3814 " diffstat = True # add a diffstat before the diff content\n" |
3815 " sources = serve # notify if source of incoming changes in this " | |
3402 "list\n" | 3816 "list\n" |
3403 " # (serve == ssh or http, push, pull, bundle)\n" | 3817 " # (serve == ssh or http, push, pull, bundle)\n" |
3404 " [email]\n" | 3818 " merge = False # send notification for merges (default True)\n" |
3405 " from = user@host.com # email address to send as if none given\n" | 3819 " [email]\n" |
3406 " [web]\n" | 3820 " from = user@host.com # email address to send as if none given\n" |
3407 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n" | 3821 " [web]\n" |
3408 "\n" | 3822 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n" |
3409 " notify config file has same format as regular hgrc. it has two\n" | 3823 "\n" |
3410 " sections so you can express subscriptions in whatever way is handier\n" | 3824 "The notify config file has same format as a regular hgrc file. It has\n" |
3411 " for you.\n" | 3825 "two sections so you can express subscriptions in whatever way is\n" |
3412 "\n" | 3826 "handier for you.\n" |
3413 " [usersubs]\n" | 3827 "\n" |
3414 " # key is subscriber email, value is \",\"-separated list of glob " | 3828 "::\n" |
3415 "patterns\n" | 3829 "\n" |
3416 " user@host = pattern\n" | 3830 " [usersubs]\n" |
3417 "\n" | 3831 " # key is subscriber email, value is \",\"-separated list of glob patterns\n" |
3418 " [reposubs]\n" | 3832 " user@host = pattern\n" |
3419 " # key is glob pattern, value is \",\"-separated list of subscriber " | 3833 "\n" |
3420 "emails\n" | 3834 " [reposubs]\n" |
3421 " pattern = user@host\n" | 3835 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n" |
3422 "\n" | 3836 " pattern = user@host\n" |
3423 " glob patterns are matched against path to repository root.\n" | 3837 "\n" |
3424 "\n" | 3838 "Glob patterns are matched against path to repository root.\n" |
3425 " if you like, you can put notify config file in repository that users\n" | 3839 "\n" |
3426 " can push changes to, they can manage their own subscriptions." | 3840 "If you like, you can put notify config file in repository that users\n" |
3841 "can push changes to, they can manage their own subscriptions.\n" | |
3427 msgstr "" | 3842 msgstr "" |
3428 | 3843 |
3429 #, python-format | 3844 #, python-format |
3430 msgid "%s: %d new changesets" | 3845 msgid "%s: %d new changesets" |
3431 msgstr "" | 3846 msgstr "" |
3447 "diffs (%d lines):\n" | 3862 "diffs (%d lines):\n" |
3448 "\n" | 3863 "\n" |
3449 msgstr "" | 3864 msgstr "" |
3450 | 3865 |
3451 #, python-format | 3866 #, python-format |
3452 msgid "notify: no subscribers to repository %s\n" | 3867 msgid "notify: suppressing notification for merge %d:%s\n" |
3453 msgstr "" | |
3454 | |
3455 #, python-format | |
3456 msgid "notify: changes have source \"%s\" - skipping\n" | |
3457 msgstr "" | 3868 msgstr "" |
3458 | 3869 |
3459 msgid "" | 3870 msgid "" |
3460 "browse command output with an external pager\n" | 3871 "browse command output with an external pager\n" |
3461 "\n" | 3872 "\n" |
3462 "To set the pager that should be used, set the application variable:\n" | 3873 "To set the pager that should be used, set the application variable::\n" |
3463 "\n" | 3874 "\n" |
3464 " [pager]\n" | 3875 " [pager]\n" |
3465 " pager = LESS='FSRX' less\n" | 3876 " pager = LESS='FSRX' less\n" |
3466 "\n" | 3877 "\n" |
3467 "If no pager is set, the pager extensions uses the environment variable\n" | 3878 "If no pager is set, the pager extensions uses the environment variable\n" |
3468 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" | 3879 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" |
3469 "\n" | 3880 "\n" |
3470 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" | 3881 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" |
3471 "setting:\n" | 3882 "setting::\n" |
3472 "\n" | 3883 "\n" |
3473 " [pager]\n" | 3884 " [pager]\n" |
3474 " quiet = True\n" | 3885 " quiet = True\n" |
3475 "\n" | 3886 "\n" |
3476 "You can disable the pager for certain commands by adding them to the\n" | 3887 "You can disable the pager for certain commands by adding them to the\n" |
3477 "pager.ignore list:\n" | 3888 "pager.ignore list::\n" |
3478 "\n" | 3889 "\n" |
3479 " [pager]\n" | 3890 " [pager]\n" |
3480 " ignore = version, help, update\n" | 3891 " ignore = version, help, update\n" |
3481 "\n" | 3892 "\n" |
3482 "You can also enable the pager only for certain commands using\n" | 3893 "You can also enable the pager only for certain commands using\n" |
3483 "pager.attend:\n" | 3894 "pager.attend::\n" |
3484 "\n" | 3895 "\n" |
3485 " [pager]\n" | 3896 " [pager]\n" |
3486 " attend = log\n" | 3897 " attend = log\n" |
3487 "\n" | 3898 "\n" |
3488 "If pager.attend is present, pager.ignore will be ignored.\n" | 3899 "If pager.attend is present, pager.ignore will be ignored.\n" |
3491 "specify them in the global .hgrc\n" | 3902 "specify them in the global .hgrc\n" |
3492 msgstr "" | 3903 msgstr "" |
3493 | 3904 |
3494 # première ligne trop longue -> traduction abrégée (à retraduire quand hg | 3905 # première ligne trop longue -> traduction abrégée (à retraduire quand hg |
3495 # sera capable de replier automatiquement la première ligne d'aide) | 3906 # sera capable de replier automatiquement la première ligne d'aide) |
3907 #, fuzzy | |
3496 msgid "" | 3908 msgid "" |
3497 "interpret suffixes to refer to ancestor revisions\n" | 3909 "interpret suffixes to refer to ancestor revisions\n" |
3498 "\n" | 3910 "\n" |
3499 "This extension allows you to use git-style suffixes to refer to the\n" | 3911 "This extension allows you to use git-style suffixes to refer to the\n" |
3500 "ancestors of a specific revision.\n" | 3912 "ancestors of a specific revision.\n" |
3501 "\n" | 3913 "\n" |
3502 "For example, if you can refer to a revision as \"foo\", then:\n" | 3914 "For example, if you can refer to a revision as \"foo\", then::\n" |
3503 "\n" | 3915 "\n" |
3504 "- foo^N = Nth parent of foo\n" | 3916 " foo^N = Nth parent of foo\n" |
3505 " foo^0 = foo\n" | 3917 " foo^0 = foo\n" |
3506 " foo^1 = first parent of foo\n" | 3918 " foo^1 = first parent of foo\n" |
3507 " foo^2 = second parent of foo\n" | 3919 " foo^2 = second parent of foo\n" |
3508 " foo^ = foo^1\n" | 3920 " foo^ = foo^1\n" |
3509 "\n" | 3921 "\n" |
3510 "- foo~N = Nth first grandparent of foo\n" | 3922 " foo~N = Nth first grandparent of foo\n" |
3511 " foo~0 = foo\n" | 3923 " foo~0 = foo\n" |
3512 " foo~1 = foo^1 = foo^ = first parent of foo\n" | 3924 " foo~1 = foo^1 = foo^ = first parent of foo\n" |
3513 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" | 3925 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" |
3514 msgstr "" | 3926 msgstr "" |
3515 "suffixes faisant référence à des révisions antérieures\n" | 3927 "suffixes faisant référence à des révisions antérieures\n" |
3530 " foo~1 = foo^1 = foo^ = premier parent de foo\n" | 3942 " foo~1 = foo^1 = foo^ = premier parent de foo\n" |
3531 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n" | 3943 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n" |
3532 | 3944 |
3533 # première ligne trop longue -> traduction abrégée (à retraduire quand hg | 3945 # première ligne trop longue -> traduction abrégée (à retraduire quand hg |
3534 # sera capable de replier automatiquement la première ligne d'aide) | 3946 # sera capable de replier automatiquement la première ligne d'aide) |
3947 #, fuzzy | |
3535 msgid "" | 3948 msgid "" |
3536 "command to send changesets as (a series of) patch emails\n" | 3949 "command to send changesets as (a series of) patch emails\n" |
3537 "\n" | 3950 "\n" |
3538 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" | 3951 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" |
3539 "describes the series as a whole.\n" | 3952 "describes the series as a whole.\n" |
3540 "\n" | 3953 "\n" |
3541 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" | 3954 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" |
3542 "first line of the changeset description as the subject text. The\n" | 3955 "first line of the changeset description as the subject text. The\n" |
3543 "message contains two or three body parts:\n" | 3956 "message contains two or three body parts:\n" |
3544 "\n" | 3957 "\n" |
3545 " The changeset description.\n" | 3958 "- The changeset description.\n" |
3546 "\n" | 3959 "- [Optional] The result of running diffstat on the patch.\n" |
3547 " [Optional] The result of running diffstat on the patch.\n" | 3960 "- The patch itself, as generated by \"hg export\".\n" |
3548 "\n" | |
3549 " The patch itself, as generated by \"hg export\".\n" | |
3550 "\n" | 3961 "\n" |
3551 "Each message refers to the first in the series using the In-Reply-To\n" | 3962 "Each message refers to the first in the series using the In-Reply-To\n" |
3552 "and References headers, so they will show up as a sequence in threaded\n" | 3963 "and References headers, so they will show up as a sequence in threaded\n" |
3553 "mail and news readers, and in mail archives.\n" | 3964 "mail and news readers, and in mail archives.\n" |
3554 "\n" | 3965 "\n" |
3555 "With the -d/--diffstat option, you will be prompted for each changeset\n" | 3966 "With the -d/--diffstat option, you will be prompted for each changeset\n" |
3556 "with a diffstat summary and the changeset summary, so you can be sure\n" | 3967 "with a diffstat summary and the changeset summary, so you can be sure\n" |
3557 "you are sending the right changes.\n" | 3968 "you are sending the right changes.\n" |
3558 "\n" | 3969 "\n" |
3559 "To configure other defaults, add a section like this to your hgrc\n" | 3970 "To configure other defaults, add a section like this to your hgrc\n" |
3560 "file:\n" | 3971 "file::\n" |
3561 "\n" | 3972 "\n" |
3562 " [email]\n" | 3973 " [email]\n" |
3563 " from = My Name <my@email>\n" | 3974 " from = My Name <my@email>\n" |
3564 " to = recipient1, recipient2, ...\n" | 3975 " to = recipient1, recipient2, ...\n" |
3565 " cc = cc1, cc2, ...\n" | 3976 " cc = cc1, cc2, ...\n" |
3578 "\n" | 3989 "\n" |
3579 "The -m/--mbox option is also very useful. Instead of previewing each\n" | 3990 "The -m/--mbox option is also very useful. Instead of previewing each\n" |
3580 "patchbomb message in a pager or sending the messages directly, it will\n" | 3991 "patchbomb message in a pager or sending the messages directly, it will\n" |
3581 "create a UNIX mailbox file with the patch emails. This mailbox file\n" | 3992 "create a UNIX mailbox file with the patch emails. This mailbox file\n" |
3582 "can be previewed with any mail user agent which supports UNIX mbox\n" | 3993 "can be previewed with any mail user agent which supports UNIX mbox\n" |
3583 "files, e.g. with mutt:\n" | 3994 "files, e.g. with mutt::\n" |
3584 "\n" | 3995 "\n" |
3585 " % mutt -R -f mbox\n" | 3996 " % mutt -R -f mbox\n" |
3586 "\n" | 3997 "\n" |
3587 "When you are previewing the patchbomb messages, you can use `formail'\n" | 3998 "When you are previewing the patchbomb messages, you can use ``formail``\n" |
3588 "(a utility that is commonly installed as part of the procmail\n" | 3999 "(a utility that is commonly installed as part of the procmail\n" |
3589 "package), to send each message out:\n" | 4000 "package), to send each message out::\n" |
3590 "\n" | 4001 "\n" |
3591 " % formail -s sendmail -bm -t < mbox\n" | 4002 " % formail -s sendmail -bm -t < mbox\n" |
3592 "\n" | 4003 "\n" |
3593 "That should be all. Now your patchbomb is on its way out.\n" | 4004 "That should be all. Now your patchbomb is on its way out.\n" |
3594 "\n" | 4005 "\n" |
3595 "You can also either configure the method option in the email section\n" | 4006 "You can also either configure the method option in the email section\n" |
3596 "to be a sendmail compatible mailer or fill out the [smtp] section so\n" | 4007 "to be a sendmail compatible mailer or fill out the [smtp] section so\n" |
3597 "that the patchbomb extension can automatically send patchbombs\n" | 4008 "that the patchbomb extension can automatically send patchbombs\n" |
3598 "directly from the commandline. See the [email] and [smtp] sections in\n" | 4009 "directly from the commandline. See the [email] and [smtp] sections in\n" |
3599 "hgrc(5) for details." | 4010 "hgrc(5) for details.\n" |
3600 msgstr "" | 4011 msgstr "" |
3601 "envoi d'une série de \"changesets\" par courrier électronique\n" | 4012 "envoi d'une série de \"changesets\" par courrier électronique\n" |
3602 "\n" | 4013 "\n" |
3603 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n" | 4014 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n" |
3604 "décrivant dans son ensemble.\n" | 4015 "décrivant dans son ensemble.\n" |
3669 "alors remplir la section [smtp] de telle sorte que l'extension\n" | 4080 "alors remplir la section [smtp] de telle sorte que l'extension\n" |
3670 "patchbomb puisse automatiquement envoyer les messages depuis la\n" | 4081 "patchbomb puisse automatiquement envoyer les messages depuis la\n" |
3671 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n" | 4082 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n" |
3672 "page de manuel hgrc(5) pour plus de détails." | 4083 "page de manuel hgrc(5) pour plus de détails." |
3673 | 4084 |
4085 #, fuzzy, python-format | |
4086 msgid "%sPlease enter a valid value" | |
4087 msgstr "Veuillez fournir une valeur valide.\n" | |
4088 | |
3674 msgid "Please enter a valid value.\n" | 4089 msgid "Please enter a valid value.\n" |
3675 msgstr "Veuillez fournir une valeur valide.\n" | 4090 msgstr "Veuillez fournir une valeur valide.\n" |
3676 | 4091 |
3677 msgid "does the diffstat above look okay? " | 4092 msgid "does the diffstat above look okay? " |
3678 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?" | 4093 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?" |
3679 | 4094 |
3680 msgid "diffstat rejected" | 4095 msgid "diffstat rejected" |
3681 msgstr "résumé des modifications rejeté" | 4096 msgstr "résumé des modifications rejeté" |
3682 | 4097 |
4098 #, fuzzy | |
3683 msgid "" | 4099 msgid "" |
3684 "send changesets by email\n" | 4100 "send changesets by email\n" |
3685 "\n" | 4101 "\n" |
3686 " By default, diffs are sent in the format generated by hg export,\n" | 4102 " By default, diffs are sent in the format generated by hg export,\n" |
3687 " one per message. The series starts with a \"[PATCH 0 of N]\"\n" | 4103 " one per message. The series starts with a \"[PATCH 0 of N]\"\n" |
3706 "\n" | 4122 "\n" |
3707 " With -b/--bundle, changesets are selected as for --outgoing, but a\n" | 4123 " With -b/--bundle, changesets are selected as for --outgoing, but a\n" |
3708 " single email containing a binary Mercurial bundle as an attachment\n" | 4124 " single email containing a binary Mercurial bundle as an attachment\n" |
3709 " will be sent.\n" | 4125 " will be sent.\n" |
3710 "\n" | 4126 "\n" |
3711 " Examples:\n" | 4127 " Examples::\n" |
3712 "\n" | 4128 "\n" |
3713 " hg email -r 3000 # send patch 3000 only\n" | 4129 " hg email -r 3000 # send patch 3000 only\n" |
3714 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" | 4130 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
3715 " hg email -r 3000:3005 # send patches 3000 through 3005\n" | 4131 " hg email -r 3000:3005 # send patches 3000 through 3005\n" |
3716 " hg email 3000 # send patch 3000 (deprecated)\n" | 4132 " hg email 3000 # send patch 3000 (deprecated)\n" |
3717 "\n" | 4133 "\n" |
3718 " hg email -o # send all patches not in default\n" | 4134 " hg email -o # send all patches not in default\n" |
3719 " hg email -o DEST # send all patches not in DEST\n" | 4135 " hg email -o DEST # send all patches not in DEST\n" |
3720 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n" | 4136 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n" |
3721 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" | 4137 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" |
3722 "\n" | 4138 "\n" |
3723 " hg email -b # send bundle of all patches not in default\n" | 4139 " hg email -b # send bundle of all patches not in default\n" |
3724 " hg email -b DEST # send bundle of all patches not in DEST\n" | 4140 " hg email -b DEST # send bundle of all patches not in DEST\n" |
3725 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in " | 4141 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in " |
3726 "default\n" | 4142 "default\n" |
3727 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" | 4143 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " |
4144 "DEST\n" | |
3728 "\n" | 4145 "\n" |
3729 " Before using this command, you will need to enable email in your\n" | 4146 " Before using this command, you will need to enable email in your\n" |
3730 " hgrc. See the [email] section in hgrc(5) for details.\n" | 4147 " hgrc. See the [email] section in hgrc(5) for details.\n" |
3731 " " | 4148 " " |
3732 msgstr "" | 4149 msgstr "" |
3862 msgstr "sujet du premier message (intro ou patch unique)" | 4279 msgstr "sujet du premier message (intro ou patch unique)" |
3863 | 4280 |
3864 msgid "message identifier to reply to" | 4281 msgid "message identifier to reply to" |
3865 msgstr "identifiant du message auquel répondre" | 4282 msgstr "identifiant du message auquel répondre" |
3866 | 4283 |
4284 msgid "flags to add in subject prefixes" | |
4285 msgstr "" | |
4286 | |
3867 msgid "email addresses of recipients" | 4287 msgid "email addresses of recipients" |
3868 msgstr "adresses électroniques des destinataires" | 4288 msgstr "adresses électroniques des destinataires" |
3869 | 4289 |
3870 msgid "omit hg patch header" | 4290 msgid "omit hg patch header" |
3871 msgstr "omettre l'en-tête de patch spécifique à Mercurial" | 4291 msgstr "omettre l'en-tête de patch spécifique à Mercurial" |
3899 msgstr "hg email [OPTION]... [DEST]..." | 4319 msgstr "hg email [OPTION]... [DEST]..." |
3900 | 4320 |
3901 msgid "command to delete untracked files from the working directory" | 4321 msgid "command to delete untracked files from the working directory" |
3902 msgstr "" | 4322 msgstr "" |
3903 | 4323 |
4324 #, fuzzy | |
3904 msgid "" | 4325 msgid "" |
3905 "removes files not tracked by Mercurial\n" | 4326 "removes files not tracked by Mercurial\n" |
3906 "\n" | 4327 "\n" |
3907 " Delete files not known to Mercurial. This is useful to test local\n" | 4328 " Delete files not known to Mercurial. This is useful to test local\n" |
3908 " and uncommitted changes in an otherwise-clean source tree.\n" | 4329 " and uncommitted changes in an otherwise-clean source tree.\n" |
3909 "\n" | 4330 "\n" |
3910 " This means that purge will delete:\n" | 4331 " This means that purge will delete:\n" |
3911 " - Unknown files: files marked with \"?\" by \"hg status\"\n" | 4332 "\n" |
3912 " - Empty directories: in fact Mercurial ignores directories unless\n" | 4333 " - Unknown files: files marked with \"?\" by \"hg status\"\n" |
3913 " they contain files under source control management\n" | 4334 " - Empty directories: in fact Mercurial ignores directories unless\n" |
4335 " they contain files under source control management\n" | |
4336 "\n" | |
3914 " But it will leave untouched:\n" | 4337 " But it will leave untouched:\n" |
3915 " - Modified and unmodified tracked files\n" | 4338 "\n" |
3916 " - Ignored files (unless --all is specified)\n" | 4339 " - Modified and unmodified tracked files\n" |
3917 " - New files added to the repository (with \"hg add\")\n" | 4340 " - Ignored files (unless --all is specified)\n" |
4341 " - New files added to the repository (with \"hg add\")\n" | |
3918 "\n" | 4342 "\n" |
3919 " If directories are given on the command line, only files in these\n" | 4343 " If directories are given on the command line, only files in these\n" |
3920 " directories are considered.\n" | 4344 " directories are considered.\n" |
3921 "\n" | 4345 "\n" |
3922 " Be careful with purge, as you could irreversibly delete some files\n" | 4346 " Be careful with purge, as you could irreversibly delete some files\n" |
3990 "\n" | 4414 "\n" |
3991 "This extension lets you rebase changesets in an existing Mercurial\n" | 4415 "This extension lets you rebase changesets in an existing Mercurial\n" |
3992 "repository.\n" | 4416 "repository.\n" |
3993 "\n" | 4417 "\n" |
3994 "For more information:\n" | 4418 "For more information:\n" |
3995 "http://mercurial.selenic.com/wiki/RebaseProject\n" | 4419 "http://mercurial.selenic.com/wiki/RebaseExtension\n" |
3996 msgstr "" | |
3997 | |
3998 msgid "first revision, do not change ancestor\n" | |
3999 msgstr "" | 4420 msgstr "" |
4000 | 4421 |
4001 msgid "" | 4422 msgid "" |
4002 "move changeset (and descendants) to a different branch\n" | 4423 "move changeset (and descendants) to a different branch\n" |
4003 "\n" | 4424 "\n" |
4039 | 4460 |
4040 #, python-format | 4461 #, python-format |
4041 msgid "%d revisions have been skipped\n" | 4462 msgid "%d revisions have been skipped\n" |
4042 msgstr "" | 4463 msgstr "" |
4043 | 4464 |
4044 msgid " set parents\n" | |
4045 msgstr "" | |
4046 | |
4047 #, python-format | |
4048 msgid "rebasing %d:%s\n" | |
4049 msgstr "" | |
4050 | |
4051 #, python-format | |
4052 msgid " future parents are %d and %d\n" | |
4053 msgstr "" | |
4054 | |
4055 #, python-format | |
4056 msgid " update to %d:%s\n" | |
4057 msgstr "" | |
4058 | |
4059 msgid " already in target\n" | |
4060 msgstr "" | |
4061 | |
4062 #, python-format | |
4063 msgid " merge against %d:%s\n" | |
4064 msgstr "" | |
4065 | |
4066 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" | 4465 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" |
4067 msgstr "" | 4466 msgstr "" |
4068 | 4467 |
4069 msgid "resuming interrupted rebase\n" | |
4070 msgstr "" | |
4071 | |
4072 #, python-format | 4468 #, python-format |
4073 msgid "no changes, revision %d skipped\n" | 4469 msgid "no changes, revision %d skipped\n" |
4074 msgstr "" | 4470 msgstr "" |
4075 | 4471 |
4076 #, python-format | 4472 #, python-format |
4077 msgid "next revision set to %s\n" | |
4078 msgstr "" | |
4079 | |
4080 #, python-format | |
4081 msgid "cannot use revision %d as base, result would have 3 parents" | 4473 msgid "cannot use revision %d as base, result would have 3 parents" |
4082 msgstr "" | 4474 msgstr "" |
4083 | 4475 |
4084 #, python-format | |
4085 msgid "revision %d is an mq patch (%s), finalize it.\n" | |
4086 msgstr "" | |
4087 | |
4088 #, python-format | |
4089 msgid "import mq patch %d (%s)\n" | |
4090 msgstr "" | |
4091 | |
4092 msgid "rebase status stored\n" | |
4093 msgstr "" | |
4094 | |
4095 msgid "rebase status resumed\n" | |
4096 msgstr "" | |
4097 | |
4098 msgid "no rebase in progress" | 4476 msgid "no rebase in progress" |
4099 msgstr "" | 4477 msgstr "" |
4100 | 4478 |
4101 msgid "warning: new changesets detected on target branch, not stripping\n" | 4479 msgid "warning: new changesets detected on target branch, not stripping\n" |
4102 msgstr "" | 4480 msgstr "" |
4105 msgstr "" | 4483 msgstr "" |
4106 | 4484 |
4107 msgid "cannot rebase onto an applied mq patch" | 4485 msgid "cannot rebase onto an applied mq patch" |
4108 msgstr "" | 4486 msgstr "" |
4109 | 4487 |
4110 msgid "cannot rebase an ancestor" | 4488 #, fuzzy |
4111 msgstr "" | 4489 msgid "source is ancestor of destination" |
4112 | 4490 msgstr "le répertoire racine ne peut servir de destination" |
4113 msgid "cannot rebase a descendant" | 4491 |
4114 msgstr "" | 4492 #, fuzzy |
4115 | 4493 msgid "source is descendant of destination" |
4116 msgid "already working on current\n" | 4494 msgstr "le répertoire racine ne peut servir de destination" |
4117 msgstr "" | |
4118 | |
4119 msgid "already working on the current branch\n" | |
4120 msgstr "" | |
4121 | |
4122 #, python-format | |
4123 msgid "rebase onto %d starting from %d\n" | |
4124 msgstr "" | |
4125 | 4495 |
4126 msgid "unable to collapse, there is more than one external parent" | 4496 msgid "unable to collapse, there is more than one external parent" |
4127 msgstr "" | 4497 msgstr "" |
4128 | 4498 |
4129 msgid "--update and --rebase are not compatible, ignoring the update flag\n" | |
4130 msgstr "" | |
4131 | |
4132 msgid "rebase working directory to branch head" | 4499 msgid "rebase working directory to branch head" |
4133 msgstr "" | 4500 msgstr "" |
4134 | 4501 |
4135 msgid "rebase from a given revision" | 4502 msgid "rebase from a given revision" |
4136 msgstr "" | 4503 msgstr "" |
4139 msgstr "" | 4506 msgstr "" |
4140 | 4507 |
4141 msgid "rebase onto a given revision" | 4508 msgid "rebase onto a given revision" |
4142 msgstr "" | 4509 msgstr "" |
4143 | 4510 |
4144 msgid "collapse the rebased revisions" | 4511 msgid "collapse the rebased changesets" |
4145 msgstr "" | 4512 msgstr "" |
4146 | 4513 |
4147 msgid "keep original revisions" | 4514 #, fuzzy |
4148 msgstr "" | 4515 msgid "keep original changesets" |
4149 | 4516 msgstr "ne pas considérer la révision" |
4150 msgid "keep original branches" | 4517 |
4518 msgid "keep original branch names" | |
4151 msgstr "" | 4519 msgstr "" |
4152 | 4520 |
4153 msgid "continue an interrupted rebase" | 4521 msgid "continue an interrupted rebase" |
4154 msgstr "" | 4522 msgstr "" |
4155 | 4523 |
4199 msgstr "" | 4567 msgstr "" |
4200 | 4568 |
4201 msgid "&?" | 4569 msgid "&?" |
4202 msgstr "" | 4570 msgstr "" |
4203 | 4571 |
4572 msgid "y - record this change" | |
4573 msgstr "" | |
4574 | |
4575 msgid "user quit" | |
4576 msgstr "" | |
4577 | |
4578 #, python-format | |
4579 msgid "examine changes to %s?" | |
4580 msgstr "" | |
4581 | |
4582 msgid " and " | |
4583 msgstr "" | |
4584 | |
4204 msgid "y" | 4585 msgid "y" |
4205 msgstr "" | |
4206 | |
4207 msgid "?" | |
4208 msgstr "" | |
4209 | |
4210 msgid "y - record this change" | |
4211 msgstr "" | |
4212 | |
4213 msgid "s" | |
4214 msgstr "" | |
4215 | |
4216 msgid "f" | |
4217 msgstr "" | |
4218 | |
4219 msgid "d" | |
4220 msgstr "" | |
4221 | |
4222 msgid "a" | |
4223 msgstr "" | |
4224 | |
4225 msgid "q" | |
4226 msgstr "" | |
4227 | |
4228 msgid "user quit" | |
4229 msgstr "" | |
4230 | |
4231 #, python-format | |
4232 msgid "examine changes to %s?" | |
4233 msgstr "" | |
4234 | |
4235 msgid " and " | |
4236 msgstr "" | 4586 msgstr "" |
4237 | 4587 |
4238 #, python-format | 4588 #, python-format |
4239 msgid "record this change to %r?" | 4589 msgid "record this change to %r?" |
4240 msgstr "" | 4590 msgstr "" |
4252 " See 'hg help dates' for a list of formats valid for -d/--date.\n" | 4602 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
4253 "\n" | 4603 "\n" |
4254 " You will be prompted for whether to record changes to each\n" | 4604 " You will be prompted for whether to record changes to each\n" |
4255 " modified file, and for files with multiple changes, for each\n" | 4605 " modified file, and for files with multiple changes, for each\n" |
4256 " change to use. For each query, the following responses are\n" | 4606 " change to use. For each query, the following responses are\n" |
4257 " possible:\n" | 4607 " possible::\n" |
4258 "\n" | 4608 "\n" |
4259 " y - record this change\n" | 4609 " y - record this change\n" |
4260 " n - skip this change\n" | 4610 " n - skip this change\n" |
4261 "\n" | 4611 "\n" |
4262 " s - skip remaining changes to this file\n" | 4612 " s - skip remaining changes to this file\n" |
4263 " f - record remaining changes to this file\n" | 4613 " f - record remaining changes to this file\n" |
4264 "\n" | 4614 "\n" |
4265 " d - done, skip remaining changes and files\n" | 4615 " d - done, skip remaining changes and files\n" |
4266 " a - record all changes to all remaining files\n" | 4616 " a - record all changes to all remaining files\n" |
4267 " q - quit, recording no changes\n" | 4617 " q - quit, recording no changes\n" |
4268 "\n" | 4618 "\n" |
4269 " ? - display help" | 4619 " ? - display help" |
4270 msgstr "" | 4620 msgstr "" |
4271 | 4621 |
4272 msgid "'mq' extension not loaded" | 4622 msgid "'mq' extension not loaded" |
4273 msgstr "" | 4623 msgstr "" |
4274 | 4624 |
4276 msgstr "" | 4626 msgstr "" |
4277 | 4627 |
4278 msgid "no changes to record\n" | 4628 msgid "no changes to record\n" |
4279 msgstr "" | 4629 msgstr "" |
4280 | 4630 |
4281 #, python-format | |
4282 msgid "backup %r as %r\n" | |
4283 msgstr "" | |
4284 | |
4285 msgid "applying patch\n" | |
4286 msgstr "" | |
4287 | |
4288 msgid "patch failed to apply" | 4631 msgid "patch failed to apply" |
4289 msgstr "" | |
4290 | |
4291 #, python-format | |
4292 msgid "restoring %r to %r\n" | |
4293 msgstr "" | 4632 msgstr "" |
4294 | 4633 |
4295 msgid "hg record [OPTION]... [FILE]..." | 4634 msgid "hg record [OPTION]... [FILE]..." |
4296 msgstr "" | 4635 msgstr "" |
4297 | 4636 |
4380 msgid "" | 4719 msgid "" |
4381 "transplant changesets from another branch\n" | 4720 "transplant changesets from another branch\n" |
4382 "\n" | 4721 "\n" |
4383 " Selected changesets will be applied on top of the current working\n" | 4722 " Selected changesets will be applied on top of the current working\n" |
4384 " directory with the log of the original changeset. If --log is\n" | 4723 " directory with the log of the original changeset. If --log is\n" |
4385 " specified, log messages will have a comment appended of the form:\n" | 4724 " specified, log messages will have a comment appended of the form::\n" |
4386 "\n" | 4725 "\n" |
4387 " (transplanted from CHANGESETHASH)\n" | 4726 " (transplanted from CHANGESETHASH)\n" |
4388 "\n" | 4727 "\n" |
4389 " You can rewrite the changelog message with the --filter option.\n" | 4728 " You can rewrite the changelog message with the --filter option.\n" |
4390 " Its argument will be invoked with the current changelog message as\n" | 4729 " Its argument will be invoked with the current changelog message as\n" |
4391 " $1 and the patch as $2.\n" | 4730 " $1 and the patch as $2.\n" |
4392 "\n" | 4731 "\n" |
4473 "This extension can be used to fix the issue with those encodings by\n" | 4812 "This extension can be used to fix the issue with those encodings by\n" |
4474 "wrapping some functions to convert to Unicode string before path\n" | 4813 "wrapping some functions to convert to Unicode string before path\n" |
4475 "operation.\n" | 4814 "operation.\n" |
4476 "\n" | 4815 "\n" |
4477 "This extension is useful for:\n" | 4816 "This extension is useful for:\n" |
4478 " * Japanese Windows users using shift_jis encoding.\n" | 4817 "\n" |
4479 " * Chinese Windows users using big5 encoding.\n" | 4818 "- Japanese Windows users using shift_jis encoding.\n" |
4480 " * All users who use a repository with one of problematic encodings on\n" | 4819 "- Chinese Windows users using big5 encoding.\n" |
4481 " case-insensitive file system.\n" | 4820 "- All users who use a repository with one of problematic encodings on\n" |
4821 " case-insensitive file system.\n" | |
4482 "\n" | 4822 "\n" |
4483 "This extension is not needed for:\n" | 4823 "This extension is not needed for:\n" |
4484 " * Any user who use only ASCII chars in path.\n" | 4824 "\n" |
4485 " * Any user who do not use any of problematic encodings.\n" | 4825 "- Any user who use only ASCII chars in path.\n" |
4826 "- Any user who do not use any of problematic encodings.\n" | |
4486 "\n" | 4827 "\n" |
4487 "Note that there are some limitations on using this extension:\n" | 4828 "Note that there are some limitations on using this extension:\n" |
4488 " * You should use single encoding in one repository.\n" | 4829 "\n" |
4489 " * You should set same encoding for the repository by locale or\n" | 4830 "- You should use single encoding in one repository.\n" |
4490 " HGENCODING.\n" | 4831 "- You should set same encoding for the repository by locale or\n" |
4832 " HGENCODING.\n" | |
4491 "\n" | 4833 "\n" |
4492 "Path encoding conversion are done between Unicode and\n" | 4834 "Path encoding conversion are done between Unicode and\n" |
4493 "encoding.encoding which is decided by Mercurial from current locale\n" | 4835 "encoding.encoding which is decided by Mercurial from current locale\n" |
4494 "setting or HGENCODING.\n" | 4836 "setting or HGENCODING.\n" |
4495 msgstr "" | 4837 msgstr "" |
4496 | 4838 |
4497 #, python-format | 4839 #, python-format |
4498 msgid "[win32mbcs] filename conversion fail with %s encoding\n" | 4840 msgid "[win32mbcs] filename conversion failed with %s encoding\n" |
4499 msgstr "" | 4841 msgstr "" |
4500 | 4842 |
4501 msgid "[win32mbcs] cannot activate on this platform.\n" | 4843 msgid "[win32mbcs] cannot activate on this platform.\n" |
4502 msgstr "" | 4844 msgstr "" |
4503 | 4845 |
4504 #, python-format | |
4505 msgid "[win32mbcs] activated with encoding: %s\n" | |
4506 msgstr "" | |
4507 | |
4508 msgid "" | 4846 msgid "" |
4509 "perform automatic newline conversion\n" | 4847 "perform automatic newline conversion\n" |
4510 "\n" | 4848 "\n" |
4511 "To perform automatic newline conversion, use:\n" | 4849 "To perform automatic newline conversion, use::\n" |
4512 "\n" | 4850 "\n" |
4513 "[extensions]\n" | 4851 " [extensions]\n" |
4514 "hgext.win32text =\n" | 4852 " hgext.win32text =\n" |
4515 "[encode]\n" | 4853 " [encode]\n" |
4516 "** = cleverencode:\n" | 4854 " ** = cleverencode:\n" |
4517 "# or ** = macencode:\n" | 4855 " # or ** = macencode:\n" |
4518 "\n" | 4856 "\n" |
4519 "[decode]\n" | 4857 " [decode]\n" |
4520 "** = cleverdecode:\n" | 4858 " ** = cleverdecode:\n" |
4521 "# or ** = macdecode:\n" | 4859 " # or ** = macdecode:\n" |
4522 "\n" | 4860 "\n" |
4523 "If not doing conversion, to make sure you do not commit CRLF/CR by " | 4861 "If not doing conversion, to make sure you do not commit CRLF/CR by " |
4524 "accident:\n" | 4862 "accident::\n" |
4525 "\n" | 4863 "\n" |
4526 "[hooks]\n" | 4864 " [hooks]\n" |
4527 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" | 4865 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" |
4528 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" | 4866 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" |
4529 "\n" | 4867 "\n" |
4530 "To do the same check on a server to prevent CRLF/CR from being\n" | 4868 "To do the same check on a server to prevent CRLF/CR from being\n" |
4531 "pushed or pulled:\n" | 4869 "pushed or pulled::\n" |
4532 "\n" | 4870 "\n" |
4533 "[hooks]\n" | 4871 " [hooks]\n" |
4534 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" | 4872 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" |
4535 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" | 4873 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" |
4536 msgstr "" | 4874 msgstr "" |
4537 | 4875 |
4538 #, python-format | 4876 #, python-format |
4539 msgid "" | 4877 msgid "" |
4540 "WARNING: %s already has %s line endings\n" | 4878 "WARNING: %s already has %s line endings\n" |
4568 "** = %sencode:\n" | 4906 "** = %sencode:\n" |
4569 "[decode]\n" | 4907 "[decode]\n" |
4570 "** = %sdecode:\n" | 4908 "** = %sdecode:\n" |
4571 msgstr "" | 4909 msgstr "" |
4572 | 4910 |
4911 #, fuzzy | |
4573 msgid "" | 4912 msgid "" |
4574 "discover and advertise repositories on the local network\n" | 4913 "discover and advertise repositories on the local network\n" |
4575 "\n" | 4914 "\n" |
4576 "Zeroconf enabled repositories will be announced in a network without\n" | 4915 "Zeroconf enabled repositories will be announced in a network without\n" |
4577 "the need to configure a server or a service. They can be discovered\n" | 4916 "the need to configure a server or a service. They can be discovered\n" |
4578 "without knowing their actual IP address.\n" | 4917 "without knowing their actual IP address.\n" |
4579 "\n" | 4918 "\n" |
4580 "To allow other people to discover your repository using run \"hg serve\"\n" | 4919 "To allow other people to discover your repository using run \"hg serve\"\n" |
4581 "in your repository.\n" | 4920 "in your repository::\n" |
4582 "\n" | 4921 "\n" |
4583 " $ cd test\n" | 4922 " $ cd test\n" |
4584 " $ hg serve\n" | 4923 " $ hg serve\n" |
4585 "\n" | 4924 "\n" |
4586 "You can discover zeroconf enabled repositories by running \"hg paths\".\n" | 4925 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n" |
4587 "\n" | 4926 "\n" |
4588 " $ hg paths\n" | 4927 " $ hg paths\n" |
4589 " zc-test = http://example.com:8000/test\n" | 4928 " zc-test = http://example.com:8000/test\n" |
4590 msgstr "" | 4929 msgstr "" |
4591 "découverte et annonce de dépôts sur le réseau local\n" | 4930 "découverte et annonce de dépôts sur le réseau local\n" |
4592 "\n" | 4931 "\n" |
4593 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n" | 4932 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n" |
4594 "qu'il n'y ait besoin de configurer un serveur ou service\n" | 4933 "qu'il n'y ait besoin de configurer un serveur ou service\n" |
4888 " New files are ignored if they match any of the patterns in\n" | 5227 " New files are ignored if they match any of the patterns in\n" |
4889 " .hgignore. As with add, these changes take effect at the next\n" | 5228 " .hgignore. As with add, these changes take effect at the next\n" |
4890 " commit.\n" | 5229 " commit.\n" |
4891 "\n" | 5230 "\n" |
4892 " Use the -s/--similarity option to detect renamed files. With a\n" | 5231 " Use the -s/--similarity option to detect renamed files. With a\n" |
4893 " parameter > 0, this compares every removed file with every added\n" | 5232 " parameter greater than 0, this compares every removed file with\n" |
4894 " file and records those similar enough as renames. This option\n" | 5233 " every added file and records those similar enough as renames. This\n" |
4895 " takes a percentage between 0 (disabled) and 100 (files must be\n" | 5234 " option takes a percentage between 0 (disabled) and 100 (files must\n" |
4896 " identical) as its parameter. Detecting renamed files this way can\n" | 5235 " be identical) as its parameter. Detecting renamed files this way\n" |
4897 " be expensive.\n" | 5236 " can be expensive.\n" |
4898 " " | 5237 " " |
4899 msgstr "" | 5238 msgstr "" |
4900 | 5239 |
4901 msgid "similarity must be a number" | 5240 msgid "similarity must be a number" |
4902 msgstr "" | 5241 msgstr "" |
4928 | 5267 |
4929 #, python-format | 5268 #, python-format |
4930 msgid "%s: binary file\n" | 5269 msgid "%s: binary file\n" |
4931 msgstr "" | 5270 msgstr "" |
4932 | 5271 |
5272 #, fuzzy | |
4933 msgid "" | 5273 msgid "" |
4934 "create an unversioned archive of a repository revision\n" | 5274 "create an unversioned archive of a repository revision\n" |
4935 "\n" | 5275 "\n" |
4936 " By default, the revision used is the parent of the working\n" | 5276 " By default, the revision used is the parent of the working\n" |
4937 " directory; use -r/--rev to specify a different revision.\n" | 5277 " directory; use -r/--rev to specify a different revision.\n" |
4938 "\n" | 5278 "\n" |
4939 " To specify the type of archive to create, use -t/--type. Valid\n" | 5279 " To specify the type of archive to create, use -t/--type. Valid\n" |
4940 " types are:\n" | 5280 " types are::\n" |
4941 "\n" | 5281 "\n" |
4942 " \"files\" (default): a directory full of files\n" | 5282 " \"files\" (default): a directory full of files\n" |
4943 " \"tar\": tar archive, uncompressed\n" | 5283 " \"tar\": tar archive, uncompressed\n" |
4944 " \"tbz2\": tar archive, compressed using bzip2\n" | 5284 " \"tbz2\": tar archive, compressed using bzip2\n" |
4945 " \"tgz\": tar archive, compressed using gzip\n" | 5285 " \"tgz\": tar archive, compressed using gzip\n" |
4946 " \"uzip\": zip archive, uncompressed\n" | 5286 " \"uzip\": zip archive, uncompressed\n" |
4947 " \"zip\": zip archive, compressed using deflate\n" | 5287 " \"zip\": zip archive, compressed using deflate\n" |
4948 "\n" | 5288 "\n" |
4949 " The exact name of the destination archive or directory is given\n" | 5289 " The exact name of the destination archive or directory is given\n" |
4950 " using a format string; see 'hg help export' for details.\n" | 5290 " using a format string; see 'hg help export' for details.\n" |
4951 "\n" | 5291 "\n" |
4952 " Each member added to an archive file has a directory prefix\n" | 5292 " Each member added to an archive file has a directory prefix\n" |
5028 #, python-format | 5368 #, python-format |
5029 msgid "%s is not a parent of %s" | 5369 msgid "%s is not a parent of %s" |
5030 msgstr "" | 5370 msgstr "" |
5031 | 5371 |
5032 msgid "cannot use --parent on non-merge changeset" | 5372 msgid "cannot use --parent on non-merge changeset" |
5033 msgstr "" | |
5034 | |
5035 #, python-format | |
5036 msgid "Backed out changeset %s" | |
5037 msgstr "" | 5373 msgstr "" |
5038 | 5374 |
5039 #, python-format | 5375 #, python-format |
5040 msgid "changeset %s backs out changeset %s\n" | 5376 msgid "changeset %s backs out changeset %s\n" |
5041 msgstr "" | 5377 msgstr "" |
5125 | 5461 |
5126 msgid "incompatible arguments" | 5462 msgid "incompatible arguments" |
5127 msgstr "arguments incompatibles" | 5463 msgstr "arguments incompatibles" |
5128 | 5464 |
5129 #, python-format | 5465 #, python-format |
5130 msgid "cannot find executable: %s" | |
5131 msgstr "exécutable %s introuvable" | |
5132 | |
5133 #, python-format | |
5134 msgid "failed to execute %s" | 5466 msgid "failed to execute %s" |
5135 msgstr "impossible d'exécuter %s" | 5467 msgstr "impossible d'exécuter %s" |
5136 | 5468 |
5137 #, python-format | 5469 #, python-format |
5138 msgid "%s killed" | 5470 msgid "%s killed" |
5140 | 5472 |
5141 #, python-format | 5473 #, python-format |
5142 msgid "Changeset %d:%s: %s\n" | 5474 msgid "Changeset %d:%s: %s\n" |
5143 msgstr "\"Changeset\" %d:%s: %s\n" | 5475 msgstr "\"Changeset\" %d:%s: %s\n" |
5144 | 5476 |
5145 #, python-format | 5477 #, fuzzy, python-format |
5146 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" | 5478 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" |
5147 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n" | 5479 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n" |
5148 | 5480 |
5149 msgid "" | 5481 msgid "" |
5150 "set or show the current branch name\n" | 5482 "set or show the current branch name\n" |
5151 "\n" | 5483 "\n" |
5230 " no revision is given, the parent of the working directory is used,\n" | 5562 " no revision is given, the parent of the working directory is used,\n" |
5231 " or tip if no revision is checked out.\n" | 5563 " or tip if no revision is checked out.\n" |
5232 "\n" | 5564 "\n" |
5233 " Output may be to a file, in which case the name of the file is\n" | 5565 " Output may be to a file, in which case the name of the file is\n" |
5234 " given using a format string. The formatting rules are the same as\n" | 5566 " given using a format string. The formatting rules are the same as\n" |
5235 " for the export command, with the following additions:\n" | 5567 " for the export command, with the following additions::\n" |
5236 "\n" | 5568 "\n" |
5237 " %s basename of file being printed\n" | 5569 " %s basename of file being printed\n" |
5238 " %d dirname of file being printed, or '.' if in repository root\n" | 5570 " %d dirname of file being printed, or '.' if in repository root\n" |
5239 " %p root-relative path name of file being printed\n" | 5571 " %p root-relative path name of file being printed\n" |
5240 " " | 5572 " " |
5241 msgstr "" | 5573 msgstr "" |
5242 | 5574 |
5243 msgid "" | 5575 msgid "" |
5244 "make a copy of an existing repository\n" | 5576 "make a copy of an existing repository\n" |
5273 " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | 5605 " filesystems, such as AFS, implement hardlinking incorrectly, but\n" |
5274 " do not report errors. In these cases, use the --pull option to\n" | 5606 " do not report errors. In these cases, use the --pull option to\n" |
5275 " avoid hardlinking.\n" | 5607 " avoid hardlinking.\n" |
5276 "\n" | 5608 "\n" |
5277 " In some cases, you can clone repositories and checked out files\n" | 5609 " In some cases, you can clone repositories and checked out files\n" |
5278 " using full hardlinks with\n" | 5610 " using full hardlinks with ::\n" |
5279 "\n" | 5611 "\n" |
5280 " $ cp -al REPO REPOCLONE\n" | 5612 " $ cp -al REPO REPOCLONE\n" |
5281 "\n" | 5613 "\n" |
5282 " This is the fastest way to clone, but it is not always safe. The\n" | 5614 " This is the fastest way to clone, but it is not always safe. The\n" |
5283 " operation is not atomic (making sure REPO is not modified during\n" | 5615 " operation is not atomic (making sure REPO is not modified during\n" |
5284 " the operation is up to you) and you have to make sure your editor\n" | 5616 " the operation is up to you) and you have to make sure your editor\n" |
5285 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | 5617 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" |
5286 " this is not compatible with certain extensions that place their\n" | 5618 " this is not compatible with certain extensions that place their\n" |
5287 " metadata under the .hg directory, such as mq.\n" | 5619 " metadata under the .hg directory, such as mq.\n" |
5288 "\n" | |
5289 " " | 5620 " " |
5290 msgstr "" | 5621 msgstr "" |
5291 | 5622 |
5292 msgid "" | 5623 msgid "" |
5293 "commit the specified files or all outstanding changes\n" | 5624 "commit the specified files or all outstanding changes\n" |
5546 " NOTE: export may generate unexpected diff output for merge\n" | 5877 " NOTE: export may generate unexpected diff output for merge\n" |
5547 " changesets, as it will compare the merge changeset against its\n" | 5878 " changesets, as it will compare the merge changeset against its\n" |
5548 " first parent only.\n" | 5879 " first parent only.\n" |
5549 "\n" | 5880 "\n" |
5550 " Output may be to a file, in which case the name of the file is\n" | 5881 " Output may be to a file, in which case the name of the file is\n" |
5551 " given using a format string. The formatting rules are as follows:\n" | 5882 " given using a format string. The formatting rules are as follows::\n" |
5552 "\n" | 5883 "\n" |
5553 " %% literal \"%\" character\n" | 5884 " %% literal \"%\" character\n" |
5554 " %H changeset hash (40 bytes of hexadecimal)\n" | 5885 " %H changeset hash (40 bytes of hexadecimal)\n" |
5555 " %N number of patches being generated\n" | 5886 " %N number of patches being generated\n" |
5556 " %R changeset revision number\n" | 5887 " %R changeset revision number\n" |
5557 " %b basename of the exporting repository\n" | 5888 " %b basename of the exporting repository\n" |
5558 " %h short-form changeset hash (12 bytes of hexadecimal)\n" | 5889 " %h short-form changeset hash (12 bytes of hexadecimal)\n" |
5559 " %n zero-padded sequence number, starting at 1\n" | 5890 " %n zero-padded sequence number, starting at 1\n" |
5560 " %r zero-padded changeset revision number\n" | 5891 " %r zero-padded changeset revision number\n" |
5561 "\n" | 5892 "\n" |
5562 " Without the -a/--text option, export will avoid generating diffs\n" | 5893 " Without the -a/--text option, export will avoid generating diffs\n" |
5563 " of files it detects as binary. With -a, export will generate a\n" | 5894 " of files it detects as binary. With -a, export will generate a\n" |
5564 " diff anyway, probably with undesirable results.\n" | 5895 " diff anyway, probably with undesirable results.\n" |
5565 "\n" | 5896 "\n" |
5626 msgid "" | 5957 msgid "" |
5627 "show current repository heads or show branch heads\n" | 5958 "show current repository heads or show branch heads\n" |
5628 "\n" | 5959 "\n" |
5629 " With no arguments, show all repository head changesets.\n" | 5960 " With no arguments, show all repository head changesets.\n" |
5630 "\n" | 5961 "\n" |
5631 " Repository \"heads\" are changesets that don't have child\n" | 5962 " Repository \"heads\" are changesets with no child changesets. They are\n" |
5632 " changesets. They are where development generally takes place and\n" | 5963 " where development generally takes place and are the usual targets\n" |
5633 " are the usual targets for update and merge operations.\n" | 5964 " for update and merge operations.\n" |
5634 "\n" | 5965 "\n" |
5635 " If one or more REV is given, the \"branch heads\" will be shown for\n" | 5966 " If one or more REV is given, the \"branch heads\" will be shown for\n" |
5636 " the named branch associated with that revision. The name of the\n" | 5967 " the named branch associated with the specified changeset(s).\n" |
5637 " branch is called the revision's branch tag.\n" | 5968 "\n" |
5638 "\n" | 5969 " Branch heads are changesets on a named branch with no descendants on\n" |
5639 " Branch heads are revisions on a given named branch that do not have\n" | 5970 " the same branch. A branch head could be a \"true\" (repository) head,\n" |
5640 " any descendants on the same branch. A branch head could be a true head\n" | 5971 " or it could be the last changeset on that branch before it was\n" |
5641 " or it could be the last changeset on a branch before a new branch\n" | 5972 " merged into another branch, or it could be the last changeset on the\n" |
5642 " was created. If none of the branch heads are true heads, the branch\n" | 5973 " branch before a new branch was created. If none of the branch heads\n" |
5643 " is considered inactive. If -c/--closed is specified, also show branch\n" | 5974 " are true heads, the branch is considered inactive.\n" |
5644 " heads marked closed (see hg commit --close-branch).\n" | 5975 "\n" |
5645 "\n" | 5976 " If -c/--closed is specified, also show branch heads marked closed\n" |
5646 " If STARTREV is specified only those heads (or branch heads) that\n" | 5977 " (see hg commit --close-branch).\n" |
5647 " are descendants of STARTREV will be displayed.\n" | 5978 "\n" |
5979 " If STARTREV is specified, only those heads that are descendants of\n" | |
5980 " STARTREV will be displayed.\n" | |
5648 " " | 5981 " " |
5982 msgstr "" | |
5983 | |
5984 msgid "you must specify a branch to use --closed" | |
5649 msgstr "" | 5985 msgstr "" |
5650 | 5986 |
5651 #, python-format | 5987 #, python-format |
5652 msgid "no open branch heads on branch %s\n" | 5988 msgid "no open branch heads on branch %s\n" |
5653 msgstr "" | 5989 msgstr "" |
5718 msgstr "extensions activées :" | 6054 msgstr "extensions activées :" |
5719 | 6055 |
5720 msgid "no help text available" | 6056 msgid "no help text available" |
5721 msgstr "pas d'aide disponible" | 6057 msgstr "pas d'aide disponible" |
5722 | 6058 |
5723 #, python-format | 6059 #, fuzzy, python-format |
5724 msgid "%s extension - %s\n" | 6060 msgid "" |
6061 "%s extension - %s\n" | |
6062 "\n" | |
5725 msgstr "extension %s - %s\n" | 6063 msgstr "extension %s - %s\n" |
5726 | 6064 |
5727 msgid "Mercurial Distributed SCM\n" | 6065 msgid "Mercurial Distributed SCM\n" |
5728 msgstr "Mercurial, système de gestion de sources distribué\n" | 6066 msgstr "Mercurial, système de gestion de sources distribué\n" |
5729 | 6067 |
5798 msgstr "" | 6136 msgstr "" |
5799 | 6137 |
5800 msgid "no diffs found" | 6138 msgid "no diffs found" |
5801 msgstr "" | 6139 msgstr "" |
5802 | 6140 |
5803 #, python-format | |
5804 msgid "" | |
5805 "message:\n" | |
5806 "%s\n" | |
5807 msgstr "" | |
5808 | |
5809 msgid "not a Mercurial patch" | 6141 msgid "not a Mercurial patch" |
5810 msgstr "" | 6142 msgstr "" |
5811 | 6143 |
5812 msgid "patch is damaged or loses information" | 6144 msgid "patch is damaged or loses information" |
5813 msgstr "" | 6145 msgstr "" |
6061 " force deletion, and -Af can be used to remove files from the next\n" | 6393 " force deletion, and -Af can be used to remove files from the next\n" |
6062 " revision without deleting them from the working directory.\n" | 6394 " revision without deleting them from the working directory.\n" |
6063 "\n" | 6395 "\n" |
6064 " The following table details the behavior of remove for different\n" | 6396 " The following table details the behavior of remove for different\n" |
6065 " file states (columns) and option combinations (rows). The file\n" | 6397 " file states (columns) and option combinations (rows). The file\n" |
6066 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n" | 6398 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" |
6067 " (as reported by hg status). The actions are Warn, Remove (from\n" | 6399 " reported by hg status). The actions are Warn, Remove (from branch)\n" |
6068 " branch) and Delete (from disk).\n" | 6400 " and Delete (from disk)::\n" |
6069 "\n" | 6401 "\n" |
6070 " A C M !\n" | 6402 " A C M !\n" |
6071 " none W RD W R\n" | 6403 " none W RD W R\n" |
6072 " -f R RD RD R\n" | 6404 " -f R RD RD R\n" |
6073 " -A W W W R\n" | 6405 " -A W W W R\n" |
6074 " -Af R R R R\n" | 6406 " -Af R R R R\n" |
6075 "\n" | 6407 "\n" |
6076 " This command schedules the files to be removed at the next commit.\n" | 6408 " This command schedules the files to be removed at the next commit.\n" |
6077 " To undo a remove before that, see hg revert.\n" | 6409 " To undo a remove before that, see hg revert.\n" |
6078 " " | 6410 " " |
6079 msgstr "" | 6411 msgstr "" |
6124 "\n" | 6456 "\n" |
6125 " This command also allows listing resolved files and manually\n" | 6457 " This command also allows listing resolved files and manually\n" |
6126 " indicating whether or not files are resolved. All files must be\n" | 6458 " indicating whether or not files are resolved. All files must be\n" |
6127 " marked as resolved before a commit is permitted.\n" | 6459 " marked as resolved before a commit is permitted.\n" |
6128 "\n" | 6460 "\n" |
6129 " The codes used to show the status of files are:\n" | 6461 " The codes used to show the status of files are::\n" |
6130 " U = unresolved\n" | 6462 "\n" |
6131 " R = resolved\n" | 6463 " U = unresolved\n" |
6464 " R = resolved\n" | |
6132 " " | 6465 " " |
6133 msgstr "" | 6466 msgstr "" |
6134 | 6467 |
6135 msgid "too many options specified" | 6468 msgid "too many options specified" |
6136 msgstr "" | 6469 msgstr "" |
6216 " the working directory.\n" | 6549 " the working directory.\n" |
6217 "\n" | 6550 "\n" |
6218 " Transactions are used to encapsulate the effects of all commands\n" | 6551 " Transactions are used to encapsulate the effects of all commands\n" |
6219 " that create new changesets or propagate existing changesets into a\n" | 6552 " that create new changesets or propagate existing changesets into a\n" |
6220 " repository. For example, the following commands are transactional,\n" | 6553 " repository. For example, the following commands are transactional,\n" |
6221 " and their effects can be rolled back:\n" | 6554 " and their effects can be rolled back::\n" |
6222 "\n" | 6555 "\n" |
6223 " commit\n" | 6556 " commit\n" |
6224 " import\n" | 6557 " import\n" |
6225 " pull\n" | 6558 " pull\n" |
6226 " push (with this repository as destination)\n" | 6559 " push (with this repository as destination)\n" |
6277 "\n" | 6610 "\n" |
6278 " If one revision is given, it is used as the base revision.\n" | 6611 " If one revision is given, it is used as the base revision.\n" |
6279 " If two revisions are given, the differences between them are\n" | 6612 " If two revisions are given, the differences between them are\n" |
6280 " shown.\n" | 6613 " shown.\n" |
6281 "\n" | 6614 "\n" |
6282 " The codes used to show the status of files are:\n" | 6615 " The codes used to show the status of files are::\n" |
6283 " M = modified\n" | 6616 "\n" |
6284 " A = added\n" | 6617 " M = modified\n" |
6285 " R = removed\n" | 6618 " A = added\n" |
6286 " C = clean\n" | 6619 " R = removed\n" |
6287 " ! = missing (deleted by non-hg command, but still tracked)\n" | 6620 " C = clean\n" |
6288 " ? = not tracked\n" | 6621 " ! = missing (deleted by non-hg command, but still tracked)\n" |
6289 " I = ignored\n" | 6622 " ? = not tracked\n" |
6290 " = origin of the previous file listed as A (added)\n" | 6623 " I = ignored\n" |
6624 " = origin of the previous file listed as A (added)\n" | |
6291 " " | 6625 " " |
6626 msgstr "" | |
6627 | |
6628 msgid "" | |
6629 "summarize working directory state\n" | |
6630 "\n" | |
6631 " This generates a brief summary of the working directory state,\n" | |
6632 " including parents, branch, commit status, and available updates.\n" | |
6633 "\n" | |
6634 " With the --remote option, this will check the default paths for\n" | |
6635 " incoming and outgoing changes. This can be time-consuming.\n" | |
6636 " " | |
6637 msgstr "" | |
6638 | |
6639 #, fuzzy | |
6640 msgid " (empty repository)" | |
6641 msgstr "clônage du dépôt des patchs\n" | |
6642 | |
6643 #, fuzzy | |
6644 msgid " (no revision checked out)" | |
6645 msgstr "aucune révision spécifiée" | |
6646 | |
6647 #, fuzzy, python-format | |
6648 msgid "parent: %d:%s %s\n" | |
6649 msgstr "abandon : %s : %s\n" | |
6650 | |
6651 #, fuzzy, python-format | |
6652 msgid "branch: %s\n" | |
6653 msgstr "abandon : %s\n" | |
6654 | |
6655 #, python-format | |
6656 msgid "%d added" | |
6657 msgstr "" | |
6658 | |
6659 #, python-format | |
6660 msgid "%d modified" | |
6661 msgstr "" | |
6662 | |
6663 #, fuzzy, python-format | |
6664 msgid "%d removed" | |
6665 msgstr "%s ne peut être supprimé" | |
6666 | |
6667 #, python-format | |
6668 msgid "%d deleted" | |
6669 msgstr "" | |
6670 | |
6671 #, python-format | |
6672 msgid "%d ignored" | |
6673 msgstr "" | |
6674 | |
6675 #, python-format | |
6676 msgid "%d unknown" | |
6677 msgstr "" | |
6678 | |
6679 #, python-format | |
6680 msgid "%d unresolved" | |
6681 msgstr "" | |
6682 | |
6683 msgid " (merge)" | |
6684 msgstr "" | |
6685 | |
6686 msgid " (new branch)" | |
6687 msgstr "" | |
6688 | |
6689 msgid " (clean)" | |
6690 msgstr "" | |
6691 | |
6692 msgid " (new branch head)" | |
6693 msgstr "" | |
6694 | |
6695 #, fuzzy, python-format | |
6696 msgid "commit: %s\n" | |
6697 msgstr "abandon : %s\n" | |
6698 | |
6699 msgid "update: (current)\n" | |
6700 msgstr "" | |
6701 | |
6702 #, python-format | |
6703 msgid "update: %d new changesets (update)\n" | |
6704 msgstr "" | |
6705 | |
6706 #, python-format | |
6707 msgid "update: %d new changesets, %d branch heads (merge)\n" | |
6708 msgstr "" | |
6709 | |
6710 msgid "1 or more incoming" | |
6711 msgstr "" | |
6712 | |
6713 #, python-format | |
6714 msgid "%d outgoing" | |
6715 msgstr "" | |
6716 | |
6717 #, fuzzy, python-format | |
6718 msgid "remote: %s\n" | |
6719 msgstr "suppression de %s\n" | |
6720 | |
6721 msgid "remote: (synced)\n" | |
6292 msgstr "" | 6722 msgstr "" |
6293 | 6723 |
6294 msgid "" | 6724 msgid "" |
6295 "add one or more tags for the current or given revision\n" | 6725 "add one or more tags for the current or given revision\n" |
6296 "\n" | 6726 "\n" |
6334 #, python-format | 6764 #, python-format |
6335 msgid "tag '%s' is not a local tag" | 6765 msgid "tag '%s' is not a local tag" |
6336 msgstr "" | 6766 msgstr "" |
6337 | 6767 |
6338 #, python-format | 6768 #, python-format |
6339 msgid "Removed tag %s" | |
6340 msgstr "" | |
6341 | |
6342 #, python-format | |
6343 msgid "tag '%s' already exists (use -f to force)" | 6769 msgid "tag '%s' already exists (use -f to force)" |
6344 msgstr "" | |
6345 | |
6346 #, python-format | |
6347 msgid "Added tag %s for changeset %s" | |
6348 msgstr "" | 6770 msgstr "" |
6349 | 6771 |
6350 msgid "" | 6772 msgid "" |
6351 "list repository tags\n" | 6773 "list repository tags\n" |
6352 "\n" | 6774 "\n" |
6408 "\n" | 6830 "\n" |
6409 " See 'hg help dates' for a list of formats valid for -d/--date.\n" | 6831 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
6410 " " | 6832 " " |
6411 msgstr "" | 6833 msgstr "" |
6412 | 6834 |
6835 msgid "cannot specify both -c/--check and -C/--clean" | |
6836 msgstr "" | |
6837 | |
6413 msgid "uncommitted local changes" | 6838 msgid "uncommitted local changes" |
6414 msgstr "" | 6839 msgstr "" |
6415 | 6840 |
6416 msgid "" | 6841 msgid "" |
6417 "verify the integrity of the repository\n" | 6842 "verify the integrity of the repository\n" |
6437 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n" | 6862 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n" |
6438 "This is free software; see the source for copying conditions. There is NO\n" | 6863 "This is free software; see the source for copying conditions. There is NO\n" |
6439 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | 6864 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
6440 msgstr "" | 6865 msgstr "" |
6441 | 6866 |
6442 msgid "repository root directory or symbolic path name" | 6867 msgid "repository root directory or name of overlay bundle file" |
6443 msgstr "" | 6868 msgstr "" |
6444 | 6869 |
6445 msgid "change working directory" | 6870 msgid "change working directory" |
6446 msgstr "" | 6871 msgstr "" |
6447 | 6872 |
6629 msgstr "" | 7054 msgstr "" |
6630 | 7055 |
6631 msgid "show only branches that have unmerged heads" | 7056 msgid "show only branches that have unmerged heads" |
6632 msgstr "" | 7057 msgstr "" |
6633 | 7058 |
6634 msgid "show normal and closed heads" | 7059 msgid "show normal and closed branches" |
6635 msgstr "" | 7060 msgstr "" |
6636 | 7061 |
6637 msgid "[-a]" | 7062 msgid "[-a]" |
6638 msgstr "" | 7063 msgstr "" |
6639 | 7064 |
6776 msgstr "" | 7201 msgstr "" |
6777 | 7202 |
6778 msgid "show only heads which are descendants of REV" | 7203 msgid "show only heads which are descendants of REV" |
6779 msgstr "" | 7204 msgstr "" |
6780 | 7205 |
6781 msgid "show only the active heads from open branches" | 7206 msgid "show only the active branch heads from open branches" |
7207 msgstr "" | |
7208 | |
7209 msgid "show normal and closed branch heads" | |
6782 msgstr "" | 7210 msgstr "" |
6783 | 7211 |
6784 msgid "[-r STARTREV] [REV]..." | 7212 msgid "[-r STARTREV] [REV]..." |
6785 msgstr "" | 7213 msgstr "" |
6786 | 7214 |
7009 msgstr "" | 7437 msgstr "" |
7010 | 7438 |
7011 msgid "[-u] [NAME]..." | 7439 msgid "[-u] [NAME]..." |
7012 msgstr "" | 7440 msgstr "" |
7013 | 7441 |
7442 msgid "check for push and pull" | |
7443 msgstr "" | |
7444 | |
7014 msgid "show status of all files" | 7445 msgid "show status of all files" |
7015 msgstr "" | 7446 msgstr "" |
7016 | 7447 |
7017 msgid "show only modified files" | 7448 msgid "show only modified files" |
7018 msgstr "" | 7449 msgstr "" |
7085 msgstr "" | 7516 msgstr "" |
7086 | 7517 |
7087 msgid "branch name not in UTF-8!" | 7518 msgid "branch name not in UTF-8!" |
7088 msgstr "le nom de la branche n'est pas en UTF-8 !" | 7519 msgstr "le nom de la branche n'est pas en UTF-8 !" |
7089 | 7520 |
7090 #, python-format | |
7091 msgid " searching for copies back to rev %d\n" | |
7092 msgstr "" | |
7093 | |
7094 #, python-format | |
7095 msgid "" | |
7096 " unmatched files in local:\n" | |
7097 " %s\n" | |
7098 msgstr "" | |
7099 | |
7100 #, python-format | |
7101 msgid "" | |
7102 " unmatched files in other:\n" | |
7103 " %s\n" | |
7104 msgstr "" | |
7105 | |
7106 msgid " all copies found (* = to merge, ! = divergent):\n" | |
7107 msgstr "" | |
7108 | |
7109 msgid " checking for directory renames\n" | |
7110 msgstr "" | |
7111 | |
7112 #, python-format | |
7113 msgid " dir %s -> %s\n" | |
7114 msgstr "" | |
7115 | |
7116 #, python-format | |
7117 msgid " file %s -> %s\n" | |
7118 msgstr "" | |
7119 | |
7120 msgid "working directory state appears damaged!" | 7521 msgid "working directory state appears damaged!" |
7121 msgstr "" | 7522 msgstr "" |
7122 | 7523 |
7123 #, python-format | 7524 #, python-format |
7124 msgid "'\\n' and '\\r' disallowed in filenames: %r" | 7525 msgid "'\\n' and '\\r' disallowed in filenames: %r" |
7161 #, python-format | 7562 #, python-format |
7162 msgid "abort: %s\n" | 7563 msgid "abort: %s\n" |
7163 msgstr "abandon : %s\n" | 7564 msgstr "abandon : %s\n" |
7164 | 7565 |
7165 #, python-format | 7566 #, python-format |
7567 msgid "hg: %s\n" | |
7568 msgstr "hg: %s\n" | |
7569 | |
7570 #, python-format | |
7166 msgid "" | 7571 msgid "" |
7167 "hg: command '%s' is ambiguous:\n" | 7572 "hg: command '%s' is ambiguous:\n" |
7168 " %s\n" | 7573 " %s\n" |
7169 msgstr "" | 7574 msgstr "" |
7170 "hg: la commande '%s' est ambiguë :\n" | 7575 "hg: la commande '%s' est ambiguë :\n" |
7171 " %s\n" | 7576 " %s\n" |
7172 | |
7173 #, python-format | |
7174 msgid "hg: %s\n" | |
7175 msgstr "hg: %s\n" | |
7176 | 7577 |
7177 #, python-format | 7578 #, python-format |
7178 msgid "timed out waiting for lock held by %s" | 7579 msgid "timed out waiting for lock held by %s" |
7179 msgstr "attendu trop longtemps le verrou détenu par %s" | 7580 msgstr "attendu trop longtemps le verrou détenu par %s" |
7180 | 7581 |
7274 #, python-format | 7675 #, python-format |
7275 msgid "alias '%s' resolves to ambiguous command '%s'\n" | 7676 msgid "alias '%s' resolves to ambiguous command '%s'\n" |
7276 msgstr "" | 7677 msgstr "" |
7277 | 7678 |
7278 #, python-format | 7679 #, python-format |
7279 msgid "alias '%s' shadows command\n" | |
7280 msgstr "" | |
7281 | |
7282 #, python-format | |
7283 msgid "malformed --config option: %s" | 7680 msgid "malformed --config option: %s" |
7284 msgstr "option incorrecte pour --config : %s" | 7681 msgstr "option incorrecte pour --config : %s" |
7285 | 7682 |
7286 #, python-format | 7683 #, python-format |
7287 msgid "extension '%s' overrides commands: %s\n" | 7684 msgid "extension '%s' overrides commands: %s\n" |
7343 #, python-format | 7740 #, python-format |
7344 msgid "tool %s requires a GUI\n" | 7741 msgid "tool %s requires a GUI\n" |
7345 msgstr "" | 7742 msgstr "" |
7346 | 7743 |
7347 #, python-format | 7744 #, python-format |
7348 msgid "picked tool '%s' for %s (binary %s symlink %s)\n" | |
7349 msgstr "" | |
7350 | |
7351 #, python-format | |
7352 msgid "" | 7745 msgid "" |
7353 " no tool found to merge %s\n" | 7746 " no tool found to merge %s\n" |
7354 "keep (l)ocal or take (o)ther?" | 7747 "keep (l)ocal or take (o)ther?" |
7355 msgstr "" | 7748 msgstr "" |
7356 | 7749 |
7358 msgstr "" | 7751 msgstr "" |
7359 | 7752 |
7360 msgid "&Other" | 7753 msgid "&Other" |
7361 msgstr "" | 7754 msgstr "" |
7362 | 7755 |
7363 msgid "l" | |
7364 msgstr "" | |
7365 | |
7366 #, python-format | 7756 #, python-format |
7367 msgid "merging %s and %s to %s\n" | 7757 msgid "merging %s and %s to %s\n" |
7368 msgstr "" | 7758 msgstr "" |
7369 | 7759 |
7370 #, python-format | 7760 #, python-format |
7371 msgid "merging %s\n" | 7761 msgid "merging %s\n" |
7372 msgstr "" | |
7373 | |
7374 #, python-format | |
7375 msgid "my %s other %s ancestor %s\n" | |
7376 msgstr "" | |
7377 | |
7378 msgid " premerge successful\n" | |
7379 msgstr "" | 7762 msgstr "" |
7380 | 7763 |
7381 #, python-format | 7764 #, python-format |
7382 msgid "" | 7765 msgid "" |
7383 " output file %s appears unchanged\n" | 7766 " output file %s appears unchanged\n" |
7388 msgstr "" | 7771 msgstr "" |
7389 | 7772 |
7390 msgid "&Yes" | 7773 msgid "&Yes" |
7391 msgstr "" | 7774 msgstr "" |
7392 | 7775 |
7393 msgid "n" | |
7394 msgstr "" | |
7395 | |
7396 #, python-format | 7776 #, python-format |
7397 msgid "merging %s failed!\n" | 7777 msgid "merging %s failed!\n" |
7398 msgstr "" | 7778 msgstr "" |
7399 | 7779 |
7400 #, python-format | 7780 #, python-format |
7403 | 7783 |
7404 #, python-format | 7784 #, python-format |
7405 msgid "unknown bisect kind %s" | 7785 msgid "unknown bisect kind %s" |
7406 msgstr "type inconnu pour dichotomie : %s" | 7786 msgstr "type inconnu pour dichotomie : %s" |
7407 | 7787 |
7408 msgid "" | |
7409 "\n" | |
7410 " Mercurial has the ability to add new features through the use of\n" | |
7411 " extensions. Extensions may add new commands, add options to\n" | |
7412 " existing commands, change the default behavior of commands, or\n" | |
7413 " implement hooks.\n" | |
7414 "\n" | |
7415 " Extensions are not loaded by default for a variety of reasons:\n" | |
7416 " they can increase startup overhead; they may be meant for\n" | |
7417 " advanced usage only; they may provide potentially dangerous\n" | |
7418 " abilities (such as letting you destroy or modify history); they\n" | |
7419 " might not be ready for prime time; or they may alter some\n" | |
7420 " usual behaviors of stock Mercurial. It is thus up to the user to\n" | |
7421 " activate extensions as needed.\n" | |
7422 "\n" | |
7423 " To enable the \"foo\" extension, either shipped with Mercurial\n" | |
7424 " or in the Python search path, create an entry for it in your\n" | |
7425 " hgrc, like this:\n" | |
7426 "\n" | |
7427 " [extensions]\n" | |
7428 " foo =\n" | |
7429 "\n" | |
7430 " You may also specify the full path to an extension:\n" | |
7431 "\n" | |
7432 " [extensions]\n" | |
7433 " myfeature = ~/.hgext/myfeature.py\n" | |
7434 "\n" | |
7435 " To explicitly disable an extension enabled in an hgrc of broader\n" | |
7436 " scope, prepend its path with !:\n" | |
7437 "\n" | |
7438 " [extensions]\n" | |
7439 " # disabling extension bar residing in /path/to/extension/bar.py\n" | |
7440 " hgext.bar = !/path/to/extension/bar.py\n" | |
7441 " # ditto, but no path was supplied for extension baz\n" | |
7442 " hgext.baz = !\n" | |
7443 " " | |
7444 msgstr "" | |
7445 "\n" | |
7446 " Mercurial a la capacité de s'enrichir de nouvelles\n" | |
7447 " fonctionnalités par le biais d'extensions. Les extensions\n" | |
7448 " permettent d'ajouter des nouvelles commandes, de changer le\n" | |
7449 " comportement de commandes existantes ou leur ajouter des\n" | |
7450 " options, ou encore d'implémenter de nouveaux \"hooks\".\n" | |
7451 "\n" | |
7452 " Les extensions ne sont pas chargées automatiquement par défaut\n" | |
7453 " pour diverses raisons : elles peuvent accroître la latence\n" | |
7454 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n" | |
7455 " une utilisation avancée ; elle peuvent fournir des\n" | |
7456 " fonctionnalités potentiellement dangereuses, comme de vous\n" | |
7457 " permettre de modifier ou détruire l'historique du dépôt ; elles\n" | |
7458 " peuvent ne pas être encore prêtes à être utilisées par le plus\n" | |
7459 " grand nombre ; ou encore elles peuvent modifier certains des\n" | |
7460 " comportements habituels de Mercurial.\n" | |
7461 " Il appartient donc à l'utilisateur de les activer en fonction\n" | |
7462 " de ses besoins.\n" | |
7463 "\n" | |
7464 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n" | |
7465 " présente dans le chemin de recherche de Python, déclarez-la\n" | |
7466 " dans votre fichier de configuration hgrc comme suit :\n" | |
7467 "\n" | |
7468 " [extensions]\n" | |
7469 " truc =\n" | |
7470 "\n" | |
7471 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n" | |
7472 "\n" | |
7473 " [extensions]\n" | |
7474 " monbidule = ~/.hgext/monbidule.py\n" | |
7475 "\n" | |
7476 " Pour forcer la désactivation d'une extension activée par un\n" | |
7477 " autre hgrc, précédez son chemin d'un point d'exclamation :\n" | |
7478 "\n" | |
7479 " [extensions]\n" | |
7480 " # désactivation de machin qui se trouve dans /vers/machin.py\n" | |
7481 " hgext.bar = !/vers/machin.py\n" | |
7482 " # idem, mais aucun chemin n'avait été donné pour chose \n" | |
7483 " hgext.chose = !\n" | |
7484 " " | |
7485 | |
7486 msgid "disabled extensions:" | 7788 msgid "disabled extensions:" |
7487 msgstr "extensions désactivées :" | 7789 msgstr "extensions désactivées :" |
7488 | 7790 |
7489 msgid "Date Formats" | 7791 msgid "Date Formats" |
7490 msgstr "" | 7792 msgstr "" |
7491 | 7793 |
7492 msgid "" | |
7493 "\n" | |
7494 " Some commands allow the user to specify a date, e.g.:\n" | |
7495 " * backout, commit, import, tag: Specify the commit date.\n" | |
7496 " * log, revert, update: Select revision(s) by date.\n" | |
7497 "\n" | |
7498 " Many date formats are valid. Here are some examples:\n" | |
7499 "\n" | |
7500 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" | |
7501 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" | |
7502 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" | |
7503 " \"Dec 6\" (midnight)\n" | |
7504 " \"13:18\" (today assumed)\n" | |
7505 " \"3:39\" (3:39AM assumed)\n" | |
7506 " \"3:39pm\" (15:39)\n" | |
7507 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n" | |
7508 " \"2006-12-6 13:18\"\n" | |
7509 " \"2006-12-6\"\n" | |
7510 " \"12-6\"\n" | |
7511 " \"12/6\"\n" | |
7512 " \"12/6/6\" (Dec 6 2006)\n" | |
7513 "\n" | |
7514 " Lastly, there is Mercurial's internal format:\n" | |
7515 "\n" | |
7516 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" | |
7517 "\n" | |
7518 " This is the internal representation format for dates. unixtime is\n" | |
7519 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" | |
7520 " offset is the offset of the local timezone, in seconds west of UTC\n" | |
7521 " (negative if the timezone is east of UTC).\n" | |
7522 "\n" | |
7523 " The log command also accepts date ranges:\n" | |
7524 "\n" | |
7525 " \"<{datetime}\" - at or before a given date/time\n" | |
7526 " \">{datetime}\" - on or after a given date/time\n" | |
7527 " \"{datetime} to {datetime}\" - a date range, inclusive\n" | |
7528 " \"-{days}\" - within a given number of days of today\n" | |
7529 " " | |
7530 msgstr "" | |
7531 | |
7532 msgid "File Name Patterns" | 7794 msgid "File Name Patterns" |
7533 msgstr "" | 7795 msgstr "" |
7534 | 7796 |
7535 msgid "" | |
7536 "\n" | |
7537 " Mercurial accepts several notations for identifying one or more\n" | |
7538 " files at a time.\n" | |
7539 "\n" | |
7540 " By default, Mercurial treats filenames as shell-style extended\n" | |
7541 " glob patterns.\n" | |
7542 "\n" | |
7543 " Alternate pattern notations must be specified explicitly.\n" | |
7544 "\n" | |
7545 " To use a plain path name without any pattern matching, start it\n" | |
7546 " with \"path:\". These path names must completely match starting at\n" | |
7547 " the current repository root.\n" | |
7548 "\n" | |
7549 " To use an extended glob, start a name with \"glob:\". Globs are\n" | |
7550 " rooted at the current directory; a glob such as \"*.c\" will only\n" | |
7551 " match files in the current directory ending with \".c\".\n" | |
7552 "\n" | |
7553 " The supported glob syntax extensions are \"**\" to match any string\n" | |
7554 " across path separators and \"{a,b}\" to mean \"a or b\".\n" | |
7555 "\n" | |
7556 " To use a Perl/Python regular expression, start a name with \"re:\".\n" | |
7557 " Regexp pattern matching is anchored at the root of the repository.\n" | |
7558 "\n" | |
7559 " Plain examples:\n" | |
7560 "\n" | |
7561 " path:foo/bar a name bar in a directory named foo in the root of\n" | |
7562 " the repository\n" | |
7563 " path:path:name a file or directory named \"path:name\"\n" | |
7564 "\n" | |
7565 " Glob examples:\n" | |
7566 "\n" | |
7567 " glob:*.c any name ending in \".c\" in the current directory\n" | |
7568 " *.c any name ending in \".c\" in the current directory\n" | |
7569 " **.c any name ending in \".c\" in any subdirectory of the\n" | |
7570 " current directory including itself.\n" | |
7571 " foo/*.c any name ending in \".c\" in the directory foo\n" | |
7572 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" | |
7573 " including itself.\n" | |
7574 "\n" | |
7575 " Regexp examples:\n" | |
7576 "\n" | |
7577 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" | |
7578 "\n" | |
7579 " " | |
7580 msgstr "" | |
7581 | |
7582 msgid "Environment Variables" | 7797 msgid "Environment Variables" |
7583 msgstr "" | 7798 msgstr "" |
7584 | 7799 |
7585 msgid "" | |
7586 "\n" | |
7587 "HG::\n" | |
7588 " Path to the 'hg' executable, automatically passed when running\n" | |
7589 " hooks, extensions or external tools. If unset or empty, this is\n" | |
7590 " the hg executable's name if it's frozen, or an executable named\n" | |
7591 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
7592 " Windows) is searched.\n" | |
7593 "\n" | |
7594 "HGEDITOR::\n" | |
7595 " This is the name of the editor to run when committing. See EDITOR.\n" | |
7596 "\n" | |
7597 " (deprecated, use .hgrc)\n" | |
7598 "\n" | |
7599 "HGENCODING::\n" | |
7600 " This overrides the default locale setting detected by Mercurial.\n" | |
7601 " This setting is used to convert data including usernames,\n" | |
7602 " changeset descriptions, tag names, and branches. This setting can\n" | |
7603 " be overridden with the --encoding command-line option.\n" | |
7604 "\n" | |
7605 "HGENCODINGMODE::\n" | |
7606 " This sets Mercurial's behavior for handling unknown characters\n" | |
7607 " while transcoding user input. The default is \"strict\", which\n" | |
7608 " causes Mercurial to abort if it can't map a character. Other\n" | |
7609 " settings include \"replace\", which replaces unknown characters, and\n" | |
7610 " \"ignore\", which drops them. This setting can be overridden with\n" | |
7611 " the --encodingmode command-line option.\n" | |
7612 "\n" | |
7613 "HGMERGE::\n" | |
7614 " An executable to use for resolving merge conflicts. The program\n" | |
7615 " will be executed with three arguments: local file, remote file,\n" | |
7616 " ancestor file.\n" | |
7617 "\n" | |
7618 " (deprecated, use .hgrc)\n" | |
7619 "\n" | |
7620 "HGRCPATH::\n" | |
7621 " A list of files or directories to search for hgrc files. Item\n" | |
7622 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" | |
7623 " platform default search path is used. If empty, only the .hg/hgrc\n" | |
7624 " from the current repository is read.\n" | |
7625 "\n" | |
7626 " For each element in HGRCPATH:\n" | |
7627 " * if it's a directory, all files ending with .rc are added\n" | |
7628 " * otherwise, the file itself will be added\n" | |
7629 "\n" | |
7630 "HGUSER::\n" | |
7631 " This is the string used as the author of a commit. If not set,\n" | |
7632 " available values will be considered in this order:\n" | |
7633 "\n" | |
7634 " * HGUSER (deprecated)\n" | |
7635 " * hgrc files from the HGRCPATH\n" | |
7636 " * EMAIL\n" | |
7637 " * interactive prompt\n" | |
7638 " * LOGNAME (with '@hostname' appended)\n" | |
7639 "\n" | |
7640 " (deprecated, use .hgrc)\n" | |
7641 "\n" | |
7642 "EMAIL::\n" | |
7643 " May be used as the author of a commit; see HGUSER.\n" | |
7644 "\n" | |
7645 "LOGNAME::\n" | |
7646 " May be used as the author of a commit; see HGUSER.\n" | |
7647 "\n" | |
7648 "VISUAL::\n" | |
7649 " This is the name of the editor to use when committing. See EDITOR.\n" | |
7650 "\n" | |
7651 "EDITOR::\n" | |
7652 " Sometimes Mercurial needs to open a text file in an editor for a\n" | |
7653 " user to modify, for example when writing commit messages. The\n" | |
7654 " editor it uses is determined by looking at the environment\n" | |
7655 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" | |
7656 " non-empty one is chosen. If all of them are empty, the editor\n" | |
7657 " defaults to 'vi'.\n" | |
7658 "\n" | |
7659 "PYTHONPATH::\n" | |
7660 " This is used by Python to find imported modules and may need to be\n" | |
7661 " set appropriately if this Mercurial is not installed system-wide.\n" | |
7662 " " | |
7663 msgstr "" | |
7664 | |
7665 msgid "Specifying Single Revisions" | 7800 msgid "Specifying Single Revisions" |
7666 msgstr "" | 7801 msgstr "" |
7667 | 7802 |
7668 msgid "" | |
7669 "\n" | |
7670 " Mercurial supports several ways to specify individual revisions.\n" | |
7671 "\n" | |
7672 " A plain integer is treated as a revision number. Negative integers\n" | |
7673 " are treated as topological offsets from the tip, with -1 denoting\n" | |
7674 " the tip. As such, negative numbers are only useful if you've\n" | |
7675 " memorized your local tree numbers and want to save typing a single\n" | |
7676 " digit. This editor suggests copy and paste.\n" | |
7677 "\n" | |
7678 " A 40-digit hexadecimal string is treated as a unique revision\n" | |
7679 " identifier.\n" | |
7680 "\n" | |
7681 " A hexadecimal string less than 40 characters long is treated as a\n" | |
7682 " unique revision identifier, and referred to as a short-form\n" | |
7683 " identifier. A short-form identifier is only valid if it is the\n" | |
7684 " prefix of exactly one full-length identifier.\n" | |
7685 "\n" | |
7686 " Any other string is treated as a tag name, which is a symbolic\n" | |
7687 " name associated with a revision identifier. Tag names may not\n" | |
7688 " contain the \":\" character.\n" | |
7689 "\n" | |
7690 " The reserved name \"tip\" is a special tag that always identifies\n" | |
7691 " the most recent revision.\n" | |
7692 "\n" | |
7693 " The reserved name \"null\" indicates the null revision. This is the\n" | |
7694 " revision of an empty repository, and the parent of revision 0.\n" | |
7695 "\n" | |
7696 " The reserved name \".\" indicates the working directory parent. If\n" | |
7697 " no working directory is checked out, it is equivalent to null. If\n" | |
7698 " an uncommitted merge is in progress, \".\" is the revision of the\n" | |
7699 " first parent.\n" | |
7700 " " | |
7701 msgstr "" | |
7702 | |
7703 msgid "Specifying Multiple Revisions" | 7803 msgid "Specifying Multiple Revisions" |
7704 msgstr "" | 7804 msgstr "" |
7705 | 7805 |
7706 msgid "" | |
7707 "\n" | |
7708 " When Mercurial accepts more than one revision, they may be\n" | |
7709 " specified individually, or provided as a topologically continuous\n" | |
7710 " range, separated by the \":\" character.\n" | |
7711 "\n" | |
7712 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" | |
7713 " are revision identifiers. Both BEGIN and END are optional. If\n" | |
7714 " BEGIN is not specified, it defaults to revision number 0. If END\n" | |
7715 " is not specified, it defaults to the tip. The range \":\" thus means\n" | |
7716 " \"all revisions\".\n" | |
7717 "\n" | |
7718 " If BEGIN is greater than END, revisions are treated in reverse\n" | |
7719 " order.\n" | |
7720 "\n" | |
7721 " A range acts as a closed interval. This means that a range of 3:5\n" | |
7722 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" | |
7723 " " | |
7724 msgstr "" | |
7725 | |
7726 msgid "Diff Formats" | 7806 msgid "Diff Formats" |
7727 msgstr "" | 7807 msgstr "" |
7728 | 7808 |
7729 msgid "" | |
7730 "\n" | |
7731 " Mercurial's default format for showing changes between two\n" | |
7732 " versions of a file is compatible with the unified format of GNU\n" | |
7733 " diff, which can be used by GNU patch and many other standard\n" | |
7734 " tools.\n" | |
7735 "\n" | |
7736 " While this standard format is often enough, it does not encode the\n" | |
7737 " following information:\n" | |
7738 "\n" | |
7739 " - executable status and other permission bits\n" | |
7740 " - copy or rename information\n" | |
7741 " - changes in binary files\n" | |
7742 " - creation or deletion of empty files\n" | |
7743 "\n" | |
7744 " Mercurial also supports the extended diff format from the git VCS\n" | |
7745 " which addresses these limitations. The git diff format is not\n" | |
7746 " produced by default because a few widespread tools still do not\n" | |
7747 " understand this format.\n" | |
7748 "\n" | |
7749 " This means that when generating diffs from a Mercurial repository\n" | |
7750 " (e.g. with \"hg export\"), you should be careful about things like\n" | |
7751 " file copies and renames or other things mentioned above, because\n" | |
7752 " when applying a standard diff to a different repository, this\n" | |
7753 " extra information is lost. Mercurial's internal operations (like\n" | |
7754 " push and pull) are not affected by this, because they use an\n" | |
7755 " internal binary format for communicating changes.\n" | |
7756 "\n" | |
7757 " To make Mercurial produce the git extended diff format, use the\n" | |
7758 " --git option available for many commands, or set 'git = True' in\n" | |
7759 " the [diff] section of your hgrc. You do not need to set this\n" | |
7760 " option when importing diffs in this format or using them in the mq\n" | |
7761 " extension.\n" | |
7762 " " | |
7763 msgstr "" | |
7764 | |
7765 msgid "Template Usage" | 7809 msgid "Template Usage" |
7766 msgstr "" | 7810 msgstr "" |
7767 | 7811 |
7768 msgid "" | |
7769 "\n" | |
7770 " Mercurial allows you to customize output of commands through\n" | |
7771 " templates. You can either pass in a template from the command\n" | |
7772 " line, via the --template option, or select an existing\n" | |
7773 " template-style (--style).\n" | |
7774 "\n" | |
7775 " You can customize output for any \"log-like\" command: log,\n" | |
7776 " outgoing, incoming, tip, parents, heads and glog.\n" | |
7777 "\n" | |
7778 " Three styles are packaged with Mercurial: default (the style used\n" | |
7779 " when no explicit preference is passed), compact and changelog.\n" | |
7780 " Usage:\n" | |
7781 "\n" | |
7782 " $ hg log -r1 --style changelog\n" | |
7783 "\n" | |
7784 " A template is a piece of text, with markup to invoke variable\n" | |
7785 " expansion:\n" | |
7786 "\n" | |
7787 " $ hg log -r1 --template \"{node}\\n\"\n" | |
7788 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |
7789 "\n" | |
7790 " Strings in curly braces are called keywords. The availability of\n" | |
7791 " keywords depends on the exact context of the templater. These\n" | |
7792 " keywords are usually available for templating a log-like command:\n" | |
7793 "\n" | |
7794 " - author: String. The unmodified author of the changeset.\n" | |
7795 " - branches: String. The name of the branch on which the changeset\n" | |
7796 " was committed. Will be empty if the branch name was default.\n" | |
7797 " - date: Date information. The date when the changeset was committed.\n" | |
7798 " - desc: String. The text of the changeset description.\n" | |
7799 " - diffstat: String. Statistics of changes with the following\n" | |
7800 " format: \"modified files: +added/-removed lines\"\n" | |
7801 " - files: List of strings. All files modified, added, or removed by\n" | |
7802 " this changeset.\n" | |
7803 " - file_adds: List of strings. Files added by this changeset.\n" | |
7804 " - file_mods: List of strings. Files modified by this changeset.\n" | |
7805 " - file_dels: List of strings. Files removed by this changeset.\n" | |
7806 " - node: String. The changeset identification hash, as a\n" | |
7807 " 40-character hexadecimal string.\n" | |
7808 " - parents: List of strings. The parents of the changeset.\n" | |
7809 " - rev: Integer. The repository-local changeset revision number.\n" | |
7810 " - tags: List of strings. Any tags associated with the changeset.\n" | |
7811 "\n" | |
7812 " The \"date\" keyword does not produce human-readable output. If you\n" | |
7813 " want to use a date in your output, you can use a filter to process\n" | |
7814 " it. Filters are functions which return a string based on the input\n" | |
7815 " variable. You can also use a chain of filters to get the desired\n" | |
7816 " output:\n" | |
7817 "\n" | |
7818 " $ hg tip --template \"{date|isodate}\\n\"\n" | |
7819 " 2008-08-21 18:22 +0000\n" | |
7820 "\n" | |
7821 " List of filters:\n" | |
7822 "\n" | |
7823 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
7824 " every line except the last.\n" | |
7825 " - age: Date. Returns a human-readable date/time difference between\n" | |
7826 " the given date/time and the current date/time.\n" | |
7827 " - basename: Any text. Treats the text as a path, and returns the\n" | |
7828 " last component of the path after splitting by the path\n" | |
7829 " separator (ignoring trailing separators). For example,\n" | |
7830 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" | |
7831 "\".\n" | |
7832 " - stripdir: Treat the text as path and strip a directory level, if\n" | |
7833 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n" | |
7834 " - date: Date. Returns a date in a Unix date format, including\n" | |
7835 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |
7836 " - domain: Any text. Finds the first string that looks like an\n" | |
7837 " email address, and extracts just the domain component.\n" | |
7838 " Example: 'User <user@example.com>' becomes 'example.com'.\n" | |
7839 " - email: Any text. Extracts the first string that looks like an\n" | |
7840 " email address. Example: 'User <user@example.com>' becomes\n" | |
7841 " 'user@example.com'.\n" | |
7842 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" | |
7843 " \"<\" and \">\" with XML entities.\n" | |
7844 " - fill68: Any text. Wraps the text to fit in 68 columns.\n" | |
7845 " - fill76: Any text. Wraps the text to fit in 76 columns.\n" | |
7846 " - firstline: Any text. Returns the first line of text.\n" | |
7847 " - nonempty: Any text. Returns '(none)' if the string is empty.\n" | |
7848 " - hgdate: Date. Returns the date as a pair of numbers:\n" | |
7849 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" | |
7850 " - isodate: Date. Returns the date in ISO 8601 format.\n" | |
7851 " - localdate: Date. Converts a date to local date.\n" | |
7852 " - obfuscate: Any text. Returns the input text rendered as a\n" | |
7853 " sequence of XML entities.\n" | |
7854 " - person: Any text. Returns the text before an email address.\n" | |
7855 " - rfc822date: Date. Returns a date using the same format used\n" | |
7856 " in email headers.\n" | |
7857 " - short: Changeset hash. Returns the short form of a changeset\n" | |
7858 " hash, i.e. a 12-byte hexadecimal string.\n" | |
7859 " - shortdate: Date. Returns a date like \"2006-09-18\".\n" | |
7860 " - strip: Any text. Strips all leading and trailing whitespace.\n" | |
7861 " - tabindent: Any text. Returns the text, with every line except\n" | |
7862 " the first starting with a tab character.\n" | |
7863 " - urlescape: Any text. Escapes all \"special\" characters. For\n" | |
7864 " example, \"foo bar\" becomes \"foo%20bar\".\n" | |
7865 " - user: Any text. Returns the user portion of an email address.\n" | |
7866 " " | |
7867 msgstr "" | |
7868 | |
7869 msgid "URL Paths" | 7812 msgid "URL Paths" |
7870 msgstr "" | |
7871 | |
7872 msgid "" | |
7873 "\n" | |
7874 " Valid URLs are of the form:\n" | |
7875 "\n" | |
7876 " local/filesystem/path[#revision]\n" | |
7877 " file://local/filesystem/path[#revision]\n" | |
7878 " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
7879 " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
7880 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n" | |
7881 "\n" | |
7882 " Paths in the local filesystem can either point to Mercurial\n" | |
7883 " repositories or to bundle files (as created by 'hg bundle' or\n" | |
7884 " 'hg incoming --bundle').\n" | |
7885 "\n" | |
7886 " An optional identifier after # indicates a particular branch, tag,\n" | |
7887 " or changeset to use from the remote repository. See also 'hg help\n" | |
7888 " revisions'.\n" | |
7889 "\n" | |
7890 " Some features, such as pushing to http:// and https:// URLs are\n" | |
7891 " only possible if the feature is explicitly enabled on the remote\n" | |
7892 " Mercurial server.\n" | |
7893 "\n" | |
7894 " Some notes about using SSH with Mercurial:\n" | |
7895 " - SSH requires an accessible shell account on the destination\n" | |
7896 " machine and a copy of hg in the remote path or specified with as\n" | |
7897 " remotecmd.\n" | |
7898 " - path is relative to the remote user's home directory by default.\n" | |
7899 " Use an extra slash at the start of a path to specify an absolute " | |
7900 "path:\n" | |
7901 " ssh://example.com//tmp/repository\n" | |
7902 " - Mercurial doesn't use its own compression via SSH; the right\n" | |
7903 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n" | |
7904 " Host *.mylocalnetwork.example.com\n" | |
7905 " Compression no\n" | |
7906 " Host *\n" | |
7907 " Compression yes\n" | |
7908 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" | |
7909 " or with the --ssh command line option.\n" | |
7910 "\n" | |
7911 " These URLs can all be stored in your hgrc with path aliases under\n" | |
7912 " the [paths] section like so:\n" | |
7913 " [paths]\n" | |
7914 " alias1 = URL1\n" | |
7915 " alias2 = URL2\n" | |
7916 " ...\n" | |
7917 "\n" | |
7918 " You can then use the alias for any command that uses a URL (for\n" | |
7919 " example 'hg pull alias1' would pull from the 'alias1' path).\n" | |
7920 "\n" | |
7921 " Two path aliases are special because they are used as defaults\n" | |
7922 " when you do not provide the URL to a command:\n" | |
7923 "\n" | |
7924 " default:\n" | |
7925 " When you create a repository with hg clone, the clone command\n" | |
7926 " saves the location of the source repository as the new\n" | |
7927 " repository's 'default' path. This is then used when you omit\n" | |
7928 " path from push- and pull-like commands (including incoming and\n" | |
7929 " outgoing).\n" | |
7930 "\n" | |
7931 " default-push:\n" | |
7932 " The push command will look for a path named 'default-push', and\n" | |
7933 " prefer it over 'default' if both are defined.\n" | |
7934 " " | |
7935 msgstr "" | 7813 msgstr "" |
7936 | 7814 |
7937 msgid "Using additional features" | 7815 msgid "Using additional features" |
7938 msgstr "" | 7816 msgstr "" |
7939 | 7817 |
7964 msgstr "" | 7842 msgstr "" |
7965 | 7843 |
7966 msgid "clone from remote to remote not supported" | 7844 msgid "clone from remote to remote not supported" |
7967 msgstr "" | 7845 msgstr "" |
7968 | 7846 |
7969 msgid "updated" | 7847 #, fuzzy, python-format |
7970 msgstr "" | 7848 msgid "updating to branch %s\n" |
7971 | 7849 msgstr "comparaison avec %s\n" |
7972 msgid "merged" | 7850 |
7973 msgstr "" | 7851 #, python-format |
7974 | 7852 msgid "" |
7975 msgid "removed" | 7853 "%d files updated, %d files merged, %d files removed, %d files unresolved\n" |
7976 msgstr "" | |
7977 | |
7978 msgid "unresolved" | |
7979 msgstr "" | |
7980 | |
7981 #, python-format | |
7982 msgid "%d files %s" | |
7983 msgstr "" | 7854 msgstr "" |
7984 | 7855 |
7985 msgid "use 'hg resolve' to retry unresolved file merges\n" | 7856 msgid "use 'hg resolve' to retry unresolved file merges\n" |
7986 msgstr "" | 7857 msgstr "" |
7987 | 7858 |
7988 msgid "" | 7859 msgid "" |
7989 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " | 7860 "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " |
7990 "abandon\n" | 7861 "abandon\n" |
7991 msgstr "" | 7862 msgstr "" |
7992 | 7863 |
7993 msgid "(branch merge, don't forget to commit)\n" | 7864 msgid "(branch merge, don't forget to commit)\n" |
7994 msgstr "" | 7865 msgstr "" |
8060 | 7931 |
8061 #, python-format | 7932 #, python-format |
8062 msgid "unsupported URL component: \"%s\"" | 7933 msgid "unsupported URL component: \"%s\"" |
8063 msgstr "" | 7934 msgstr "" |
8064 | 7935 |
8065 #, python-format | |
8066 msgid "using %s\n" | |
8067 msgstr "" | |
8068 | |
8069 #, python-format | |
8070 msgid "capabilities: %s\n" | |
8071 msgstr "" | |
8072 | |
8073 msgid "operation not supported over http" | 7936 msgid "operation not supported over http" |
8074 msgstr "" | 7937 msgstr "" |
8075 | 7938 |
8076 #, python-format | |
8077 msgid "sending %s command\n" | |
8078 msgstr "" | |
8079 | |
8080 #, python-format | |
8081 msgid "sending %s bytes\n" | |
8082 msgstr "" | |
8083 | |
8084 msgid "authorization failed" | 7939 msgid "authorization failed" |
8085 msgstr "" | 7940 msgstr "" |
8086 | 7941 |
8087 #, python-format | |
8088 msgid "http error while sending %s command\n" | |
8089 msgstr "" | |
8090 | |
8091 msgid "http error, possibly caused by proxy setting" | 7942 msgid "http error, possibly caused by proxy setting" |
8092 msgstr "" | 7943 msgstr "" |
8093 | 7944 |
8094 #, python-format | 7945 #, python-format |
8095 msgid "real URL is %s\n" | 7946 msgid "real URL is %s\n" |
8096 msgstr "" | 7947 msgstr "" |
8097 | 7948 |
8098 #, python-format | 7949 #, python-format |
8099 msgid "requested URL: '%s'\n" | |
8100 msgstr "" | |
8101 | |
8102 #, python-format | |
8103 msgid "'%s' does not appear to be an hg repository" | 7950 msgid "'%s' does not appear to be an hg repository" |
8104 msgstr "" | 7951 msgstr "" |
8105 | 7952 |
8106 #, python-format | 7953 #, python-format |
8107 msgid "'%s' sent a broken Content-Type header (%s)" | 7954 msgid "'%s' sent a broken Content-Type header (%s)" |
8132 | 7979 |
8133 msgid "cannot create new http repository" | 7980 msgid "cannot create new http repository" |
8134 msgstr "" | 7981 msgstr "" |
8135 | 7982 |
8136 #, python-format | 7983 #, python-format |
8137 msgid "%s: ignoring invalid syntax '%s'\n" | 7984 msgid "ignoring invalid syntax '%s'" |
8138 msgstr "" | 7985 msgstr "" |
8139 | 7986 |
8140 #, python-format | 7987 #, python-format |
8141 msgid "skipping unreadable ignore file '%s': %s\n" | 7988 msgid "skipping unreadable ignore file '%s': %s\n" |
8142 msgstr "" | 7989 msgstr "" |
8163 | 8010 |
8164 msgid "working copy of .hgtags is changed (please commit .hgtags manually)" | 8011 msgid "working copy of .hgtags is changed (please commit .hgtags manually)" |
8165 msgstr "" | 8012 msgstr "" |
8166 | 8013 |
8167 #, python-format | 8014 #, python-format |
8168 msgid "%s, line %s: %s\n" | |
8169 msgstr "" | |
8170 | |
8171 msgid "cannot parse entry" | |
8172 msgstr "" | |
8173 | |
8174 #, python-format | |
8175 msgid "node '%s' is not well formed" | |
8176 msgstr "" | |
8177 | |
8178 #, python-format | |
8179 msgid "working directory has unknown parent '%s'!" | 8015 msgid "working directory has unknown parent '%s'!" |
8180 msgstr "" | 8016 msgstr "" |
8181 | 8017 |
8182 #, python-format | 8018 #, python-format |
8183 msgid "unknown revision '%s'" | 8019 msgid "unknown revision '%s'" |
8184 msgstr "" | 8020 msgstr "" |
8185 | 8021 |
8186 #, python-format | |
8187 msgid "filtering %s through %s\n" | |
8188 msgstr "" | |
8189 | |
8190 msgid "journal already exists - run hg recover" | 8022 msgid "journal already exists - run hg recover" |
8191 msgstr "" | 8023 msgstr "" |
8192 | 8024 |
8193 msgid "rolling back interrupted transaction\n" | 8025 msgid "rolling back interrupted transaction\n" |
8194 msgstr "" | 8026 msgstr "" |
8214 msgid "repository %s" | 8046 msgid "repository %s" |
8215 msgstr "" | 8047 msgstr "" |
8216 | 8048 |
8217 #, python-format | 8049 #, python-format |
8218 msgid "working directory of %s" | 8050 msgid "working directory of %s" |
8219 msgstr "" | |
8220 | |
8221 #, python-format | |
8222 msgid " %s: searching for copy revision for %s\n" | |
8223 msgstr "" | |
8224 | |
8225 #, python-format | |
8226 msgid " %s: copy %s:%s\n" | |
8227 msgstr "" | 8051 msgstr "" |
8228 | 8052 |
8229 msgid "cannot partially commit a merge (do not specify files or patterns)" | 8053 msgid "cannot partially commit a merge (do not specify files or patterns)" |
8230 msgstr "" | 8054 msgstr "" |
8231 | 8055 |
8288 msgstr "" | 8112 msgstr "" |
8289 | 8113 |
8290 msgid "searching for changes\n" | 8114 msgid "searching for changes\n" |
8291 msgstr "" | 8115 msgstr "" |
8292 | 8116 |
8293 #, python-format | |
8294 msgid "examining %s:%s\n" | |
8295 msgstr "" | |
8296 | |
8297 msgid "branch already found\n" | |
8298 msgstr "" | |
8299 | |
8300 #, python-format | |
8301 msgid "found incomplete branch %s:%s\n" | |
8302 msgstr "" | |
8303 | |
8304 #, python-format | |
8305 msgid "found new changeset %s\n" | |
8306 msgstr "" | |
8307 | |
8308 #, python-format | |
8309 msgid "request %d: %s\n" | |
8310 msgstr "" | |
8311 | |
8312 #, python-format | |
8313 msgid "received %s:%s\n" | |
8314 msgstr "" | |
8315 | |
8316 #, python-format | |
8317 msgid "narrowing %d:%d %s\n" | |
8318 msgstr "" | |
8319 | |
8320 #, python-format | |
8321 msgid "found new branch changeset %s\n" | |
8322 msgstr "" | |
8323 | |
8324 #, python-format | |
8325 msgid "narrowed branch search to %s:%s\n" | |
8326 msgstr "" | |
8327 | |
8328 msgid "already have changeset " | 8117 msgid "already have changeset " |
8329 msgstr "" | 8118 msgstr "" |
8330 | 8119 |
8331 msgid "warning: repository is unrelated\n" | 8120 msgid "warning: repository is unrelated\n" |
8332 msgstr "" | 8121 msgstr "" |
8333 | 8122 |
8334 msgid "repository is unrelated" | 8123 msgid "repository is unrelated" |
8335 msgstr "" | |
8336 | |
8337 msgid "found new changesets starting at " | |
8338 msgstr "" | |
8339 | |
8340 #, python-format | |
8341 msgid "%d total queries\n" | |
8342 msgstr "" | |
8343 | |
8344 msgid "common changesets up to " | |
8345 msgstr "" | 8124 msgstr "" |
8346 | 8125 |
8347 msgid "requesting all changes\n" | 8126 msgid "requesting all changes\n" |
8348 msgstr "" | 8127 msgstr "" |
8349 | 8128 |
8367 | 8146 |
8368 #, python-format | 8147 #, python-format |
8369 msgid "%d changesets found\n" | 8148 msgid "%d changesets found\n" |
8370 msgstr "" | 8149 msgstr "" |
8371 | 8150 |
8372 msgid "list of changesets:\n" | |
8373 msgstr "" | |
8374 | |
8375 #, python-format | 8151 #, python-format |
8376 msgid "empty or missing revlog for %s" | 8152 msgid "empty or missing revlog for %s" |
8377 msgstr "" | 8153 msgstr "" |
8378 | 8154 |
8379 #, python-format | |
8380 msgid "add changeset %s\n" | |
8381 msgstr "" | |
8382 | |
8383 msgid "adding changesets\n" | 8155 msgid "adding changesets\n" |
8384 msgstr "" | 8156 msgstr "" |
8385 | 8157 |
8386 msgid "received changelog group is empty" | 8158 msgid "received changelog group is empty" |
8387 msgstr "" | 8159 msgstr "" |
8390 msgstr "" | 8162 msgstr "" |
8391 | 8163 |
8392 msgid "adding file changes\n" | 8164 msgid "adding file changes\n" |
8393 msgstr "" | 8165 msgstr "" |
8394 | 8166 |
8395 #, python-format | |
8396 msgid "adding %s revisions\n" | |
8397 msgstr "" | |
8398 | |
8399 msgid "received file revlog group is empty" | 8167 msgid "received file revlog group is empty" |
8400 msgstr "" | 8168 msgstr "" |
8401 | 8169 |
8402 #, python-format | 8170 #, python-format |
8403 msgid " (%+d heads)" | 8171 msgid " (%+d heads)" |
8405 | 8173 |
8406 #, python-format | 8174 #, python-format |
8407 msgid "added %d changesets with %d changes to %d files%s\n" | 8175 msgid "added %d changesets with %d changes to %d files%s\n" |
8408 msgstr "" | 8176 msgstr "" |
8409 | 8177 |
8410 msgid "updating the branch cache\n" | |
8411 msgstr "" | |
8412 | |
8413 msgid "Unexpected response from remote server:" | 8178 msgid "Unexpected response from remote server:" |
8414 msgstr "" | 8179 msgstr "" |
8415 | 8180 |
8416 msgid "operation forbidden by server" | 8181 msgid "operation forbidden by server" |
8417 msgstr "" | 8182 msgstr "" |
8425 msgid "streaming all changes\n" | 8190 msgid "streaming all changes\n" |
8426 msgstr "" | 8191 msgstr "" |
8427 | 8192 |
8428 #, python-format | 8193 #, python-format |
8429 msgid "%d files to transfer, %s of data\n" | 8194 msgid "%d files to transfer, %s of data\n" |
8430 msgstr "" | |
8431 | |
8432 #, python-format | |
8433 msgid "adding %s (%s)\n" | |
8434 msgstr "" | 8195 msgstr "" |
8435 | 8196 |
8436 #, python-format | 8197 #, python-format |
8437 msgid "transferred %s in %.1f seconds (%s/sec)\n" | 8198 msgid "transferred %s in %.1f seconds (%s/sec)\n" |
8438 msgstr "" | 8199 msgstr "" |
8512 | 8273 |
8513 msgid "resolving manifests\n" | 8274 msgid "resolving manifests\n" |
8514 msgstr "" | 8275 msgstr "" |
8515 | 8276 |
8516 #, python-format | 8277 #, python-format |
8517 msgid " overwrite %s partial %s\n" | |
8518 msgstr "" | |
8519 | |
8520 #, python-format | |
8521 msgid " ancestor %s local %s remote %s\n" | |
8522 msgstr "" | |
8523 | |
8524 #, python-format | |
8525 msgid "" | 8278 msgid "" |
8526 " local changed %s which remote deleted\n" | 8279 " local changed %s which remote deleted\n" |
8527 "use (c)hanged version or (d)elete?" | 8280 "use (c)hanged version or (d)elete?" |
8528 msgstr "" | 8281 msgstr "" |
8529 | 8282 |
8531 msgstr "" | 8284 msgstr "" |
8532 | 8285 |
8533 msgid "&Delete" | 8286 msgid "&Delete" |
8534 msgstr "" | 8287 msgstr "" |
8535 | 8288 |
8536 msgid "c" | |
8537 msgstr "" | |
8538 | |
8539 #, python-format | 8289 #, python-format |
8540 msgid "" | 8290 msgid "" |
8541 "remote changed %s which local deleted\n" | 8291 "remote changed %s which local deleted\n" |
8542 "use (c)hanged version or leave (d)eleted?" | 8292 "use (c)hanged version or leave (d)eleted?" |
8543 msgstr "" | 8293 msgstr "" |
8544 | 8294 |
8545 msgid "&Deleted" | 8295 msgid "&Deleted" |
8546 msgstr "" | 8296 msgstr "" |
8547 | 8297 |
8548 #, python-format | 8298 #, python-format |
8549 msgid "preserving %s for resolve of %s\n" | |
8550 msgstr "" | |
8551 | |
8552 #, python-format | |
8553 msgid "update failed to remove %s: %s!\n" | 8299 msgid "update failed to remove %s: %s!\n" |
8554 msgstr "" | 8300 msgstr "" |
8555 | 8301 |
8556 #, python-format | 8302 #, python-format |
8557 msgid "getting %s\n" | 8303 msgid "getting %s\n" |
8594 #, python-format | 8340 #, python-format |
8595 msgid "cannot create %s: unable to create destination directory" | 8341 msgid "cannot create %s: unable to create destination directory" |
8596 msgstr "" | 8342 msgstr "" |
8597 | 8343 |
8598 #, python-format | 8344 #, python-format |
8599 msgid "found patch at byte %d\n" | |
8600 msgstr "" | |
8601 | |
8602 msgid "patch generated by hg export\n" | |
8603 msgstr "" | |
8604 | |
8605 #, python-format | |
8606 msgid "unable to find '%s' for patching\n" | 8345 msgid "unable to find '%s' for patching\n" |
8607 msgstr "" | 8346 msgstr "" |
8608 | 8347 |
8609 #, python-format | 8348 #, python-format |
8610 msgid "patching file %s\n" | 8349 msgid "patching file %s\n" |
8671 #, python-format | 8410 #, python-format |
8672 msgid "Unsupported line endings type: %s" | 8411 msgid "Unsupported line endings type: %s" |
8673 msgstr "" | 8412 msgstr "" |
8674 | 8413 |
8675 #, python-format | 8414 #, python-format |
8676 msgid "no valid hunks found; trying with %r instead\n" | 8415 msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
8677 msgstr "" | 8416 msgstr "" |
8678 | 8417 |
8679 #, python-format | 8418 #, python-format |
8680 msgid "exited with status %d" | 8419 msgid "exited with status %d" |
8681 msgstr "" | 8420 msgstr "" |
8683 #, python-format | 8422 #, python-format |
8684 msgid "killed by signal %d" | 8423 msgid "killed by signal %d" |
8685 msgstr "" | 8424 msgstr "" |
8686 | 8425 |
8687 #, python-format | 8426 #, python-format |
8688 msgid "stopped by signal %d" | |
8689 msgstr "" | |
8690 | |
8691 msgid "invalid exit code" | |
8692 msgstr "" | |
8693 | |
8694 #, python-format | |
8695 msgid "saving bundle to %s\n" | 8427 msgid "saving bundle to %s\n" |
8696 msgstr "" | 8428 msgstr "" |
8697 | 8429 |
8698 msgid "adding branch\n" | 8430 msgid "adding branch\n" |
8699 msgstr "" | 8431 msgstr "" |
8760 msgstr "" | 8492 msgstr "" |
8761 | 8493 |
8762 msgid "could not create remote repo" | 8494 msgid "could not create remote repo" |
8763 msgstr "" | 8495 msgstr "" |
8764 | 8496 |
8497 msgid "no suitable response from remote hg" | |
8498 msgstr "" | |
8499 | |
8765 msgid "remote: " | 8500 msgid "remote: " |
8766 msgstr "" | 8501 msgstr "" |
8767 | 8502 |
8768 msgid "no suitable response from remote hg" | |
8769 msgstr "" | |
8770 | |
8771 #, python-format | 8503 #, python-format |
8772 msgid "push refused: %s" | 8504 msgid "push refused: %s" |
8773 msgstr "" | 8505 msgstr "" |
8774 | 8506 |
8775 msgid "unsynced changes" | 8507 msgid "unsynced changes" |
8781 msgid "cannot create new static-http repository" | 8513 msgid "cannot create new static-http repository" |
8782 msgstr "" | 8514 msgstr "" |
8783 | 8515 |
8784 #, python-format | 8516 #, python-format |
8785 msgid "invalid entry in fncache, line %s" | 8517 msgid "invalid entry in fncache, line %s" |
8786 msgstr "" | |
8787 | |
8788 msgid "scanning\n" | |
8789 msgstr "" | |
8790 | |
8791 #, python-format | |
8792 msgid "%d files, %d bytes to transfer\n" | |
8793 msgstr "" | |
8794 | |
8795 #, python-format | |
8796 msgid "sending %s (%d bytes)\n" | |
8797 msgstr "" | 8518 msgstr "" |
8798 | 8519 |
8799 #, python-format | 8520 #, python-format |
8800 msgid "" | 8521 msgid "" |
8801 " subrepository sources for %s differ\n" | 8522 " subrepository sources for %s differ\n" |
8803 msgstr "" | 8524 msgstr "" |
8804 | 8525 |
8805 msgid "&Remote" | 8526 msgid "&Remote" |
8806 msgstr "" | 8527 msgstr "" |
8807 | 8528 |
8808 msgid "r" | |
8809 msgstr "" | |
8810 | |
8811 #, python-format | 8529 #, python-format |
8812 msgid "" | 8530 msgid "" |
8813 " local changed subrepository %s which remote removed\n" | 8531 " local changed subrepository %s which remote removed\n" |
8814 "use (c)hanged version or (d)elete?" | 8532 "use (c)hanged version or (d)elete?" |
8815 msgstr "" | 8533 msgstr "" |
8830 | 8548 |
8831 #, python-format | 8549 #, python-format |
8832 msgid "pushing subrepo %s\n" | 8550 msgid "pushing subrepo %s\n" |
8833 msgstr "" | 8551 msgstr "" |
8834 | 8552 |
8553 #, python-format | |
8554 msgid "%s, line %s: %s\n" | |
8555 msgstr "" | |
8556 | |
8557 msgid "cannot parse entry" | |
8558 msgstr "" | |
8559 | |
8560 #, python-format | |
8561 msgid "node '%s' is not well formed" | |
8562 msgstr "" | |
8563 | |
8835 msgid "unmatched quotes" | 8564 msgid "unmatched quotes" |
8836 msgstr "" | 8565 msgstr "" |
8837 | 8566 |
8838 #, python-format | 8567 #, python-format |
8839 msgid "error expanding '%s%%%s'" | 8568 msgid "error expanding '%s%%%s'" |
8895 | 8624 |
8896 #, python-format | 8625 #, python-format |
8897 msgid "username %s contains a newline\n" | 8626 msgid "username %s contains a newline\n" |
8898 msgstr "" | 8627 msgstr "" |
8899 | 8628 |
8629 msgid "response expected" | |
8630 msgstr "" | |
8631 | |
8900 msgid "unrecognized response\n" | 8632 msgid "unrecognized response\n" |
8901 msgstr "" | 8633 msgstr "" |
8902 | 8634 |
8903 msgid "response expected" | |
8904 msgstr "" | |
8905 | |
8906 msgid "password: " | 8635 msgid "password: " |
8907 msgstr "" | 8636 msgstr "" |
8908 | 8637 |
8909 msgid "edit failed" | 8638 msgid "edit failed" |
8910 msgstr "" | 8639 msgstr "" |
8929 #, python-format | 8658 #, python-format |
8930 msgid "http auth: user %s, password %s\n" | 8659 msgid "http auth: user %s, password %s\n" |
8931 msgstr "" | 8660 msgstr "" |
8932 | 8661 |
8933 #, python-format | 8662 #, python-format |
8934 msgid "proxying through http://%s:%s\n" | |
8935 msgstr "" | |
8936 | |
8937 #, python-format | |
8938 msgid "command '%s' failed: %s" | 8663 msgid "command '%s' failed: %s" |
8939 msgstr "" | 8664 msgstr "" |
8940 | 8665 |
8941 #, python-format | 8666 #, python-format |
8942 msgid "path contains illegal component: %s" | 8667 msgid "path contains illegal component: %s" |
9130 #, python-format | 8855 #, python-format |
9131 msgid "unpacking %s" | 8856 msgid "unpacking %s" |
9132 msgstr "" | 8857 msgstr "" |
9133 | 8858 |
9134 #, python-format | 8859 #, python-format |
8860 msgid "warning: copy source of '%s' not in parents of %s" | |
8861 msgstr "" | |
8862 | |
8863 #, python-format | |
9135 msgid "empty or missing copy source revlog %s:%s" | 8864 msgid "empty or missing copy source revlog %s:%s" |
9136 msgstr "" | 8865 msgstr "" |
9137 | 8866 |
9138 #, python-format | 8867 #, python-format |
9139 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" | 8868 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" |