-
Notifications
You must be signed in to change notification settings - Fork 217
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'weblate/master'
- Loading branch information
Showing
3 changed files
with
176 additions
and
187 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
# | ||
msgid "" | ||
msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: [email protected]\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-05-18 12:01+0000\nLast-Translator: Jean-Noël Avila <[email protected]>\nLanguage-Team: LANGUAGE <[email protected]>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 5.6-dev\n" | ||
msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: [email protected]\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-06-25 01:09+0000\nLast-Translator: Jean-Noël Avila <[email protected]>\nLanguage-Team: LANGUAGE <[email protected]>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 5.6-rc\n" | ||
|
||
#. type: Labeled list | ||
#: en/blame-options.txt:1 en/diff-options.txt:780 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31 | ||
|
@@ -45923,7 +45923,7 @@ msgstr "utilisation régulière" | |
#: en/git-rebase.txt:855 | ||
#, priority:100 | ||
msgid "finish something worthy of a commit" | ||
msgstr "" | ||
msgstr "finir quelque chose digne d'un commit" | ||
|
||
#. type: Labeled list | ||
#: en/git-rebase.txt:856 en/git-update-ref.txt:136 | ||
|
@@ -45935,19 +45935,19 @@ msgstr "valider" | |
#: en/git-rebase.txt:858 | ||
#, priority:100 | ||
msgid "independent fixup" | ||
msgstr "" | ||
msgstr "correction indépendante" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:860 | ||
#, priority:100 | ||
msgid "realize that something does not work" | ||
msgstr "" | ||
msgstr "réaliser que quelque chose ne fonctionne pas" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:861 | ||
#, priority:100 | ||
msgid "fix that" | ||
msgstr "" | ||
msgstr "réparer ça" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:862 | ||
|
@@ -45959,25 +45959,25 @@ msgstr "le valider" | |
#: en/git-rebase.txt:868 | ||
#, priority:100 | ||
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one." | ||
msgstr "" | ||
msgstr "Parfois, la chose corrigée en b.2. ne peut pas être ajoutée au commit pas totalement parfait qu'elle corrige, parce que ce commit est enterré profondément dans une série de rustines. C'est exactement ce à quoi le rebasage interactif sert : utilisez-le après beaucoup de \"a\"s et \"b\"s, en réorganisant et en éditant des commits, et en combinant plusieurs commits en un." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:870 | ||
#, priority:100 | ||
msgid "Start it with the last commit you want to retain as-is:" | ||
msgstr "" | ||
msgstr "Commencez avec le dernier commit que vous voulez retenir tel quel :" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:872 | ||
#, no-wrap, priority:100 | ||
msgid "\tgit rebase -i <after-this-commit>\n" | ||
msgstr "" | ||
msgstr "\tgit rebase -i <après-ce-commit>\n" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:877 | ||
#, priority:100 | ||
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:" | ||
msgstr "" | ||
msgstr "Un éditeur sera démarré avec tous les commits dans votre branche actuelle (en ignorant les commits de fusion), qui viennent après le commit donné. Vous pouvez réorganiser à votre goût les commits dans cette liste, et vous pouvez les supprimer. La liste ressemble plus ou moins à ceci :" | ||
|
||
#. type: delimited block - | ||
#: en/git-rebase.txt:882 | ||
|
@@ -45986,13 +45986,13 @@ msgid "" | |
"pick deadbee The oneline of this commit\n" | ||
"pick fa1afe1 The oneline of the next commit\n" | ||
"...\n" | ||
msgstr "" | ||
msgstr "pick deadbee Le titre de ce commit\npick fa1afe1 Le titre du commit suivant\n...\n" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:887 | ||
#, priority:100 | ||
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names." | ||
msgstr "" | ||
msgstr "Les titres sont purement pour votre usage ; 'git rebase' ne les regardera pas mais s'appuiera sur les noms de commit («deadbee» et «fa1afe1» dans cet exemple), donc ne supprimez pas ou ne modifiez pas les noms." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:892 | ||
|
@@ -46004,55 +46004,55 @@ msgstr "En remplaçant la commande \"pick\" par la commande \"edit\", vous pouve | |
#: en/git-rebase.txt:895 | ||
#, priority:100 | ||
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command." | ||
msgstr "" | ||
msgstr "Pour interrompre le rebasage (comme une commande \"edit\" le ferait, mais sans picorer de commit d'abord), utilisez la commande \"break\"." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:898 | ||
#, priority:100 | ||
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"." | ||
msgstr "" | ||
msgstr "Si vous voulez simplement modifier le message de validation pour un commit, remplacez la commande \"pick\" par la commande \"reword\"." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:901 | ||
#, priority:100 | ||
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line." | ||
msgstr "" | ||
msgstr "Pour abandonner un commit, remplacer la commande \"pick\" par \"drop\", ou supprimez simplement la ligne correspondante." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:916 | ||
#, priority:100 | ||
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the first commit's message with those identified by \"squash\" commands, omitting the messages of commits identified by \"fixup\" commands, unless \"fixup -c\" is used. In that case the suggested commit message is only the message of the \"fixup -c\" commit, and an editor is opened allowing you to edit the message. The contents (patch) of the \"fixup -c\" commit are still incorporated into the folded commit. If there is more than one \"fixup -c\" commit, the message from the final one is used. You can also use \"fixup -C\" to get the same behavior as \"fixup -c\" except without opening an editor." | ||
msgstr "" | ||
msgstr "Si vous voulez replier deux ou plusieurs commits en un, remplacer la commande \"pick\" pour le second commit et les commits subséquents par \"squash\" ou \"fixup\". Si les commits avaient différents auteurs, le commit replié sera attribué à l'auteur du premier commit. Le message de commit proposé pour le commit replié est la concaténation du message du premier commit avec ceux identifiés par les commandes \"squash\", en omettant les messages de commits identifiés par les commandes \"fixup\", à moins que \"fixup -c\" ne soit utilisé. Dans ce cas, le message de validation proposé n'est que le message du commit appliqué par \"fixup -c\", et un éditeur est ouvert vous permettant de modifier le message. Le contenu (rustine) du commit \"fixup -c\" sont toujours incorporé dans le commit replié. S'il y a plus d'un commit \"fixup -c\", le message du dernier est utilisé. Vous pouvez également utiliser \"fixup -C\" pour obtenir le même comportement que \"fixup -c\" sauf sans ouvrir un éditeur." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:920 | ||
#, placeholders:'--continue`', priority:100 | ||
msgid "`git rebase` will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`." | ||
msgstr "" | ||
msgstr "`git rebase` s'arrêtera lorsque \"pick\" a été remplacé par \"edit\" ou quand une commande échoue en raison d'erreurs de fusion. Lorsque vous avez terminé l'édition et/ou la résolution des conflits, vous pouvez continuer avec `git rebase --continue`." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:924 | ||
#, placeholders:'HEAD':'HEAD', priority:100 | ||
msgid "For example, if you want to reorder the last 5 commits, such that what was `HEAD~4` becomes the new `HEAD`. To achieve that, you would call `git rebase` like this:" | ||
msgstr "" | ||
msgstr "Par exemple, si vous voulez réorganiser les 5 derniers commits, de sorte que ce qui était `HEAD~4` devient le nouveau `HEAD`. Pour ce faire, vous appelez `git rebase` comme ceci :" | ||
|
||
#. type: delimited block - | ||
#: en/git-rebase.txt:927 | ||
#, no-wrap, placeholders:'HEAD', priority:100 | ||
msgid "$ git rebase -i HEAD~5\n" | ||
msgstr "" | ||
msgstr "$ git rebase -i HEAD~5\n" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:930 | ||
#, priority:100 | ||
msgid "And move the first patch to the end of the list." | ||
msgstr "" | ||
msgstr "Et déplacer la première rustine jusqu'à la fin de la liste." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:933 | ||
#, priority:100 | ||
msgid "You might want to recreate merge commits, e.g. if you have a history like this:" | ||
msgstr "" | ||
msgstr "Vous pourriez vouloir recréer des commits de fusion, par exemple si vous avez une histoire comme celle-ci :" | ||
|
||
#. type: delimited block - | ||
#: en/git-rebase.txt:940 | ||
|
@@ -46063,25 +46063,25 @@ msgid "" | |
" A---M---B\n" | ||
" /\n" | ||
"---o---O---P---Q\n" | ||
msgstr "" | ||
msgstr " X\n \\\n A---M---B\n /\n---o---O---P---Q\n" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:944 | ||
#, placeholders:'HEAD', priority:100 | ||
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current `HEAD` is \"B\", and call" | ||
msgstr "" | ||
msgstr "Supposons que vous voulez rebaser la branche latérale à partir de \"A\" à \"Q\". Assurez-vous que la `HEAD`actuelle est \"B\", et appelez" | ||
|
||
#. type: delimited block - | ||
#: en/git-rebase.txt:947 | ||
#, no-wrap, placeholders:'--onto', priority:100 | ||
msgid "$ git rebase -i -r --onto Q O\n" | ||
msgstr "" | ||
msgstr "$ git rebase -i -r --onto Q O\n" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:954 | ||
#, priority:100 | ||
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:" | ||
msgstr "" | ||
msgstr "La réorganisation et l'édition des commits créent généralement des étapes intermédiaires non testées. Vous pouvez vérifier que votre édition d'historique n'a rien cassé en exécutant un test, ou au moins en recompilant à des points intermédiaires de l'historique en utilisant la commande \"exec\" (raccourci \"x\"). Vous pouvez le faire en créant une liste de todo comme celle-ci :" | ||
|
||
#. type: delimited block - | ||
#: en/git-rebase.txt:963 | ||
|
@@ -46094,31 +46094,31 @@ msgid "" | |
"edit deadbab The oneline of the commit after\n" | ||
"exec cd subdir; make test\n" | ||
"...\n" | ||
msgstr "" | ||
msgstr "pick deadbee Implement feature XXX\nfixup f1a5c00 Fix to feature XXX\nexec make\npick c0ffeee The oneline of the next commit\nedit deadbab The oneline of the commit after\nexec cd subdir; make test\n...\n" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:968 | ||
#, placeholders:'--continue`', priority:100 | ||
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`." | ||
msgstr "" | ||
msgstr "Le rebasage interactif s'arrêtera quand une commande échouera (c.-à-d. des sorties avec statut non-0) pour vous donner l'occasion de résoudre le problème. Vous pouvez continuer avec `git rebase --continue`." | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:972 | ||
#, ignore-ellipsis, priority:100 | ||
msgid "The \"exec\" command launches the command in a shell (the default one, usually /bin/sh), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree." | ||
msgstr "" | ||
msgstr "La commande \"exec\" lance la commande dans un shell (la commande par défaut, habituellement /bin/sh), de sorte que vous pouvez utiliser des fonctions de shell (comme \"cd\", \">\", \";\" ...). La commande est exécutée de la racine de l'arbre de travail." | ||
|
||
#. type: delimited block - | ||
#: en/git-rebase.txt:975 | ||
#, no-wrap, placeholders:'--exec', priority:100 | ||
msgid "$ git rebase -i --exec \"make test\"\n" | ||
msgstr "" | ||
msgstr "$ git rebase -i --exec \"make test\"\n" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:979 | ||
#, priority:100 | ||
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:" | ||
msgstr "" | ||
msgstr "Cette commande vous permet de vérifier que les commits intermédiaires sont compilables. La liste de todo devient ainsi :" | ||
|
||
#. type: delimited block - | ||
#: en/git-rebase.txt:989 | ||
|
@@ -46132,13 +46132,13 @@ msgid "" | |
"exec make test\n" | ||
"pick f4593f9 four\n" | ||
"exec make test\n" | ||
msgstr "" | ||
msgstr "pick 5928aea one\nexec make test\npick 04d0fda two\nexec make test\npick ba46169 three\nexec make test\npick f4593f9 four\nexec make test\n" | ||
|
||
#. type: Title - | ||
#: en/git-rebase.txt:992 | ||
#, no-wrap, priority:100 | ||
msgid "SPLITTING COMMITS" | ||
msgstr "" | ||
msgstr "DÉCOUPAGE DE COMMITS" | ||
|
||
#. type: Plain text | ||
#: en/git-rebase.txt:998 | ||
|
Oops, something went wrong.