Skip to content
Snippets Groups Projects
Commit 2ab9ec0f authored by Cédric Duval's avatar Cédric Duval
Browse files

i18n-fr: synchronized with 78e54b9f3a62

parent 38d8b025
No related branches found
No related tags found
No related merge requests found
......@@ -86,7 +86,7 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
"POT-Creation-Date: 2009-07-01 08:41+0200\n"
"POT-Creation-Date: 2009-07-18 22:46+0200\n"
"PO-Revision-Date: 2009-05-14 13:06+0200\n"
"Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
"Language-Team: French\n"
......@@ -1026,7 +1026,9 @@
msgid "CVS pserver authentication failed"
msgstr ""
msgid "server sucks"
#, python-format
msgid ""
"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
msgstr ""
#, python-format
......@@ -2611,7 +2613,6 @@
"\n"
" To stop managing a patch and move it into permanent history,\n"
" use the qfinish command."
msgstr ""
"supprime des patchs de la pile\n"
"\n"
......@@ -4844,6 +4845,10 @@
msgstr ""
#, python-format
msgid "HG: subrepo %s"
msgstr ""
#, python-format
msgid "HG: added %s"
msgstr ""
......@@ -4983,7 +4988,8 @@
msgstr "le répertoire racine ne peut servir de destination"
msgid "cannot archive plain files to stdout"
msgstr "impossible d'envoyer une archive de simples fichiers vers la sortie standard"
msgstr ""
"impossible d'envoyer une archive de simples fichiers vers la sortie standard"
msgid ""
"reverse effect of earlier changeset\n"
......@@ -5156,7 +5162,8 @@
" the parent of the working directory, negating a previous branch\n"
" change.\n"
"\n"
" Use the command 'hg update' to switch to an existing branch.\n"
" Use the command 'hg update' to switch to an existing branch. Use\n"
" 'hg commit --close-branch' to mark this branch as closed.\n"
" "
msgstr ""
......@@ -5175,9 +5182,11 @@
"list repository named branches\n"
"\n"
" List the repository's named branches, indicating which ones are\n"
" inactive. If -a/--active is specified, only show active branches.\n"
"\n"
" A branch is considered active if it contains repository heads.\n"
" inactive. If -c/--closed is specified, also list branches which have\n"
" been marked closed (see hg commit --close-branch).\n"
"\n"
" If -a/--active is specified, only show active branches. A branch\n"
" is considered active if it contains repository heads.\n"
"\n"
" Use the command 'hg update' to switch to an existing branch.\n"
" "
......@@ -5300,6 +5309,9 @@
" "
msgstr ""
msgid "nothing changed\n"
msgstr ""
msgid "created new head\n"
msgstr ""
......@@ -5628,7 +5640,8 @@
" 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"
" is considered inactive. If -c/--closed is specified, also show branch\n"
" heads marked closed (see hg commit --close-branch).\n"
"\n"
" If STARTREV is specified only those heads (or branch heads) that\n"
" are descendants of STARTREV will be displayed.\n"
......@@ -6618,6 +6631,9 @@
msgid "show only branches that have unmerged heads"
msgstr ""
msgid "show normal and closed heads"
msgstr ""
msgid "[-a]"
msgstr ""
......@@ -6765,9 +6781,6 @@
msgid "show only the active heads from open branches"
msgstr ""
msgid "show normal and closed heads"
msgstr ""
msgid "[-r STARTREV] [REV]..."
msgstr ""
......@@ -7860,13 +7873,14 @@
"\n"
" Valid URLs are of the form:\n"
"\n"
" local/filesystem/path (or file://local/filesystem/path)\n"
" http://[user[:pass]@]host[:port]/[path]\n"
" https://[user[:pass]@]host[:port]/[path]\n"
" ssh://[user[:pass]@]host[:port]/[path]\n"
" local/filesystem/path[#revision]\n"
" file://local/filesystem/path[#revision]\n"
" http://[user[:pass]@]host[:port]/[path][#revision]\n"
" https://[user[:pass]@]host[:port]/[path][#revision]\n"
" ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
"\n"
" Paths in the local filesystem can either point to Mercurial\n"
" repositories or to bundle files (as created by 'hg bundle' or\n"
" 'hg incoming --bundle').\n"
"\n"
" An optional identifier after # indicates a particular branch, tag,\n"
......@@ -7867,10 +7881,11 @@
"\n"
" Paths in the local filesystem can either point to Mercurial\n"
" repositories or to bundle files (as created by 'hg bundle' or\n"
" 'hg incoming --bundle').\n"
"\n"
" An optional identifier after # indicates a particular branch, tag,\n"
" or changeset to use from the remote repository.\n"
" or changeset to use from the remote repository. See also 'hg help\n"
" revisions'.\n"
"\n"
" Some features, such as pushing to http:// and https:// URLs are\n"
" only possible if the feature is explicitly enabled on the remote\n"
......@@ -8223,9 +8238,6 @@
msgid "file not tracked!"
msgstr ""
msgid "nothing changed\n"
msgstr ""
msgid "unresolved merge conflicts (see hg resolve)"
msgstr ""
......@@ -9124,7 +9136,7 @@
msgstr ""
#, python-format
msgid "warning: %s@%s: copy source revision is nullid %s:%s"
msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
msgstr ""
#, python-format
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment