From 7e0c35324b952931439aafcbff8ce6c4efd14b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Wed, 29 Apr 2020 20:18:53 +0000 Subject: [PATCH] Translated using Weblate (French) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 45.0% (4616 of 10245 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/ Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr> --- po/documentation.fr.po | 126 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 6 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 8f62c6d..ee5ea09 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-04-04 19:51+0200\n" -"PO-Revision-Date: 2020-04-28 14:59+0000\n" +"PO-Revision-Date: 2020-05-05 10:11+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.0.2\n" +"X-Generator: Weblate 4.1-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:666 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 @@ -37979,6 +37979,10 @@ msgstr "--[no-]atomic" #, priority:220 msgid "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail." msgstr "" +"Utiliser une transaction atomique 횪 distance, si possible. Soit toutes les " +"r챕f챕rences sont mises 횪 jour, soit, en cas d'erreur, aucune r챕f챕rence n'est " +"mise 횪 jour. Si le serveur ne prend pas en charge les pouss챕es atomiques, " +"la pouss챕e 챕chouera." #. type: Labeled list #: en/git-push.txt:216 @@ -37991,6 +37995,13 @@ msgstr "--push-option=<option>" #, priority:220 msgid "Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. When multiple `--push-option=<option>` are given, they are all sent to the other side in the order listed on the command line. When no `--push-option=<option>` is given from the command line, the values of configuration variable `push.pushOption` are used instead." msgstr "" +"Transmettre la cha챤ne donn챕e au serveur, qui les transmet au crochet pre-" +"receive ainsi qu'au crochet post-receive. La cha챤ne donn챕e ne doit pas " +"contenir de caract챔re NUL ou LF. Lorsque plusieurs `--push-option=<option>` " +"sont donn챕s, ils sont tous envoy챕s de l'autre c척t챕 dans l'ordre indiqu챕 sur " +"la ligne de commande. Lorsqu'aucun `--push-option=<option>` n'est donn챕 en " +"ligne de commande, les valeurs de la variable de configuration " +"`push.pushOption` sont utilis챕es 횪 la place." #. type: Labeled list #: en/git-push.txt:227 en/git-send-pack.txt:28 @@ -38009,6 +38020,9 @@ msgstr "--exec=<git-receive-pack>" #, priority:220 msgid "Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH." msgstr "" +"Chemin d'acc챔s au programme 'git-receive-pack' sur l'extr챕mit챕 distante. " +"Parfois utile lorsque vous poussez vers un d챕p척t distant via ssh, et que " +"vous n'avez pas le programme dans un r챕pertoire sur le $PATH par d챕faut." #. type: Labeled list #: en/git-push.txt:234 @@ -38020,85 +38034,138 @@ msgstr "--[no-]force-with-lease" #: en/git-push.txt:235 #, no-wrap, priority:220 msgid "--force-with-lease=<refname>" -msgstr "" +msgstr "--force-with-lease=<nom-de-r챕f>" #. type: Labeled list #: en/git-push.txt:236 #, no-wrap, priority:220 msgid "--force-with-lease=<refname>:<expect>" -msgstr "" +msgstr "--force-with-lease=<nom-de-r챕f>:<attendu>" #. type: Plain text #: en/git-push.txt:239 #, priority:220 msgid "Usually, \"git push\" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it." msgstr "" +"Habituellement, \"git push\" refuse de mettre 횪 jour une r챕f챕rence distante " +"qui n'est pas un anc챗tre de la r챕f챕rence locale utilis챕e pour la remplacer." #. type: Plain text #: en/git-push.txt:242 #, priority:220 msgid "This option overrides this restriction if the current value of the remote ref is the expected value. \"git push\" fails otherwise." msgstr "" +"Cette option passe outre cette restriction si la valeur actuelle de la " +"r챕f챕rence distante est la valeur attendue. \"git push\" 챕choue sinon." #. type: Plain text #: en/git-push.txt:249 #, priority:220 msgid "Imagine that you have to rebase what you have already published. You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history. If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work." msgstr "" +"Imaginez que vous devez rebaser ce que vous avez d챕j횪 publi챕. Vous devrez " +"contourner la r챔gle \"doit avancer rapidement\" afin de remplacer " +"l'historique que vous avez initialement publi챕 par l'historique rebas챕. Si " +"quelqu'un d'autre a construit sur votre historique d'origine pendant que " +"vous rebasez, le sommet de la branche distante peut avoir avanc챕 avec son " +"commit, et pousser aveugl챕ment avec `--force` 챕liminera son travail." #. type: Plain text #: en/git-push.txt:256 #, priority:220 msgid "This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref still points at the commit you specified, you can be sure that no other people did anything to the ref. It is like taking a \"lease\" on the ref without explicitly locking it, and the remote ref is updated only if the \"lease\" is still valid." msgstr "" +"Cette option vous permet de dire que vous vous attendez 횪 ce que " +"l'historique que vous mettez 횪 jour est ce que vous avez rebas챕 et que vous " +"souhaitez remplacer. Si la r챕f챕rence distante pointe toujours sur le commit " +"que vous avez sp챕cifi챕, vous pouvez 챗tre s청r qu'aucune autre personne n'a " +"fait quoi que ce soit 횪 la r챕f챕rence. C'est comme prendre un \"contrat\" sur " +"la r챕f챕rence sans la verrouiller explicitement, et la r챕f챕rence distante " +"n'est mise 횪 jour que si le \"contrat\" est toujours valide." #. type: Plain text #: en/git-push.txt:261 #, priority:220 msgid "`--force-with-lease` alone, without specifying the details, will protect all remote refs that are going to be updated by requiring their current value to be the same as the remote-tracking branch we have for them." msgstr "" +"Seul `--force-with-lease`, sans pr챕ciser les d챕tails, prot챕gera toutes les " +"r챕f챕rences distantes qui vont 챗tre mises 횪 jour en exigeant leur valeur " +"actuelle 횪 챗tre la m챗me que la branche de suivi 횪 distance que nous avons " +"pour eux." #. type: Plain text #: en/git-push.txt:266 #, priority:220 msgid "`--force-with-lease=<refname>`, without specifying the expected value, will protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the remote-tracking branch we have for it." msgstr "" +"`--force-with-lease=<nom-de-r챕f>`, sans sp챕cifier la valeur attendue, " +"prot챕gera (seulement) la r챕f챕rence nomm챕e, si elle va 챗tre mise 횪 jour, en " +"exigeant que sa valeur actuelle soit la m챗me que la branche de suivi 횪 " +"distance que nous avons pour elle." #. type: Plain text #: en/git-push.txt:274 #, priority:220 msgid "`--force-with-lease=<refname>:<expect>` will protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the specified value `<expect>` (which is allowed to be different from the remote-tracking branch we have for the refname, or we do not even have to have such a remote-tracking branch when this form is used). If `<expect>` is the empty string, then the named ref must not already exist." msgstr "" +"`--force-with-lease = <nom-de-r챕f>: <attendu>` prot챕gera (seulement) la " +"r챕f챕rence nomm챕e, si elle va 챗tre mise 횪 jour, en exigeant que sa valeur " +"actuelle soit la m챗me que la valeur sp챕cifi챕e `<attendu > `(qui peut 챗tre " +"diff챕rente de la branche de suivi 횪 distance que nous avons pour le nom de " +"r챕f챕rence, ou si nous n'avons m챗me pas besoin d'avoir une telle branche de " +"suivi 횪 distance lorsque cette forme est utilis챕e). Si `<attendu>` est la " +"cha챤ne vide, alors la r챕f챕rence nomm챕e ne doit pas d챕j횪 exister." #. type: Plain text #: en/git-push.txt:279 #, priority:220 msgid "Note that all forms other than `--force-with-lease=<refname>:<expect>` that specifies the expected current value of the ref explicitly are still experimental and their semantics may change as we gain experience with this feature." msgstr "" +"Notez que toutes les formes autres que `--force-with-lease=<nom-de-" +"r챕f>:<attendu>` qui sp챕cifie explicitement la valeur actuelle attendue de la " +"r챕f챕rence sont toujours exp챕rimentales et leur s챕mantique peut changer 횪 " +"mesure que nous acqu챕rons de l'exp챕rience avec cette fonctionnalit챕." #. type: Plain text #: en/git-push.txt:282 #, priority:220 msgid "\"--no-force-with-lease\" will cancel all the previous --force-with-lease on the command line." msgstr "" +"\"--no-force-with-lease\" annulera tous les pr챕c챕dents --force-with-lease " +"sur la ligne de commande." #. type: Plain text #: en/git-push.txt:288 #, priority:220 msgid "A general note on safety: supplying this option without an expected value, i.e. as `--force-with-lease` or `--force-with-lease=<refname>` interacts very badly with anything that implicitly runs `git fetch` on the remote to be pushed to in the background, e.g. `git fetch origin` on your repository in a cronjob." msgstr "" +"Une note g챕n챕rale sur la s챕curit챕혻: fournir cette option sans valeur " +"attendue, c'est-횪-dire que `--force-with-lease` ou `--force-with-lease=<nom-" +"de-r챕f>` interagit tr챔s mal avec tout ce qui ex챕cute implicitement `git " +"fetch` sur le distant pour 챗tre pouss챕 en arri챔re-plan, par exemple `git " +"fetch origin` sur votre d챕p척t dans un job cron." #. type: Plain text #: en/git-push.txt:295 #, priority:220 msgid "The protection it offers over `--force` is ensuring that subsequent changes your work wasn't based on aren't clobbered, but this is trivially defeated if some background process is updating refs in the background. We don't have anything except the remote tracking info to go by as a heuristic for refs you're expected to have seen & are willing to clobber." msgstr "" +"La protection qu'il offre par rapport 횪 `--force` est d'assurer que les " +"modifications ult챕rieures sur lesquelles votre travail n'챕tait pas bas챕 ne " +"sont pas supprim챕es, mais elle est trivialement r챕duite 횪 n챕ant si un " +"processus de mise 횪 jour des r챕f챕rences est effectu챕 en arri챔re-plan. Nous " +"n'avons rien d'autre que les informations de suivi 횪 distance 횪 utiliser " +"comme heuristique pour les r챕f챕rences que vous 챗tes cens챕 avoir vues et que " +"vous 챗tes pr챗t 횪 supprimer." #. type: Plain text #: en/git-push.txt:299 #, priority:220 msgid "If your editor or some other system is running `git fetch` in the background for you a way to mitigate this is to simply set up another remote:" msgstr "" +"Si votre 챕diteur ou un autre syst챔me ex챕cute `git fetch` en arri챔re-plan " +"pour vous, un moyen d'att챕nuer cela est simplement de configurer un autre " +"distant :" #. type: Plain text #: en/git-push.txt:302 @@ -38107,24 +38174,33 @@ msgid "" "\tgit remote add origin-push $(git config remote.origin.url)\n" "\tgit fetch origin-push\n" msgstr "" +"\tgit remote add origin-push $(git config remote.origin.url)\n" +"\tgit fetch origin-push\n" #. type: Plain text #: en/git-push.txt:305 #, priority:220 msgid "Now when the background process runs `git fetch origin` the references on `origin-push` won't be updated, and thus commands like:" msgstr "" +"Maintenant, lorsque le processus d'arri챔re-plan ex챕cute `git fetch origin`, " +"les r챕f챕rences sur` origin-push` ne seront pas mises 횪 jour, et donc des " +"commandes comme��:" #. type: Plain text #: en/git-push.txt:307 #, no-wrap, priority:220 msgid "\tgit push --force-with-lease origin-push\n" -msgstr "" +msgstr "\tgit push --force-with-lease origin-push\n" #. type: Plain text #: en/git-push.txt:312 #, priority:220 msgid "Will fail unless you manually run `git fetch origin-push`. This method is of course entirely defeated by something that runs `git fetch --all`, in that case you'd need to either disable it or do something more tedious like:" msgstr "" +"횋chouera 횪 moins que vous ne lanciez manuellement `git fetch origin-push`. " +"Cette m챕thode est bien s청r enti챔rement contrecarr챕e par quelque chose qui " +"lance `git fetch --all`, auquel cas vous devrez soit la d챕sactiver soit " +"faire quelque chose de plus fastidieux comme :" #. type: Plain text #: en/git-push.txt:317 @@ -38135,48 +38211,79 @@ msgid "" "\tgit rebase -i master # rewrite some commits\n" "\tgit push --force-with-lease=master:base master:master\n" msgstr "" +"\tgit fetch # mettre 횪 jour 'master' depuis le distant\n" +"\tgit tag base master # 챕tiqueter notre point de base\n" +"\tgit rebase -i master # r챕챕crire quelques commits\n" +"\tgit push --force-with-lease=master:base master:master\n" #. type: Plain text #: en/git-push.txt:323 #, priority:220 msgid "I.e. create a `base` tag for versions of the upstream code that you've seen and are willing to overwrite, then rewrite history, and finally force push changes to `master` if the remote version is still at `base`, regardless of what your local `remotes/origin/master` has been updated to in the background." msgstr "" +"C'est-횪-dire cr챕er une 챕tiquette `base` pour les versions du code amont que " +"vous avez vues et que vous 챗tes pr챗t 횪 챕craser, puis r챕챕crire l'historique, " +"et enfin forcer la pouss챕e des modification vers `master` si la version " +"distante est toujours 횪 `base`, ind챕pendamment de ce que votre `remotes/" +"origin/master` local a 챕t챕 mis 횪 jour en arri챔re-plan." #. type: Plain text #: en/git-push.txt:331 #, priority:220 msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Also, when `--force-with-lease` option is used, the command refuses to update a remote ref whose current value does not match what is expected." msgstr "" +"Habituellement, la commande refuse de mettre 횪 jour une r챕f챕rence distante " +"qui n'est pas un anc챗tre de la r챕f챕rence locale utilis챕e pour la remplacer. " +"De plus, lorsque l'option `--force-with-lease` est utilis챕e, la commande " +"refuse de mettre 횪 jour une r챕f챕rence distante dont la valeur actuelle ne " +"correspond pas 횪 ce qui est attendu." #. type: Plain text #: en/git-push.txt:334 #, priority:220 msgid "This flag disables these checks, and can cause the remote repository to lose commits; use it with care." msgstr "" +"Ce drapeau d챕sactive ces contr척les et peut entra챤ner la perte de commits du " +"d챕p척t distant ; utilisez-le avec pr챕caution." #. type: Plain text #: en/git-push.txt:343 #, ignore-ellipsis, priority:220 msgid "Note that `--force` applies to all the refs that are pushed, hence using it with `push.default` set to `matching` or with multiple push destinations configured with `remote.*.push` may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart). To force a push to only one branch, use a `+` in front of the refspec to push (e.g `git push origin +master` to force a push to the `master` branch). See the `<refspec>...` section above for details." msgstr "" +"Notez que `--force` s'applique 횪 toutes les refs qui sont pouss챕es, donc " +"l'utiliser avec `push.default` r챕gl챕 sur `matching` ou avec plusieurs " +"destinations de pouss챕e configur챕es avec `remote.*.push` peut 챕craser les " +"refs autres que la branche courante (y compris les refs locales qui sont " +"strictement derri챔re leur homologue distante). Pour forcer un push vers une " +"seule branche, utilisez un \" + \" devant le sp챕cificateur de r챕f챕rence 횪 " +"pousser (par exemple `git push origin +master` pour forcer une pouss챕e vers " +"la branche `master`). Voir la section `<sp챕c-de -r챕f>...` ci-dessus pour " +"plus de d챕tails." #. type: Labeled list #: en/git-push.txt:344 #, no-wrap, priority:220 msgid "--repo=<repository>" -msgstr "" +msgstr "--repo=<d챕p척t>" #. type: Plain text #: en/git-push.txt:347 #, priority:220 msgid "This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence." msgstr "" +"Cette option est 챕quivalente 횪 l'argument <d챕p척t>. Si les deux sont " +"sp챕cifi챕s, l'argument de la ligne de commande a la priorit챕." #. type: Plain text #: en/git-push.txt:354 #, priority:220 msgid "For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` in linkgit:git-config[1]." msgstr "" +"Pour chaque branche qui est 횪 jour ou pouss챕e avec succ챔s, ajoutet une " +"r챕f챕rence de suivi amont, utilis챕e par les commandes sans argument linkgit" +":git-pull[1] et autres. Pour plus d'informations, voir `branch.<nom>.merge` " +"dans linkgit:git-config[1]." #. type: Labeled list #: en/git-push.txt:355 @@ -38189,12 +38296,19 @@ msgstr "--[no-]thin" #, priority:220 msgid "These options are passed to linkgit:git-send-pack[1]. A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is `--thin`." msgstr "" +"Ces options sont pass챕es 횪 linkgit:git-send-pack[1]. Un transfert fin r챕duit " +"consid챕rablement la quantit챕 de donn챕es envoy챕es lorsque l'exp챕diteur et le " +"destinataire ont de nombreux objets identiques en commun. La valeur par " +"d챕faut est `--thin`." #. type: Plain text #: en/git-push.txt:366 #, priority:220 msgid "Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream." msgstr "" +"Supprimer toutes les sorties, y compris la liste des r챕f챕rences mises 횪 " +"jour, 횪 moins qu'une erreur ne se produise. Les progr챔s ne sont pas signal챕s " +"dans le flux d'erreurs standard." #. type: Labeled list #: en/git-push.txt:378 -- GitLab