diff --git a/po/documentation.fr.po b/po/documentation.fr.po index a3dff39ada6977f4d7acc55ab6c7c57b3e8fafb6..700ed0b60f35ffdce9d6a71f2b69112436c8822c 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-10-09 18:58+0200\n" -"PO-Revision-Date: 2020-10-14 05:26+0000\n" +"PO-Revision-Date: 2020-10-16 19:26+0000\n" "Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.3-dev\n" +"X-Generator: Weblate 4.3.1-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:675 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 @@ -7466,36 +7466,43 @@ msgstr "" #, priority:100 msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped." msgstr "" +"Le message de validation est form챕 par le titre tir챕 du \"Subject:\", une " +"ligne vide et le corps du message jusqu'au d챕but du patch. Les espaces en " +"exc챔s 횪 la fin de chaque ligne sont automatiquement supprim챕s." #. type: Plain text #: en/git-am.txt:208 #, priority:100 msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:" msgstr "" +"La rustine devrait 챗tre incluse, 횪 la suite imm챕diate du message. Toute " +"ligne qui est de la forme :" #. type: Plain text #: en/git-am.txt:210 #, priority:100 msgid "three-dashes and end-of-line, or" -msgstr "" +msgstr "trois tirets et fin de ligne, ou" #. type: Plain text #: en/git-am.txt:211 #, priority:100 msgid "a line that begins with \"diff -\", or" -msgstr "" +msgstr "une ligne qui commence par \"diff -\", ou" #. type: Plain text #: en/git-am.txt:212 #, priority:100 msgid "a line that begins with \"Index: \"" -msgstr "" +msgstr "une ligne qui commence par \"Index : \"" #. type: Plain text #: en/git-am.txt:215 #, priority:100 msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line." msgstr "" +"est pris comme le d챕but d'une rustine, et le message de journal de " +"validation est termin챕 avant la premi챔re occurrence d'une telle ligne." #. type: Plain text #: en/git-am.txt:219 @@ -7508,24 +7515,37 @@ msgstr "" #, priority:100 msgid "skip the current patch by re-running the command with the `--skip` option." msgstr "" +"sauter la rustine en cours en relan챌ant la commande avec l'option `--skip`." #. type: Plain text #: en/git-am.txt:226 #, priority:100 msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option." msgstr "" +"r챕soudre manuellement le conflit dans le r챕pertoire de travail, et mettre 횪 " +"jour le fichier d'index pour le mettre dans un 챕tat que la rustine aurait d청 " +"produire. Ensuite, lancer la commande avec l'option `--continue`." #. type: Plain text #: en/git-am.txt:231 #, priority:100 msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names." msgstr "" +"La commande refuse de traiter de nouvelles bo챤tes aux lettres tant que " +"l'op챕ration en cours n'est pas termin챕e, donc si vous d챕cidez de repartir de " +"z챕ro, lancez `git am --abort` avant d'ex챕cuter la commande avec les noms des " +"bo챤tes aux lettres." #. type: Plain text #: en/git-am.txt:237 #, priority:100 msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)." msgstr "" +"Avant l'application de tout correctif, ORIG_HEAD est plac챕 au sommet de la " +"branche en cours. C'est utile si vous avez des probl챔mes avec plusieurs " +"commits, par exemple si vous lancez 'git am' sur la mauvaise branche ou si " +"une erreur dans les commits est plus facilement corrig챕e en changeant de " +"bo챤te aux lettres (par exemple des erreurs dans les lignes \"From :\")." #. type: Title - #: en/git-am.txt:239 en/git-commit.txt:521 en/git-gc.txt:146 @@ -7556,18 +7576,22 @@ msgstr "git-annotate(1)" #, priority:100 msgid "git-annotate - Annotate file lines with commit information" msgstr "" +"git-annotate - Annote les lignes d'un fichier avec les informations de commit" #. type: Plain text #: en/git-annotate.txt:12 #, no-wrap, priority:100 msgid "'git annotate' [<options>] <file> [<revision>]\n" -msgstr "" +msgstr "'git annotate' [<options>] <fichier> [<r챕vision>]\n" #. type: Plain text #: en/git-annotate.txt:17 #, priority:100 msgid "Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision." msgstr "" +"Annote chaque ligne dans le fichier donn챕 avec les informations du commit " +"qui a introduit la ligne. Annote optionnellement 횪 partir d'une r챕vision " +"donn챕e." #. type: Plain text #: en/git-annotate.txt:22