diff -r 7d39c76be4ee -r 134b37b27c20 i18n/fr.po
--- a/i18n/fr.po	Tue Jun 30 23:30:52 2009 +0200
+++ b/i18n/fr.po	Wed Jul 01 07:09:44 2009 +0200
@@ -86,7 +86,7 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2009-06-28 20:09+0200\n"
+"POT-Creation-Date: 2009-07-01 06:55+0200\n"
 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
 "Language-Team: French\n"
@@ -115,7 +115,7 @@
 msgstr ""
 
 msgid ""
-"control access to a repository using simple hooks\n"
+"hooks for controlling repository access\n"
 "\n"
 "This hook makes it possible to allow or deny write access to portions\n"
 "of a repository when receiving incoming changesets.\n"
@@ -267,7 +267,7 @@
 msgstr ""
 
 msgid ""
-"integrate Mercurial with a Bugzilla bug tracker\n"
+"hooks for integrating with the Bugzilla bug tracker\n"
 "\n"
 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
@@ -451,7 +451,7 @@
 msgid "database error: %s"
 msgstr ""
 
-msgid "display children changesets"
+msgid "command to display child changesets"
 msgstr ""
 
 msgid ""
@@ -471,7 +471,7 @@
 msgid "hg children [-r REV] [FILE]"
 msgstr ""
 
-msgid "display statistics about repository history"
+msgid "command to display statistics about repository history"
 msgstr ""
 
 #, python-format
@@ -599,7 +599,11 @@
 msgid "don't colorize output"
 msgstr ""
 
-msgid "import from foreign VCS repositories into Mercurial"
+#, python-format
+msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
+msgstr ""
+
+msgid "import revisions from foreign VCS repositories into Mercurial"
 msgstr ""
 
 msgid ""
@@ -1342,7 +1346,7 @@
 msgstr ""
 
 msgid ""
-"allow external programs to compare revisions\n"
+"command to allow external programs to compare revisions\n"
 "\n"
 "The `extdiff' Mercurial extension allows you to use external programs\n"
 "to compare revisions, or revision with working directory. The external diff\n"
@@ -1522,7 +1526,7 @@
 msgid "hg fetch [SOURCE]"
 msgstr ""
 
-msgid "sign and verify changesets"
+msgid "commands to sign and verify changesets"
 msgstr ""
 
 msgid "error while verifying signature"
@@ -1607,7 +1611,7 @@
 msgstr ""
 
 msgid ""
-"show revision graphs in terminals\n"
+"command to view revision graphs from a shell\n"
 "\n"
 "This extension adds a --graph option to the incoming, outgoing and log\n"
 "commands. When this options is given, an ASCII representation of the\n"
@@ -1652,7 +1656,7 @@
 msgstr ""
 
 msgid ""
-"integrate Mercurial with a CIA notification service\n"
+"hooks for integrating with the CIA.vc notification service\n"
 "\n"
 "This is meant to be run as a changegroup or incoming hook.\n"
 "To configure it, set the following options in your hgrc:\n"
@@ -1788,7 +1792,7 @@
 msgid "hg debug-config"
 msgstr ""
 
-msgid "hg debug-merge-base node node"
+msgid "hg debug-merge-base REV REV"
 msgstr ""
 
 msgid "ignored"
@@ -1809,11 +1813,11 @@
 msgid "max-count"
 msgstr ""
 
-msgid "hg debug-rev-list [options] revs"
-msgstr ""
-
-msgid ""
-"syntax highlighting for hgweb\n"
+msgid "hg debug-rev-list [OPTION]... REV..."
+msgstr "hg debug-rev-list [OPTION]... REV..."
+
+msgid ""
+"syntax highlighting for hgweb (requires Pygments)\n"
 "\n"
 "It depends on the Pygments syntax highlighting library:\n"
 "http://pygments.org/\n"
@@ -1824,11 +1828,9 @@
 "pygments_style = <style>\n"
 "\n"
 "The default is 'colorful'.\n"
-"\n"
-"-- Adam Hupp <adam@hupp.org>\n"
-msgstr ""
-
-msgid "accelerate status report using system level services"
+msgstr ""
+
+msgid "accelerate status report using Linux's inotify service"
 msgstr ""
 
 msgid "start an inotify server for this repository"
@@ -1856,8 +1858,8 @@
 msgid "name of file to write process ID to"
 msgstr ""
 
-msgid "hg inserve [OPT]..."
-msgstr ""
+msgid "hg inserve [OPTION]..."
+msgstr "hg inserve [OPTION]..."
 
 msgid "(found dead inotify server socket; removing it)\n"
 msgstr ""
@@ -2104,18 +2106,18 @@
 msgstr ""
 
 #, python-format
-msgid ""
-"\n"
-"\t%s\n"
-msgstr ""
-
-#, python-format
 msgid "creating temporary repository at %s\n"
 msgstr ""
 
 #, python-format
 msgid ""
 "\n"
+"\tconfig using %s keyword template maps\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"\n"
 "%s keywords written to %s:\n"
 msgstr ""
 
@@ -2125,6 +2127,12 @@
 #, python-format
 msgid ""
 "\n"
+"\t%s keywords expanded%s\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"\n"
 "removing temporary repository %s\n"
 msgstr ""
 
@@ -2138,11 +2146,26 @@
 msgstr ""
 
 msgid ""
-"print files currently configured for keyword expansion\n"
-"\n"
-"    Crosscheck which files in working directory are potential targets\n"
-"    for keyword expansion. That is, files matched by [keyword] config\n"
-"    patterns but not symlinks.\n"
+"show files configured for keyword expansion\n"
+"\n"
+"    List which files in the working directory are matched by the\n"
+"    [keyword] configuration patterns.\n"
+"\n"
+"    Useful to prevent inadvertent keyword expansion and to speed up\n"
+"    execution by including only files that are actual candidates\n"
+"    for expansion.\n"
+"\n"
+"    See \"hg help keyword\" on how to construct patterns both for\n"
+"    inclusion and exclusion of files.\n"
+"\n"
+"    Use -u/--untracked to list untracked files as well.\n"
+"\n"
+"    With -a/--all and -v/--verbose the codes used to show the status\n"
+"    of files are:\n"
+"    K = keyword expansion candidate\n"
+"    k = keyword expansion candidate (untracked)\n"
+"    I = ignored\n"
+"    i = ignored (untracked)\n"
 "    "
 msgstr ""
 
@@ -2184,7 +2207,7 @@
 msgstr ""
 
 msgid ""
-"work with a stack of patches\n"
+"manage a stack of patches\n"
 "\n"
 "This extension lets you work with a stack of patches in a Mercurial\n"
 "repository. It manages two stacks of patches - all known patches, and\n"
@@ -2543,11 +2566,9 @@
 msgid ""
 "remove patches from queue\n"
 "\n"
-"    The patches must not be applied, and at least one patch is\n"
-"    required.\n"
-"\n"
-"    With -k/--keep, the patch files are preserved in the patch\n"
-"    directory.\n"
+"    The patches must not be applied, and at least one patch is required. "
+"With\n"
+"    -k/--keep, the patch files are preserved in the patch directory.\n"
 "\n"
 "    To stop managing a patch and move it into permanent history,\n"
 "    use the qfinish command."
@@ -3180,11 +3201,11 @@
 msgid "finish all applied changesets"
 msgstr ""
 
-msgid "hg qfinish [-a] [REV...]"
-msgstr ""
-
-msgid ""
-"send e-mail notifications for commits/pushes\n"
+msgid "hg qfinish [-a] [REV]..."
+msgstr ""
+
+msgid ""
+"hooks for sending email notifications at commit/push time\n"
 "\n"
 "Subscriptions can be managed through hgrc. Default mode is to print\n"
 "messages to stdout, for testing and configuring.\n"
@@ -3332,10 +3353,9 @@
 "  foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
 msgstr ""
 
-# cédric: première ligne trop longue (utilisée pour la liste d'extensions
-#         activée, une par ligne) -> traduction abrégée
-msgid ""
-"send Mercurial changesets as a series of patch e-mails\n"
+# première ligne trop longue -> traduction abrégée
+msgid ""
+"command to send changesets as (a series of) patch emails\n"
 "\n"
 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
 "describes the series as a whole.\n"
@@ -3700,7 +3720,7 @@
 msgid "hg email [OPTION]... [DEST]..."
 msgstr "hg email [OPTION]... [DEST]..."
 
-msgid "delete files not tracked from the working directory"
+msgid "command to delete untracked files from the working directory"
 msgstr ""
 
 msgid ""
@@ -3760,13 +3780,13 @@
 msgstr ""
 
 msgid ""
-"move sets of revisions to a different ancestor\n"
+"command to move sets of revisions to a different ancestor\n"
 "\n"
 "This extension lets you rebase changesets in an existing Mercurial\n"
 "repository.\n"
 "\n"
 "For more information:\n"
-"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
+"http://mercurial.selenic.com/wiki/RebaseProject\n"
 msgstr ""
 
 msgid "first revision, do not change ancestor\n"
@@ -3935,7 +3955,7 @@
 "| [-c] | [-a]"
 msgstr ""
 
-msgid "interactively select which sets of changes to commit/qrefresh"
+msgid "commands to interactively select changes for commit/qrefresh"
 msgstr ""
 
 msgid "this modifies a binary file (all or nothing)\n"
@@ -4093,7 +4113,7 @@
 msgstr ""
 
 msgid ""
-"transplant changesets from another branch\n"
+"command to transplant changesets from another branch\n"
 "\n"
 "This extension allows you to transplant patches from another branch.\n"
 "\n"
@@ -4239,7 +4259,7 @@
 msgstr ""
 
 msgid ""
-"allow the use of MBCS paths with problematic encoding\n"
+"allow the use of MBCS paths with problematic encodings\n"
 "\n"
 "Some MBCS encodings are not good for some path operations (i.e.\n"
 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
@@ -4873,7 +4893,7 @@
 "list repository named branches\n"
 "\n"
 "    List the repository's named branches, indicating which ones are\n"
-"    inactive. If active is specified, only show active branches.\n"
+"    inactive. If -a/--active is specified, only show active branches.\n"
 "\n"
 "    A branch is considered active if it contains repository heads.\n"
 "\n"
@@ -4892,8 +4912,8 @@
 "    parameters. To create a bundle containing all changesets, use\n"
 "    -a/--all (or --base null).\n"
 "\n"
-"    To change the compression method applied, use the -t/--type\n"
-"    option. The available compression methods are: none, bzip2, and\n"
+"    You can change compression method with the -t/--type option.\n"
+"    The available compression methods are: none, bzip2, and\n"
 "    gzip (by default, bundles are compressed using bzip2).\n"
 "\n"
 "    The bundle file can then be transferred using conventional means\n"
@@ -5151,8 +5171,8 @@
 msgstr ""
 
 msgid ""
-" Internal patcher failure, please report this error to http://www.selenic."
-"com/mercurial/bts\n"
+" Internal patcher failure, please report this error to http://mercurial."
+"selenic.com/bts/\n"
 msgstr ""
 
 msgid "Checking commit editor...\n"
@@ -5323,7 +5343,7 @@
 "    branch is called the revision's branch tag.\n"
 "\n"
 "    Branch heads are revisions on a given named branch that do not have\n"
-"    any children on the same branch. A branch head could be a true head\n"
+"    any descendants on the same branch. A branch head could be a true head\n"
 "    or it could be the last changeset on a branch before a new branch\n"
 "    was created. If none of the branch heads are true heads, the branch\n"
 "    is considered inactive.\n"
@@ -5473,7 +5493,8 @@
 "    With -s/--similarity, hg will attempt to discover renames and\n"
 "    copies in the patch in the same way as 'addremove'.\n"
 "\n"
-"    To read a patch from standard input, use \"-\" as the patch name.\n"
+"    To read a patch from standard input, use \"-\" as the patch name. If\n"
+"    a URL is specified, the patch will be downloaded from it.\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
@@ -6925,7 +6946,7 @@
 msgid "** unknown exception encountered, details follow\n"
 msgstr ""
 
-msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
+msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
 msgstr ""
 
 msgid "** or mercurial@selenic.com\n"