From 195a35e4676f33c9fa638206c4ac65b363f3e923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Sun, 6 Jan 2019 20:28:01 +0000 Subject: [PATCH] Translated using Weblate (French) Currently translated at 17.5% (1713 of 9770 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/ --- po/documentation.fr.po | 5158 +++++++++++++--------------------------- 1 file changed, 1719 insertions(+), 3439 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 99590b2..5e5ecbf 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "POT-Creation-Date: 2018-12-22 17:08+0100\n" -"PO-Revision-Date: 2019-01-06 20:26+0000\n" +"PO-Revision-Date: 2019-01-06 21:21+0000\n" "Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language-Team: French <https://hosted.weblate.org/projects/git-manpages/" "translations/fr/>\n" @@ -954,7 +954,7 @@ msgstr "OPTIONS" #: en/git.txt:534 en/git-cvsserver.txt:45 #, no-wrap msgid "--version" -msgstr "" +msgstr "--version" #. type: Plain text #: en/git.txt:536 @@ -965,7 +965,7 @@ msgstr "" #: en/git.txt:537 en/git-cvsserver.txt:50 #, no-wrap msgid "--help" -msgstr "" +msgstr "--help" #. type: Plain text #: en/git.txt:542 @@ -988,7 +988,7 @@ msgstr "" #: en/git.txt:548 #, no-wrap msgid "-C <path>" -msgstr "-C <chemin>" +msgstr "patch" #. type: Plain text #: en/git.txt:553 @@ -1056,7 +1056,7 @@ msgstr "" #: en/git.txt:579 #, no-wrap msgid "--html-path" -msgstr "" +msgstr "--html-path" #. type: Plain text #: en/git.txt:582 @@ -1069,7 +1069,7 @@ msgstr "" #: en/git.txt:583 #, no-wrap msgid "--man-path" -msgstr "" +msgstr "--man-path" #. type: Plain text #: en/git.txt:586 @@ -1082,7 +1082,7 @@ msgstr "" #: en/git.txt:587 #, no-wrap msgid "--info-path" -msgstr "" +msgstr "--info-path" #. type: Plain text #: en/git.txt:590 @@ -1106,7 +1106,7 @@ msgstr "" #: en/git.txt:592 #, no-wrap msgid "--paginate" -msgstr "" +msgstr "--paginate" #. type: Plain text #: en/git.txt:597 @@ -1145,7 +1145,7 @@ msgstr "" #: en/git.txt:606 #, no-wrap msgid "--work-tree=<path>" -msgstr "--work-tree=<chemin>" +msgstr "whitespace" #. type: Plain text #: en/git.txt:613 @@ -1188,7 +1188,7 @@ msgstr "" #: en/git.txt:624 en/git-clone.txt:138 en/git-init.txt:48 en/git-p4.txt:268 #, no-wrap msgid "--bare" -msgstr "" +msgstr "--bare" #. type: Plain text #: en/git.txt:628 @@ -1214,7 +1214,7 @@ msgstr "" #: en/git.txt:633 #, no-wrap msgid "--literal-pathspecs" -msgstr "" +msgstr "--literal-pathspecs" #. type: Plain text #: en/git.txt:637 @@ -1228,7 +1228,7 @@ msgstr "" #: en/git.txt:638 #, no-wrap msgid "--glob-pathspecs" -msgstr "" +msgstr "--glob-pathspecs" #. type: Plain text #: en/git.txt:643 @@ -1242,7 +1242,7 @@ msgstr "" #: en/git.txt:644 #, no-wrap msgid "--noglob-pathspecs" -msgstr "" +msgstr "--noglob-pathspecs" #. type: Plain text #: en/git.txt:649 @@ -1256,7 +1256,7 @@ msgstr "" #: en/git.txt:650 #, no-wrap msgid "--icase-pathspecs" -msgstr "" +msgstr "--icase-pathspecs" #. type: Plain text #: en/git.txt:653 @@ -1409,7 +1409,7 @@ msgstr "" #: en/git.txt:750 #, no-wrap msgid "Configuration Mechanism" -msgstr "M챕canisme de configuration" +msgstr "Configuration" #. type: Plain text #: en/git.txt:755 @@ -1498,7 +1498,7 @@ msgstr "" #: en/git.txt:789 en/git-tag.txt:165 #, no-wrap msgid "<commit>" -msgstr "<commit>" +msgstr "git-commit(1)" #. type: Plain text #: en/git.txt:791 @@ -1524,7 +1524,7 @@ msgstr "" #: en/git.txt:798 #, no-wrap msgid "<commit-ish>" -msgstr "<commit-ou-equivalent>" +msgstr "git-commit(1)" #. type: Plain text #: en/git.txt:803 @@ -1822,7 +1822,7 @@ msgstr "" #: en/git.txt:928 #, no-wrap msgid "`GIT_COMMON_DIR`" -msgstr "`GIT_COMMON_DIR`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Plain text #: en/git.txt:936 @@ -1839,43 +1839,43 @@ msgstr "" #: en/git.txt:938 #, no-wrap msgid "Git Commits" -msgstr "Commits Git" +msgstr "$ git commit\n" #. type: Labeled list #: en/git.txt:939 #, no-wrap msgid "`GIT_AUTHOR_NAME`" -msgstr "`GIT_AUTHOR_NAME`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Labeled list #: en/git.txt:940 #, no-wrap msgid "`GIT_AUTHOR_EMAIL`" -msgstr "`GIT_AUTHOR_EMAIL`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Labeled list #: en/git.txt:941 #, no-wrap msgid "`GIT_AUTHOR_DATE`" -msgstr "`GIT_AUTHOR_DATE`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Labeled list #: en/git.txt:942 #, no-wrap msgid "`GIT_COMMITTER_NAME`" -msgstr "`GIT_COMMITTER_NAME`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Labeled list #: en/git.txt:943 #, no-wrap msgid "`GIT_COMMITTER_EMAIL`" -msgstr "`GIT_COMMITTER_EMAIL`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Labeled list #: en/git.txt:944 #, no-wrap msgid "`GIT_COMMITTER_DATE`" -msgstr "`GIT_COMMITTER_DATE`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Labeled list #: en/git.txt:945 @@ -1886,13 +1886,13 @@ msgstr "" #. type: Plain text #: en/git.txt:947 msgid "see linkgit:git-commit-tree[1]" -msgstr "voir linkgit:git-commit-tree[1]" +msgstr "git-commit(1)" #. type: Title ~ #: en/git.txt:949 #, no-wrap msgid "Git Diffs" -msgstr "Diff챕rences Git" +msgstr "$ git commit\n" #. type: Labeled list #: en/git.txt:950 @@ -2056,7 +2056,7 @@ msgstr "" #: en/git.txt:1002 #, no-wrap msgid "`GIT_EDITOR`" -msgstr "`GIT_EDITOR`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Plain text #: en/git.txt:1007 @@ -2077,7 +2077,7 @@ msgstr "" #: en/git.txt:1009 #, no-wrap msgid "`GIT_SSH_COMMAND`" -msgstr "`GIT_SSH_COMMAND`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Plain text #: en/git.txt:1018 @@ -2194,7 +2194,7 @@ msgstr "" #: en/git.txt:1065 #, no-wrap msgid "`GIT_TRACE`" -msgstr "`GIT_TRACE`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Plain text #: en/git.txt:1068 @@ -2347,7 +2347,7 @@ msgstr "" #: en/git.txt:1134 #, no-wrap msgid "`GIT_LITERAL_PATHSPECS`" -msgstr "`GIT_LITERAL_PATHSPECS`" +msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Plain text #: en/git.txt:1142 @@ -2676,10 +2676,8 @@ msgid "" "tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's " "Manual], linkgit:gitworkflows[7]" msgstr "" -"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], " -"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-" -"tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual]" -", linkgit:gitworkflows[7]" +"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-" +"mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" #. type: Title - #: en/git.txt:1295 en/git-add.txt:415 en/git-am.txt:232 en/git-annotate.txt:33 @@ -3091,9 +3089,9 @@ msgid "" "add them to the index. This gives the user a chance to review the difference " "before adding modified contents to the index." msgstr "" -"Choisir de mani챔re interactive les sections de rustine entre l'index et " -"l'arbre de travail et les ajouter 횪 l'index. Cela permet 횪 l'utilisateur de " -"r챕viser les diff챕rences avant d'ajouter le contenu modifi챕 횪 l'index." +"Choisir de mani챔re interactive les sections de patch entre l'index et la " +"copie de travail et les ajouter 횪 l'index. Cela permet 횪 l'utilisateur de " +"r챕viser les diff챕rences avec d'ajouter le contenu modifi챕 횪 l'index." #. type: Plain text #: en/git-add.txt:95 @@ -3435,7 +3433,7 @@ msgid "" "subdirectories:" msgstr "" "Ajouter le contenu de tous les fichiers `*.txt` sous le r챕pertoire " -"`Documentation` et ses sous r챕pertoires혻:" +"`Documentation` et ses sous r챕pertoires." #. type: delimited block - #: en/git-add.txt:196 @@ -3997,12 +3995,12 @@ msgstr "" #: en/git-am.txt:2 #, no-wrap msgid "git-am(1)" -msgstr "git-add(1)" +msgstr "git-am(1)" #. type: Plain text #: en/git-am.txt:7 msgid "git-am - Apply a series of patches from a mailbox" -msgstr "" +msgstr "git-am - Appliquer une s챕rie de rustines depuis des fichiers mailbox" #. type: Plain text #: en/git-am.txt:20 @@ -4017,6 +4015,14 @@ msgid "" "\t [(<mbox> | <Maildir>)...]\n" "'git am' (--continue | --skip | --abort)\n" msgstr "" +"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n" +"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n" +"\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n" +"\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<r챕pertoire>]\n" +"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n" +"\t [--[no-]scissors] [-S[<idcl챕>]] [--patch-format=<format>]\n" +"\t [(<mbox> | <Maildir>)...]\n" +"'git am' (--continue | --skip | --abort)\n" #. type: Plain text #: en/git-am.txt:26 @@ -4024,12 +4030,14 @@ msgid "" "Splits mail messages in a mailbox into commit log message, authorship " "information and patches, and applies them to the current branch." msgstr "" +"D챕coupe des messages courriel dans un bo챤te aux lettre en message, auteur, " +"information et rustine de commit, et les applique sur la branche en cours." #. type: Labeled list #: en/git-am.txt:30 #, no-wrap msgid "(<mbox>|<Maildir>)..." -msgstr "" +msgstr "(<mbox>|<Maildir>)..." #. type: Plain text #: en/git-am.txt:34 @@ -4038,6 +4046,10 @@ msgid "" "argument, the command reads from the standard input. If you supply " "directories, they will be treated as Maildirs." msgstr "" +"La liste de fichiers de bo챤te aux lettres desquelles on lit les rustines. Si " +"vous ne fournissez pas cet argument, la commande lit depuis l'entr챕e " +"standard. Si vous fournissez des r챕pertoires, ils sont lus comme des " +"Maildirs." #. type: Labeled list #: en/git-am.txt:35 en/git-blame.txt:74 en/git-cat-file.txt:40 @@ -4048,14 +4060,14 @@ msgstr "" #: en/git-tag.txt:63 en/git-verify-pack.txt:31 en/diff-options.txt:30 #, no-wrap msgid "-s" -msgstr "" +msgstr "-s" #. type: Labeled list #: en/git-am.txt:36 en/git-cherry-pick.txt:101 en/git-commit.txt:160 #: en/git-format-patch.txt:114 en/git-revert.txt:90 #, no-wrap msgid "--signoff" -msgstr "" +msgstr "--signoff" #. type: Plain text #: en/git-am.txt:40 @@ -4064,6 +4076,9 @@ msgid "" "identity of yourself. See the signoff option in linkgit:git-commit[1] for " "more information." msgstr "" +"Ajouter une ligne `Signed-off-by:` au message de commit, en utilisant votre " +"identit챕 pour validateur. R챕f챕rez-vous 횪 l'option signoff dans linkgit:git-" +"commit[1] pour plus d'information." #. type: Labeled list #: en/git-am.txt:41 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 @@ -4072,36 +4087,36 @@ msgstr "" #: en/fetch-options.txt:58 #, no-wrap msgid "-k" -msgstr "" +msgstr "-k" #. type: Labeled list #: en/git-am.txt:42 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 #: en/git-reset.txt:82 en/fetch-options.txt:59 #, no-wrap msgid "--keep" -msgstr "" +msgstr "--keep" #. type: Plain text #: en/git-am.txt:44 msgid "Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])." -msgstr "" +msgstr "Passer l'option `-k` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1])." #. type: Labeled list #: en/git-am.txt:45 #, no-wrap msgid "--keep-non-patch" -msgstr "" +msgstr "--keep-non-patch" #. type: Plain text #: en/git-am.txt:47 msgid "Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])." -msgstr "" +msgstr "Passer l'option `-b` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1])." #. type: Labeled list #: en/git-am.txt:48 #, no-wrap msgid "--[no-]keep-cr" -msgstr "" +msgstr "--[no-]keep-cr" #. type: Plain text #: en/git-am.txt:53 @@ -4111,6 +4126,10 @@ msgid "" "keepcr` configuration variable can be used to specify the default " "behaviour. `--no-keep-cr` is useful to override `am.keepcr`." msgstr "" +"Avec `--keep-cr`, appeler 'git mailsplit' (voir linkgit:git-mailsplit[1]) " +"avec la m챗me option, pour l'emp챗cher de supprimer les CR en fin de ligne. La " +"variable de configuration `am.keepcr` peut 챗tre utilis챕e pour sp챕cifier le " +"comportement par d챕faut. `--no-keep-cr` permet de surcharger `am.keepcr`." #. type: Labeled list #: en/git-am.txt:54 en/git-blame.txt:52 en/git-cvsexportcommit.txt:37 @@ -4134,6 +4153,9 @@ msgid "" "mailinfo[1]). Can be activated by default using the `mailinfo.scissors` " "configuration variable." msgstr "" +"Retirer tout du corps du message avant la ligne de ciseaux (voir linkgit:git-" +"mailinfo[1]). Peut 챗tre activ챕 par d챕faut en utilisant la variable de " +"configuration `mailinfo.scissors`." #. type: Labeled list #: en/git-am.txt:60 en/git-mailinfo.txt:90 @@ -4161,7 +4183,7 @@ msgstr "" #: en/git-am.txt:64 en/git-mailinfo.txt:70 #, no-wrap msgid "--message-id" -msgstr "" +msgstr "--message-id" #. type: Plain text #: en/git-am.txt:69 @@ -4175,7 +4197,7 @@ msgstr "" #: en/git-am.txt:70 #, no-wrap msgid "--no-message-id" -msgstr "" +msgstr "--no-message-id" #. type: Plain text #: en/git-am.txt:73 @@ -4183,6 +4205,8 @@ msgid "" "Do not add the Message-ID header to the commit message. `no-message-id` is " "useful to override `am.messageid`." msgstr "" +"Ne pas ajouter l'ent챗te Message-ID au message de validation. `no-message-id` " +"est utile pour surcharger `am.messageid`." #. type: Labeled list #: en/git-am.txt:74 en/git-branch.txt:157 en/git-checkout-index.txt:30 @@ -4199,7 +4223,7 @@ msgstr "" #: en/fetch-options.txt:159 en/merge-options.txt:104 #, no-wrap msgid "-q" -msgstr "" +msgstr "-q" #. type: Labeled list #: en/git-am.txt:75 en/git-branch.txt:158 en/git-checkout-index.txt:31 @@ -4215,7 +4239,7 @@ msgstr "" #: en/merge-options.txt:105 en/rev-list-options.txt:201 #, no-wrap msgid "--quiet" -msgstr "" +msgstr "--quiet" #. type: Plain text #: en/git-am.txt:77 @@ -4226,7 +4250,7 @@ msgstr "N'afficher que les messages d'erreur." #: en/git-am.txt:79 #, no-wrap msgid "--utf8" -msgstr "" +msgstr "--utf8" #. type: Plain text #: en/git-am.txt:85 @@ -4236,6 +4260,10 @@ msgid "" "encoding (configuration variable `i18n.commitencoding` can be used to " "specify project's preferred encoding if it is not UTF-8)." msgstr "" +"Passer l'option `-u` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1]). Le " +"message de validation propos챕 extrait depuis le courriel est re-cod챕 en UTF-" +"8 (la variable de configuration `i18n.commitencoding` peut sp챕cifier un " +"codage pr챕f챕r챕 s'il est diff챕rent d'UTF-8)." #. type: Plain text #: en/git-am.txt:88 @@ -4244,35 +4272,37 @@ msgid "" "This was optional in prior versions of git, but now it is the\n" "default. You can use `--no-utf8` to override this.\n" msgstr "" +"C'챕tait optionnel dans les versions pr챕c챕dentes de git, mais c'est\n" +"횪 pr챕sent par d챕faut. Vous pouvez utiliser `--no-utf8` pour surcharger.\n" #. type: Labeled list #: en/git-am.txt:89 #, no-wrap msgid "--no-utf8" -msgstr "" +msgstr "--no-utf8" #. type: Plain text #: en/git-am.txt:92 msgid "Pass `-n` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])." -msgstr "" +msgstr "Passer l'option `-n` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1])." #. type: Labeled list #: en/git-am.txt:93 en/git-apply.txt:77 #, no-wrap msgid "-3" -msgstr "" +msgstr "-3" #. type: Labeled list #: en/git-am.txt:94 en/git-apply.txt:78 #, no-wrap msgid "--3way" -msgstr "" +msgstr "--3way" #. type: Labeled list #: en/git-am.txt:95 #, no-wrap msgid "--no-3way" -msgstr "" +msgstr "--no-3way" #. type: Plain text #: en/git-am.txt:102 @@ -4283,12 +4313,17 @@ msgid "" "configuration variable. For more information, see am.threeWay in linkgit:git-" "config[1]." msgstr "" +"Quand la rustine ne s'applique pas correctement, revenir 횪 une fusion 횪 3 " +"points si la rustine contient l'identit챕 des blobs auxquels elle est " +"suppos챕e s'appliquer et que ces blobs sont disponibles localement. `--no-" +"3way` permet de surcharger la variable de configuration am.threeWay. Pour " +"plus d'information, r챕f챕rez-vous 횪 am.threeWay dans linkgit:git-config[1]." #. type: Labeled list #: en/git-am.txt:103 en/git-apply.txt:172 en/diff-options.txt:526 #, no-wrap msgid "--ignore-space-change" -msgstr "" +msgstr "--ignore-space-change" #. type: Labeled list #: en/git-am.txt:104 en/git-apply.txt:173 en/git-rebase.txt:361 @@ -4306,31 +4341,31 @@ msgstr "--whitespace=<option>" #: en/git-am.txt:106 en/git-apply.txt:119 en/git-rebase.txt:329 #, no-wrap msgid "-C<n>" -msgstr "" +msgstr "-C<n>" #. type: Labeled list #: en/git-am.txt:107 en/git-apply.txt:115 #, no-wrap msgid "-p<n>" -msgstr "" +msgstr "-p<n>" #. type: Labeled list #: en/git-am.txt:108 #, no-wrap msgid "--directory=<dir>" -msgstr "" +msgstr "--directory=<r챕p.>" #. type: Labeled list #: en/git-am.txt:109 #, no-wrap msgid "--exclude=<path>" -msgstr "" +msgstr "--exclude=<chemin>" #. type: Labeled list #: en/git-am.txt:110 #, no-wrap msgid "--include=<path>" -msgstr "" +msgstr "--include=<chemin>" #. type: Labeled list #: en/git-am.txt:111 en/git-apply.txt:100 @@ -4349,7 +4384,7 @@ msgstr "" #: en/git-am.txt:116 #, no-wrap msgid "--patch-format" -msgstr "" +msgstr "--patch-format" #. type: Plain text #: en/git-am.txt:122 @@ -4363,13 +4398,13 @@ msgstr "" #. type: Plain text #: en/git-am.txt:126 msgid "Run interactively." -msgstr "Mode interactif." +msgstr "Lancer de mani챔re interactive" #. type: Labeled list #: en/git-am.txt:127 en/git-rebase.txt:367 #, no-wrap msgid "--committer-date-is-author-date" -msgstr "" +msgstr "--committer-date-is-author-date" #. type: Plain text #: en/git-am.txt:133 @@ -4384,7 +4419,7 @@ msgstr "" #: en/git-am.txt:134 en/git-rebase.txt:368 #, no-wrap msgid "--ignore-date" -msgstr "" +msgstr "--ignore-date" #. type: Plain text #: en/git-am.txt:140 @@ -4399,7 +4434,7 @@ msgstr "" #: en/git-am.txt:141 en/git-rebase.txt:264 #, no-wrap msgid "--skip" -msgstr "" +msgstr "--skip" #. type: Plain text #: en/git-am.txt:144 @@ -4438,7 +4473,7 @@ msgstr "Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par #: en/sequencer.txt:1 #, no-wrap msgid "--continue" -msgstr "" +msgstr "--continue" #. type: Labeled list #: en/git-am.txt:152 en/git-branch.txt:136 en/git-cherry-pick.txt:74 @@ -4453,7 +4488,7 @@ msgstr "" #: en/git-am.txt:153 #, no-wrap msgid "--resolved" -msgstr "" +msgstr "--resolved" #. type: Plain text #: en/git-am.txt:160 @@ -4484,7 +4519,7 @@ msgstr "" #: en/git-rebase.txt:248 en/sequencer.txt:11 #, no-wrap msgid "--abort" -msgstr "" +msgstr "--abort" #. type: Plain text #: en/git-am.txt:170 @@ -4606,8 +4641,9 @@ msgid "" "This command can run `applypatch-msg`, `pre-applypatch`, and `post-" "applypatch` hooks. See linkgit:githooks[5] for more information." msgstr "" -"Cette commande peut lancer `applypatch-msg`, `applypatch` et `post-" -"applypatch`. Voir linkgit:githooks[5] pour de plus amples informations." +"Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, " +"`pre-commit` et `post-commit`. Voir linkgit:githooks[5] pour de plus amples " +"informations." #. type: Plain text #: en/git-am.txt:230 @@ -4651,7 +4687,7 @@ msgstr "" #: en/git-annotate.txt:31 en/cmds-ancillaryinterrogators.txt:4 #, no-wrap msgid "linkgit:git-blame[1]" -msgstr "" +msgstr "linkgit:git-blame[1]" #. type: Title = #: en/git-apply.txt:2 @@ -4663,7 +4699,7 @@ msgstr "git-apply(1)" #. type: Plain text #: en/git-apply.txt:7 msgid "git-apply - Apply a patch to files and/or to the index" -msgstr "git-apply - Applique une rustine 횪 des fichiers et/ou 횪 l'index" +msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" #. type: Plain text #: en/git-apply.txt:20 @@ -4702,7 +4738,7 @@ msgstr "" #: en/git-apply.txt:37 #, no-wrap msgid "<patch>..." -msgstr "<rustine>..." +msgstr "patch" #. type: Plain text #: en/git-apply.txt:40 @@ -4728,7 +4764,7 @@ msgstr "" #: en/git-apply.txt:45 en/diff-options.txt:116 #, no-wrap msgid "--numstat" -msgstr "" +msgstr "--numstat" #. type: Plain text #: en/git-apply.txt:51 @@ -4744,7 +4780,7 @@ msgstr "" #: en/merge-options.txt:98 #, no-wrap msgid "--summary" -msgstr "" +msgstr "--summary" #. type: Plain text #: en/git-apply.txt:57 @@ -4758,7 +4794,7 @@ msgstr "" #: en/git-apply.txt:58 en/diff-options.txt:292 #, no-wrap msgid "--check" -msgstr "" +msgstr "--check" #. type: Plain text #: en/git-apply.txt:62 @@ -4771,7 +4807,7 @@ msgstr "" #: en/git-apply.txt:63 en/git-checkout-index.txt:26 #, no-wrap msgid "--index" -msgstr "" +msgstr "--index" #. type: Plain text #: en/git-apply.txt:71 @@ -4789,7 +4825,7 @@ msgstr "" #: en/git-submodule.txt:300 #, no-wrap msgid "--cached" -msgstr "" +msgstr "--cached" #. type: Plain text #: en/git-apply.txt:76 @@ -4847,7 +4883,10 @@ msgstr "--reverse" #. type: Plain text #: en/git-apply.txt:99 msgid "Apply the patch in reverse." -msgstr "Applique une rustine 횪 rebours." +msgstr "" +"-v::\n" +"--verbose::\n" +" Mode bavard.\n" #. type: Plain text #: en/git-apply.txt:106 @@ -4866,7 +4905,7 @@ msgstr "" #: en/diff-options.txt:183 #, no-wrap msgid "-z" -msgstr "" +msgstr "-z" #. type: Plain text #: en/git-apply.txt:110 @@ -4901,7 +4940,7 @@ msgstr "" #: en/git-apply.txt:125 #, no-wrap msgid "--unidiff-zero" -msgstr "" +msgstr "--unidiff-zero" #. type: Plain text #: en/git-apply.txt:131 @@ -4937,7 +4976,7 @@ msgstr "" #: en/git-apply.txt:142 #, no-wrap msgid "--no-add" -msgstr "" +msgstr "--no-add" #. type: Plain text #: en/git-apply.txt:148 @@ -4952,13 +4991,13 @@ msgstr "" #: en/git-apply.txt:149 #, no-wrap msgid "--allow-binary-replacement" -msgstr "" +msgstr "--allow-binary-replacement" #. type: Labeled list #: en/git-apply.txt:150 en/diff-options.txt:320 #, no-wrap msgid "--binary" -msgstr "" +msgstr "--binary" #. type: Plain text #: en/git-apply.txt:155 @@ -5019,7 +5058,7 @@ msgstr "" #: en/git-apply.txt:180 #, no-wrap msgid "--whitespace=<action>" -msgstr "--whitespace=<action>" +msgstr "whitespace" #. type: Plain text #: en/git-apply.txt:188 @@ -5082,7 +5121,7 @@ msgstr "" #: en/git-apply.txt:207 #, no-wrap msgid "--inaccurate-eof" -msgstr "" +msgstr "--inaccurate-eof" #. type: Plain text #: en/git-apply.txt:213 @@ -5105,7 +5144,7 @@ msgstr "" #: en/git-apply.txt:220 #, no-wrap msgid "--recount" -msgstr "" +msgstr "--recount" #. type: Plain text #: en/git-apply.txt:224 @@ -5140,7 +5179,7 @@ msgstr "" #: en/git-apply.txt:233 #, no-wrap msgid "--unsafe-paths" -msgstr "" +msgstr "--unsafe-paths" #. type: Plain text #: en/git-apply.txt:238 @@ -5163,7 +5202,7 @@ msgstr "" #: en/git-apply.txt:246 en/config.txt:908 #, no-wrap msgid "apply.ignoreWhitespace" -msgstr "apply.ignoreWhitespace" +msgstr "whitespace" #. type: Plain text #: en/git-apply.txt:250 @@ -5177,7 +5216,7 @@ msgstr "" #: en/git-apply.txt:250 en/config.txt:916 #, no-wrap msgid "apply.whitespace" -msgstr "apply.whitespace" +msgstr "whitespace" #. type: Plain text #: en/git-apply.txt:253 @@ -5370,7 +5409,7 @@ msgstr "" #: en/git-merge-index.txt:29 en/git-push.txt:159 #, no-wrap msgid "-o" -msgstr "" +msgstr "-o" #. type: Plain text #: en/git-archimport.txt:92 @@ -5444,7 +5483,9 @@ msgstr "git-archive(1)" #. type: Plain text #: en/git-archive.txt:7 msgid "git-archive - Create an archive of files from a named tree" -msgstr "git-archive - Cr챕er une archive des fichiers d'un arbre nomm챕" +msgstr "" +"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " +"de l'index, encore une fois, avant d'utiliser la commande 'commit'," #. type: Plain text #: en/git-archive.txt:16 @@ -5480,7 +5521,7 @@ msgstr "" #: en/git-archive.txt:36 #, no-wrap msgid "--format=<fmt>" -msgstr "--format=<fmt>" +msgstr "Configuration" #. type: Plain text #: en/git-archive.txt:42 @@ -5505,7 +5546,7 @@ msgstr "" #: en/git-show-branch.txt:80 #, no-wrap msgid "--list" -msgstr "" +msgstr "--list" #. type: Plain text #: en/git-archive.txt:46 @@ -5515,7 +5556,7 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:50 msgid "Report progress to stderr." -msgstr "Afficher la progression sur stderr." +msgstr "Mode bavard." #. type: Labeled list #: en/git-archive.txt:51 en/git-read-tree.txt:84 en/git-write-tree.txt:35 @@ -5549,7 +5590,7 @@ msgstr "" #: en/git-archive.txt:58 #, no-wrap msgid "--worktree-attributes" -msgstr "" +msgstr "--worktree-attributes" #. type: Plain text #: en/git-archive.txt:61 @@ -5634,7 +5675,7 @@ msgstr "" #: en/git-archive.txt:90 en/git-diff-files.txt:28 #, no-wrap msgid "-0" -msgstr "" +msgstr "-0" #. type: Plain text #: en/git-archive.txt:92 @@ -5645,7 +5686,7 @@ msgstr "" #: en/git-archive.txt:92 #, no-wrap msgid "-9" -msgstr "" +msgstr "-9" #. type: Plain text #: en/git-archive.txt:95 @@ -5983,7 +6024,7 @@ msgstr "" #: en/git-bisect.txt:74 #, no-wrap msgid "$ git bisect good\n" -msgstr "$ git bisect good\n" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:77 @@ -5994,7 +6035,7 @@ msgstr "" #: en/git-bisect.txt:80 #, no-wrap msgid "$ git bisect bad\n" -msgstr "$ git bisect bad\n" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:83 @@ -6027,7 +6068,7 @@ msgstr "" #: en/git-bisect.txt:98 #, no-wrap msgid "Bisect reset" -msgstr "Bisect reset" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:102 @@ -6040,7 +6081,7 @@ msgstr "" #: en/git-bisect.txt:105 #, no-wrap msgid "$ git bisect reset\n" -msgstr "$ git bisect reset\n" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:110 @@ -6060,7 +6101,7 @@ msgstr "" #: en/git-bisect.txt:116 #, no-wrap msgid "$ git bisect reset <commit>\n" -msgstr "$ git bisect reset <commit>\n" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:121 @@ -6120,7 +6161,7 @@ msgstr "" #: en/git-bisect.txt:152 #, no-wrap msgid "git bisect old [<rev>]\n" -msgstr "git bisect old [<rev>]\n" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:155 @@ -6131,7 +6172,7 @@ msgstr "" #: en/git-bisect.txt:158 #, no-wrap msgid "git bisect new [<rev>...]\n" -msgstr "git bisect new [<rev>...]\n" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:161 @@ -6147,7 +6188,7 @@ msgstr "" #: en/git-bisect.txt:166 #, no-wrap msgid "git bisect terms\n" -msgstr "git bisect terms\n" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:170 @@ -6205,7 +6246,7 @@ msgstr "" #: en/git-bisect.txt:197 #, no-wrap msgid "Bisect visualize" -msgstr "Bisect visualize" +msgstr "$ git commit\n" #. type: Plain text #: en/git-bisect.txt:201 @@ -6216,8 +6257,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:204 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git bisect visualize\n" msgstr "$ git commit\n" @@ -6235,8 +6275,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:214 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git bisect view --stat\n" msgstr "$ git commit\n" @@ -6255,8 +6294,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:224 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git bisect log\n" msgstr "$ git commit\n" @@ -6279,8 +6317,7 @@ msgstr "" #. type: Title ~ #: en/git-bisect.txt:237 -#, fuzzy, no-wrap -#| msgid "modifying existing content" +#, no-wrap msgid "Avoiding testing a commit" msgstr "modification de contenu existant" @@ -6434,8 +6471,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:322 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git bisect run my_script arguments\n" msgstr "$ git commit\n" @@ -6491,10 +6527,9 @@ msgstr "" #. type: Labeled list #: en/git-bisect.txt:358 en/git-clone.txt:134 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--no-checkout" -msgstr "git-commit(1)" +msgstr "--no-checkout" #. type: Plain text #: en/git-bisect.txt:363 @@ -6735,10 +6770,9 @@ msgstr "" #. type: Title = #: en/git-blame.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-blame(1)" -msgstr "git-add(1)" +msgstr "git-blame(1)" #. type: Plain text #: en/git-blame.txt:7 @@ -6817,7 +6851,7 @@ msgstr "" #: en/git-blame.txt:55 #, no-wrap msgid "--score-debug" -msgstr "" +msgstr "--score-debug" #. type: Plain text #: en/git-blame.txt:63 @@ -6833,7 +6867,7 @@ msgstr "" #: en/git-blame.txt:65 #, no-wrap msgid "--show-name" -msgstr "" +msgstr "--show-name" #. type: Plain text #: en/git-blame.txt:69 @@ -6847,7 +6881,7 @@ msgstr "" #: en/git-blame.txt:71 #, no-wrap msgid "--show-number" -msgstr "" +msgstr "--show-number" #. type: Plain text #: en/git-blame.txt:73 @@ -6861,10 +6895,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:78 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--show-email" -msgstr "git-commit(1)" +msgstr "--show-email" #. type: Plain text #: en/git-blame.txt:82 @@ -7177,14 +7210,13 @@ msgstr "" #: en/git-blame.txt:234 en/cmds-ancillaryinterrogators.txt:1 #, no-wrap msgid "linkgit:git-annotate[1]" -msgstr "" +msgstr "linkgit:git-annotate[1]" #. type: Title = #: en/git-branch.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-branch(1)" -msgstr "git-add(1)" +msgstr "git-branch(1)" #. type: Plain text #: en/git-branch.txt:7 @@ -7302,7 +7334,7 @@ msgstr "" #: en/git-symbolic-ref.txt:36 en/git-tag.txt:76 #, no-wrap msgid "--delete" -msgstr "" +msgstr "--delete" #. type: Plain text #: en/git-branch.txt:83 @@ -7326,7 +7358,7 @@ msgstr "" #: en/git-branch.txt:88 en/git-tag.txt:152 #, no-wrap msgid "--create-reflog" -msgstr "" +msgstr "--create-reflog" #. type: Plain text #: en/git-branch.txt:97 @@ -7354,7 +7386,7 @@ msgstr "" #: en/git-branch.txt:108 #, no-wrap msgid "--move" -msgstr "" +msgstr "--move" #. type: Plain text #: en/git-branch.txt:110 @@ -7391,7 +7423,7 @@ msgstr "" #: en/diff-options.txt:227 #, no-wrap msgid "--no-color" -msgstr "" +msgstr "--no-color" #. type: Plain text #: en/git-branch.txt:123 @@ -7403,10 +7435,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:125 en/git-for-each-ref.txt:82 en/git-grep.txt:117 #: en/git-tag.txt:112 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "--ignore-case" -msgstr "whitespace" +msgstr "--ignore-case" #. type: Plain text #: en/git-branch.txt:127 @@ -7421,10 +7452,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:129 en/git-status.txt:105 en/git-tag.txt:116 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--no-column" -msgstr "status" +msgstr "--no-column" #. type: Plain text #: en/git-branch.txt:133 @@ -7441,10 +7471,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:137 en/git-show-branch.txt:44 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--remotes" -msgstr "git-commit(1)" +msgstr "--remotes" #. type: Plain text #: en/git-branch.txt:139 @@ -7467,7 +7496,7 @@ msgstr "" #: en/git-branch.txt:149 #, no-wrap msgid "-vv" -msgstr "" +msgstr "-vv" #. type: Plain text #: en/git-branch.txt:156 @@ -7501,7 +7530,7 @@ msgstr "" #: en/git-branch.txt:167 #, no-wrap msgid "--no-abbrev" -msgstr "" +msgstr "--no-abbrev" #. type: Plain text #: en/git-branch.txt:169 @@ -7522,7 +7551,7 @@ msgstr "" #: en/git-branch.txt:171 en/git-checkout.txt:156 #, no-wrap msgid "--track" -msgstr "" +msgstr "--track" #. type: Plain text #: en/git-branch.txt:179 @@ -7549,7 +7578,7 @@ msgstr "" #: en/git-branch.txt:186 en/git-checkout.txt:170 #, no-wrap msgid "--no-track" -msgstr "" +msgstr "--no-track" #. type: Plain text #: en/git-branch.txt:189 en/git-checkout.txt:173 @@ -7562,7 +7591,7 @@ msgstr "" #: en/git-branch.txt:190 en/git-push.txt:246 #, no-wrap msgid "--set-upstream" -msgstr "" +msgstr "--set-upstream" #. type: Plain text #: en/git-branch.txt:195 @@ -7596,7 +7625,7 @@ msgstr "" #: en/git-branch.txt:202 #, no-wrap msgid "--unset-upstream" -msgstr "" +msgstr "--unset-upstream" #. type: Plain text #: en/git-branch.txt:205 @@ -7607,10 +7636,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:206 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--edit-description" -msgstr "git-add(1)" +msgstr "--edit-description" #. type: Plain text #: en/git-branch.txt:211 @@ -7689,8 +7717,7 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:235 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "<oldbranch>" msgstr "Mode interactif" @@ -7742,8 +7769,7 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:256 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--format <format>" msgstr "Configuration" @@ -7873,10 +7899,9 @@ msgstr "" #. type: Title = #: en/git-bundle.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-bundle(1)" -msgstr "git-add(1)" +msgstr "git-bundle(1)" #. type: Plain text #: en/git-bundle.txt:7 @@ -7968,10 +7993,9 @@ msgstr "" #. type: Labeled list #: en/git-bundle.txt:60 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "<git-rev-list-args>" -msgstr "git-commit(1)" +msgstr "<git-rev-list-args>" #. type: Plain text #: en/git-bundle.txt:69 @@ -8166,8 +8190,6 @@ msgstr "" #. type: Plain text #: en/git-bundle.txt:174 -#, fuzzy -#| msgid "but can be used to amend a merge commit." msgid "You can use the number of commits:" msgstr "mais peut 챗tre utilis챕 pour corriger un commit de fusion." @@ -8224,10 +8246,9 @@ msgstr "" #. type: Title = #: en/git-cat-file.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-cat-file(1)" -msgstr "git-commit(1)" +msgstr "git-cat-file(1)" #. type: Plain text #: en/git-cat-file.txt:7 @@ -8308,7 +8329,7 @@ msgstr "" #: en/git-cat-file.txt:59 en/git-grep.txt:109 en/diff-options.txt:570 #, no-wrap msgid "--textconv" -msgstr "" +msgstr "--textconv" #. type: Plain text #: en/git-cat-file.txt:64 @@ -8322,7 +8343,7 @@ msgstr "" #: en/git-cat-file.txt:65 #, no-wrap msgid "--filters" -msgstr "" +msgstr "--filters" #. type: Plain text #: en/git-cat-file.txt:70 @@ -8335,8 +8356,7 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:71 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "--path=<path>" msgstr "patch" @@ -8350,15 +8370,13 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:76 en/git-mktree.txt:32 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "--batch" -msgstr "patch" +msgstr "--batch" #. type: Labeled list #: en/git-cat-file.txt:77 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--batch=<format>" msgstr "Configuration" @@ -8375,7 +8393,7 @@ msgstr "" #: en/git-cat-file.txt:84 #, no-wrap msgid "--batch-check" -msgstr "" +msgstr "--batch-check" #. type: Labeled list #: en/git-cat-file.txt:85 @@ -8396,7 +8414,7 @@ msgstr "" #: en/git-cat-file.txt:92 #, no-wrap msgid "--batch-all-objects" -msgstr "" +msgstr "--batch-all-objects" #. type: Plain text #: en/git-cat-file.txt:98 @@ -8411,7 +8429,7 @@ msgstr "" #: en/git-cat-file.txt:99 #, no-wrap msgid "--buffer" -msgstr "" +msgstr "--buffer" #. type: Plain text #: en/git-cat-file.txt:105 @@ -8426,7 +8444,7 @@ msgstr "" #: en/git-cat-file.txt:106 #, no-wrap msgid "--allow-unknown-type" -msgstr "" +msgstr "--allow-unknown-type" #. type: Plain text #: en/git-cat-file.txt:108 @@ -8437,7 +8455,7 @@ msgstr "" #: en/git-cat-file.txt:109 #, no-wrap msgid "--follow-symlinks" -msgstr "" +msgstr "--follow-symlinks" #. type: Plain text #: en/git-cat-file.txt:118 @@ -8574,8 +8592,7 @@ msgstr "" #. type: Title - #: en/git-cat-file.txt:179 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "BATCH OUTPUT" msgstr "FORMATS DE DATE" @@ -8830,10 +8847,9 @@ msgstr "" #. type: Title = #: en/git-check-attr.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-check-attr(1)" -msgstr "git-commit(1)" +msgstr "git-check-attr(1)" #. type: Plain text #: en/git-check-attr.txt:7 @@ -8871,10 +8887,6 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:29 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Consider `.gitattributes` in the index only, ignoring the working tree." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -8889,7 +8901,7 @@ msgstr "" #: en/git-update-index.txt:140 en/rev-list-options.txt:194 #, no-wrap msgid "--stdin" -msgstr "" +msgstr "--stdin" #. type: Plain text #: en/git-check-attr.txt:33 en/git-check-ignore.txt:40 @@ -9077,16 +9089,14 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:117 -#, fuzzy -#| msgid "git-commit(1)" msgid "linkgit:gitattributes[5]." -msgstr "git-commit(1)" +msgstr "linkgit:gitattributes[5]." #. type: Title = #: en/git-check-ignore.txt:2 #, no-wrap msgid "git-check-ignore(1)" -msgstr "" +msgstr "git-check-ignore(1)" #. type: Plain text #: en/git-check-ignore.txt:7 @@ -9169,7 +9179,7 @@ msgstr "" #: en/git-check-ignore.txt:52 en/git-grep.txt:76 #, no-wrap msgid "--no-index" -msgstr "" +msgstr "--no-index" #. type: Plain text #: en/git-check-ignore.txt:58 @@ -9280,21 +9290,14 @@ msgstr "" # #. type: Plain text #: en/git-check-ignore.txt:117 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]" -msgstr "" -"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -"merge[1], linkgit:git-commit-tree[1]" +msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]" #. type: Title = #: en/git-check-mailmap.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-check-mailmap(1)" -msgstr "git-commit(1)" +msgstr "git-check-mailmap(1)" #. type: Plain text #: en/git-check-mailmap.txt:7 @@ -9336,13 +9339,11 @@ msgstr "" #: en/git-checkout-index.txt:2 #, no-wrap msgid "git-checkout-index(1)" -msgstr "" +msgstr "git-checkout-index(1)" # #. type: Plain text #: en/git-checkout-index.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-checkout-index - Copy files from the index to the working tree" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -9359,10 +9360,6 @@ msgstr "" #. type: Plain text #: en/git-checkout-index.txt:22 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "" "Will copy all files listed from the index to the working directory (not " "overwriting existing files)." @@ -9378,18 +9375,11 @@ msgstr "" # #. type: Plain text #: en/git-checkout-index.txt:33 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "be quiet if files exist or are not in the index" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" #. type: Plain text #: en/git-checkout-index.txt:37 -#, fuzzy -#| msgid "" -#| "-f::\n" -#| "--force::\n" -#| "\tAllow adding otherwise ignored files.\n" msgid "forces overwrite of existing files" msgstr "" "-f::\n" @@ -9407,7 +9397,7 @@ msgstr "" #: en/git-checkout-index.txt:44 #, no-wrap msgid "--no-create" -msgstr "" +msgstr "--no-create" #. type: Plain text #: en/git-checkout-index.txt:47 @@ -9445,7 +9435,7 @@ msgstr "" #: en/git-checkout-index.txt:57 #, no-wrap msgid "--temp" -msgstr "" +msgstr "--temp" #. type: Plain text #: en/git-checkout-index.txt:61 @@ -9663,16 +9653,13 @@ msgstr "" #. type: Title = #: en/git-checkout.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-checkout(1)" -msgstr "git-commit(1)" +msgstr "git-checkout(1)" # #. type: Plain text #: en/git-checkout.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-checkout - Switch branches or restore working tree files" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -9698,8 +9685,7 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:25 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "'git checkout' <branch>" msgstr "$ git commit\n" @@ -9780,8 +9766,7 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:66 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "'git checkout' [--detach] <commit>" msgstr "$ git commit\n" @@ -9848,11 +9833,6 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:109 -#, fuzzy -#| msgid "" -#| "-q::\n" -#| "--quiet::\n" -#| "\tSuppress commit summary message.\n" msgid "Quiet, suppress feedback messages." msgstr "" "-q::\n" @@ -9863,7 +9843,7 @@ msgstr "" #: en/git-checkout.txt:110 en/git-fsck.txt:92 en/blame-options.txt:73 #, no-wrap msgid "--[no-]progress" -msgstr "" +msgstr "--[no-]progress" #. type: Plain text #: en/git-checkout.txt:115 @@ -9892,13 +9872,13 @@ msgstr "" #: en/git-checkout.txt:125 en/git-merge-file.txt:73 #, no-wrap msgid "--ours" -msgstr "" +msgstr "--ours" #. type: Labeled list #: en/git-checkout.txt:126 en/git-merge-file.txt:74 #, no-wrap msgid "--theirs" -msgstr "" +msgstr "--theirs" #. type: Plain text #: en/git-checkout.txt:129 @@ -9987,7 +9967,7 @@ msgstr "" #: en/git-checkout.txt:178 en/git-daemon.txt:134 en/git-worktree.txt:100 #, no-wrap msgid "--detach" -msgstr "" +msgstr "--detach" #. type: Plain text #: en/git-checkout.txt:184 @@ -10044,10 +10024,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:210 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--ignore-skip-worktree-bits" -msgstr "git-commit(1)" +msgstr "--ignore-skip-worktree-bits" #. type: Plain text #: en/git-checkout.txt:215 @@ -10060,10 +10039,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:217 en/git-rebase.txt:271 en/git-reset.txt:71 #: en/git-submodule.txt:363 en/git-svn.txt:638 en/rev-list-options.txt:278 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--merge" -msgstr "git-commit(1)" +msgstr "--merge" #. type: Plain text #: en/git-checkout.txt:226 @@ -10118,13 +10096,6 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:252 -#, fuzzy -#| msgid "" -#| "by using the --interactive or --patch switches with the 'commit' command " -#| "to decide one by one which files or hunks should be part of the commit in " -#| "addition to contents in the index, before finalizing the operation. See " -#| "the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to " -#| "operate these modes." msgid "" "This means that you can use `git checkout -p` to selectively discard edits " "from your current working tree. See the ``Interactive Mode'' section of " @@ -10140,7 +10111,7 @@ msgstr "" #: en/git-checkout.txt:253 #, no-wrap msgid "--ignore-other-worktrees" -msgstr "" +msgstr "--ignore-other-worktrees" #. type: Plain text #: en/git-checkout.txt:258 @@ -10152,8 +10123,7 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:259 en/git-rebase.txt:242 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "<branch>" msgstr "Mode interactif" @@ -10252,8 +10222,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:311 en/git-checkout.txt:346 en/git-checkout.txt:363 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ edit; git add; git commit\n" msgstr "$ git commit\n" @@ -10281,8 +10250,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:329 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "" "$ git checkout v2.0 # or\n" "$ git checkout master^^\n" @@ -10356,8 +10324,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:380 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git checkout master\n" msgstr "$ git commit\n" @@ -10470,8 +10437,6 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:449 -#, fuzzy -#| msgid "git-add(1)" msgid "switch branch" msgstr "git-add(1)" @@ -10493,8 +10458,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:457 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git checkout -- '*.c'\n" msgstr "$ git commit\n" @@ -10516,8 +10480,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:470 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git checkout -- hello.c\n" msgstr "$ git commit\n" @@ -10530,8 +10493,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:477 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git checkout mytopic\n" msgstr "$ git commit\n" @@ -10559,8 +10521,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:494 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "" "$ git checkout -m mytopic\n" "Auto-merging frotz\n" @@ -10601,8 +10562,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:518 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "" "$ edit frotz\n" "$ git add frotz\n" @@ -10610,10 +10570,9 @@ msgstr "$ git commit\n" #. type: Title = #: en/git-check-ref-format.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-check-ref-format(1)" -msgstr "git-commit(1)" +msgstr "git-check-ref-format(1)" #. type: Plain text #: en/git-check-ref-format.txt:7 @@ -10766,7 +10725,7 @@ msgstr "" #: en/git-check-ref-format.txt:88 #, no-wrap msgid "--[no-]allow-onelevel" -msgstr "" +msgstr "--[no-]allow-onelevel" #. type: Plain text #: en/git-check-ref-format.txt:92 @@ -10780,7 +10739,7 @@ msgstr "" #: en/git-check-ref-format.txt:93 #, no-wrap msgid "--refspec-pattern" -msgstr "" +msgstr "--refspec-pattern" #. type: Plain text #: en/git-check-ref-format.txt:99 @@ -10795,7 +10754,7 @@ msgstr "" #: en/git-check-ref-format.txt:100 #, no-wrap msgid "--normalize" -msgstr "" +msgstr "--normalize" #. type: Plain text #: en/git-check-ref-format.txt:107 @@ -10814,10 +10773,9 @@ msgstr "" #. type: delimited block - #: en/git-check-ref-format.txt:116 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "$ git check-ref-format --branch @{-1}\n" -msgstr "git-commit(1)" +msgstr "$ git check-ref-format --branch @{-1}\n" #. type: Plain text #: en/git-check-ref-format.txt:119 @@ -10836,7 +10794,7 @@ msgstr "" #: en/git-cherry-pick.txt:2 #, no-wrap msgid "git-cherry-pick(1)" -msgstr "" +msgstr "git-cherry-pick(1)" #. type: Plain text #: en/git-cherry-pick.txt:7 @@ -10910,10 +10868,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:45 en/git-merge.txt:110 en/git-revert.txt:35 #: en/git-verify-commit.txt:27 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "<commit>..." -msgstr "git-commit(1)" +msgstr "<commit>..." #. type: Plain text #: en/git-cherry-pick.txt:54 @@ -10984,10 +10941,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--no-commit" -msgstr "git-commit(1)" +msgstr "--no-commit" #. type: Plain text #: en/git-cherry-pick.txt:96 @@ -11017,7 +10973,7 @@ msgstr "" #: en/git-cherry-pick.txt:111 en/merge-options.txt:30 #, no-wrap msgid "--ff" -msgstr "" +msgstr "--ff" #. type: Plain text #: en/git-cherry-pick.txt:115 @@ -11030,7 +10986,7 @@ msgstr "" #: en/git-cherry-pick.txt:116 en/git-commit.txt:173 en/git-notes.txt:158 #, no-wrap msgid "--allow-empty" -msgstr "" +msgstr "--allow-empty" #. type: Plain text #: en/git-cherry-pick.txt:128 @@ -11051,7 +11007,7 @@ msgstr "" #: en/git-cherry-pick.txt:129 en/git-commit.txt:179 #, no-wrap msgid "--allow-empty-message" -msgstr "" +msgstr "--allow-empty-message" #. type: Plain text #: en/git-cherry-pick.txt:133 @@ -11065,7 +11021,7 @@ msgstr "" #: en/git-cherry-pick.txt:134 #, no-wrap msgid "--keep-redundant-commits" -msgstr "" +msgstr "--keep-redundant-commits" #. type: Plain text #: en/git-cherry-pick.txt:140 @@ -11093,8 +11049,7 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:146 en/git-revert.txt:99 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "-X<option>" msgstr "status" @@ -11275,14 +11230,13 @@ msgstr "" #: en/git-cherry-pick.txt:230 en/cmds-mainporcelain.txt:85 #, no-wrap msgid "linkgit:git-revert[1]" -msgstr "" +msgstr "linkgit:git-revert[1]" #. type: Title = #: en/git-cherry.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-cherry(1)" -msgstr "git-commit(1)" +msgstr "git-cherry(1)" #. type: Plain text #: en/git-cherry.txt:7 @@ -11504,14 +11458,13 @@ msgstr "" #: en/git-cherry.txt:142 en/cmds-purehelpers.txt:40 #, no-wrap msgid "linkgit:git-patch-id[1]" -msgstr "" +msgstr "linkgit:git-patch-id[1]" #. type: Title = #: en/git-citool.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-citool(1)" -msgstr "git-commit(1)" +msgstr "git-citool(1)" #. type: Plain text #: en/git-citool.txt:7 @@ -11520,10 +11473,9 @@ msgstr "" #. type: Plain text #: en/git-citool.txt:12 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "'git citool'\n" -msgstr "$ git commit\n" +msgstr "'git citool'\n" #. type: Plain text #: en/git-citool.txt:19 @@ -11543,17 +11495,12 @@ msgstr "" #. type: Title = #: en/git-clean.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-clean(1)" -msgstr "git-add(1)" +msgstr "git-clean(1)" #. type: Plain text #: en/git-clean.txt:7 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "git-clean - Remove untracked files from the working tree" msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -11614,12 +11561,6 @@ msgstr "" #. type: Plain text #: en/git-clean.txt:50 -#, fuzzy -#| msgid "" -#| "-n::\n" -#| "--dry-run::\n" -#| "\tDon't actually add the file(s), just show if they exist and/or will\n" -#| "\tbe ignored.\n" msgid "Don't actually remove anything, just show what would be done." msgstr "" "-n::\n" @@ -11680,10 +11621,6 @@ msgstr "" # #. type: Plain text #: en/git-clean.txt:79 -#, fuzzy -#| msgid "" -#| "When the command enters the interactive mode, it shows the output of the " -#| "'status' subcommand, and then goes into its interactive command loop." msgid "" "When the command enters the interactive mode, it shows the files and " "directories to be cleaned, and goes into its interactive command loop." @@ -11693,12 +11630,7 @@ msgstr "" #. type: delimited block - #: en/git-clean.txt:90 -#, fuzzy, no-wrap -#| msgid "" -#| " *** Commands ***\n" -#| " 1: status 2: update 3: revert 4: add untracked\n" -#| " 5: patch 6: diff 7: quit 8: help\n" -#| " What now> 1\n" +#, no-wrap msgid "" " *** Commands ***\n" "\t1: clean 2: filter by pattern 3: select by numbers\n" @@ -11713,10 +11645,6 @@ msgstr "" # #. type: Plain text #: en/git-clean.txt:93 -#, fuzzy -#| msgid "" -#| "You also could say `s` or `sta` or `status` above as long as the choice " -#| "is unique." msgid "" "You also could say `c` or `clean` above as long as the choice is unique." msgstr "" @@ -11726,8 +11654,6 @@ msgstr "" # #. type: Plain text #: en/git-clean.txt:95 -#, fuzzy -#| msgid "The main command loop has 6 subcommands (plus help and quit)." msgid "The main command loop has 6 subcommands." msgstr "" "La boucle de commande principale propose 6 sous-commandes (plus help (aide) " @@ -11769,15 +11695,6 @@ msgstr "" # #. type: Plain text #: en/git-clean.txt:120 -#, fuzzy -#| msgid "" -#| "This shows the status information and issues an \"Update>>\" prompt. " -#| "When the prompt ends with double '>>', you can make more than one " -#| "selection, concatenated with whitespace or comma. Also you can say " -#| "ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the " -#| "second number in a range is omitted, all remaining patches are taken. E." -#| "g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose " -#| "everything." msgid "" "This shows the files and directories to be deleted and issues an \"Select " "items to delete>>\" prompt. When the prompt ends with double '>>' like this, " @@ -11839,10 +11756,9 @@ msgstr "" #. type: Title = #: en/git-clone.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-clone(1)" -msgstr "git-commit(1)" +msgstr "git-clone(1)" #. type: Plain text #: en/git-clone.txt:7 @@ -11882,10 +11798,6 @@ msgstr "" #. type: Plain text #: en/git-clone.txt:39 -#, fuzzy -#| msgid "" -#| "The default can be changed by the `commit.cleanup` configuration variable " -#| "(see linkgit:git-config[1])." msgid "" "This default configuration is achieved by creating references to the remote " "branch heads under `refs/remotes/origin` and by initializing `remote.origin." @@ -11899,7 +11811,7 @@ msgstr "" #: en/git-pack-objects.txt:127 en/git-svn.txt:229 #, no-wrap msgid "--local" -msgstr "" +msgstr "--local" #. type: Plain text #: en/git-clone.txt:51 @@ -11925,7 +11837,7 @@ msgstr "" #: en/git-clone.txt:59 #, no-wrap msgid "--no-hardlinks" -msgstr "" +msgstr "--no-hardlinks" #. type: Plain text #: en/git-clone.txt:64 @@ -11939,7 +11851,7 @@ msgstr "" #: en/git-clone.txt:65 #, no-wrap msgid "--shared" -msgstr "" +msgstr "--shared" #. type: Plain text #: en/git-clone.txt:72 @@ -12012,7 +11924,7 @@ msgstr "" #: en/git-clone.txt:107 #, no-wrap msgid "--dissociate" -msgstr "" +msgstr "--dissociate" #. type: Plain text #: en/git-clone.txt:117 @@ -12044,7 +11956,7 @@ msgstr "" #: en/fetch-options.txt:170 en/merge-options.txt:112 #, no-wrap msgid "--progress" -msgstr "" +msgstr "--progress" #. type: Plain text #: en/git-clone.txt:133 en/git-pack-objects.txt:141 en/git-push.txt:273 @@ -12076,7 +11988,7 @@ msgstr "" #: en/git-clone.txt:150 en/git-push.txt:106 #, no-wrap msgid "--mirror" -msgstr "" +msgstr "--mirror" #. type: Plain text #: en/git-clone.txt:157 @@ -12109,8 +12021,7 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:163 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "--branch <name>" msgstr "Mode interactif" @@ -12138,8 +12049,7 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:173 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "-u <upload-pack>" msgstr "git-add(1)" @@ -12230,7 +12140,7 @@ msgstr "" #: en/git-clone.txt:208 #, no-wrap msgid "--[no-]single-branch" -msgstr "" +msgstr "--[no-]single-branch" #. type: Plain text #: en/git-clone.txt:217 @@ -12247,14 +12157,13 @@ msgstr "" #: en/git-clone.txt:218 en/git-submodule.txt:400 #, no-wrap msgid "--recursive" -msgstr "" +msgstr "--recursive" #. type: Labeled list #: en/git-clone.txt:219 en/git-grep.txt:92 en/git-ls-files.txt:142 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--recurse-submodules" -msgstr "git-add(1)" +msgstr "--recurse-submodules" #. type: Plain text #: en/git-clone.txt:226 @@ -12270,7 +12179,7 @@ msgstr "" #: en/git-clone.txt:227 #, no-wrap msgid "--[no-]shallow-submodules" -msgstr "" +msgstr "--[no-]shallow-submodules" #. type: Plain text #: en/git-clone.txt:229 @@ -12400,10 +12309,9 @@ msgstr "" #. type: Title = #: en/git-column.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-column(1)" -msgstr "git-commit(1)" +msgstr "git-column(1)" #. type: Plain text #: en/git-column.txt:7 @@ -12515,8 +12423,6 @@ msgstr "git-commit(1)" #. type: Plain text #: en/git-commit.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-commit - Record changes to the repository" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -12540,30 +12446,20 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:22 -#, fuzzy -#| msgid "" -#| "Stores the current contents of the index in a new commit along with a log " -#| "message from the user describing the changes." msgid "" "Stores the current contents of the index in a new commit along with a log " "message from the user describing the changes." msgstr "" -"Enregistre les contenu actuel de l'index dans un nouveau commit avec un " +"Enregistre les contenus actuels de l'index dans un nouveau commit avec un " "message de journal de l'utilisateur d챕crivant les modifications." #. type: Plain text #: en/git-commit.txt:24 -#, fuzzy -#| msgid "The content to be added can be specified in several ways:" msgid "The content to be added can be specified in several ways:" msgstr "Le contenu 횪 ajouter peut 챗tre sp챕cifi챕 de diff챕rentes mani챔res혻:" #. type: Plain text #: en/git-commit.txt:28 -#, fuzzy -#| msgid "" -#| "by using 'git add' to incrementally \"add\" changes to the index before " -#| "using the 'commit' command (Note: even modified files must be \"added\");" msgid "" "by using 'git add' to incrementally \"add\" changes to the index before " "using the 'commit' command (Note: even modified files must be \"added\");" @@ -12575,10 +12471,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:31 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "" "by using 'git rm' to remove files from the working tree and the index, again " "before using the 'commit' command;" @@ -12588,12 +12480,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:37 -#, fuzzy -#| msgid "" -#| "by listing files as arguments to the 'commit' command (without --" -#| "interactive or --patch switch), in which case the commit will ignore " -#| "changes staged in the index, and instead record the current content of " -#| "the listed files (which must already be known to Git);" msgid "" "by listing files as arguments to the 'commit' command (without --interactive " "or --patch switch), in which case the commit will ignore changes staged in " @@ -12607,12 +12493,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:43 -#, fuzzy -#| msgid "" -#| "by using the -a switch with the 'commit' command to automatically \"add\" " -#| "changes from all known files (i.e. all files that are already listed in " -#| "the index) and to automatically \"rm\" files in the index that have been " -#| "removed from the working tree, and then perform the actual commit;" msgid "" "by using the -a switch with the 'commit' command to automatically \"add\" " "changes from all known files (i.e. all files that are already listed in the " @@ -12627,13 +12507,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:49 -#, fuzzy -#| msgid "" -#| "by using the --interactive or --patch switches with the 'commit' command " -#| "to decide one by one which files or hunks should be part of the commit in " -#| "addition to contents in the index, before finalizing the operation. See " -#| "the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to " -#| "operate these modes." msgid "" "by using the --interactive or --patch switches with the 'commit' command to " "decide one by one which files or hunks should be part of the commit in " @@ -12649,25 +12522,17 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:53 -#, fuzzy -#| msgid "" -#| "The `--dry-run` option can be used to obtain a summary of what is " -#| "included by any of the above for the next commit by giving the same set " -#| "of parameters (options and paths)." msgid "" "The `--dry-run` option can be used to obtain a summary of what is included " "by any of the above for the next commit by giving the same set of parameters " "(options and paths)." msgstr "" "L'option `--dry-run` peut 챗tre utilis챕e pour obtenir un r챕sum챕 de ce qui " -"serait inclus par la commande 횪 laquelle elle est ajout챕e." +"sera inclus par une des commandes ci-dessus pour la prochaine validation en " +"fournissant le jeu de param챔tres (options et chemins)." #. type: Plain text #: en/git-commit.txt:56 -#, fuzzy -#| msgid "" -#| "If you make a commit and then find a mistake immediately after that, you " -#| "can recover from it with 'git reset'." msgid "" "If you make a commit and then find a mistake immediately after that, you can " "recover from it with 'git reset'." @@ -12677,41 +12542,23 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:65 -#, fuzzy -#| msgid "" -#| "-a::\n" -#| "--all::\n" -#| "\tTell the command to automatically stage files that have\n" -#| "\tbeen modified and deleted, but new files you have not\n" -#| "\ttold Git about are not affected.\n" msgid "" "Tell the command to automatically stage files that have been modified and " "deleted, but new files you have not told Git about are not affected." msgstr "" -"-a::\n" -"--all::\n" -"\tIndiquer 횪 la commande d'indexer automatiquement les fichiers qui\n" -"\tont 챕t챕 modifi챕s ou supprim챕s, mais les nouveaux fichiers dont\n" -"\tvous n'avez pas signal챕 la pr챕sence 횪 Git ne sont pas affect챕s.\n" +"Indiquer 횪 la commande d'indexer automatiquement les fichiers qui ont 챕t챕 " +"modifi챕s ou supprim챕s, mais les nouveaux fichiers dont vous n'avez pas " +"signal챕 la pr챕sence 횪 Git ne sont pas affect챕s." #. type: Plain text #: en/git-commit.txt:71 -#, fuzzy -#| msgid "" -#| "-p::\n" -#| "--patch::\n" -#| "\tUse the interactive patch selection interface to chose\n" -#| "\twhich changes to commit. See linkgit:git-add[1] for\n" -#| "\tdetails.\n" msgid "" "Use the interactive patch selection interface to chose which changes to " "commit. See linkgit:git-add[1] for details." msgstr "" -"-p::\n" -"--patch::\n" -"\tUtiliser la s챕lection interactive de patch pour\n" -"\tchoisir quelles modifications valider. R챕f챕rez-vous\n" -"\t횪 linkgit:git-add[1] pour plus de d챕tails.\n" +"Utiliser la s챕lection interactive de rustine pour choisir quelles " +"modifications valider. R챕f챕rez-vous 횪 linkgit:git-add[1] pour plus de " +"d챕tails." #. type: Labeled list #: en/git-commit.txt:72 @@ -12724,26 +12571,16 @@ msgstr "git-commit(1)" #: en/git-commit.txt:73 #, no-wrap msgid "--reuse-message=<commit>" -msgstr "" +msgstr "--reuse-message=<commit>" #. type: Plain text #: en/git-commit.txt:77 -#, fuzzy -#| msgid "" -#| "-C <commit>::\n" -#| "--reuse-message=<commit>::\n" -#| "\tTake an existing commit object, and reuse the log message\n" -#| "\tand the authorship information (including the timestamp)\n" -#| "\twhen creating the commit.\n" msgid "" "Take an existing commit object, and reuse the log message and the authorship " "information (including the timestamp) when creating the commit." msgstr "" -"-C <commit>::\n" -"--reuse-message=<commit>::\n" -"\tPrendre un objet commit existant et r챕utiliser son message\n" -"\tde validation et son information de paternit챕 (y compris\n" -"\tl'horodatage) pour la cr챕ation du commit.\n" +"Prendre un objet commit existant et r챕utiliser son message de validation et " +"son information d'auteur (y compris l'horodatage) pour la cr챕ation du commit." #. type: Labeled list #: en/git-commit.txt:78 @@ -12760,208 +12597,134 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:82 -#, fuzzy -#| msgid "" -#| "-c <commit>::\n" -#| "--reedit-message=<commit>::\n" -#| "\tLike '-C', but with `-c` the editor is invoked, so that\n" -#| "\tthe user can further edit the commit message.\n" msgid "" "Like '-C', but with `-c` the editor is invoked, so that the user can further " "edit the commit message." msgstr "" -"-c <commit>::\n" -"--reedit-message=<commit>::\n" -"\tComme '-C', mais avec '-c', l'챕diteur est appel챕 pour permettre \n" -"\t횪 l'utilisateur de modifier le message de validation.\n" +"Comme '-C', mais avec '-c', l'챕diteur est appel챕 pour permettre 횪 " +"l'utilisateur de modifier le message de validation." #. type: Labeled list #: en/git-commit.txt:83 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--fixup=<commit>" -msgstr "git-commit(1)" +msgstr "--fixup=<commit>" #. type: Plain text #: en/git-commit.txt:88 -#, fuzzy -#| msgid "" -#| "--fixup=<commit>::\n" -#| "\tConstruct a commit message for use with `rebase --autosquash`.\n" -#| "\tThe commit message will be the subject line from the specified\n" -#| "\tcommit with a prefix of \"fixup! \". See linkgit:git-rebase[1]\n" -#| "\tfor details.\n" msgid "" "Construct a commit message for use with `rebase --autosquash`. The commit " "message will be the subject line from the specified commit with a prefix of " "\"fixup! \". See linkgit:git-rebase[1] for details." msgstr "" -"--fixup=<commit>::\n" -"\tConstruire un message de validation pour une utilisation avec\n" -"\t`rebase --autosquash`. Le message de validation sera la ligne\n" -"\tde titre du commit sp챕cifi챕 pr챕fix챕 de 짬혻fixup! 혻쨩. R챕f챕rez-vous\n" -"\t횪 linkgit:git-rebase[1] pour de plus amples d챕tails.\n" +"Construire un message de validation pour une utilisation avec `rebase " +"--autosquash`. Le message de validation sera la ligne de titre du commit " +"sp챕cifi챕 pr챕fix챕 de 짬혻fixup! 혻쨩. R챕f챕rez-vous 횪 linkgit:git-rebase[1] pour " +"de plus amples d챕tails." #. type: Labeled list #: en/git-commit.txt:89 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--squash=<commit>" -msgstr "git-commit(1)" +msgstr "--squash=<commit>" #. type: Plain text #: en/git-commit.txt:95 -#, fuzzy -#| msgid "" -#| "--squash=<commit>::\n" -#| "\tConstruct a commit message for use with `rebase --autosquash`.\n" -#| "\tThe commit message subject line is taken from the specified\n" -#| "\tcommit with a prefix of \"squash! \". Can be used with additional\n" -#| "\tcommit message options (`-m`/`-c`/`-C`/`-F`). See\n" -#| "\tlinkgit:git-rebase[1] for details.\n" msgid "" "Construct a commit message for use with `rebase --autosquash`. The commit " "message subject line is taken from the specified commit with a prefix of " "\"squash! \". Can be used with additional commit message options (`-m`/`-c`/" "`-C`/`-F`). See linkgit:git-rebase[1] for details." msgstr "" -"--squash=<commit>::\n" -"\tConstruire un message de validation pour une utilisation avec\n" -"\t`rebase --autosquash`. La ligne de titre du message de validation\n" -"\test tir챕e du commit sp챕cifi챕 pr챕fix챕 par 짬혻squash!혻쨩. Peut 챗tre\n" -"\tutilis챕 avec d'autres options de 'commit' (`-m`/`-c`/`-C`/`-F`).\n" -"\tR챕f챕rez-vous 횪 linkgit:git-rebase[1] pour plus de d챕tails.\n" +"Construire un message de validation pour une utilisation avec `rebase " +"--autosquash`. La ligne de titre du message de validation est tir챕e du " +"commit sp챕cifi챕 pr챕fix챕 par 짬혻squash!혻쨩. Peut 챗tre utilis챕 avec d'autres " +"options de 'commit' (`-m`/`-c`/`-C`/`-F`). R챕f챕rez-vous 횪 linkgit:git-" +"rebase[1] pour plus de d챕tails." #. type: Labeled list #: en/git-commit.txt:96 #, no-wrap msgid "--reset-author" -msgstr "" +msgstr "--reset-author" #. type: Plain text #: en/git-commit.txt:101 -#, fuzzy -#| msgid "" -#| "--reset-author::\n" -#| "\tWhen used with -C/-c/--amend options, or when committing after a\n" -#| "\ta conflicting cherry-pick, declare that the authorship of the\n" -#| "\tresulting commit now belongs to the committer. This also renews\n" -#| "\tthe author timestamp.\n" msgid "" "When used with -C/-c/--amend options, or when committing after a a " "conflicting cherry-pick, declare that the authorship of the resulting commit " "now belongs to the committer. This also renews the author timestamp." msgstr "" -"--reset-author::\n" -"\tUtilis챕 avec les options -C/-c/--amend ou lors de validation\n" -"\tapr챔s un picorage conflictuel, d챕clarer que la paternit챕\n" -"\tdu commit r챕sultant appartient 횪 pr챕sent au validateur avec\n" -"\tun horodatage mis 횪 jour.\n" +"Utilis챕 avec les options -C/-c/--amend ou lors de validation apr챔s un " +"picorage conflictuel, d챕clarer que la paternit챕 du commit r챕sultant " +"appartient 횪 pr챕sent au validateur avec un horodatage mis 횪 jour." #. type: Labeled list #: en/git-commit.txt:102 en/git-rev-parse.txt:139 en/git-status.txt:28 #: en/git-symbolic-ref.txt:45 #, no-wrap msgid "--short" -msgstr "" +msgstr "--short" #. type: Plain text #: en/git-commit.txt:105 -#, fuzzy -#| msgid "" -#| "--short::\n" -#| "\tWhen doing a dry-run, give the output in the short-format. See\n" -#| "\tlinkgit:git-status[1] for details. Implies `--dry-run`.\n" msgid "" "When doing a dry-run, give the output in the short-format. See linkgit:git-" "status[1] for details. Implies `--dry-run`." msgstr "" -"--short::\n" -"\tSeulement avec '--dry-run', fournir la sortie en format court.\n" -"\tVoir linkgit:git-status[1] pour plus de d챕tails.\n" +"Seulement avec '--dry-run', fournir la sortie en format court. Voir linkgit" +":git-status[1] pour plus de d챕tails." #. type: Labeled list #: en/git-commit.txt:106 en/git-status.txt:32 en/git-submodule.txt:280 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "--branch" -msgstr "Mode interactif" +msgstr "--branch" #. type: Plain text #: en/git-commit.txt:108 en/git-status.txt:34 -#, fuzzy -#| msgid "" -#| "--branch::\n" -#| "\tShow the branch and tracking info even in short-format.\n" msgid "Show the branch and tracking info even in short-format." msgstr "" -"--branch::\n" -"\tMontrer la branche et l'information de suivi, y compris en format court.\n" +"Montrer la branche et l'information de suivi, y compris en format court." #. type: Labeled list #: en/git-commit.txt:109 en/git-push.txt:121 en/git-worktree.txt:115 #: en/blame-options.txt:40 #, no-wrap msgid "--porcelain" -msgstr "" +msgstr "--porcelain" #. type: Plain text #: en/git-commit.txt:113 -#, fuzzy -#| msgid "" -#| "--porcelain::\n" -#| "\tWhen doing a dry-run, give the output in a porcelain-ready\n" -#| "\tformat. See linkgit:git-status[1] for details. Implies\n" -#| "\t`--dry-run`.\n" msgid "" "When doing a dry-run, give the output in a porcelain-ready format. See " "linkgit:git-status[1] for details. Implies `--dry-run`." msgstr "" -"--porcelain::\n" -"\tSeulement avec '--dry-run', donner la sortie en format\n" -"\tcompatible porcelain. Voir linkgit:git-status[1]\n" -"\tpour plus de d챕tails.\n" +"Seulement avec '--dry-run', donner la sortie en format compatible " +"porcelaine. Voir linkgit:git-status[1] pour plus de d챕tails." #. type: Labeled list #: en/git-commit.txt:114 en/git-describe.txt:74 en/git-ls-tree.txt:52 #: en/git-status.txt:44 #, no-wrap msgid "--long" -msgstr "" +msgstr "--long" #. type: Plain text #: en/git-commit.txt:117 -#, fuzzy -#| msgid "" -#| "--long::\n" -#| "\tWhen doing a dry-run, give the output in a the long-format.\n" -#| "\tImplies `--dry-run`.\n" msgid "" "When doing a dry-run, give the output in a the long-format. Implies `--dry-" "run`." -msgstr "" -"--long::\n" -"\tSeulement avec '--dry-run', donner la sortie en format\n" -"\tlong.\n" +msgstr "Seulement avec '--dry-run', donner la sortie en format long." #. type: Labeled list #: en/git-commit.txt:119 en/git-config.txt:184 en/git-grep.txt:197 #, no-wrap msgid "--null" -msgstr "" +msgstr "--null" #. type: Plain text #: en/git-commit.txt:126 -#, fuzzy -#| msgid "" -#| "-z::\n" -#| "--null::\n" -#| "\tWhen showing `short` or `porcelain` status output, print the\n" -#| "\tfilename verbatim and terminate the entries with NUL, instead of LF.\n" -#| "\tIf no format is given, implies the `--porcelain` output format.\n" -#| "\tWithout the `-z` option, filenames with \"unusual\" characters are\n" -#| "\tquoted as explained for the configuration variable `core.quotePath`\n" -#| "\t(see linkgit:git-config[1]).\n" msgid "" "When showing `short` or `porcelain` status output, print the filename " "verbatim and terminate the entries with NUL, instead of LF. If no format is " @@ -12969,14 +12732,11 @@ msgid "" "filenames with \"unusual\" characters are quoted as explained for the " "configuration variable `core.quotePath` (see linkgit:git-config[1])." msgstr "" -"-z::\n" -"--null::\n" -"\tAvec les sorties de status `short` ou `porcelain`, afficher\n" -"\tle nom du fichier verbatim et terminer par NUL, au lieu de LF.\n" -"\tSi aucun format n'est sp챕cifi챕, implique `--porcelain`.\n" -"\tSans l'option `-z`, les noms fichiers contenant des caract챔res\n" -"\t짬혻inusuels혻쨩 sont cit챕s selon la variable de configuration\n" -"\t`core.quotePath` (voir linkgit:git-config[1]).\n" +"Avec les sorties de status `short` ou `porcelain`, afficher le nom du " +"fichier verbatim et terminer par NUL, au lieu de LF. Si aucun format n'est " +"sp챕cifi챕, implique `--porcelain`. Sans l'option `-z`, les noms de fichier " +"contenant des caract챔res 짬혻inusuels혻쨩 sont cit챕s selon la variable de " +"configuration `core.quotePath` (voir linkgit:git-config[1]). " #. type: Labeled list #: en/git-commit.txt:127 en/git-commit-tree.txt:53 en/git-fmt-merge-msg.txt:47 @@ -13002,18 +12762,10 @@ msgstr "Prendre le message de validation depuis le fichier indiqu챕. Utilisez '- #: en/git-commit.txt:132 #, no-wrap msgid "--author=<author>" -msgstr "" +msgstr "--author=<auteur>" #. type: Plain text #: en/git-commit.txt:138 -#, fuzzy -#| msgid "" -#| "--author=<author>::\n" -#| "\tOverride the commit author. Specify an explicit author using the\n" -#| "\tstandard `A U Thor <author@example.com>` format. Otherwise <author>\n" -#| "\tis assumed to be a pattern and is used to search for an existing\n" -#| "\tcommit by that author (i.e. rev-list --all -i --author=<author>);\n" -#| "\tthe commit author is then copied from the first such commit found.\n" msgid "" "Override the commit author. Specify an explicit author using the standard `A " "U Thor <author@example.com>` format. Otherwise <author> is assumed to be a " @@ -13021,88 +12773,59 @@ msgid "" "rev-list --all -i --author=<author>); the commit author is then copied from " "the first such commit found." msgstr "" -"--author=<auteur>::\n" -"\tSurcharger l'auteur du commit. Sp챕cifier un auteur explicite avec\n" -"\tle format standard `A U Teur <auteur@exemple.com>`. Sinon <auteur>\n" -"\test consid챕r챕 comme un patron utilis챕 pour chercher un commit existant\n" -"\tpar cet auteur (c-횪-d rev-list --all -i --author=<auteur>)혻;\n" -"\tl'auteur du commit est alors copi챕 depuis le premier commit trouv챕.\n" +"Surcharger l'auteur du commit. Sp챕cifier un auteur explicite avec le format " +"standard `A U Teur <auteur@exemple.com>`. Sinon <auteur> est consid챕r챕 comme " +"un patron utilis챕 pour chercher un commit existant par cet auteur (c-횪-d rev-" +"list --all -i --author=<auteur>)혻; l'auteur du commit est alors copi챕 depuis " +"le premier commit trouv챕." #. type: Labeled list #: en/git-commit.txt:139 #, no-wrap msgid "--date=<date>" -msgstr "" +msgstr "--date=<date>" #. type: Plain text #: en/git-commit.txt:141 -#, fuzzy -#| msgid "" -#| "--date=<date>::\n" -#| "\tOverride the author date used in the commit.\n" msgid "Override the author date used in the commit." -msgstr "" -"--date=<date>::\n" -"\tSurcharger la date d'auteur utilis챕e dans le commit.\n" +msgstr "Surcharger la date d'auteur utilis챕e dans le commit." #. type: Labeled list #: en/git-commit.txt:142 en/git-merge.txt:78 en/git-notes.txt:132 #: en/git-tag.txt:130 #, no-wrap msgid "-m <msg>" -msgstr "" +msgstr "-m <msg>" #. type: Labeled list #: en/git-commit.txt:143 en/git-notes.txt:133 en/git-tag.txt:131 #, no-wrap msgid "--message=<msg>" -msgstr "" +msgstr "--message=<msg>" #. type: Plain text #: en/git-commit.txt:147 -#, fuzzy -#| msgid "" -#| "-m <msg>::\n" -#| "--message=<msg>::\n" -#| "\tUse the given <msg> as the commit message.\n" -#| "\tIf multiple `-m` options are given, their values are\n" -#| "\tconcatenated as separate paragraphs.\n" msgid "" "Use the given <msg> as the commit message. If multiple `-m` options are " "given, their values are concatenated as separate paragraphs." msgstr "" -"-m <msg>::\n" -"--message=<msg>::\n" -"\tUtiliser le <msg> fourni comme message de validation\n" -"\tSi plusieurs options `-m` sont fournies, leurs valeurs\n" -"\tsont concat챕n챕es comme paragraphes s챕par챕s.\n" +"Utiliser le <msg> fourni comme message de validation. Si plusieurs options " +"`-m` sont fournies, leurs valeurs sont concat챕n챕es comme paragraphes s챕par챕s." #. type: Labeled list #: en/git-commit.txt:148 #, no-wrap msgid "-t <file>" -msgstr "" +msgstr "-t <fichier>" #. type: Labeled list #: en/git-commit.txt:149 #, no-wrap msgid "--template=<file>" -msgstr "" +msgstr "--template=<fichier>" #. type: Plain text #: en/git-commit.txt:158 -#, fuzzy -#| msgid "" -#| "-t <file>::\n" -#| "--template=<file>::\n" -#| "\tWhen editing the commit message, start the editor with the\n" -#| "\tcontents in the given file. The `commit.template` configuration\n" -#| "\tvariable is often used to give this option implicitly to the\n" -#| "\tcommand. This mechanism can be used by projects that want to\n" -#| "\tguide participants with some hints on what to write in the message\n" -#| "\tin what order. If the user exits the editor without editing the\n" -#| "\tmessage, the commit is aborted. This has no effect when a message\n" -#| "\tis given by other means, e.g. with the `-m` or `-F` options.\n" msgid "" "When editing the commit message, start the editor with the contents in the " "given file. The `commit.template` configuration variable is often used to " @@ -13112,33 +12835,17 @@ msgid "" "message, the commit is aborted. This has no effect when a message is given " "by other means, e.g. with the `-m` or `-F` options." msgstr "" -"-t <fichier>::\n" -"--template=<fichier>::\n" -"\t� l'챕dition du message de validation, d챕marrer l'챕diteur avec le\n" -"\tcontenu du fichier indiqu챕. La variable de configuration `commit." -"template`\n" -"\test souvent utilis챕e pour fournir implicitement cette option 횪 la " -"commande.\n" -"\tCe m챕canisme peut 챗tre utilis챕 par les projets qui souhaitent guider les\n" -"\tparticipants avec une aide sur ce qu'il faut 챕crire dans le message et\n" -"\tdans quel ordre. Si l'utilisateur sort de l'챕diteur sans changer le " -"message\n" -"\tla validation est annul챕e. Ceci n'a aucun effet quand un message est " -"fourni\n" -"\tpar un autre moyen, par exemple par les options `-m` ou `-F`.\n" +"� l'챕dition du message de validation, d챕marrer l'챕diteur avec le contenu du " +"fichier indiqu챕. La variable de configuration `commit.template` est souvent " +"utilis챕e pour fournir implicitement cette option 횪 la commande. Ce m챕canisme " +"peut 챗tre utilis챕 par les projets qui souhaitent guider les collaborateurs " +"avec une aide sur ce qu'il faut 챕crire dans le message et dans quel ordre. " +"Si l'utilisateur sort de l'챕diteur sans changer le message, la validation " +"est annul챕e. Ceci n'a aucun effet quand un message est fourni par un autre " +"moyen, par exemple par les options `-m` ou `-F`." #. type: Plain text #: en/git-commit.txt:167 -#, fuzzy -#| msgid "" -#| "-s::\n" -#| "--signoff::\n" -#| "\tAdd Signed-off-by line by the committer at the end of the commit\n" -#| "\tlog message. The meaning of a signoff depends on the project,\n" -#| "\tbut it typically certifies that committer has\n" -#| "\tthe rights to submit this work under the same license and\n" -#| "\tagrees to a Developer Certificate of Origin\n" -#| "\t(see http://developercertificate.org/ for more information).\n" msgid "" "Add Signed-off-by line by the committer at the end of the commit log " "message. The meaning of a signoff depends on the project, but it typically " @@ -13146,102 +12853,68 @@ msgid "" "license and agrees to a Developer Certificate of Origin (see http://" "developercertificate.org/ for more information)." msgstr "" -"-s::\n" -"--signoff::\n" -"\tAjouter une ligne Signed-off-by du validateur 횪 la fin du message\n" -"\tde validation. La signification de signoff d챕pend du projet,\n" -"\tmais ceci certifie typiquement que le validateur a les droits\n" -"\tde soumettre son travail sous la m챗me licence et accepte un \n" -"\tCertificat d'Origine de D챕veloppeur (voir \n" -"\thttp://developercertificate.org/ pour plus d'information).\n" +"Ajouter une ligne Signed-off-by du validateur 횪 la fin du message de " +"validation. La signification de signoff d챕pend du projet, mais ceci certifie " +"typiquement que le validateur a les droits de soumettre son travail sous la " +"m챗me licence et accepte un Certificat d'Origine de D챕veloppeur (voir " +"http://developercertificate.org/ pour plus d'information). " #. type: Labeled list #: en/git-commit.txt:169 en/git-rebase.txt:322 #, no-wrap msgid "--no-verify" -msgstr "" +msgstr "--no-verify" #. type: Plain text #: en/git-commit.txt:172 -#, fuzzy -#| msgid "" -#| "-n::\n" -#| "--no-verify::\n" -#| "\tThis option bypasses the pre-commit and commit-msg hooks.\n" -#| "\tSee also linkgit:githooks[5].\n" msgid "" "This option bypasses the pre-commit and commit-msg hooks. See also linkgit:" "githooks[5]." msgstr "" -"-n::\n" -"--no-verify::\n" -"\tCette option court-circuite les crochets pre-commit et commit-msg.\n" -"\tVoir aussi linkgit:githooks[5].\n" +"Cette option court-circuite les crochets pre-commit et commit-msg. Voir " +"aussi linkgit:githooks[5]." #. type: Plain text #: en/git-commit.txt:178 -#, fuzzy -#| msgid "" -#| "--allow-empty::\n" -#| "\tUsually recording a commit that has the exact same tree as its\n" -#| "\tsole parent commit is a mistake, and the command prevents you\n" -#| "\tfrom making such a commit. This option bypasses the safety, and\n" -#| "\tis primarily for use by foreign SCM interface scripts.\n" msgid "" "Usually recording a commit that has the exact same tree as its sole parent " "commit is a mistake, and the command prevents you from making such a " "commit. This option bypasses the safety, and is primarily for use by " "foreign SCM interface scripts." msgstr "" -"--allow-empty::\n" -"\tG챕n챕ralement enregistrer un commit qui pointe sur la m챗me version\n" -"\tque son unique parent est une erreur et la commande vous emp챗che\n" -"\tde cr챕er un tel commit. Cette option court-circuite cette s챕curit챕\n" -"\tet sert principalement dans les scripts d'interface avec d'autres SCM.\n" +"G챕n챕ralement enregistrer un commit qui pointe sur la m챗me version que son " +"unique parent est une erreur et la commande vous emp챗che de cr챕er un tel " +"commit. Cette option court-circuite cette s챕curit챕 et sert principalement " +"dans les scripts d'interface avec d'autres SCM." #. type: Plain text #: en/git-commit.txt:184 -#, fuzzy -#| msgid "" -#| "--allow-empty-message::\n" -#| " Like --allow-empty this command is primarily for use by foreign\n" -#| " SCM interface scripts. It allows you to create a commit with an\n" -#| " empty commit message without using plumbing commands like\n" -#| " linkgit:git-commit-tree[1].\n" msgid "" "Like --allow-empty this command is primarily for use by foreign SCM " "interface scripts. It allows you to create a commit with an empty commit " "message without using plumbing commands like linkgit:git-commit-tree[1]." msgstr "" -"--allow-empty-message::\n" -" Comme --allow-empty cette commande est principalement utilis챕e\n" -" par les scripts d'interface d'autres SCM. Elle vous permet de\n" -" cr챕er un commit avec un message vide sans utiliser de commande\n" -" de plomberie telle que linkgit:git-commit-tree[1].\n" +"Comme --allow-empty cette commande est principalement utilis챕e par les " +"scripts d'interface d'autres SCM. Elle vous permet de cr챕er un commit avec " +"un message vide sans utiliser de commande de plomberie telle que linkgit:git-" +"commit-tree[1]." #. type: Labeled list #: en/git-commit.txt:185 en/git-tag.txt:145 #, no-wrap msgid "--cleanup=<mode>" -msgstr "" +msgstr "--cleanup=<mode>" #. type: Plain text #: en/git-commit.txt:189 -#, fuzzy -#| msgid "" -#| "--cleanup=<mode>::\n" -#| "\tThis option determines how the supplied commit message should be\n" -#| "\tcleaned up before committing. The '<mode>' can be `strip`,\n" -#| "\t`whitespace`, `verbatim`, `scissors` or `default`.\n" msgid "" "This option determines how the supplied commit message should be cleaned up " "before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, " "`scissors` or `default`." msgstr "" -"--cleanup=<mode>::\n" -"\tCette option d챕termine comment le message fourni doit 챗tre\n" -"\tnettoy챕 avant la validation. Le '<mode>' peut 챗tre `strip`,\n" -"\t`whitespace`, `verbatim`, `scissors` ou `default`.\n" +"Cette option d챕termine comment le message fourni doit 챗tre nettoy챕 avant la " +"validation. Le '<mode>' peut 챗tre `strip`, `whitespace`, `verbatim`, " +"`scissors` ou `default`." #. type: Labeled list #: en/git-commit.txt:191 @@ -13288,12 +12961,6 @@ msgstr "scissors" #. type: Plain text #: en/git-commit.txt:204 -#, fuzzy -#| msgid "" -#| "Same as `whitespace`, except that everything from (and including) the " -#| "line \"`# ------------------------ >8 ------------------------`\" is " -#| "truncated if the message is to be edited. \"`#`\" can be customized with " -#| "core.commentChar." msgid "" "Same as `whitespace`, except that everything from (and including) the line " "\"`# ------------------------ >8 ------------------------`\" is truncated if " @@ -13301,8 +12968,8 @@ msgid "" msgstr "" "Identique 횪 `whitespace`, 횪 l'exception que tout 횪 partir de la ligne \"`# " "------------------------ >8 ------------------------`\" incluse sera 챕limin챕 " -"si le message est 챕dit챕. \"`#`\" peut 챗tre personnalis챕 gr창ce 횪 core." -"commentChar." +"si le message est 챕dit챕. \"`#`\" peut 챗tre personnalis챕 gr창ce 횪 " +"core.commentChar." #. type: Labeled list #: en/git-commit.txt:204 @@ -13328,71 +12995,42 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:218 -#, fuzzy -#| msgid "" -#| "-e::\n" -#| "--edit::\n" -#| "\tThe message taken from file with `-F`, command line with\n" -#| "\t`-m`, and from commit object with `-C` are usually used as\n" -#| "\tthe commit log message unmodified. This option lets you\n" -#| "\tfurther edit the message taken from these sources.\n" msgid "" "The message taken from file with `-F`, command line with `-m`, and from " "commit object with `-C` are usually used as the commit log message " "unmodified. This option lets you further edit the message taken from these " "sources." msgstr "" -"-e::\n" -"--edit::\n" -"\tLe message tir챕 d'un fichier avec `-F`, ou de la ligne\n" -"\tde commande avec `-m`, ou depuis un objet commit avec `-C`\n" -"\test g챕n챕ralement utilis챕 sans modification. Cette option\n" -"\tpermet d'챕diter au passage le message tir챕 de ces sources.\n" +"Le message tir챕 d'un fichier avec `-F`, ou de la ligne de commande avec `-m`" +", ou depuis un objet commit avec `-C` est g챕n챕ralement utilis챕 sans " +"modification. Cette option permet d'챕diter au passage le message tir챕 de ces " +"sources." #. type: Labeled list #: en/git-commit.txt:219 en/git-revert.txt:65 en/merge-options.txt:12 #, no-wrap msgid "--no-edit" -msgstr "" +msgstr "--no-edit" #. type: Plain text #: en/git-commit.txt:223 -#, fuzzy -#| msgid "" -#| "--no-edit::\n" -#| "\tUse the selected commit message without launching an editor.\n" -#| "\tFor example, `git commit --amend --no-edit` amends a commit\n" -#| "\twithout changing its commit message.\n" msgid "" "Use the selected commit message without launching an editor. For example, " "`git commit --amend --no-edit` amends a commit without changing its commit " "message." msgstr "" -"--no-edit::\n" -"\tUtiliser le message de validation s챕lectionn챕 sans lancer\n" -"\td'챕diteur. Par exemple, `git commit --amend --no-edit` corrige\n" -"\tun commit sans changer son message de validation.\n" +"Utiliser le message de validation s챕lectionn챕 sans lancer d'챕diteur. Par " +"exemple, `git commit --amend --no-edit` corrige un commit sans changer son " +"message de validation." #. type: Labeled list #: en/git-commit.txt:224 #, no-wrap msgid "--amend" -msgstr "" +msgstr "--amend" #. type: Plain text #: en/git-commit.txt:234 -#, fuzzy -#| msgid "" -#| "--amend::\n" -#| "\tReplace the tip of the current branch by creating a new\n" -#| "\tcommit. The recorded tree is prepared as usual (including\n" -#| "\tthe effect of the `-i` and `-o` options and explicit\n" -#| "\tpathspec), and the message from the original commit is used\n" -#| "\tas the starting point, instead of an empty message, when no\n" -#| "\tother message is specified from the command line via options\n" -#| "\tsuch as `-m`, `-F`, `-c`, etc. The new commit has the same\n" -#| "\tparents and author as the current one (the `--reset-author`\n" -#| "\toption can countermand this).\n" msgid "" "Replace the tip of the current branch by creating a new commit. The recorded " "tree is prepared as usual (including the effect of the `-i` and `-o` options " @@ -13402,16 +13040,14 @@ msgid "" "The new commit has the same parents and author as the current one (the `--" "reset-author` option can countermand this)." msgstr "" -"--amend::\n" -"\tRemplacer le sommet de la branche actuelle en cr챕ant un nouveau \n" -"\tcommit. L'arbre enregistr챕 est pr챕par챕 comme d'habitude \n" -"\t(incluant l'effet des options `-i` et `-o` et les sp챕cificateurs\n" -"\texplicites de chemin) et le message du commit originel est\n" -"\tutilis챕 comme point de d챕part au lieu d'un message vide, quand\n" -"\taucun autre message n'est sp챕cifi챕 횪 la ligne de commande via\n" -"\tdes options telles que `-m`, `-F`, `-c`, etc. Le nouveau commit\n" -"\ta les m챗mes parents et auteur que l'originel (l'option \n" -"\t`--reset-author` peut modifier l'auteur).\n" +"Remplacer le sommet de la branche actuelle en cr챕ant un nouveau commit. " +"L'arbre enregistr챕 est pr챕par챕 comme d'habitude (incluant l'effet des " +"options `-i` et `-o` et les sp챕cificateurs explicites de chemin) et le " +"message du commit originel est utilis챕 comme point de d챕part au lieu d'un " +"message vide, quand aucun autre message n'est sp챕cifi챕 횪 la ligne de " +"commande via des options telles que `-m`, `-F`, `-c`, etc. Le nouveau commit " +"a les m챗mes parents et auteur que l'originel (l'option `--reset-author` peut " +"modifier l'auteur)." #. type: Plain text #: en/git-commit.txt:237 @@ -13450,70 +13086,39 @@ msgstr "" #: en/git-commit.txt:250 #, no-wrap msgid "--no-post-rewrite" -msgstr "" +msgstr "--no-post-rewrite" #. type: Plain text #: en/git-commit.txt:252 -#, fuzzy -#| msgid "" -#| "--no-post-rewrite::\n" -#| "\tBypass the post-rewrite hook.\n" msgid "Bypass the post-rewrite hook." -msgstr "" -"--no-post-rewrite::\n" -"\tCourt-circuiter le crochet post-rewrite.\n" +msgstr "Court-circuiter le crochet post-rewrite." #. type: Labeled list #: en/git-commit.txt:254 #, no-wrap msgid "--include" -msgstr "" +msgstr "--include" #. type: Plain text #: en/git-commit.txt:259 -#, fuzzy -#| msgid "" -#| "-i::\n" -#| "--include::\n" -#| "\tBefore making a commit out of staged contents so far,\n" -#| "\tstage the contents of paths given on the command line\n" -#| "\tas well. This is usually not what you want unless you\n" -#| "\tare concluding a conflicted merge.\n" msgid "" "Before making a commit out of staged contents so far, stage the contents of " "paths given on the command line as well. This is usually not what you want " "unless you are concluding a conflicted merge." msgstr "" -"-i::\n" -"--include::\n" -"\tAvant de cr챕er un commit 횪 partir du contenu index챕\n" -"\tjusqu'횪 pr챕sent, indexer aussi les contenus des chemins fournis\n" -"\tsur la ligne de commande. Cela n'est habituellement pas ce que\n" -"\tvous souhaitez, 횪 part si vous terminez une fusion conflictuelle.\n" +"Avant de cr챕er un commit 횪 partir du contenu index챕 jusqu'횪 pr챕sent, indexer " +"aussi les contenus des chemins fournis sur la ligne de commande. Cela n'est " +"habituellement pas ce que vous souhaitez, 횪 part si vous terminez une fusion " +"conflictuelle." #. type: Labeled list #: en/git-commit.txt:261 #, no-wrap msgid "--only" -msgstr "" +msgstr "--only" #. type: Plain text #: en/git-commit.txt:273 -#, fuzzy -#| msgid "" -#| "-o::\n" -#| "--only::\n" -#| "\tMake a commit by taking the updated working tree contents\n" -#| "\tof the paths specified on the\n" -#| "\tcommand line, disregarding any contents that have been\n" -#| "\tstaged for other paths. This is the default mode of operation of\n" -#| "\t'git commit' if any paths are given on the command line,\n" -#| "\tin which case this option can be omitted.\n" -#| "\tIf this option is specified together with `--amend`, then\n" -#| "\tno paths need to be specified, which can be used to amend\n" -#| "\tthe last commit without committing changes that have\n" -#| "\talready been staged. If used together with `--allow-empty`\n" -#| "\tpaths are also not required, and an empty commit will be created.\n" msgid "" "Make a commit by taking the updated working tree contents of the paths " "specified on the command line, disregarding any contents that have been " @@ -13525,38 +13130,32 @@ msgid "" "together with `--allow-empty` paths are also not required, and an empty " "commit will be created." msgstr "" -"-o::\n" -"--only::\n" -"\tR챕aliser une validation en prenant le contenu de l'arbre de travail\n" -"\tdes chemins sp챕cifi챕s sur la ligne de commande, en ignorant tout\n" -"\tcontenu d'autres chemins d챕j횪 index챕. C'est le mode d'op챕ration\n" -"\tpar d챕faut de 'git commit' si des chemins sont fournis sur la \n" -"\tligne de commande, auquel cas l'option peut 챗tre omise.\n" -"\tSi cette option est sp챕cifi챕e en m챗me temps que `--amend`, alors\n" -"\til n'est pas n챕cessaire de sp챕cifier des chemins, ce qui peut\n" -"\t챗tre utile pour corriger le dernier commit sans valider les\n" -"\tmodifications qui ont d챕j횪 챕t챕 index챕es. Si utilis챕 avec\n" -"\t`--allow-empty`, les chemins ne sont pas n챕cessaires non plus et\n" -"\tun commit vide sera cr챕챕.\n" +"R챕aliser une validation en prenant le contenu de l'arbre de travail des " +"chemins sp챕cifi챕s sur la ligne de commande, en ignorant tout contenu " +"d'autres chemins d챕j횪 index챕. C'est le mode d'op챕ration par d챕faut de 'git " +"commit' si des chemins sont fournis sur la ligne de commande, auquel cas " +"l'option peut 챗tre omise. Si cette option est sp챕cifi챕e en m챗me temps que " +"`--amend`, alors il n'est pas n챕cessaire de sp챕cifier des chemins, ce qui " +"peut 챗tre utile pour corriger le dernier commit sans valider les " +"modifications qui ont d챕j횪 챕t챕 index챕es. Si utilis챕 avec `--allow-empty`, " +"les chemins ne sont pas n챕cessaires non plus et un commit vide sera cr챕챕." #. type: Labeled list #: en/git-commit.txt:274 en/git-status.txt:55 #, no-wrap msgid "-u[<mode>]" -msgstr "" +msgstr "-u[<mode>]" #. type: Labeled list #: en/git-commit.txt:275 en/git-status.txt:56 #, no-wrap msgid "--untracked-files[=<mode>]" -msgstr "" +msgstr "--untracked-files[=<mode>]" #. type: Plain text #: en/git-commit.txt:277 en/git-status.txt:58 -#, fuzzy -#| msgid "'no' - Show no untracked files\n" msgid "Show untracked files." -msgstr "'no' - Ne montrer aucun fichier non-suivi\n" +msgstr "Montrer les fichiers non-suivis." #. type: Plain text #: en/git-commit.txt:281 @@ -13604,18 +13203,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:301 -#, fuzzy -#| msgid "" -#| "-v::\n" -#| "--verbose::\n" -#| "\tShow unified diff between the HEAD commit and what\n" -#| "\twould be committed at the bottom of the commit message\n" -#| "\ttemplate to help the user describe the commit by reminding\n" -#| "\twhat changes the commit has.\n" -#| "\tNote that this diff output doesn't have its\n" -#| "\tlines prefixed with '#'. This diff will not be a part\n" -#| "\tof the commit message. See the `commit.verbose` configuration\n" -#| "\tvariable in linkgit:git-config[1].\n" msgid "" "Show unified diff between the HEAD commit and what would be committed at the " "bottom of the commit message template to help the user describe the commit " @@ -13624,16 +13211,12 @@ msgid "" "the commit message. See the `commit.verbose` configuration variable in " "linkgit:git-config[1]." msgstr "" -"-v::\n" -"--verbose::\n" -"\tAfficher en bas du mod챔le de message de validation un diff\n" -"\tunifi챕 entre le commit HEAD et ce qui serait valid챕 pour aider\n" -"\tl'utilisateur 횪 d챕crire le commit en lui rappelant les\n" -"\tmodifications qui seront valid챕es.\n" -"\tVeuillez noter que cette sortie de diff n'est pas pr챕fix챕e par\n" -"\tdes '#'. Elle ne fera pas pour autant partie du message de\n" -"\tvalidation. R챕f챕rez-vous 횪 la variable de configuration\n" -"\t`commit.verbose` dans linkgit:git-config[1].\n" +"Afficher en bas du mod챔le de message de validation un diff unifi챕 entre le " +"commit HEAD et ce qui serait valid챕 pour aider l'utilisateur 횪 d챕crire le " +"commit en lui rappelant les modifications qui seront valid챕es. Veuillez " +"noter que cette sortie de diff n'est pas pr챕fix챕e par des '#'. Elle ne fera " +"pas pour autant partie du message de validation. R챕f챕rez-vous 횪 la variable " +"de configuration `commit.verbose` dans linkgit:git-config[1]. " #. type: Plain text #: en/git-commit.txt:305 @@ -13647,149 +13230,90 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:309 -#, fuzzy -#| msgid "" -#| "-q::\n" -#| "--quiet::\n" -#| "\tSuppress commit summary message.\n" msgid "Suppress commit summary message." -msgstr "" -"-q::\n" -"--quiet::\n" -"\tSupprimer le message de r챕sum챕 de commit.\n" +msgstr "Supprimer le message de r챕sum챕 de commit." #. type: Plain text #: en/git-commit.txt:314 -#, fuzzy -#| msgid "" -#| "--dry-run::\n" -#| "\tDo not create a commit, but show a list of paths that are\n" -#| "\tto be committed, paths with local changes that will be left\n" -#| "\tuncommitted and paths that are untracked.\n" msgid "" "Do not create a commit, but show a list of paths that are to be committed, " "paths with local changes that will be left uncommitted and paths that are " "untracked." msgstr "" -"--dry-run::\n" -"\tNe pas cr챕er de commit, mais montrer une liste des chemins qui\n" -"\tseront valid챕s, une de ceux contenant des modifications locales\n" -"\tet qui ne seront pas valid챕s, et une de ceux non-suivis.\n" +"Ne pas cr챕er de commit, mais montrer une liste des chemins qui seront " +"valid챕s, une de ceux contenant des modifications locales et qui ne seront " +"pas valid챕s, et une de ceux non-suivis." #. type: Labeled list #: en/git-commit.txt:315 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--status" -msgstr "status" +msgstr "--status" #. type: Plain text #: en/git-commit.txt:320 -#, fuzzy -#| msgid "" -#| "--status::\n" -#| "\tInclude the output of linkgit:git-status[1] in the commit\n" -#| "\tmessage template when using an editor to prepare the commit\n" -#| "\tmessage. Defaults to on, but can be used to override\n" -#| "\tconfiguration variable commit.status.\n" msgid "" "Include the output of linkgit:git-status[1] in the commit message template " "when using an editor to prepare the commit message. Defaults to on, but can " "be used to override configuration variable commit.status." msgstr "" -"--status::\n" -"\tInclure la sortie de linkgit:git-status[1] dans le mod챔le de\n" -"\tmessage de validation lors de l'utilisation d'un 챕diteur pour\n" -"\tpr챕parer le message de validation. Activ챕 par d챕faut, mais\n" -"\tpeut surcharger la variable de configuration commit.status.\n" +"Inclure la sortie de linkgit:git-status[1] dans le mod챔le de message de " +"validation lors de l'utilisation d'un 챕diteur pour pr챕parer le message de " +"validation. Activ챕 par d챕faut, mais peut surcharger la variable de " +"configuration commit.status." #. type: Labeled list #: en/git-commit.txt:321 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--no-status" -msgstr "status" +msgstr "--no-status" #. type: Plain text #: en/git-commit.txt:325 -#, fuzzy -#| msgid "" -#| "--no-status::\n" -#| "\tDo not include the output of linkgit:git-status[1] in the\n" -#| "\tcommit message template when using an editor to prepare the\n" -#| "\tdefault commit message.\n" msgid "" "Do not include the output of linkgit:git-status[1] in the commit message " "template when using an editor to prepare the default commit message." msgstr "" -"--no-status::\n" -"\tNe pas inclure la sortie de linkgit:git-status[1] dans le\n" -"\tmod챔le de message de validation lors de l'utilisation d'un\n" -"\t챕diteur pour pr챕parer le message de validation par d챕faut.\n" +"Ne pas inclure la sortie de linkgit:git-status[1] dans le mod챔le de message " +"de validation lors de l'utilisation d'un 챕diteur pour pr챕parer le message de " +"validation par d챕faut." #. type: Labeled list #: en/git-commit.txt:332 en/git-commit-tree.txt:63 #, no-wrap msgid "--no-gpg-sign" -msgstr "" +msgstr "--no-gpg-sign" #. type: Plain text #: en/git-commit.txt:335 -#, fuzzy -#| msgid "" -#| "--no-gpg-sign::\n" -#| "\tCountermand `commit.gpgSign` configuration variable that is\n" -#| "\tset to force each and every commit to be signed.\n" msgid "" "Countermand `commit.gpgSign` configuration variable that is set to force " "each and every commit to be signed." msgstr "" -"--no-gpg-sign::\n" -"\tAnnuler la variable de configuration `commit.gpgSign` qui\n" -"\tforce tous les commits 횪 챗tre sign챕s.\n" +"Annuler la variable de configuration `commit.gpgSign` qui force tous les " +"commits 횪 챗tre sign챕s." #. type: Labeled list #: en/git-commit.txt:339 en/git-rm.txt:29 #, no-wrap msgid "<file>..." -msgstr "" +msgstr "<fichier>..." #. type: Plain text #: en/git-commit.txt:345 -#, fuzzy -#| msgid "" -#| "<file>...::\n" -#| "\tWhen files are given on the command line, the command\n" -#| "\tcommits the contents of the named files, without\n" -#| "\trecording the changes already staged. The contents of\n" -#| "\tthese files are also staged for the next commit on top\n" -#| "\tof what have been staged before.\n" msgid "" "When files are given on the command line, the command commits the contents " "of the named files, without recording the changes already staged. The " "contents of these files are also staged for the next commit on top of what " "have been staged before." msgstr "" -"<fichier>...::\n" -"\tQuand des chemins sont fournis sur la ligne de commande,\n" -"\tla commande valide le contenu des fichiers sp챕cifi챕s, sans\n" -"\tenregistrer les modifications d챕j횪 index챕es. Le contenu de\n" -"\tces fichiers est aussi index챕 pour le commit suivant par\n" -"\tdessus ce qui a 챕t챕 index챕 auparavant.\n" +"Quand des chemins sont fournis sur la ligne de commande, la commande valide " +"le contenu des fichiers sp챕cifi챕s, sans enregistrer les modifications d챕j횪 " +"index챕es. Le contenu de ces fichiers est aussi index챕 pour le commit suivant " +"par-dessus ce qui a 챕t챕 index챕 auparavant." #. type: Plain text #: en/git-commit.txt:362 -#, fuzzy -#| msgid "" -#| "When recording your own work, the contents of modified files in your " -#| "working tree are temporarily stored to a staging area called the \"index" -#| "\" with 'git add'. A file can be reverted back, only in the index but " -#| "not in the working tree, to that of the last commit with `git reset HEAD " -#| "-- <file>`, which effectively reverts 'git add' and prevents the changes " -#| "to this file from participating in the next commit. After building the " -#| "state to be committed incrementally with these commands, `git commit` " -#| "(without any pathname parameter) is used to record what has been staged " -#| "so far. This is the most basic form of the command. An example:" msgid "" "When recording your own work, the contents of modified files in your working " "tree are temporarily stored to a staging area called the \"index\" with 'git " @@ -13802,8 +13326,8 @@ msgid "" "basic form of the command. An example:" msgstr "" "Lors de l'enregistrement de votre propre travail, le contenu des fichiers " -"modifi챕s dans votre arbre de travail est temporairement stock챕 au moyen de " -"`git add` dans une zone de stockage interm챕diaire appel챕e 짬혻l'index혻쨩. Un " +"modifi챕s dans votre arbre de travail est temporairement stock챕 au moyen de `" +"git add` dans une zone de stockage interm챕diaire appel챕e 짬혻l'index혻쨩. Un " "fichier peut n'챗tre ramen챕 횪 son contenu correspondant au dernier commit " "seulement dans l'index mais pas dans l'arbre de travail gr창ce 횪 `git reset " "HEAD -- <fichier>`, ce qui inverse effectivement le 'git add' et emp챗che les " @@ -13815,12 +13339,7 @@ msgstr "" #. type: delimited block - #: en/git-commit.txt:368 -#, fuzzy, no-wrap -#| msgid "" -#| "$ edit hello.c\n" -#| "$ git rm goodbye.c\n" -#| "$ git add hello.c\n" -#| "$ git commit\n" +#, no-wrap msgid "" "$ edit hello.c\n" "$ git rm goodbye.c\n" @@ -13834,13 +13353,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:376 -#, fuzzy -#| msgid "" -#| "Instead of staging files after each individual change, you can tell `git " -#| "commit` to notice the changes to the files whose contents are tracked in " -#| "your working tree and do corresponding `git add` and `git rm` for you. " -#| "That is, this example does the same as the earlier example if there is no " -#| "other change in your working tree:" msgid "" "Instead of staging files after each individual change, you can tell `git " "commit` to notice the changes to the files whose contents are tracked in " @@ -13857,11 +13369,7 @@ msgstr "" #. type: delimited block - #: en/git-commit.txt:381 -#, fuzzy, no-wrap -#| msgid "" -#| "$ edit hello.c\n" -#| "$ rm goodbye.c\n" -#| "$ git commit -a\n" +#, no-wrap msgid "" "$ edit hello.c\n" "$ rm goodbye.c\n" @@ -13873,11 +13381,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:386 -#, fuzzy -#| msgid "" -#| "The command `git commit -a` first looks at your working tree, notices " -#| "that you have modified hello.c and removed goodbye.c, and performs " -#| "necessary `git add` and `git rm` for you." msgid "" "The command `git commit -a` first looks at your working tree, notices that " "you have modified hello.c and removed goodbye.c, and performs necessary `git " @@ -13889,12 +13392,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:391 -#, fuzzy -#| msgid "" -#| "After staging changes to many files, you can alter the order the changes " -#| "are recorded in, by giving pathnames to `git commit`. When pathnames are " -#| "given, the command makes a commit that only records the changes made to " -#| "the named paths:" msgid "" "After staging changes to many files, you can alter the order the changes are " "recorded in, by giving pathnames to `git commit`. When pathnames are given, " @@ -13909,12 +13406,7 @@ msgstr "" #. type: delimited block - #: en/git-commit.txt:397 -#, fuzzy, no-wrap -#| msgid "" -#| "$ edit hello.c hello.h\n" -#| "$ git add hello.c hello.h\n" -#| "$ edit Makefile\n" -#| "$ git commit Makefile\n" +#, no-wrap msgid "" "$ edit hello.c hello.h\n" "$ git add hello.c hello.h\n" @@ -13928,12 +13420,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:404 -#, fuzzy -#| msgid "" -#| "This makes a commit that records the modification to `Makefile`. The " -#| "changes staged for `hello.c` and `hello.h` are not included in the " -#| "resulting commit. However, their changes are not lost -- they are still " -#| "staged and merely held back. After the above sequence, if you do:" msgid "" "This makes a commit that records the modification to `Makefile`. The " "changes staged for `hello.c` and `hello.h` are not included in the resulting " @@ -13948,17 +13434,12 @@ msgstr "" #. type: delimited block - #: en/git-commit.txt:407 en/git-commit.txt:433 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git commit\n" msgstr "$ git commit\n" #. type: Plain text #: en/git-commit.txt:411 -#, fuzzy -#| msgid "" -#| "this second commit would record the changes to `hello.c` and `hello.h` as " -#| "expected." msgid "" "this second commit would record the changes to `hello.c` and `hello.h` as " "expected." @@ -13968,14 +13449,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:419 -#, fuzzy -#| msgid "" -#| "After a merge (initiated by 'git merge' or 'git pull') stops because of " -#| "conflicts, cleanly merged paths are already staged to be committed for " -#| "you, and paths that conflicted are left in unmerged state. You would " -#| "have to first check which paths are conflicting with 'git status' and " -#| "after fixing them manually in your working tree, you would stage the " -#| "result as usual with 'git add':" msgid "" "After a merge (initiated by 'git merge' or 'git pull') stops because of " "conflicts, cleanly merged paths are already staged to be committed for you, " @@ -13993,12 +13466,7 @@ msgstr "" #. type: delimited block - #: en/git-commit.txt:425 -#, fuzzy, no-wrap -#| msgid "" -#| "$ git status | grep unmerged\n" -#| "unmerged: hello.c\n" -#| "$ edit hello.c\n" -#| "$ git add hello.c\n" +#, no-wrap msgid "" "$ git status | grep unmerged\n" "unmerged: hello.c\n" @@ -14012,11 +13480,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:430 -#, fuzzy -#| msgid "" -#| "After resolving conflicts and staging the result, `git ls-files -u` would " -#| "stop mentioning the conflicted path. When you are done, run `git commit` " -#| "to finally record the merge:" msgid "" "After resolving conflicts and staging the result, `git ls-files -u` would " "stop mentioning the conflicted path. When you are done, run `git commit` to " @@ -14028,14 +13491,6 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:441 -#, fuzzy -#| msgid "" -#| "As with the case to record your own changes, you can use `-a` option to " -#| "save typing. One difference is that during a merge resolution, you " -#| "cannot use `git commit` with pathnames to alter the order the changes are " -#| "committed, because the merge should be recorded as a single commit. In " -#| "fact, the command refuses to run when given pathnames (but see `-i` " -#| "option)." msgid "" "As with the case to record your own changes, you can use `-a` option to save " "typing. One difference is that during a merge resolution, you cannot use " @@ -14045,11 +13500,11 @@ msgid "" msgstr "" "Comme dans le cas de la validation de vos propres modifications, vous pouvez " "utiliser l'option `-a` pour vous 챕pargner de la frappe. Une diff챕rence est " -"que pendant la r챕solution de fusion, vous ne pouvez pas utiliser `git " -"commit` avec des noms de chemin pour changer l'ordre des modifications 횪 " -"valider, parce que la fusion doit 챗tre enregistr챕e comme un commit unique. " -"En fait, la commande refuse d'챗tre lanc챕e avec des noms de chemin (voir par " -"contre l'option `-i`)." +"que pendant la r챕solution de fusion, vous ne pouvez pas utiliser `git commit`" +" avec des noms de chemin pour changer l'ordre des modifications 횪 valider, " +"parce que la fusion doit 챗tre enregistr챕e comme un commit unique. En fait, " +"la commande refuse d'챗tre lanc챕e avec des noms de chemin (voir par contre " +"l'option `-i`)." #. type: Plain text #: en/git-commit.txt:453 @@ -14079,12 +13534,6 @@ msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION" #. type: Plain text #: en/git-commit.txt:462 -#, fuzzy -#| msgid "" -#| "The editor used to edit the commit log message will be chosen from the " -#| "`GIT_EDITOR` environment variable, the core.editor configuration " -#| "variable, the `VISUAL` environment variable, or the `EDITOR` environment " -#| "variable (in that order). See linkgit:git-var[1] for details." msgid "" "The editor used to edit the commit log message will be chosen from the " "`GIT_EDITOR` environment variable, the core.editor configuration variable, " @@ -14124,13 +13573,6 @@ msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Plain text #: en/git-commit.txt:478 -#, fuzzy -#| msgid "" -#| "This file contains the commit message of a commit in progress. If `git " -#| "commit` exits due to an error before creating a commit, any commit " -#| "message that has been provided by the user (e.g., in an editor session) " -#| "will be available in this file, but will be overwritten by the next " -#| "invocation of `git commit`." msgid "" "This file contains the commit message of a commit in progress. If `git " "commit` exits due to an error before creating a commit, any commit message " @@ -14141,8 +13583,8 @@ msgstr "" "Ce fichier contient le message de validation en cours. Si `git commit` sort " "횪 cause d'une erreur avant de cr챕er un commit, tout message de validation " "fourni par l'utilisateur (par exemple dans une session d'챕diteur) sera " -"disponible dans ce fichier, mais sera 챕cras챕 par l'invocation suivante de " -"`git commit`." +"disponible dans ce fichier, mais sera 챕cras챕 par l'invocation suivante de `" +"git commit`." # #. type: Plain text @@ -14156,16 +13598,13 @@ msgstr "" #. type: Title = #: en/git-commit-tree.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-commit-tree(1)" -msgstr "git-commit(1)" +msgstr "git-commit-tree(1)" # #. type: Plain text #: en/git-commit-tree.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-commit-tree - Create a new commit object" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -14248,12 +13687,6 @@ msgstr "" #. type: Plain text #: en/git-commit-tree.txt:56 -#, fuzzy -#| msgid "" -#| "-F <file>::\n" -#| "--file=<file>::\n" -#| "\tTake the commit message from the given file. Use '-' to\n" -#| "\tread the message from the standard input.\n" msgid "" "Read the commit log message from the given file. Use `-` to read from the " "standard input." @@ -14272,8 +13705,7 @@ msgstr "" #. type: Title - #: en/git-commit-tree.txt:69 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Commit Information" msgstr "Configuration" @@ -14355,19 +13787,16 @@ msgstr "" #: en/git-commit-tree.txt:115 en/cmds-plumbingmanipulators.txt:49 #, no-wrap msgid "linkgit:git-write-tree[1]" -msgstr "" +msgstr "linkgit:git-write-tree[1]" #. type: Title = #: en/git-config.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-config(1)" -msgstr "git-commit(1)" +msgstr "git-config(1)" #. type: Plain text #: en/git-config.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-config - Get and set repository or global options" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -14491,7 +13920,7 @@ msgstr "" #: en/git-config.txt:74 #, no-wrap msgid "--replace-all" -msgstr "" +msgstr "--replace-all" #. type: Plain text #: en/git-config.txt:77 @@ -14504,7 +13933,7 @@ msgstr "" #: en/git-config.txt:78 en/git-update-index.txt:42 #, no-wrap msgid "--add" -msgstr "" +msgstr "--add" #. type: Plain text #: en/git-config.txt:82 @@ -14517,7 +13946,7 @@ msgstr "" #: en/git-config.txt:83 #, no-wrap msgid "--get" -msgstr "" +msgstr "--get" #. type: Plain text #: en/git-config.txt:87 @@ -14531,7 +13960,7 @@ msgstr "" #: en/git-config.txt:88 #, no-wrap msgid "--get-all" -msgstr "" +msgstr "--get-all" #. type: Plain text #: en/git-config.txt:90 @@ -14542,7 +13971,7 @@ msgstr "" #: en/git-config.txt:91 #, no-wrap msgid "--get-regexp" -msgstr "" +msgstr "--get-regexp" #. type: Plain text #: en/git-config.txt:97 @@ -14573,7 +14002,7 @@ msgstr "" #: en/git-config.txt:106 #, no-wrap msgid "--global" -msgstr "" +msgstr "--global" #. type: Plain text #: en/git-config.txt:111 @@ -14600,7 +14029,7 @@ msgstr "" #: en/git-config.txt:117 #, no-wrap msgid "--system" -msgstr "" +msgstr "--system" #. type: Plain text #: en/git-config.txt:121 @@ -14666,14 +14095,10 @@ msgstr "" #: en/git-config.txt:147 #, no-wrap msgid "--remove-section" -msgstr "" +msgstr "--remove-section" #. type: Plain text #: en/git-config.txt:149 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Remove the given section from the configuration file." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -14683,7 +14108,7 @@ msgstr "" #: en/git-config.txt:150 #, no-wrap msgid "--rename-section" -msgstr "" +msgstr "--rename-section" #. type: Plain text #: en/git-config.txt:152 @@ -14694,7 +14119,7 @@ msgstr "" #: en/git-config.txt:153 #, no-wrap msgid "--unset" -msgstr "" +msgstr "--unset" #. type: Plain text #: en/git-config.txt:155 @@ -14705,7 +14130,7 @@ msgstr "" #: en/git-config.txt:156 #, no-wrap msgid "--unset-all" -msgstr "" +msgstr "--unset-all" #. type: Plain text #: en/git-config.txt:158 @@ -14721,7 +14146,7 @@ msgstr "" #: en/git-config.txt:163 #, no-wrap msgid "--bool" -msgstr "" +msgstr "--bool" #. type: Plain text #: en/git-config.txt:165 @@ -14732,7 +14157,7 @@ msgstr "" #: en/git-config.txt:166 #, no-wrap msgid "--int" -msgstr "" +msgstr "--int" #. type: Plain text #: en/git-config.txt:171 @@ -14746,7 +14171,7 @@ msgstr "" #: en/git-config.txt:172 #, no-wrap msgid "--bool-or-int" -msgstr "" +msgstr "--bool-or-int" #. type: Plain text #: en/git-config.txt:175 @@ -14759,7 +14184,7 @@ msgstr "" #: en/git-config.txt:176 en/git-hash-object.txt:41 #, no-wrap msgid "--path" -msgstr "" +msgstr "--path" #. type: Plain text #: en/git-config.txt:182 @@ -14784,7 +14209,7 @@ msgstr "" #: en/git-name-rev.txt:51 en/diff-options.txt:199 #, no-wrap msgid "--name-only" -msgstr "" +msgstr "--name-only" #. type: Plain text #: en/git-config.txt:195 @@ -14796,7 +14221,7 @@ msgstr "" #: en/git-config.txt:196 #, no-wrap msgid "--show-origin" -msgstr "" +msgstr "--show-origin" #. type: Plain text #: en/git-config.txt:201 @@ -14850,7 +14275,7 @@ msgstr "" #: en/git-config.txt:225 #, no-wrap msgid "--[no-]includes" -msgstr "" +msgstr "--[no-]includes" #. type: Plain text #: en/git-config.txt:230 @@ -15219,10 +14644,9 @@ msgstr "" #. type: Title = #: en/git-count-objects.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-count-objects(1)" -msgstr "git-commit(1)" +msgstr "git-count-objects(1)" #. type: Plain text #: en/git-count-objects.txt:7 @@ -15251,8 +14675,6 @@ msgstr "" #. type: Plain text #: en/git-count-objects.txt:26 -#, fuzzy -#| msgid "but can be used to amend a merge commit." msgid "count: the number of loose objects" msgstr "mais peut 챗tre utilis챕 pour corriger un commit de fusion." @@ -15313,7 +14735,7 @@ msgstr "" #: en/git-count-objects.txt:48 #, no-wrap msgid "--human-readable" -msgstr "" +msgstr "--human-readable" #. type: Plain text #: en/git-count-objects.txt:51 @@ -15324,7 +14746,7 @@ msgstr "" #: en/git-credential-cache--daemon.txt:2 #, no-wrap msgid "git-credential-cache--daemon(1)" -msgstr "" +msgstr "git-credential-cache--daemon(1)" #. type: Plain text #: en/git-credential-cache--daemon.txt:7 @@ -15366,7 +14788,7 @@ msgstr "" #: en/git-credential-cache.txt:2 #, no-wrap msgid "git-credential-cache(1)" -msgstr "" +msgstr "git-credential-cache(1)" #. type: Plain text #: en/git-credential-cache.txt:7 @@ -15437,8 +14859,7 @@ msgstr "" #. type: delimited block - #: en/git-credential-cache.txt:49 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git credential-cache exit\n" msgstr "git-commit(1)" @@ -15485,7 +14906,7 @@ msgstr "" #: en/git-credential-store.txt:2 #, no-wrap msgid "git-credential-store(1)" -msgstr "" +msgstr "git-credential-store(1)" #. type: Plain text #: en/git-credential-store.txt:7 @@ -15524,8 +14945,7 @@ msgstr "" #. type: Labeled list #: en/git-credential-store.txt:32 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "--file=<path>" msgstr "patch" @@ -15611,8 +15031,7 @@ msgstr "" #. type: Title - #: en/git-credential-store.txt:88 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "STORAGE FORMAT" msgstr "FORMATS DE DATE" @@ -15641,10 +15060,9 @@ msgstr "" #. type: Title = #: en/git-credential.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-credential(1)" -msgstr "git-commit(1)" +msgstr "git-credential(1)" #. type: Plain text #: en/git-credential.txt:7 @@ -15910,10 +15328,9 @@ msgstr "" #. type: Title = #: en/git-cvsexportcommit.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-cvsexportcommit(1)" -msgstr "git-commit(1)" +msgstr "git-cvsexportcommit(1)" #. type: Plain text #: en/git-cvsexportcommit.txt:7 @@ -16057,8 +15474,7 @@ msgstr "" #. type: Labeled list #: en/git-cvsexportcommit.txt:87 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "cvsexportcommit.cvsdir" msgstr "git-commit(1)" @@ -16112,10 +15528,9 @@ msgstr "" #. type: Title = #: en/git-cvsimport.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-cvsimport(1)" -msgstr "git-commit(1)" +msgstr "git-cvsimport(1)" #. type: Plain text #: en/git-cvsimport.txt:7 @@ -16210,8 +15625,7 @@ msgstr "" #. type: Labeled list #: en/git-cvsimport.txt:62 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "<CVS_module>" msgstr "git-add(1)" @@ -16590,7 +16004,7 @@ msgstr "" #: en/git-cvsserver.txt:2 #, no-wrap msgid "git-cvsserver(1)" -msgstr "" +msgstr "git-cvsserver(1)" #. type: Plain text #: en/git-cvsserver.txt:7 @@ -16655,7 +16069,7 @@ msgstr "" #: en/git-cvsserver.txt:37 en/git-daemon.txt:48 #, no-wrap msgid "--strict-paths" -msgstr "" +msgstr "--strict-paths" #. type: Plain text #: en/git-cvsserver.txt:39 @@ -16666,7 +16080,7 @@ msgstr "" #: en/git-cvsserver.txt:40 en/git-daemon.txt:77 #, no-wrap msgid "--export-all" -msgstr "" +msgstr "--export-all" #. type: Plain text #: en/git-cvsserver.txt:43 @@ -17385,15 +16799,12 @@ msgstr "" #. type: Title = #: en/git-daemon.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-daemon(1)" -msgstr "git-add(1)" +msgstr "git-daemon(1)" #. type: Plain text #: en/git-daemon.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-daemon - A really simple server for Git repositories" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -17482,7 +16893,7 @@ msgstr "" #: en/git-daemon.txt:61 #, no-wrap msgid "--base-path-relaxed" -msgstr "" +msgstr "--base-path-relaxed" #. type: Plain text #: en/git-daemon.txt:66 @@ -17522,7 +16933,7 @@ msgstr "" #: en/git-daemon.txt:82 #, no-wrap msgid "--inetd" -msgstr "" +msgstr "--inetd" #. type: Plain text #: en/git-daemon.txt:86 @@ -17603,7 +17014,7 @@ msgstr "" #: en/git-daemon.txt:112 #, no-wrap msgid "--syslog" -msgstr "" +msgstr "--syslog" #. type: Plain text #: en/git-daemon.txt:115 @@ -17616,7 +17027,7 @@ msgstr "" #: en/git-daemon.txt:116 #, no-wrap msgid "--user-path" -msgstr "" +msgstr "--user-path" #. type: Labeled list #: en/git-daemon.txt:117 @@ -17643,7 +17054,7 @@ msgstr "" #: en/git-daemon.txt:129 #, no-wrap msgid "--reuseaddr" -msgstr "" +msgstr "--reuseaddr" #. type: Plain text #: en/git-daemon.txt:133 @@ -17752,7 +17163,7 @@ msgstr "" #: en/git-daemon.txt:174 #, no-wrap msgid "--[no-]informative-errors" -msgstr "" +msgstr "--[no-]informative-errors" #. type: Plain text #: en/git-daemon.txt:182 @@ -17818,8 +17229,7 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:213 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "upload-pack" msgstr "git-add(1)" @@ -17833,8 +17243,7 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:219 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "upload-archive" msgstr "git-commit(1)" @@ -17848,8 +17257,7 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:224 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "receive-pack" msgstr "git-commit(1)" @@ -18002,10 +17410,9 @@ msgstr "" #. type: Title = #: en/git-describe.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-describe(1)" -msgstr "git-commit(1)" +msgstr "git-describe(1)" #. type: Plain text #: en/git-describe.txt:7 @@ -18076,7 +17483,7 @@ msgstr "" #: en/fetch-options.txt:99 #, no-wrap msgid "--tags" -msgstr "" +msgstr "--tags" #. type: Plain text #: en/git-describe.txt:46 @@ -18089,7 +17496,7 @@ msgstr "" #: en/git-describe.txt:47 #, no-wrap msgid "--contains" -msgstr "" +msgstr "--contains" #. type: Plain text #: en/git-describe.txt:51 @@ -18125,7 +17532,7 @@ msgstr "" #: en/git-describe.txt:65 #, no-wrap msgid "--exact-match" -msgstr "" +msgstr "--exact-match" #. type: Plain text #: en/git-describe.txt:68 @@ -18138,7 +17545,7 @@ msgstr "" #: en/git-describe.txt:69 en/git-ls-files.txt:151 #, no-wrap msgid "--debug" -msgstr "" +msgstr "--debug" #. type: Plain text #: en/git-describe.txt:73 @@ -18196,7 +17603,7 @@ msgstr "" #: en/git-describe.txt:101 en/git-diff-tree.txt:111 en/git-name-rev.txt:61 #, no-wrap msgid "--always" -msgstr "" +msgstr "--always" #. type: Plain text #: en/git-describe.txt:103 en/git-name-rev.txt:63 @@ -18207,7 +17614,7 @@ msgstr "" #: en/git-describe.txt:104 en/rev-list-options.txt:121 #, no-wrap msgid "--first-parent" -msgstr "" +msgstr "--first-parent" #. type: Plain text #: en/git-describe.txt:108 @@ -18352,14 +17759,10 @@ msgstr "" #: en/git-diff-files.txt:2 #, no-wrap msgid "git-diff-files(1)" -msgstr "" +msgstr "git-diff-files(1)" #. type: Plain text #: en/git-diff-files.txt:7 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "git-diff-files - Compares files in the working tree and the index" msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -18418,7 +17821,7 @@ msgstr "" #: en/rev-list-options.txt:873 #, no-wrap msgid "--cc" -msgstr "" +msgstr "--cc" #. type: Plain text #: en/git-diff-files.txt:43 @@ -18435,16 +17838,13 @@ msgstr "" #. type: Title = #: en/git-diff-index.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-diff-index(1)" -msgstr "git-add(1)" +msgstr "git-diff-index(1)" # #. type: Plain text #: en/git-diff-index.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-diff-index - Compare a tree to the working tree or index" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -18470,8 +17870,6 @@ msgstr "" #. type: Plain text #: en/git-diff-index.txt:31 -#, fuzzy -#| msgid "Do not change the message at all." msgid "do not consider the on-disk file at all" msgstr "Laisser le message inchang챕." @@ -18650,10 +18048,9 @@ msgstr "" #. type: Title = #: en/git-difftool.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-difftool(1)" -msgstr "git-commit(1)" +msgstr "git-difftool(1)" #. type: Plain text #: en/git-difftool.txt:7 @@ -18679,7 +18076,7 @@ msgstr "" #: en/git-difftool.txt:23 #, no-wrap msgid "--dir-diff" -msgstr "" +msgstr "--dir-diff" #. type: Plain text #: en/git-difftool.txt:27 @@ -18692,13 +18089,13 @@ msgstr "" #: en/git-difftool.txt:28 en/git-mergetool.txt:70 #, no-wrap msgid "-y" -msgstr "" +msgstr "-y" #. type: Labeled list #: en/git-difftool.txt:29 en/git-mergetool.txt:71 #, no-wrap msgid "--no-prompt" -msgstr "" +msgstr "--no-prompt" #. type: Plain text #: en/git-difftool.txt:31 @@ -18709,7 +18106,7 @@ msgstr "" #: en/git-difftool.txt:32 en/git-mergetool.txt:78 #, no-wrap msgid "--prompt" -msgstr "" +msgstr "--prompt" #. type: Plain text #: en/git-difftool.txt:36 @@ -18726,8 +18123,7 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:38 en/git-mergetool.txt:28 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "--tool=<tool>" msgstr "diff" @@ -18781,7 +18177,7 @@ msgstr "" #: en/git-difftool.txt:69 en/git-mergetool.txt:67 #, no-wrap msgid "--tool-help" -msgstr "" +msgstr "--tool-help" #. type: Plain text #: en/git-difftool.txt:71 @@ -18792,7 +18188,7 @@ msgstr "" #: en/git-difftool.txt:72 #, no-wrap msgid "--[no-]symlinks" -msgstr "" +msgstr "--[no-]symlinks" #. type: Plain text #: en/git-difftool.txt:77 @@ -18811,8 +18207,7 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:81 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "-x <command>" msgstr "git-commit(1)" @@ -18841,7 +18236,7 @@ msgstr "" #: en/git-difftool.txt:89 #, no-wrap msgid "--[no-]gui" -msgstr "" +msgstr "--[no-]gui" #. type: Plain text #: en/git-difftool.txt:94 @@ -18855,7 +18250,7 @@ msgstr "" #: en/git-difftool.txt:95 #, no-wrap msgid "--[no-]trust-exit-code" -msgstr "" +msgstr "--[no-]trust-exit-code" #. type: Plain text #: en/git-difftool.txt:100 @@ -18893,10 +18288,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:111 en/diff-config.txt:172 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "diff.tool" -msgstr "diff" +msgstr "diff.tool" #. type: Plain text #: en/git-difftool.txt:113 @@ -18905,10 +18299,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:114 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "diff.guitool" -msgstr "diff" +msgstr "diff.guitool" #. type: Plain text #: en/git-difftool.txt:116 @@ -18917,8 +18310,7 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:117 en/config.txt:1270 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "difftool.<tool>.path" msgstr "diff" @@ -18931,8 +18323,7 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:121 en/config.txt:1274 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "difftool.<tool>.cmd" msgstr "diff" @@ -18948,8 +18339,7 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:126 en/config.txt:1282 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "difftool.prompt" msgstr "diff" @@ -18978,7 +18368,7 @@ msgstr "" #: en/git-difftool.txt:136 en/cmds-mainporcelain.txt:40 #, no-wrap msgid "linkgit:git-diff[1]" -msgstr "" +msgstr "linkgit:git-diff[1]" #. type: Plain text #: en/git-difftool.txt:138 @@ -18989,7 +18379,7 @@ msgstr "" #: en/git-difftool.txt:139 en/cmds-ancillarymanipulators.txt:13 #, no-wrap msgid "linkgit:git-mergetool[1]" -msgstr "" +msgstr "linkgit:git-mergetool[1]" #. type: Plain text #: en/git-difftool.txt:141 @@ -19000,7 +18390,7 @@ msgstr "" #: en/git-difftool.txt:142 en/cmds-ancillarymanipulators.txt:1 #, no-wrap msgid "linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-config[1]" #. type: Plain text #: en/git-difftool.txt:144 @@ -19009,10 +18399,9 @@ msgstr "" #. type: Title = #: en/git-diff-tree.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-diff-tree(1)" -msgstr "git-commit(1)" +msgstr "git-diff-tree(1)" #. type: Plain text #: en/git-diff-tree.txt:7 @@ -19082,7 +18471,7 @@ msgstr "" #: en/git-rebase.txt:415 en/blame-options.txt:5 #, no-wrap msgid "--root" -msgstr "" +msgstr "--root" #. type: Plain text #: en/git-diff-tree.txt:48 @@ -19150,10 +18539,9 @@ msgstr "" #. type: Labeled list #: en/git-diff-tree.txt:87 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--no-commit-id" -msgstr "git-commit(1)" +msgstr "--no-commit-id" #. type: Plain text #: en/git-diff-tree.txt:90 @@ -19294,10 +18682,9 @@ msgstr "" #. type: Title = #: en/git-diff.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-diff(1)" -msgstr "git-add(1)" +msgstr "git-diff(1)" #. type: Plain text #: en/git-diff.txt:7 @@ -19477,10 +18864,6 @@ msgstr "" #. type: Plain text #: en/git-diff.txt:120 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Changes in the working tree not yet staged for the next commit." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -19626,10 +19009,6 @@ msgstr "" # #. type: Plain text #: en/git-diff.txt:186 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:" "gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]" @@ -19641,7 +19020,7 @@ msgstr "" #: en/git-fast-export.txt:2 #, no-wrap msgid "git-fast-export(1)" -msgstr "" +msgstr "git-fast-export(1)" #. type: Plain text #: en/git-fast-export.txt:7 @@ -19795,7 +19174,7 @@ msgstr "" #: en/git-fast-export.txt:84 #, no-wrap msgid "--fake-missing-tagger" -msgstr "" +msgstr "--fake-missing-tagger" #. type: Plain text #: en/git-fast-export.txt:89 @@ -19809,7 +19188,7 @@ msgstr "" #: en/git-fast-export.txt:90 #, no-wrap msgid "--use-done-feature" -msgstr "" +msgstr "--use-done-feature" #. type: Plain text #: en/git-fast-export.txt:93 @@ -19822,7 +19201,7 @@ msgstr "" #: en/git-fast-export.txt:94 #, no-wrap msgid "--no-data" -msgstr "" +msgstr "--no-data" #. type: Plain text #: en/git-fast-export.txt:101 @@ -19838,7 +19217,7 @@ msgstr "" #: en/git-fast-export.txt:102 en/git-ls-tree.txt:72 #, no-wrap msgid "--full-tree" -msgstr "" +msgstr "--full-tree" #. type: Plain text #: en/git-fast-export.txt:107 @@ -19853,7 +19232,7 @@ msgstr "" #: en/git-fast-export.txt:108 #, no-wrap msgid "--anonymize" -msgstr "" +msgstr "--anonymize" #. type: Plain text #: en/git-fast-export.txt:112 @@ -19866,7 +19245,7 @@ msgstr "" #: en/git-fast-export.txt:113 #, no-wrap msgid "--refspec" -msgstr "" +msgstr "--refspec" #. type: Plain text #: en/git-fast-export.txt:116 @@ -20031,13 +19410,13 @@ msgstr "" #: en/git-fast-export.txt:215 en/cmds-ancillarymanipulators.txt:7 #, no-wrap msgid "linkgit:git-fast-import[1]" -msgstr "" +msgstr "linkgit:git-fast-import[1]" #. type: Title = #: en/git-fast-import.txt:2 #, no-wrap msgid "git-fast-import(1)" -msgstr "" +msgstr "git-fast-import(1)" #. type: Plain text #: en/git-fast-import.txt:7 @@ -20094,10 +19473,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:47 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--stats" -msgstr "status" +msgstr "--stats" #. type: Plain text #: en/git-fast-import.txt:52 @@ -20146,7 +19524,7 @@ msgstr "" #: en/git-fast-import.txt:68 #, no-wrap msgid "--done" -msgstr "" +msgstr "--done" #. type: Plain text #: en/git-fast-import.txt:73 @@ -20198,7 +19576,7 @@ msgstr "" #: en/git-fast-import.txt:98 #, no-wrap msgid "--[no-]relative-marks" -msgstr "" +msgstr "--[no-]relative-marks" #. type: Plain text #: en/git-fast-import.txt:105 @@ -20297,8 +19675,6 @@ msgstr "" #. type: Plain text #: en/git-fast-import.txt:141 -#, fuzzy -#| msgid "git-commit(1)" msgid "See linkgit:git-config[1]" msgstr "git-commit(1)" @@ -20414,8 +19790,7 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:208 en/git-rev-parse.txt:309 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Input Format" msgstr "Configuration" @@ -20441,8 +19816,7 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:224 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Stream Comments" msgstr "$ git commit\n" @@ -20527,10 +19901,6 @@ msgstr "" #. type: Plain text #: en/git-fast-import.txt:264 -#, fuzzy -#| msgid "" -#| "The standard email format as described by RFC 2822, for example `Thu, 07 " -#| "Apr 2005 22:13:13 +0200`." msgid "This is the standard email format as described by RFC 2822." msgstr "" "Le standard de format des courriel tel que d챕crit par la RFC 2822, par " @@ -20882,8 +20252,7 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:434 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "`committer`" msgstr "git-commit(1)" @@ -21025,8 +20394,7 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:509 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "`merge`" msgstr "git-commit(1)" @@ -21064,8 +20432,7 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:527 en/git-fast-import.txt:694 -#, fuzzy, no-wrap -#| msgid "Git internal format" +#, no-wrap msgid "External data format" msgstr "Format interne de Git" @@ -21094,8 +20461,7 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:541 en/git-fast-import.txt:707 -#, fuzzy, no-wrap -#| msgid "Git internal format" +#, no-wrap msgid "Inline data format" msgstr "Format interne de Git" @@ -21681,8 +21047,7 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:865 -#, fuzzy, no-wrap -#| msgid "Git internal format" +#, no-wrap msgid "Delimited format" msgstr "Format interne de Git" @@ -22720,8 +22085,7 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:1442 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "per active tree" msgstr "Mode interactif" @@ -22736,8 +22100,7 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:1449 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "per active file entry" msgstr "Mode interactif" @@ -22779,18 +22142,16 @@ msgstr "" #: en/git-fast-import.txt:1472 en/cmds-ancillarymanipulators.txt:4 #, no-wrap msgid "linkgit:git-fast-export[1]" -msgstr "" +msgstr "linkgit:git-fast-export[1]" #. type: Title = #: en/git-fetch-pack.txt:2 #, no-wrap msgid "git-fetch-pack(1)" -msgstr "" +msgstr "git-fetch-pack(1)" #. type: Plain text #: en/git-fetch-pack.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-fetch-pack - Receive missing objects from another repository" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -22868,7 +22229,7 @@ msgstr "" #: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:184 en/git-send-pack.txt:64 #, no-wrap msgid "--thin" -msgstr "" +msgstr "--thin" #. type: Plain text #: en/git-fetch-pack.txt:63 @@ -22881,7 +22242,7 @@ msgstr "" #: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:81 #, no-wrap msgid "--include-tag" -msgstr "" +msgstr "--include-tag" #. type: Plain text #: en/git-fetch-pack.txt:69 @@ -22894,8 +22255,7 @@ msgstr "" #. type: Labeled list #: en/git-fetch-pack.txt:70 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--upload-pack=<git-upload-pack>" msgstr "git-add(1)" @@ -22914,8 +22274,7 @@ msgstr "" #. type: Labeled list #: en/git-fetch-pack.txt:82 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--exec=<git-upload-pack>" msgstr "git-add(1)" @@ -22951,7 +22310,7 @@ msgstr "" #: en/git-fetch-pack.txt:99 #, no-wrap msgid "--deepen-relative" -msgstr "" +msgstr "--deepen-relative" #. type: Plain text #: en/git-fetch-pack.txt:103 @@ -22964,7 +22323,7 @@ msgstr "" #: en/git-fetch-pack.txt:104 en/merge-options.txt:113 #, no-wrap msgid "--no-progress" -msgstr "" +msgstr "--no-progress" #. type: Plain text #: en/git-fetch-pack.txt:106 @@ -22975,7 +22334,7 @@ msgstr "" #: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77 #, no-wrap msgid "--check-self-contained-and-connected" -msgstr "" +msgstr "--check-self-contained-and-connected" #. type: Plain text #: en/git-fetch-pack.txt:110 @@ -22986,11 +22345,6 @@ msgstr "" #. type: Plain text #: en/git-fetch-pack.txt:113 en/git-push.txt:267 en/git-send-pack.txt:63 -#, fuzzy -#| msgid "" -#| "-v::\n" -#| "--verbose::\n" -#| " Be verbose.\n" msgid "Run verbosely." msgstr "" "-v::\n" @@ -22999,8 +22353,6 @@ msgstr "" #. type: Plain text #: en/git-fetch-pack.txt:116 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "The URL to the remote repository." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -23030,19 +22382,16 @@ msgstr "" #: en/git-fetch-pack.txt:129 en/cmds-mainporcelain.txt:43 #, no-wrap msgid "linkgit:git-fetch[1]" -msgstr "" +msgstr "linkgit:git-fetch[1]" #. type: Title = #: en/git-fetch.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-fetch(1)" -msgstr "git-commit(1)" +msgstr "git-fetch(1)" #. type: Plain text #: en/git-fetch.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-fetch - Download objects and refs from another repository" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -23241,7 +22590,7 @@ msgstr "" #: en/git-fetch.txt:128 en/git-push.txt:332 #, no-wrap msgid "`-`" -msgstr "" +msgstr "`-`" #. type: Plain text #: en/git-fetch.txt:129 @@ -23352,8 +22701,7 @@ msgstr "" #. type: delimited block - #: en/git-fetch.txt:161 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git fetch origin\n" msgstr "$ git commit\n" @@ -23372,8 +22720,7 @@ msgstr "" #. type: delimited block - #: en/git-fetch.txt:172 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git fetch origin +pu:pu maint:tmp\n" msgstr "$ git commit\n" @@ -23438,13 +22785,13 @@ msgstr "" #: en/git-fetch.txt:209 en/cmds-mainporcelain.txt:73 #, no-wrap msgid "linkgit:git-pull[1]" -msgstr "" +msgstr "linkgit:git-pull[1]" #. type: Title = #: en/git-filter-branch.txt:2 #, no-wrap msgid "git-filter-branch(1)" -msgstr "" +msgstr "git-filter-branch(1)" #. type: Plain text #: en/git-filter-branch.txt:7 @@ -23734,7 +23081,7 @@ msgstr "" #: en/git-filter-branch.txt:169 #, no-wrap msgid "--prune-empty" -msgstr "" +msgstr "--prune-empty" #. type: Plain text #: en/git-filter-branch.txt:176 @@ -24222,7 +23569,7 @@ msgstr "" #: en/git-fmt-merge-msg.txt:2 #, no-wrap msgid "git-fmt-merge-msg(1)" -msgstr "" +msgstr "git-fmt-merge-msg(1)" #. type: Plain text #: en/git-fmt-merge-msg.txt:7 @@ -24271,7 +23618,7 @@ msgstr "" #: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:46 #, no-wrap msgid "--no-log" -msgstr "" +msgstr "--no-log" #. type: Plain text #: en/git-fmt-merge-msg.txt:37 @@ -24282,7 +23629,7 @@ msgstr "" #: en/git-fmt-merge-msg.txt:38 #, no-wrap msgid "--[no-]summary" -msgstr "" +msgstr "--[no-]summary" #. type: Plain text #: en/git-fmt-merge-msg.txt:41 @@ -24312,12 +23659,6 @@ msgstr "" #. type: Plain text #: en/git-fmt-merge-msg.txt:51 -#, fuzzy -#| msgid "" -#| "-F <file>::\n" -#| "--file=<file>::\n" -#| "\tTake the commit message from the given file. Use '-' to\n" -#| "\tread the message from the standard input.\n" msgid "Take the list of merged objects from <file> instead of stdin." msgstr "" "-F <fichier>::\n" @@ -24356,19 +23697,17 @@ msgstr "" #: en/git-fmt-merge-msg.txt:75 en/cmds-mainporcelain.txt:64 #, no-wrap msgid "linkgit:git-merge[1]" -msgstr "" +msgstr "linkgit:git-merge[1]" #. type: Title = #: en/git-for-each-ref.txt:2 #, no-wrap msgid "git-for-each-ref(1)" -msgstr "" +msgstr "git-for-each-ref(1)" # #. type: Plain text #: en/git-for-each-ref.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-for-each-ref - Output information on each ref" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -24421,8 +23760,7 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:40 en/git-tag.txt:170 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "<format>" msgstr "Configuration" @@ -24454,28 +23792,27 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:58 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--shell" -msgstr "git-add(1)" +msgstr "--shell" #. type: Labeled list #: en/git-for-each-ref.txt:59 #, no-wrap msgid "--perl" -msgstr "" +msgstr "--perl" #. type: Labeled list #: en/git-for-each-ref.txt:60 #, no-wrap msgid "--python" -msgstr "" +msgstr "--python" #. type: Labeled list #: en/git-for-each-ref.txt:61 #, no-wrap msgid "--tcl" -msgstr "" +msgstr "--tcl" #. type: Plain text #: en/git-for-each-ref.txt:66 @@ -24694,8 +24031,7 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:171 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "if" msgstr "diff" @@ -24976,14 +24312,13 @@ msgstr "" #: en/git-for-each-ref.txt:341 en/cmds-plumbinginterrogators.txt:40 #, no-wrap msgid "linkgit:git-show-ref[1]" -msgstr "" +msgstr "linkgit:git-show-ref[1]" #. type: Title = #: en/git-format-patch.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-format-patch(1)" -msgstr "git-commit(1)" +msgstr "git-format-patch(1)" #. type: Plain text #: en/git-format-patch.txt:7 @@ -25129,10 +24464,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:94 en/git-shortlog.txt:30 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--numbered" -msgstr "Configuration" +msgstr "--numbered" #. type: Plain text #: en/git-format-patch.txt:96 @@ -25141,10 +24475,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:98 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--no-numbered" -msgstr "Configuration" +msgstr "--no-numbered" #. type: Plain text #: en/git-format-patch.txt:100 @@ -25164,10 +24497,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:104 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--numbered-files" -msgstr "git-commit(1)" +msgstr "--numbered-files" #. type: Plain text #: en/git-format-patch.txt:107 @@ -25180,7 +24512,7 @@ msgstr "" #: en/git-format-patch.txt:109 #, no-wrap msgid "--keep-subject" -msgstr "" +msgstr "--keep-subject" #. type: Plain text #: en/git-format-patch.txt:112 @@ -25200,7 +24532,7 @@ msgstr "" #: en/git-format-patch.txt:119 en/git-pack-objects.txt:57 #, no-wrap msgid "--stdout" -msgstr "" +msgstr "--stdout" #. type: Plain text #: en/git-format-patch.txt:122 @@ -25227,7 +24559,7 @@ msgstr "" #: en/git-format-patch.txt:128 #, no-wrap msgid "--no-attach" -msgstr "" +msgstr "--no-attach" #. type: Plain text #: en/git-format-patch.txt:131 @@ -25259,7 +24591,7 @@ msgstr "" #: en/git-format-patch.txt:138 #, no-wrap msgid "--no-thread" -msgstr "" +msgstr "--no-thread" #. type: Plain text #: en/git-format-patch.txt:143 @@ -25313,7 +24645,7 @@ msgstr "" #: en/git-format-patch.txt:163 #, no-wrap msgid "--ignore-if-in-upstream" -msgstr "" +msgstr "--ignore-if-in-upstream" #. type: Plain text #: en/git-format-patch.txt:169 @@ -25341,7 +24673,7 @@ msgstr "" #: en/git-format-patch.txt:176 #, no-wrap msgid "--rfc" -msgstr "" +msgstr "--rfc" #. type: Plain text #: en/git-format-patch.txt:180 @@ -25405,7 +24737,7 @@ msgstr "" #: en/git-format-patch.txt:202 #, no-wrap msgid "--from" -msgstr "" +msgstr "--from" #. type: Labeled list #: en/git-format-patch.txt:203 @@ -25452,7 +24784,7 @@ msgstr "" #: en/git-format-patch.txt:225 #, no-wrap msgid "--[no-]cover-letter" -msgstr "" +msgstr "--[no-]cover-letter" #. type: Plain text #: en/git-format-patch.txt:229 @@ -25542,7 +24874,7 @@ msgstr "" #: en/git-format-patch.txt:264 #, no-wrap msgid "--no-binary" -msgstr "" +msgstr "--no-binary" #. type: Plain text #: en/git-format-patch.txt:269 @@ -25554,10 +24886,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:270 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--zero-commit" -msgstr "git-commit(1)" +msgstr "--zero-commit" #. type: Plain text #: en/git-format-patch.txt:273 @@ -25568,8 +24899,7 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:274 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--base=<commit>" msgstr "git-commit(1)" @@ -25868,8 +25198,7 @@ msgstr "" #. type: Title ^ #: en/git-format-patch.txt:440 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Approach #1 (add-on)" msgstr "Configuration" @@ -25886,8 +25215,7 @@ msgstr "" #. type: Title ^ #: en/git-format-patch.txt:450 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Approach #2 (configuration)" msgstr "Configuration" @@ -25941,8 +25269,7 @@ msgstr "" #. type: Title ^ #: en/git-format-patch.txt:478 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Approach #3 (external editor)" msgstr "Configuration" @@ -26060,8 +25387,7 @@ msgstr "" #. type: Title - #: en/git-format-patch.txt:535 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "BASE TREE INFORMATION" msgstr "FORMATS DE DATE" @@ -26230,8 +25556,6 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:638 -#, fuzzy -#| msgid "git-commit(1)" msgid "linkgit:git-am[1], linkgit:git-send-email[1]" msgstr "git-commit(1)" @@ -26243,10 +25567,6 @@ msgstr "git-fsck-objects(1)" #. type: Plain text #: en/git-fsck-objects.txt:7 -#, fuzzy -#| msgid "" -#| "git-fsck-objects - Verifies the connectivity and validity of the objects " -#| "in the database" msgid "" "git-fsck-objects - Verifies the connectivity and validity of the objects in " "the database" @@ -26262,10 +25582,6 @@ msgstr "'git fsck-objects' ...\n" #. type: Plain text #: en/git-fsck-objects.txt:19 -#, fuzzy -#| msgid "" -#| "This is a synonym for linkgit:git-fsck[1]. Please refer to the " -#| "documentation of that command." msgid "" "This is a synonym for linkgit:git-fsck[1]. Please refer to the " "documentation of that command." @@ -26281,10 +25597,6 @@ msgstr "git-fsck(1)" #. type: Plain text #: en/git-fsck.txt:7 -#, fuzzy -#| msgid "" -#| "git-fsck - Verifies the connectivity and validity of the objects in the " -#| "database" msgid "" "git-fsck - Verifies the connectivity and validity of the objects in the " "database" @@ -26313,10 +25625,6 @@ msgstr "V챕rifie la connectivit챕 et la validit챕 des objets en base de donn챕es #. type: Plain text #: en/git-fsck.txt:25 -#, fuzzy -#| msgid "" -#| "<object>::\n" -#| "\tAn object to treat as the head of an unreachability trace.\n" msgid "An object to treat as the head of an unreachability trace." msgstr "" "<objet>::\n" @@ -26334,7 +25642,7 @@ msgstr "" #: en/git-fsck.txt:30 #, no-wrap msgid "--unreachable" -msgstr "" +msgstr "--unreachable" #. type: Plain text #: en/git-fsck.txt:33 @@ -26347,7 +25655,7 @@ msgstr "" #: en/git-fsck.txt:34 #, no-wrap msgid "--[no-]dangling" -msgstr "" +msgstr "--[no-]dangling" #. type: Plain text #: en/git-fsck.txt:37 @@ -26370,14 +25678,10 @@ msgstr "" #: en/git-fsck.txt:44 #, no-wrap msgid "--cache" -msgstr "" +msgstr "--cache" #. type: Plain text #: en/git-fsck.txt:47 -#, fuzzy -#| msgid "" -#| "<object>::\n" -#| "\tAn object to treat as the head of an unreachability trace.\n" msgid "" "Consider any object recorded in the index also as a head node for an " "unreachability trace." @@ -26389,7 +25693,7 @@ msgstr "" #: en/git-fsck.txt:48 #, no-wrap msgid "--no-reflogs" -msgstr "" +msgstr "--no-reflogs" #. type: Plain text #: en/git-fsck.txt:53 @@ -26403,7 +25707,7 @@ msgstr "" #: en/git-fsck.txt:54 #, no-wrap msgid "--full" -msgstr "" +msgstr "--full" #. type: Plain text #: en/git-fsck.txt:63 @@ -26420,7 +25724,7 @@ msgstr "" #: en/git-fsck.txt:64 #, no-wrap msgid "--connectivity-only" -msgstr "" +msgstr "--connectivity-only" #. type: Plain text #: en/git-fsck.txt:68 @@ -26432,10 +25736,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:69 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44 -#, fuzzy, no-wrap -#| msgid "strip" +#, no-wrap msgid "--strict" -msgstr "strip" +msgstr "--strict" #. type: Plain text #: en/git-fsck.txt:76 @@ -26456,7 +25759,7 @@ msgstr "" #: en/git-fsck.txt:80 #, no-wrap msgid "--lost-found" -msgstr "" +msgstr "--lost-found" #. type: Plain text #: en/git-fsck.txt:85 @@ -26468,10 +25771,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:86 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--name-objects" -msgstr "git-commit(1)" +msgstr "--name-objects" #. type: Plain text #: en/git-fsck.txt:91 @@ -26612,8 +25914,6 @@ msgstr "" # #. type: Plain text #: en/git-fsck.txt:153 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "used to specify the index file of the index" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -26630,10 +25930,9 @@ msgstr "" #. type: Title = #: en/git-gc.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-gc(1)" -msgstr "git-add(1)" +msgstr "git-gc(1)" #. type: Plain text #: en/git-gc.txt:7 @@ -26681,7 +25980,7 @@ msgstr "" #: en/git-gc.txt:36 en/git-read-tree.txt:71 #, no-wrap msgid "--aggressive" -msgstr "" +msgstr "--aggressive" #. type: Plain text #: en/git-gc.txt:43 @@ -26697,7 +25996,7 @@ msgstr "" #: en/git-gc.txt:44 #, no-wrap msgid "--auto" -msgstr "" +msgstr "--auto" #. type: Plain text #: en/git-gc.txt:49 @@ -26746,22 +26045,15 @@ msgstr "" #: en/git-gc.txt:71 en/git-pack-refs.txt:57 #, no-wrap msgid "--no-prune" -msgstr "" +msgstr "--no-prune" #. type: Plain text #: en/git-gc.txt:73 -#, fuzzy -#| msgid "but can be used to amend a merge commit." msgid "Do not prune any loose objects." msgstr "mais peut 챗tre utilis챕 pour corriger un commit de fusion." #. type: Plain text #: en/git-gc.txt:76 -#, fuzzy -#| msgid "" -#| "-q::\n" -#| "--quiet::\n" -#| "\tSuppress commit summary message.\n" msgid "Suppress all progress reports." msgstr "" "-q::\n" @@ -26912,10 +26204,6 @@ msgstr "" #. type: Plain text #: en/git-gc.txt:175 -#, fuzzy -#| msgid "" -#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, " -#| "and `post-commit` hooks. See linkgit:githooks[5] for more information." msgid "" "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:" "githooks[5] for more information." @@ -26927,10 +26215,6 @@ msgstr "" # #. type: Plain text #: en/git-gc.txt:183 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-" "rerere[1]" @@ -26940,10 +26224,9 @@ msgstr "" #. type: Title = #: en/git-get-tar-commit-id.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-get-tar-commit-id(1)" -msgstr "git-commit(1)" +msgstr "git-get-tar-commit-id(1)" #. type: Plain text #: en/git-get-tar-commit-id.txt:7 @@ -26978,10 +26261,9 @@ msgstr "" #. type: Title = #: en/git-grep.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-grep(1)" -msgstr "git-add(1)" +msgstr "git-grep(1)" #. type: Plain text #: en/git-grep.txt:7 @@ -27102,10 +26384,6 @@ msgstr "" #. type: Plain text #: en/git-grep.txt:75 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "" "Instead of searching tracked files in the working tree, search blobs " "registered in the index file." @@ -27120,17 +26398,12 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:79 -#, fuzzy, no-wrap -#| msgid "add untracked" +#, no-wrap msgid "--untracked" -msgstr "add untracked" +msgstr "--untracked" #. type: Plain text #: en/git-grep.txt:82 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "" "In addition to searching in the tracked files in the working tree, search " "also in untracked files." @@ -27142,7 +26415,7 @@ msgstr "" #: en/git-grep.txt:83 #, no-wrap msgid "--no-exclude-standard" -msgstr "" +msgstr "--no-exclude-standard" #. type: Plain text #: en/git-grep.txt:86 @@ -27155,7 +26428,7 @@ msgstr "" #: en/git-grep.txt:87 en/git-ls-files.txt:97 #, no-wrap msgid "--exclude-standard" -msgstr "" +msgstr "--exclude-standard" #. type: Plain text #: en/git-grep.txt:91 @@ -27193,7 +26466,7 @@ msgstr "" #: en/git-grep.txt:106 en/diff-options.txt:519 #, no-wrap msgid "--text" -msgstr "" +msgstr "--text" #. type: Plain text #: en/git-grep.txt:108 @@ -27209,7 +26482,7 @@ msgstr "" #: en/git-grep.txt:112 en/diff-options.txt:571 #, no-wrap msgid "--no-textconv" -msgstr "" +msgstr "--no-textconv" #. type: Plain text #: en/git-grep.txt:115 @@ -27252,7 +26525,7 @@ msgstr "" #: en/git-grep.txt:132 #, no-wrap msgid "--word-regexp" -msgstr "" +msgstr "--word-regexp" #. type: Plain text #: en/git-grep.txt:136 @@ -27266,7 +26539,7 @@ msgstr "" #: en/git-grep.txt:138 #, no-wrap msgid "--invert-match" -msgstr "" +msgstr "--invert-match" #. type: Plain text #: en/git-grep.txt:140 @@ -27285,7 +26558,7 @@ msgstr "" #: en/git-grep.txt:149 en/git-ls-files.txt:136 en/git-ls-tree.txt:68 #, no-wrap msgid "--full-name" -msgstr "" +msgstr "--full-name" #. type: Plain text #: en/git-grep.txt:154 en/git-ls-files.txt:141 @@ -27305,7 +26578,7 @@ msgstr "" #: en/git-grep.txt:156 en/rev-list-options.txt:85 #, no-wrap msgid "--extended-regexp" -msgstr "" +msgstr "--extended-regexp" #. type: Labeled list #: en/git-grep.txt:157 @@ -27317,7 +26590,7 @@ msgstr "" #: en/git-grep.txt:158 en/rev-list-options.txt:80 #, no-wrap msgid "--basic-regexp" -msgstr "" +msgstr "--basic-regexp" #. type: Plain text #: en/git-grep.txt:161 @@ -27330,7 +26603,7 @@ msgstr "" #: en/git-grep.txt:163 en/rev-list-options.txt:94 #, no-wrap msgid "--perl-regexp" -msgstr "" +msgstr "--perl-regexp" #. type: Plain text #: en/git-grep.txt:166 @@ -27348,7 +26621,7 @@ msgstr "" #: en/git-grep.txt:168 en/rev-list-options.txt:90 #, no-wrap msgid "--fixed-strings" -msgstr "" +msgstr "--fixed-strings" #. type: Plain text #: en/git-grep.txt:171 @@ -27359,7 +26632,7 @@ msgstr "" #: en/git-grep.txt:173 #, no-wrap msgid "--line-number" -msgstr "" +msgstr "--line-number" #. type: Plain text #: en/git-grep.txt:175 @@ -27370,7 +26643,7 @@ msgstr "" #: en/git-grep.txt:177 #, no-wrap msgid "--files-with-matches" -msgstr "" +msgstr "--files-with-matches" #. type: Labeled list #: en/git-grep.txt:179 @@ -27382,7 +26655,7 @@ msgstr "" #: en/git-grep.txt:180 #, no-wrap msgid "--files-without-match" -msgstr "" +msgstr "--files-without-match" #. type: Plain text #: en/git-grep.txt:185 @@ -27424,7 +26697,7 @@ msgstr "" #: en/git-grep.txt:202 en/rev-list-options.txt:848 #, no-wrap msgid "--count" -msgstr "" +msgstr "--count" #. type: Plain text #: en/git-grep.txt:205 @@ -27450,7 +26723,7 @@ msgstr "" #: en/git-grep.txt:215 #, no-wrap msgid "--break" -msgstr "" +msgstr "--break" #. type: Plain text #: en/git-grep.txt:217 @@ -27461,7 +26734,7 @@ msgstr "" #: en/git-grep.txt:218 #, no-wrap msgid "--heading" -msgstr "" +msgstr "--heading" #. type: Plain text #: en/git-grep.txt:221 @@ -27474,7 +26747,7 @@ msgstr "" #: en/git-grep.txt:223 #, no-wrap msgid "--show-function" -msgstr "" +msgstr "--show-function" #. type: Plain text #: en/git-grep.txt:229 @@ -27552,7 +26825,7 @@ msgstr "" #: en/git-grep.txt:247 en/diff-options.txt:547 #, no-wrap msgid "--function-context" -msgstr "" +msgstr "--function-context" #. type: Plain text #: en/git-grep.txt:252 @@ -27598,19 +26871,19 @@ msgstr "" #: en/git-grep.txt:266 #, no-wrap msgid "--and" -msgstr "" +msgstr "--and" #. type: Labeled list #: en/git-grep.txt:267 #, no-wrap msgid "--or" -msgstr "" +msgstr "--or" #. type: Labeled list #: en/git-grep.txt:268 en/git-rev-parse.txt:129 en/rev-list-options.txt:131 #, no-wrap msgid "--not" -msgstr "" +msgstr "--not" #. type: Labeled list #: en/git-grep.txt:269 @@ -27630,7 +26903,7 @@ msgstr "" #: en/git-grep.txt:275 en/rev-list-options.txt:67 #, no-wrap msgid "--all-match" -msgstr "" +msgstr "--all-match" #. type: Plain text #: en/git-grep.txt:279 @@ -27654,10 +26927,6 @@ msgstr "" #. type: Plain text #: en/git-grep.txt:288 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "" "Instead of searching tracked files in the working tree, search blobs in the " "given trees." @@ -27688,10 +26957,6 @@ msgstr "" # #. type: Plain text #: en/git-grep.txt:303 -#, fuzzy -#| msgid "" -#| "Adds content from all `*.txt` files under `Documentation` directory and " -#| "its subdirectories:" msgid "" "Looks for `time_t` in all tracked .c and .h files in the working directory " "and its subdirectories." @@ -27726,10 +26991,9 @@ msgstr "" #. type: Title = #: en/git-gui.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-gui(1)" -msgstr "git-add(1)" +msgstr "git-gui(1)" #. type: Plain text #: en/git-gui.txt:7 @@ -27872,8 +27136,7 @@ msgstr "" #. type: Labeled list #: en/git-gui.txt:74 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "`git gui citool`" msgstr "$ git commit\n" @@ -27887,8 +27150,7 @@ msgstr "" #. type: Labeled list #: en/git-gui.txt:80 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "`git gui citool --amend`" msgstr "$ git commit\n" @@ -27899,8 +27161,7 @@ msgstr "" #. type: Labeled list #: en/git-gui.txt:85 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "`git gui citool --nocommit`" msgstr "$ git commit\n" @@ -27915,15 +27176,12 @@ msgstr "" #. type: Labeled list #: en/git-gui.txt:92 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "`git citool`" msgstr "$ git commit\n" #. type: Plain text #: en/git-gui.txt:95 -#, fuzzy -#| msgid "$ git commit\n" msgid "Same as `git gui citool` (above)." msgstr "$ git commit\n" @@ -27994,7 +27252,7 @@ msgstr "" #: en/git-hash-object.txt:2 #, no-wrap msgid "git-hash-object(1)" -msgstr "" +msgstr "git-hash-object(1)" #. type: Plain text #: en/git-hash-object.txt:7 @@ -28035,8 +27293,6 @@ msgstr "" # #. type: Plain text #: en/git-hash-object.txt:33 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Actually write the object into the object database." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -28049,7 +27305,7 @@ msgstr "" #: en/git-hash-object.txt:37 #, no-wrap msgid "--stdin-paths" -msgstr "" +msgstr "--stdin-paths" #. type: Plain text #: en/git-hash-object.txt:40 @@ -28074,7 +27330,7 @@ msgstr "" #: en/git-hash-object.txt:51 #, no-wrap msgid "--no-filters" -msgstr "" +msgstr "--no-filters" #. type: Plain text #: en/git-hash-object.txt:56 @@ -28089,7 +27345,7 @@ msgstr "" #: en/git-hash-object.txt:57 #, no-wrap msgid "--literally" -msgstr "" +msgstr "--literally" #. type: Plain text #: en/git-hash-object.txt:62 @@ -28102,10 +27358,9 @@ msgstr "" #. type: Title = #: en/git-help.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-help(1)" -msgstr "git-add(1)" +msgstr "git-help(1)" #. type: Plain text #: en/git-help.txt:7 @@ -28178,7 +27433,7 @@ msgstr "" #: en/git-help.txt:47 #, no-wrap msgid "--guides" -msgstr "" +msgstr "--guides" #. type: Plain text #: en/git-help.txt:50 @@ -28191,7 +27446,7 @@ msgstr "" #: en/git-help.txt:52 #, no-wrap msgid "--info" -msgstr "" +msgstr "--info" #. type: Plain text #: en/git-help.txt:55 @@ -28204,7 +27459,7 @@ msgstr "" #: en/git-help.txt:57 #, no-wrap msgid "--man" -msgstr "" +msgstr "--man" #. type: Plain text #: en/git-help.txt:61 @@ -28225,7 +27480,7 @@ msgstr "" #: en/git-help.txt:67 #, no-wrap msgid "--web" -msgstr "" +msgstr "--web" #. type: Plain text #: en/git-help.txt:70 @@ -28247,15 +27502,13 @@ msgstr "" #. type: Title - #: en/git-help.txt:78 en/git-interpret-trailers.txt:84 en/git-p4.txt:450 #: en/git-web--browse.txt:59 -#, fuzzy, no-wrap -#| msgid "ENVIRONMENT AND CONFIGURATION VARIABLES" +#, no-wrap msgid "CONFIGURATION VARIABLES" msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION" #. type: Labeled list #: en/git-help.txt:81 en/config.txt:1765 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "help.format" msgstr "Configuration" @@ -28480,10 +27733,9 @@ msgstr "" #. type: Title = #: en/git-http-backend.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-http-backend(1)" -msgstr "git-add(1)" +msgstr "git-http-backend(1)" #. type: Plain text #: en/git-http-backend.txt:7 @@ -28960,12 +28212,10 @@ msgstr "" #: en/git-http-fetch.txt:2 #, no-wrap msgid "git-http-fetch(1)" -msgstr "" +msgstr "git-http-fetch(1)" #. type: Plain text #: en/git-http-fetch.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-http-fetch - Download from a remote Git repository via HTTP" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -28977,8 +28227,6 @@ msgstr "" #. type: Plain text #: en/git-http-fetch.txt:17 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Downloads a remote Git repository via HTTP." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -29051,7 +28299,7 @@ msgstr "" #: en/git-http-fetch.txt:46 #, no-wrap msgid "--recover" -msgstr "" +msgstr "--recover" #. type: Plain text #: en/git-http-fetch.txt:49 @@ -29064,12 +28312,10 @@ msgstr "" #: en/git-http-push.txt:2 #, no-wrap msgid "git-http-push(1)" -msgstr "" +msgstr "git-http-push(1)" #. type: Plain text #: en/git-http-push.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-http-push - Push objects over HTTP/DAV to another repository" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -29229,10 +28475,9 @@ msgstr "" #. type: Title = #: en/git-imap-send.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-imap-send(1)" -msgstr "git-add(1)" +msgstr "git-imap-send(1)" #. type: Plain text #: en/git-imap-send.txt:7 @@ -29275,7 +28520,7 @@ msgstr "" #: en/git-imap-send.txt:40 #, no-wrap msgid "--curl" -msgstr "" +msgstr "--curl" #. type: Plain text #: en/git-imap-send.txt:44 @@ -29288,7 +28533,7 @@ msgstr "" #: en/git-imap-send.txt:45 #, no-wrap msgid "--no-curl" -msgstr "" +msgstr "--no-curl" #. type: Plain text #: en/git-imap-send.txt:49 @@ -29557,7 +28802,7 @@ msgstr "" #: en/git-index-pack.txt:2 #, no-wrap msgid "git-index-pack(1)" -msgstr "" +msgstr "git-index-pack(1)" #. type: Plain text #: en/git-index-pack.txt:7 @@ -29616,7 +28861,7 @@ msgstr "" #: en/git-index-pack.txt:48 #, no-wrap msgid "--fix-thin" -msgstr "" +msgstr "--fix-thin" #. type: Plain text #: en/git-index-pack.txt:53 @@ -29732,15 +28977,12 @@ msgstr "" #. type: Title = #: en/git-init-db.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-init-db(1)" -msgstr "git-add(1)" +msgstr "git-init-db(1)" #. type: Plain text #: en/git-init-db.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-init-db - Creates an empty Git repository" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -29752,10 +28994,6 @@ msgstr "" #. type: Plain text #: en/git-init-db.txt:20 -#, fuzzy -#| msgid "" -#| "This is a synonym for linkgit:git-fsck[1]. Please refer to the " -#| "documentation of that command." msgid "" "This is a synonym for linkgit:git-init[1]. Please refer to the " "documentation of that command." @@ -29765,15 +29003,12 @@ msgstr "" #. type: Title = #: en/git-init.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-init(1)" -msgstr "git-commit(1)" +msgstr "git-init(1)" #. type: Plain text #: en/git-init.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "" "git-init - Create an empty Git repository or reinitialize an existing one" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -30034,8 +29269,6 @@ msgstr "" # #. type: Plain text #: en/git-init.txt:154 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Add all existing files to the index." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -30046,10 +29279,9 @@ msgstr "" #. type: Title = #: en/git-instaweb.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-instaweb(1)" -msgstr "git-commit(1)" +msgstr "git-instaweb(1)" #. type: Plain text #: en/git-instaweb.txt:7 @@ -30081,7 +29313,7 @@ msgstr "" #: en/git-instaweb.txt:28 #, no-wrap msgid "--httpd" -msgstr "" +msgstr "--httpd" #. type: Plain text #: en/git-instaweb.txt:34 @@ -30096,7 +29328,7 @@ msgstr "" #: en/git-instaweb.txt:36 #, no-wrap msgid "--module-path" -msgstr "" +msgstr "--module-path" #. type: Plain text #: en/git-instaweb.txt:39 @@ -30109,7 +29341,7 @@ msgstr "" #: en/git-instaweb.txt:41 #, no-wrap msgid "--port" -msgstr "" +msgstr "--port" #. type: Plain text #: en/git-instaweb.txt:43 @@ -30128,7 +29360,7 @@ msgstr "" #: en/git-instaweb.txt:45 #, no-wrap msgid "--browser" -msgstr "" +msgstr "--browser" #. type: Plain text #: en/git-instaweb.txt:51 @@ -30149,7 +29381,7 @@ msgstr "" #: en/git-instaweb.txt:53 #, no-wrap msgid "--start" -msgstr "" +msgstr "--start" #. type: Plain text #: en/git-instaweb.txt:56 @@ -30168,7 +29400,7 @@ msgstr "" #: en/git-instaweb.txt:58 #, no-wrap msgid "--stop" -msgstr "" +msgstr "--stop" #. type: Plain text #: en/git-instaweb.txt:62 @@ -30188,7 +29420,7 @@ msgstr "" #: en/git-instaweb.txt:64 #, no-wrap msgid "--restart" -msgstr "" +msgstr "--restart" #. type: Plain text #: en/git-instaweb.txt:67 @@ -30232,13 +29464,11 @@ msgstr "" #: en/git-interpret-trailers.txt:2 #, no-wrap msgid "git-interpret-trailers(1)" -msgstr "" +msgstr "git-interpret-trailers(1)" # #. type: Plain text #: en/git-interpret-trailers.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "" "git-interpret-trailers - help add structured information into commit messages" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -30342,7 +29572,7 @@ msgstr "" #: en/git-interpret-trailers.txt:70 #, no-wrap msgid "--in-place" -msgstr "" +msgstr "--in-place" #. type: Plain text #: en/git-interpret-trailers.txt:72 @@ -30353,7 +29583,7 @@ msgstr "" #: en/git-interpret-trailers.txt:73 #, no-wrap msgid "--trim-empty" -msgstr "" +msgstr "--trim-empty" #. type: Plain text #: en/git-interpret-trailers.txt:77 @@ -30855,10 +30085,6 @@ msgstr "" # #. type: Plain text #: en/git-interpret-trailers.txt:336 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]" msgstr "" @@ -30867,10 +30093,9 @@ msgstr "" #. type: Title = #: en/git-log.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-log(1)" -msgstr "git-add(1)" +msgstr "git-log(1)" #. type: Plain text #: en/git-log.txt:7 @@ -30900,7 +30125,7 @@ msgstr "" #: en/git-log.txt:27 #, no-wrap msgid "--follow" -msgstr "" +msgstr "--follow" #. type: Plain text #: en/git-log.txt:30 @@ -30913,7 +30138,7 @@ msgstr "" #: en/git-log.txt:31 #, no-wrap msgid "--no-decorate" -msgstr "" +msgstr "--no-decorate" #. type: Labeled list #: en/git-log.txt:32 @@ -30936,7 +30161,7 @@ msgstr "" #: en/git-log.txt:41 #, no-wrap msgid "--source" -msgstr "" +msgstr "--source" #. type: Plain text #: en/git-log.txt:44 @@ -30947,10 +30172,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:45 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--use-mailmap" -msgstr "git-commit(1)" +msgstr "--use-mailmap" #. type: Plain text #: en/git-log.txt:49 @@ -30963,7 +30187,7 @@ msgstr "" #: en/git-log.txt:50 #, no-wrap msgid "--full-diff" -msgstr "" +msgstr "--full-diff" #. type: Plain text #: en/git-log.txt:56 @@ -30986,7 +30210,7 @@ msgstr "" #: en/git-log.txt:60 #, no-wrap msgid "--log-size" -msgstr "" +msgstr "--log-size" #. type: Plain text #: en/git-log.txt:65 @@ -31209,10 +30433,7 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:179 en/config.txt:2053 -#, fuzzy, no-wrap -#| msgid "" -#| "[i18n]\n" -#| "\tlogoutputencoding = ISO-8859-1\n" +#, no-wrap msgid "i18n.logOutputEncoding" msgstr "" "[i18n]\n" @@ -31326,13 +30547,11 @@ msgstr "" #: en/git-ls-files.txt:2 #, no-wrap msgid "git-ls-files(1)" -msgstr "" +msgstr "git-ls-files(1)" # #. type: Plain text #: en/git-ls-files.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "" "git-ls-files - Show information about files in the index and the working tree" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -31376,7 +30595,7 @@ msgstr "" #: en/git-ls-files.txt:40 #, no-wrap msgid "--deleted" -msgstr "" +msgstr "--deleted" #. type: Plain text #: en/git-ls-files.txt:42 @@ -31385,10 +30604,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:44 -#, fuzzy, no-wrap -#| msgid "modified content" +#, no-wrap msgid "--modified" -msgstr "contenu modifi챕" +msgstr "--modified" #. type: Plain text #: en/git-ls-files.txt:46 @@ -31399,7 +30617,7 @@ msgstr "" #: en/git-ls-files.txt:48 #, no-wrap msgid "--others" -msgstr "" +msgstr "--others" #. type: Plain text #: en/git-ls-files.txt:50 @@ -31410,7 +30628,7 @@ msgstr "" #: en/git-ls-files.txt:52 en/git-status.txt:97 #, no-wrap msgid "--ignored" -msgstr "" +msgstr "--ignored" #. type: Plain text #: en/git-ls-files.txt:57 @@ -31422,10 +30640,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:59 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--stage" -msgstr "git-add(1)" +msgstr "--stage" #. type: Plain text #: en/git-ls-files.txt:61 @@ -31437,7 +30654,7 @@ msgstr "" #: en/git-ls-files.txt:62 #, no-wrap msgid "--directory" -msgstr "" +msgstr "--directory" #. type: Plain text #: en/git-ls-files.txt:65 @@ -31450,7 +30667,7 @@ msgstr "" #: en/git-ls-files.txt:66 #, no-wrap msgid "--no-empty-directory" -msgstr "" +msgstr "--no-empty-directory" #. type: Plain text #: en/git-ls-files.txt:68 @@ -31459,10 +30676,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:70 en/git-update-index.txt:65 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--unmerged" -msgstr "git-commit(1)" +msgstr "--unmerged" #. type: Plain text #: en/git-ls-files.txt:72 @@ -31473,7 +30689,7 @@ msgstr "" #: en/git-ls-files.txt:74 #, no-wrap msgid "--killed" -msgstr "" +msgstr "--killed" #. type: Plain text #: en/git-ls-files.txt:78 @@ -31543,7 +30759,7 @@ msgstr "" #: en/git-ls-files.txt:101 #, no-wrap msgid "--error-unmatch" -msgstr "" +msgstr "--error-unmatch" #. type: Plain text #: en/git-ls-files.txt:104 @@ -31625,8 +30841,6 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:127 -#, fuzzy -#| msgid "removed content" msgid "removed/deleted" msgstr "contenu supprim챕" @@ -31638,8 +30852,6 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:128 -#, fuzzy -#| msgid "modified content" msgid "modified/changed" msgstr "contenu modifi챕" @@ -31701,7 +30913,7 @@ msgstr "" #: en/git-ls-files.txt:157 #, no-wrap msgid "--eol" -msgstr "" +msgstr "--eol" #. type: Plain text #: en/git-ls-files.txt:162 @@ -31852,10 +31064,6 @@ msgstr "" # #. type: Plain text #: en/git-ls-files.txt:239 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]" msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -31863,10 +31071,9 @@ msgstr "" #. type: Title = #: en/git-ls-remote.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-ls-remote(1)" -msgstr "git-commit(1)" +msgstr "git-ls-remote(1)" #. type: Plain text #: en/git-ls-remote.txt:7 @@ -31893,7 +31100,7 @@ msgstr "" #: en/git-ls-remote.txt:25 en/git-show-ref.txt:41 #, no-wrap msgid "--heads" -msgstr "" +msgstr "--heads" #. type: Plain text #: en/git-ls-remote.txt:32 @@ -31907,7 +31114,7 @@ msgstr "" #: en/git-ls-remote.txt:33 #, no-wrap msgid "--refs" -msgstr "" +msgstr "--refs" #. type: Plain text #: en/git-ls-remote.txt:35 @@ -31921,8 +31128,7 @@ msgstr "" #. type: Labeled list #: en/git-ls-remote.txt:40 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--upload-pack=<exec>" msgstr "git-add(1)" @@ -31938,7 +31144,7 @@ msgstr "" #: en/git-ls-remote.txt:46 en/diff-options.txt:552 #, no-wrap msgid "--exit-code" -msgstr "" +msgstr "--exit-code" #. type: Plain text #: en/git-ls-remote.txt:51 @@ -31953,7 +31159,7 @@ msgstr "" #: en/git-ls-remote.txt:52 #, no-wrap msgid "--get-url" -msgstr "" +msgstr "--get-url" #. type: Plain text #: en/git-ls-remote.txt:56 @@ -31967,7 +31173,7 @@ msgstr "" #: en/git-ls-remote.txt:57 #, no-wrap msgid "--symref" -msgstr "" +msgstr "--symref" #. type: Plain text #: en/git-ls-remote.txt:62 @@ -32018,7 +31224,7 @@ msgstr "" #: en/git-ls-tree.txt:2 #, no-wrap msgid "git-ls-tree(1)" -msgstr "" +msgstr "git-ls-tree(1)" #. type: Plain text #: en/git-ls-tree.txt:7 @@ -32099,10 +31305,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-tree.txt:60 en/diff-options.txt:202 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--name-status" -msgstr "status" +msgstr "--name-status" #. type: Plain text #: en/git-ls-tree.txt:62 @@ -32173,10 +31378,9 @@ msgstr "" #. type: Title = #: en/git-mailinfo.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-mailinfo(1)" -msgstr "git-commit(1)" +msgstr "git-mailinfo(1)" #. type: Plain text #: en/git-mailinfo.txt:7 @@ -32337,8 +31541,7 @@ msgstr "" #. type: Labeled list #: en/git-mailinfo.txt:97 en/git-patch-id.txt:59 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "<patch>" msgstr "patch" @@ -32349,10 +31552,9 @@ msgstr "" #. type: Title = #: en/git-mailsplit.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-mailsplit(1)" -msgstr "git-commit(1)" +msgstr "git-mailsplit(1)" #. type: Plain text #: en/git-mailsplit.txt:7 @@ -32389,12 +31591,6 @@ msgstr "" #. type: Plain text #: en/git-mailsplit.txt:27 -#, fuzzy -#| msgid "" -#| "-F <file>::\n" -#| "--file=<file>::\n" -#| "\tTake the commit message from the given file. Use '-' to\n" -#| "\tread the message from the standard input.\n" msgid "" "Mbox file to split. If not given, the mbox is read from the standard input." msgstr "" @@ -32464,7 +31660,7 @@ msgstr "" #: en/git-mailsplit.txt:48 #, no-wrap msgid "--keep-cr" -msgstr "" +msgstr "--keep-cr" #. type: Plain text #: en/git-mailsplit.txt:50 @@ -32475,7 +31671,7 @@ msgstr "" #: en/git-mailsplit.txt:51 #, no-wrap msgid "--mboxrd" -msgstr "" +msgstr "--mboxrd" #. type: Plain text #: en/git-mailsplit.txt:54 @@ -32487,7 +31683,7 @@ msgstr "" #: en/git-merge-base.txt:2 #, no-wrap msgid "git-merge-base(1)" -msgstr "" +msgstr "git-merge-base(1)" #. type: Plain text #: en/git-merge-base.txt:7 @@ -32552,7 +31748,7 @@ msgstr "" #: en/git-merge-base.txt:43 #, no-wrap msgid "--octopus" -msgstr "" +msgstr "--octopus" #. type: Plain text #: en/git-merge-base.txt:47 @@ -32566,7 +31762,7 @@ msgstr "" #: en/git-merge-base.txt:48 en/git-show-branch.txt:90 #, no-wrap msgid "--independent" -msgstr "" +msgstr "--independent" #. type: Plain text #: en/git-merge-base.txt:54 @@ -32581,7 +31777,7 @@ msgstr "" #: en/git-merge-base.txt:55 #, no-wrap msgid "--is-ancestor" -msgstr "" +msgstr "--is-ancestor" #. type: Plain text #: en/git-merge-base.txt:59 @@ -32595,7 +31791,7 @@ msgstr "" #: en/git-merge-base.txt:60 en/git-rebase.txt:346 #, no-wrap msgid "--fork-point" -msgstr "" +msgstr "--fork-point" #. type: Plain text #: en/git-merge-base.txt:68 @@ -32795,8 +31991,7 @@ msgstr "" #. type: Plain text #: en/git-merge-base.txt:173 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "" " $ fork_point=$(git merge-base --fork-point origin/master topic)\n" " $ git rebase --onto origin/master $fork_point topic\n" @@ -32811,10 +32006,6 @@ msgstr "" # #. type: Plain text #: en/git-merge-base.txt:180 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]" msgstr "" @@ -32823,10 +32014,9 @@ msgstr "" #. type: Title = #: en/git-merge-file.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-merge-file(1)" -msgstr "git-commit(1)" +msgstr "git-merge-file(1)" #. type: Plain text #: en/git-merge-file.txt:7 @@ -32927,10 +32117,9 @@ msgstr "" #. type: Labeled list #: en/git-merge-file.txt:70 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "--diff3" -msgstr "diff" +msgstr "--diff3" #. type: Plain text #: en/git-merge-file.txt:72 @@ -32941,7 +32130,7 @@ msgstr "" #: en/git-merge-file.txt:75 #, no-wrap msgid "--union" -msgstr "" +msgstr "--union" #. type: Plain text #: en/git-merge-file.txt:78 @@ -32980,7 +32169,7 @@ msgstr "" #: en/git-merge-index.txt:2 #, no-wrap msgid "git-merge-index(1)" -msgstr "" +msgstr "git-merge-index(1)" #. type: Plain text #: en/git-merge-index.txt:7 @@ -33093,7 +32282,7 @@ msgstr "" #: en/git-merge-one-file.txt:2 #, no-wrap msgid "git-merge-one-file(1)" -msgstr "" +msgstr "git-merge-one-file(1)" #. type: Plain text #: en/git-merge-one-file.txt:7 @@ -33157,8 +32346,7 @@ msgstr "" #. type: Title - #: en/git-mergetool--lib.txt:29 en/git-sh-i18n.txt:28 en/git-sh-setup.txt:34 -#, fuzzy, no-wrap -#| msgid "OPTIONS" +#, no-wrap msgid "FUNCTIONS" msgstr "OPTIONS" @@ -33211,10 +32399,9 @@ msgstr "" #. type: Title = #: en/git-mergetool.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-mergetool(1)" -msgstr "git-commit(1)" +msgstr "git-mergetool(1)" #. type: Plain text #: en/git-mergetool.txt:7 @@ -33361,10 +32548,9 @@ msgstr "" #. type: Title = #: en/git-merge-tree.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-merge-tree(1)" -msgstr "git-commit(1)" +msgstr "git-merge-tree(1)" #. type: Plain text #: en/git-merge-tree.txt:7 @@ -33397,10 +32583,9 @@ msgstr "" #. type: Title = #: en/git-merge.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-merge(1)" -msgstr "git-commit(1)" +msgstr "git-merge(1)" #. type: Plain text #: en/git-merge.txt:7 @@ -33501,13 +32686,6 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:77 -#, fuzzy -#| msgid "" -#| "-S[<keyid>]::\n" -#| "--gpg-sign[=<keyid>]::\n" -#| "\tGPG-sign commits. The `keyid` argument is optional and\n" -#| "\tdefaults to the committer identity; if specified, it must be\n" -#| "\tstuck to the option without a space.\n" msgid "" "GPG-sign the resulting merge commit. The `keyid` argument is optional and " "defaults to the committer identity; if specified, it must be stuck to the " @@ -33545,7 +32723,7 @@ msgstr "" #: en/git-merge.txt:89 #, no-wrap msgid "--[no-]rerere-autoupdate" -msgstr "" +msgstr "--[no-]rerere-autoupdate" #. type: Plain text #: en/git-merge.txt:92 @@ -33964,8 +33142,7 @@ msgstr "" #. type: delimited block - #: en/git-merge.txt:331 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git merge --no-commit maint\n" msgstr "$ git commit\n" @@ -34001,10 +33178,6 @@ msgstr "" # #. type: Plain text #: en/git-merge.txt:360 -#, fuzzy -#| msgid "" -#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-" -#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" msgid "" "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], " "linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:" @@ -34015,10 +33188,9 @@ msgstr "" #. type: Title = #: en/git-mktag.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-mktag(1)" -msgstr "git-add(1)" +msgstr "git-mktag(1)" #. type: Plain text #: en/git-mktag.txt:7 @@ -34077,16 +33249,13 @@ msgstr "" #. type: Title = #: en/git-mktree.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-mktree(1)" -msgstr "git-commit(1)" +msgstr "git-mktree(1)" # #. type: Plain text #: en/git-mktree.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-mktree - Build a tree-object from ls-tree formatted text" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -34114,7 +33283,7 @@ msgstr "" #: en/git-mktree.txt:26 #, no-wrap msgid "--missing" -msgstr "" +msgstr "--missing" #. type: Plain text #: en/git-mktree.txt:31 @@ -34135,10 +33304,9 @@ msgstr "" #. type: Title = #: en/git-mv.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-mv(1)" -msgstr "git-add(1)" +msgstr "git-mv(1)" #. type: Plain text #: en/git-mv.txt:7 @@ -34200,11 +33368,6 @@ msgstr "" #. type: Plain text #: en/git-mv.txt:46 -#, fuzzy -#| msgid "" -#| "-v::\n" -#| "--verbose::\n" -#| " Be verbose.\n" msgid "Report the names of files as they are moved." msgstr "" "-v::\n" @@ -34242,10 +33405,9 @@ msgstr "" #. type: Title = #: en/git-name-rev.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-name-rev(1)" -msgstr "git-add(1)" +msgstr "git-name-rev(1)" #. type: Plain text #: en/git-name-rev.txt:7 @@ -34323,7 +33485,7 @@ msgstr "" #: en/git-name-rev.txt:57 #, no-wrap msgid "--no-undefined" -msgstr "" +msgstr "--no-undefined" #. type: Plain text #: en/git-name-rev.txt:60 @@ -34343,8 +33505,6 @@ msgstr "" #. type: Plain text #: en/git-name-rev.txt:73 -#, fuzzy -#| msgid "git-add(1)" msgid "Enter 'git name-rev':" msgstr "git-add(1)" @@ -34376,10 +33536,9 @@ msgstr "" #. type: Title = #: en/git-notes.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-notes(1)" -msgstr "git-commit(1)" +msgstr "git-notes(1)" #. type: Plain text #: en/git-notes.txt:7 @@ -34632,13 +33791,6 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:139 -#, fuzzy -#| msgid "" -#| "-m <msg>::\n" -#| "--message=<msg>::\n" -#| "\tUse the given <msg> as the commit message.\n" -#| "\tIf multiple `-m` options are given, their values are\n" -#| "\tconcatenated as separate paragraphs.\n" msgid "" "Use the given note message (instead of prompting). If multiple `-m` options " "are given, their values are concatenated as separate paragraphs. Lines " @@ -34653,12 +33805,6 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:146 -#, fuzzy -#| msgid "" -#| "-F <file>::\n" -#| "--file=<file>::\n" -#| "\tTake the commit message from the given file. Use '-' to\n" -#| "\tread the message from the standard input.\n" msgid "" "Take the note message from the given file. Use '-' to read the note message " "from the standard input. Lines starting with `#` and empty lines other than " @@ -34702,12 +33848,6 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:157 -#, fuzzy -#| msgid "" -#| "-c <commit>::\n" -#| "--reedit-message=<commit>::\n" -#| "\tLike '-C', but with `-c` the editor is invoked, so that\n" -#| "\tthe user can further edit the commit message.\n" msgid "" "Like '-C', but with `-c` the editor is invoked, so that the user can further " "edit the note message." @@ -34779,10 +33919,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:192 en/merge-options.txt:1 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--commit" -msgstr "git-commit(1)" +msgstr "--commit" #. type: Plain text #: en/git-notes.txt:200 @@ -34957,10 +34096,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:313 en/config.txt:846 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "core.notesRef" -msgstr "whitespace" +msgstr "core.notesRef" #. type: Plain text #: en/git-notes.txt:318 @@ -35156,15 +34294,12 @@ msgstr "" #. type: Title = #: en/git-p4.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-p4(1)" -msgstr "git-add(1)" +msgstr "git-p4(1)" #. type: Plain text #: en/git-p4.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-p4 - Import from and submit to Perforce repositories" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -35239,8 +34374,7 @@ msgstr "" #. type: delimited block - #: en/git-p4.txt:59 en/git-p4.txt:145 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git p4 submit\n" msgstr "$ git commit\n" @@ -35307,8 +34441,7 @@ msgstr "" #. type: delimited block - #: en/git-p4.txt:94 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git p4 sync\n" msgstr "$ git commit\n" @@ -35468,8 +34601,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:180 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "--branch <ref>" msgstr "Mode interactif" @@ -35513,7 +34645,7 @@ msgstr "" #: en/git-p4.txt:199 #, no-wrap msgid "--detect-branches" -msgstr "" +msgstr "--detect-branches" #. type: Plain text #: en/git-p4.txt:202 @@ -35540,14 +34672,10 @@ msgstr "" #: en/git-p4.txt:208 #, no-wrap msgid "--silent" -msgstr "" +msgstr "--silent" #. type: Plain text #: en/git-p4.txt:210 -#, fuzzy -#| msgid "" -#| "\\--::\n" -#| "\tDo not interpret any more arguments as options.\n" msgid "Do not print any progress information." msgstr "" "\\--::\n" @@ -35557,7 +34685,7 @@ msgstr "" #: en/git-p4.txt:211 #, no-wrap msgid "--detect-labels" -msgstr "" +msgstr "--detect-labels" #. type: Plain text #: en/git-p4.txt:215 @@ -35571,7 +34699,7 @@ msgstr "" #: en/git-p4.txt:216 en/git-p4.txt:331 #, no-wrap msgid "--import-labels" -msgstr "" +msgstr "--import-labels" #. type: Plain text #: en/git-p4.txt:218 @@ -35582,7 +34710,7 @@ msgstr "" #: en/git-p4.txt:219 #, no-wrap msgid "--import-local" -msgstr "" +msgstr "--import-local" #. type: Plain text #: en/git-p4.txt:226 @@ -35630,7 +34758,7 @@ msgstr "" #: en/git-p4.txt:243 #, no-wrap msgid "--keep-path" -msgstr "" +msgstr "--keep-path" #. type: Plain text #: en/git-p4.txt:250 @@ -35646,7 +34774,7 @@ msgstr "" #: en/git-p4.txt:251 #, no-wrap msgid "--use-client-spec" -msgstr "" +msgstr "--use-client-spec" #. type: Plain text #: en/git-p4.txt:254 @@ -35657,8 +34785,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:255 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "-/ <path>" msgstr "patch" @@ -35695,8 +34822,6 @@ msgstr "" #. type: Plain text #: en/git-p4.txt:270 -#, fuzzy -#| msgid "git-commit(1)" msgid "Perform a bare clone. See linkgit:git-clone[1]." msgstr "git-commit(1)" @@ -35713,8 +34838,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:275 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--origin <commit>" msgstr "git-commit(1)" @@ -35737,7 +34861,7 @@ msgstr "" #: en/git-p4.txt:286 #, no-wrap msgid "--preserve-user" -msgstr "" +msgstr "--preserve-user" #. type: Plain text #: en/git-p4.txt:289 @@ -35750,7 +34874,7 @@ msgstr "" #: en/git-p4.txt:290 #, no-wrap msgid "--export-labels" -msgstr "" +msgstr "--export-labels" #. type: Plain text #: en/git-p4.txt:293 @@ -35770,7 +34894,7 @@ msgstr "" #: en/git-p4.txt:299 #, no-wrap msgid "--prepare-p4-only" -msgstr "" +msgstr "--prepare-p4-only" #. type: Plain text #: en/git-p4.txt:305 @@ -35786,7 +34910,7 @@ msgstr "" #: en/git-p4.txt:306 #, no-wrap msgid "--shelve" -msgstr "" +msgstr "--shelve" #. type: Plain text #: en/git-p4.txt:310 @@ -35826,8 +34950,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:322 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "--branch <branch>" msgstr "Mode interactif" @@ -36093,8 +35216,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:456 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-p4.user" msgstr "git-add(1)" @@ -36120,8 +35242,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:465 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-p4.port" msgstr "git-add(1)" @@ -36134,8 +35255,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:470 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-p4.host" msgstr "git-add(1)" @@ -36148,8 +35268,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:475 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-p4.client" msgstr "git-add(1)" @@ -36162,8 +35281,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:479 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-p4.retries" msgstr "git-add(1)" @@ -36582,8 +35700,7 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:637 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-p4.conflict" msgstr "git-commit(1)" @@ -36630,10 +35747,9 @@ msgstr "" #. type: Title = #: en/git-pack-objects.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-pack-objects(1)" -msgstr "git-commit(1)" +msgstr "git-pack-objects(1)" #. type: Plain text #: en/git-pack-objects.txt:7 @@ -36720,7 +35836,7 @@ msgstr "" #: en/git-pack-objects.txt:61 #, no-wrap msgid "--revs" -msgstr "" +msgstr "--revs" #. type: Plain text #: en/git-pack-objects.txt:69 @@ -36734,10 +35850,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:70 en/rev-list-options.txt:693 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--unpacked" -msgstr "git-add(1)" +msgstr "--unpacked" #. type: Plain text #: en/git-pack-objects.txt:74 @@ -36815,7 +35930,7 @@ msgstr "" #: en/git-pack-objects.txt:118 #, no-wrap msgid "--honor-pack-keep" -msgstr "" +msgstr "--honor-pack-keep" #. type: Plain text #: en/git-pack-objects.txt:122 @@ -36828,7 +35943,7 @@ msgstr "" #: en/git-pack-objects.txt:123 en/git-svn.txt:357 en/blame-options.txt:48 #, no-wrap msgid "--incremental" -msgstr "" +msgstr "--incremental" #. type: Plain text #: en/git-pack-objects.txt:126 @@ -36848,7 +35963,7 @@ msgstr "" #: en/git-pack-objects.txt:132 #, no-wrap msgid "--non-empty" -msgstr "" +msgstr "--non-empty" #. type: Plain text #: en/git-pack-objects.txt:135 @@ -36859,7 +35974,7 @@ msgstr "" #: en/git-pack-objects.txt:142 #, no-wrap msgid "--all-progress" -msgstr "" +msgstr "--all-progress" #. type: Plain text #: en/git-pack-objects.txt:152 @@ -36877,7 +35992,7 @@ msgstr "" #: en/git-pack-objects.txt:153 #, no-wrap msgid "--all-progress-implied" -msgstr "" +msgstr "--all-progress-implied" #. type: Plain text #: en/git-pack-objects.txt:157 @@ -36898,7 +36013,7 @@ msgstr "" #: en/git-pack-objects.txt:162 #, no-wrap msgid "--no-reuse-delta" -msgstr "" +msgstr "--no-reuse-delta" #. type: Plain text #: en/git-pack-objects.txt:168 @@ -36913,7 +36028,7 @@ msgstr "" #: en/git-pack-objects.txt:169 #, no-wrap msgid "--no-reuse-object" -msgstr "" +msgstr "--no-reuse-object" #. type: Plain text #: en/git-pack-objects.txt:175 @@ -36961,7 +36076,7 @@ msgstr "" #: en/git-pack-objects.txt:194 #, no-wrap msgid "--shallow" -msgstr "" +msgstr "--shallow" #. type: Plain text #: en/git-pack-objects.txt:198 @@ -36975,7 +36090,7 @@ msgstr "" #: en/git-pack-objects.txt:199 #, no-wrap msgid "--delta-base-offset" -msgstr "" +msgstr "--delta-base-offset" #. type: Plain text #: en/git-pack-objects.txt:209 @@ -37013,7 +36128,7 @@ msgstr "" #: en/git-pack-objects.txt:230 #, no-wrap msgid "--keep-true-parents" -msgstr "" +msgstr "--keep-true-parents" #. type: Plain text #: en/git-pack-objects.txt:233 @@ -37024,10 +36139,6 @@ msgstr "" # #. type: Plain text #: en/git-pack-objects.txt:239 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]" msgstr "" @@ -37036,10 +36147,9 @@ msgstr "" #. type: Title = #: en/git-pack-redundant.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-pack-redundant(1)" -msgstr "git-add(1)" +msgstr "git-pack-redundant(1)" #. type: Plain text #: en/git-pack-redundant.txt:7 @@ -37085,7 +36195,7 @@ msgstr "" #: en/git-pack-redundant.txt:35 #, no-wrap msgid "--alt-odb" -msgstr "" +msgstr "--alt-odb" #. type: Plain text #: en/git-pack-redundant.txt:38 @@ -37102,10 +36212,6 @@ msgstr "" # #. type: Plain text #: en/git-pack-redundant.txt:47 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]" msgstr "" @@ -37114,10 +36220,9 @@ msgstr "" #. type: Title = #: en/git-pack-refs.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-pack-refs(1)" -msgstr "git-add(1)" +msgstr "git-pack-refs(1)" #. type: Plain text #: en/git-pack-refs.txt:7 @@ -37197,7 +36302,7 @@ msgstr "" #: en/git-parse-remote.txt:2 #, no-wrap msgid "git-parse-remote(1)" -msgstr "" +msgstr "git-parse-remote(1)" #. type: Plain text #: en/git-parse-remote.txt:7 @@ -37222,10 +36327,9 @@ msgstr "" #. type: Title = #: en/git-patch-id.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-patch-id(1)" -msgstr "git-add(1)" +msgstr "git-patch-id(1)" #. type: Plain text #: en/git-patch-id.txt:7 @@ -37272,7 +36376,7 @@ msgstr "" #: en/git-patch-id.txt:33 #, no-wrap msgid "--stable" -msgstr "" +msgstr "--stable" #. type: Plain text #: en/git-patch-id.txt:35 @@ -37309,7 +36413,7 @@ msgstr "" #: en/git-patch-id.txt:50 #, no-wrap msgid "--unstable" -msgstr "" +msgstr "--unstable" #. type: Plain text #: en/git-patch-id.txt:56 @@ -37333,10 +36437,9 @@ msgstr "" #. type: Title = #: en/git-prune-packed.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-prune-packed(1)" -msgstr "git-add(1)" +msgstr "git-prune-packed(1)" #. type: Plain text #: en/git-prune-packed.txt:7 @@ -37377,12 +36480,6 @@ msgstr "" #. type: Plain text #: en/git-prune-packed.txt:35 -#, fuzzy -#| msgid "" -#| "-n::\n" -#| "--dry-run::\n" -#| "\tDon't actually add the file(s), just show if they exist and/or will\n" -#| "\tbe ignored.\n" msgid "" "Don't actually remove any objects, only show those that would have been " "removed." @@ -37400,10 +36497,6 @@ msgstr "" # #. type: Plain text #: en/git-prune-packed.txt:44 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]" msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -37411,16 +36504,13 @@ msgstr "" #. type: Title = #: en/git-prune.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-prune(1)" -msgstr "git-add(1)" +msgstr "git-prune(1)" # #. type: Plain text #: en/git-prune.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-prune - Prune all unreachable objects from the object database" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -37457,12 +36547,6 @@ msgstr "" #. type: Plain text #: en/git-prune.txt:40 -#, fuzzy -#| msgid "" -#| "-n::\n" -#| "--dry-run::\n" -#| "\tDon't actually add the file(s), just show if they exist and/or will\n" -#| "\tbe ignored.\n" msgid "Do not remove anything; just report what it would remove." msgstr "" "-n::\n" @@ -37472,11 +36556,6 @@ msgstr "" #. type: Plain text #: en/git-prune.txt:44 -#, fuzzy -#| msgid "" -#| "-v::\n" -#| "--verbose::\n" -#| " Be verbose.\n" msgid "Report all removed objects." msgstr "" "-v::\n" @@ -37538,10 +36617,6 @@ msgstr "" # #. type: Plain text #: en/git-prune.txt:83 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]" msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -37549,10 +36624,9 @@ msgstr "" #. type: Title = #: en/git-pull.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-pull(1)" -msgstr "git-add(1)" +msgstr "git-pull(1)" #. type: Plain text #: en/git-pull.txt:7 @@ -37742,7 +36816,7 @@ msgstr "" #: en/git-pull.txt:128 en/git-svn.txt:245 #, no-wrap msgid "--no-rebase" -msgstr "" +msgstr "--no-rebase" #. type: Plain text #: en/git-pull.txt:130 @@ -37753,13 +36827,13 @@ msgstr "" #: en/git-pull.txt:131 en/git-rebase.txt:442 #, no-wrap msgid "--autostash" -msgstr "" +msgstr "--autostash" #. type: Labeled list #: en/git-pull.txt:132 en/git-rebase.txt:443 #, no-wrap msgid "--no-autostash" -msgstr "" +msgstr "--no-autostash" #. type: Plain text #: en/git-pull.txt:137 @@ -37880,8 +36954,7 @@ msgstr "" #. type: delimited block - #: en/git-pull.txt:214 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git pull, git pull origin\n" msgstr "$ git commit\n" @@ -37930,10 +37003,6 @@ msgstr "" # #. type: Plain text #: en/git-pull.txt:254 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]" msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -37941,10 +37010,9 @@ msgstr "" #. type: Title = #: en/git-push.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-push(1)" -msgstr "git-add(1)" +msgstr "git-push(1)" #. type: Plain text #: en/git-push.txt:7 @@ -38098,10 +37166,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:98 en/fetch-options.txt:68 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--prune" -msgstr "git-add(1)" +msgstr "--prune" #. type: Plain text #: en/git-push.txt:105 @@ -38151,7 +37218,7 @@ msgstr "" #: en/git-push.txt:135 #, no-wrap msgid "--follow-tags" -msgstr "" +msgstr "--follow-tags" #. type: Plain text #: en/git-push.txt:142 @@ -38167,7 +37234,7 @@ msgstr "" #: en/git-push.txt:143 en/git-send-pack.txt:73 #, no-wrap msgid "--[no-]signed" -msgstr "" +msgstr "--[no-]signed" #. type: Labeled list #: en/git-push.txt:144 en/git-send-pack.txt:74 @@ -38191,7 +37258,7 @@ msgstr "" #: en/git-push.txt:154 #, no-wrap msgid "--[no-]atomic" -msgstr "" +msgstr "--[no-]atomic" #. type: Plain text #: en/git-push.txt:158 @@ -38203,10 +37270,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:160 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--push-option" -msgstr "status" +msgstr "--push-option" #. type: Plain text #: en/git-push.txt:164 @@ -38218,15 +37284,13 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:165 en/git-send-pack.txt:28 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--receive-pack=<git-receive-pack>" msgstr "git-commit(1)" #. type: Labeled list #: en/git-push.txt:166 en/git-send-pack.txt:34 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--exec=<git-receive-pack>" msgstr "git-commit(1)" @@ -38242,7 +37306,7 @@ msgstr "" #: en/git-push.txt:172 #, no-wrap msgid "--[no-]force-with-lease" -msgstr "" +msgstr "--[no-]force-with-lease" #. type: Labeled list #: en/git-push.txt:173 @@ -38390,7 +37454,7 @@ msgstr "" #: en/git-push.txt:252 #, no-wrap msgid "--[no-]thin" -msgstr "" +msgstr "--[no-]thin" #. type: Plain text #: en/git-push.txt:257 @@ -38409,10 +37473,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:274 en/fetch-options.txt:125 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--no-recurse-submodules" -msgstr "git-add(1)" +msgstr "--no-recurse-submodules" #. type: Labeled list #: en/git-push.txt:275 @@ -38441,7 +37504,7 @@ msgstr "" #: en/git-push.txt:290 #, no-wrap msgid "--[no-]verify" -msgstr "" +msgstr "--[no-]verify" #. type: Plain text #: en/git-push.txt:294 @@ -38455,13 +37518,13 @@ msgstr "" #: en/git-push.txt:295 en/fetch-options.txt:176 #, no-wrap msgid "-4" -msgstr "" +msgstr "-4" #. type: Labeled list #: en/git-push.txt:296 en/fetch-options.txt:177 #, no-wrap msgid "--ipv4" -msgstr "" +msgstr "--ipv4" #. type: Plain text #: en/git-push.txt:298 en/fetch-options.txt:179 @@ -38472,13 +37535,13 @@ msgstr "" #: en/git-push.txt:299 en/fetch-options.txt:180 #, no-wrap msgid "-6" -msgstr "" +msgstr "-6" #. type: Labeled list #: en/git-push.txt:300 en/fetch-options.txt:181 #, no-wrap msgid "--ipv6" -msgstr "" +msgstr "--ipv6" #. type: Plain text #: en/git-push.txt:302 en/fetch-options.txt:182 @@ -38565,8 +37628,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:346 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "rejected" msgstr "contenu supprim챕" @@ -38579,8 +37641,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:350 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "remote rejected" msgstr "contenu supprim챕" @@ -38597,8 +37658,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:359 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "remote failure" msgstr "contenu supprim챕" @@ -38775,8 +37835,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:469 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "`git push`" msgstr "git-add(1)" @@ -38789,8 +37848,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:474 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "`git push origin`" msgstr "$ git commit\n" @@ -38821,8 +37879,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:489 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "`git push origin :`" msgstr "$ git commit\n" @@ -38835,8 +37892,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:494 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "`git push origin master`" msgstr "$ git commit\n" @@ -38851,8 +37907,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:501 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "`git push origin HEAD`" msgstr "$ git commit\n" @@ -38987,7 +38042,7 @@ msgstr "" #: en/git-quiltimport.txt:2 #, no-wrap msgid "git-quiltimport(1)" -msgstr "" +msgstr "git-quiltimport(1)" #. type: Plain text #: en/git-quiltimport.txt:7 @@ -39086,16 +38141,13 @@ msgstr "" #. type: Title = #: en/git-read-tree.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-read-tree(1)" -msgstr "git-add(1)" +msgstr "git-read-tree(1)" # #. type: Plain text #: en/git-read-tree.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-read-tree - Reads tree information into the index" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -39143,10 +38195,9 @@ msgstr "" #. type: Labeled list #: en/git-read-tree.txt:40 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--reset" -msgstr "git-commit(1)" +msgstr "--reset" #. type: Plain text #: en/git-read-tree.txt:43 @@ -39187,7 +38238,7 @@ msgstr "" #: en/git-read-tree.txt:65 #, no-wrap msgid "--trivial" -msgstr "" +msgstr "--trivial" #. type: Plain text #: en/git-read-tree.txt:70 @@ -39276,7 +38327,7 @@ msgstr "" #: en/git-read-tree.txt:118 #, no-wrap msgid "--no-sparse-checkout" -msgstr "" +msgstr "--no-sparse-checkout" #. type: Plain text #: en/git-read-tree.txt:121 @@ -39287,7 +38338,7 @@ msgstr "" #: en/git-read-tree.txt:122 #, no-wrap msgid "--empty" -msgstr "" +msgstr "--empty" #. type: Plain text #: en/git-read-tree.txt:125 @@ -39821,10 +38872,6 @@ msgstr "" # #. type: Plain text #: en/git-read-tree.txt:428 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]" msgstr "" @@ -39833,10 +38880,9 @@ msgstr "" #. type: Title = #: en/git-rebase.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-rebase(1)" -msgstr "git-add(1)" +msgstr "git-rebase(1)" #. type: Plain text #: en/git-rebase.txt:7 @@ -40045,8 +39091,6 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:129 -#, fuzzy -#| msgid "support the following date formats:" msgid "We can get this using the following command:" msgstr "prend en charge les formats de date suivants혻:" @@ -40292,7 +39336,7 @@ msgstr "" #: en/git-rebase.txt:255 en/sequencer.txt:6 #, no-wrap msgid "--quit" -msgstr "" +msgstr "--quit" #. type: Plain text #: en/git-rebase.txt:259 @@ -40305,7 +39349,7 @@ msgstr "" #: en/git-rebase.txt:260 #, no-wrap msgid "--keep-empty" -msgstr "" +msgstr "--keep-empty" #. type: Plain text #: en/git-rebase.txt:263 @@ -40322,7 +39366,7 @@ msgstr "" #: en/git-rebase.txt:267 #, no-wrap msgid "--edit-todo" -msgstr "" +msgstr "--edit-todo" #. type: Plain text #: en/git-rebase.txt:269 @@ -40364,8 +39408,7 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:293 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "-X <strategy-option>" msgstr "status" @@ -40390,11 +39433,6 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:313 -#, fuzzy -#| msgid "" -#| "-v::\n" -#| "--verbose::\n" -#| " Be verbose.\n" msgid "Be verbose. Implies --stat." msgstr "" "-v::\n" @@ -40412,7 +39450,7 @@ msgstr "" #: en/git-rebase.txt:319 en/diff-options.txt:17 en/merge-options.txt:57 #, no-wrap msgid "--no-stat" -msgstr "" +msgstr "--no-stat" #. type: Plain text #: en/git-rebase.txt:321 @@ -40421,12 +39459,6 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:324 -#, fuzzy -#| msgid "" -#| "-n::\n" -#| "--no-verify::\n" -#| "\tThis option bypasses the pre-commit and commit-msg hooks.\n" -#| "\tSee also linkgit:githooks[5].\n" msgid "" "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]." msgstr "" @@ -40440,7 +39472,7 @@ msgstr "" #: en/git-tag.txt:80 #, no-wrap msgid "--verify" -msgstr "" +msgstr "--verify" #. type: Plain text #: en/git-rebase.txt:328 @@ -40453,7 +39485,7 @@ msgstr "" #: en/git-rebase.txt:336 #, no-wrap msgid "--force-rebase" -msgstr "" +msgstr "--force-rebase" #. type: Plain text #: en/git-rebase.txt:339 @@ -40476,7 +39508,7 @@ msgstr "" #: en/git-rebase.txt:347 #, no-wrap msgid "--no-fork-point" -msgstr "" +msgstr "--no-fork-point" #. type: Plain text #: en/git-rebase.txt:351 @@ -40536,7 +39568,7 @@ msgstr "" #: en/git-rebase.txt:384 en/git-svn.txt:642 #, no-wrap msgid "--preserve-merges" -msgstr "" +msgstr "--preserve-merges" #. type: Plain text #: en/git-rebase.txt:388 @@ -40627,13 +39659,13 @@ msgstr "" #: en/git-rebase.txt:425 #, no-wrap msgid "--autosquash" -msgstr "" +msgstr "--autosquash" #. type: Labeled list #: en/git-rebase.txt:426 #, no-wrap msgid "--no-autosquash" -msgstr "" +msgstr "--no-autosquash" #. type: Plain text #: en/git-rebase.txt:435 @@ -40673,7 +39705,7 @@ msgstr "" #: en/git-rebase.txt:450 en/merge-options.txt:35 #, no-wrap msgid "--no-ff" -msgstr "" +msgstr "--no-ff" #. type: Plain text #: en/git-rebase.txt:454 @@ -40705,11 +39737,6 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:470 -#, fuzzy -#| msgid "" -#| "You should understand the implications of rewriting history if you amend " -#| "a commit that has already been published. (See the \"RECOVERING FROM " -#| "UPSTREAM REBASE\" section in linkgit:git-rebase[1].)" msgid "" "You should understand the implications of using 'git rebase' on a repository " "that you share. See also RECOVERING FROM UPSTREAM REBASE below." @@ -40788,8 +39815,6 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:498 -#, fuzzy -#| msgid "git-commit(1)" msgid "commit" msgstr "git-commit(1)" @@ -40810,8 +39835,6 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:504 -#, fuzzy -#| msgid "git-commit(1)" msgid "commit it" msgstr "git-commit(1)" @@ -41355,12 +40378,10 @@ msgstr "" #: en/git-receive-pack.txt:2 #, no-wrap msgid "git-receive-pack(1)" -msgstr "" +msgstr "git-receive-pack(1)" #. type: Plain text #: en/git-receive-pack.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-receive-pack - Receive what is pushed into the repository" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -41526,7 +40547,7 @@ msgstr "" #: en/git-receive-pack.txt:86 #, no-wrap msgid "`UNSOLICITED`" -msgstr "" +msgstr "`UNSOLICITED`" #. type: Plain text #: en/git-receive-pack.txt:89 @@ -41537,7 +40558,7 @@ msgstr "" #: en/git-receive-pack.txt:89 #, no-wrap msgid "`MISSING`" -msgstr "" +msgstr "`MISSING`" #. type: Plain text #: en/git-receive-pack.txt:91 @@ -41548,7 +40569,7 @@ msgstr "" #: en/git-receive-pack.txt:91 #, no-wrap msgid "`BAD`" -msgstr "" +msgstr "`BAD`" #. type: Plain text #: en/git-receive-pack.txt:93 @@ -41559,7 +40580,7 @@ msgstr "" #: en/git-receive-pack.txt:93 #, no-wrap msgid "`OK`" -msgstr "" +msgstr "`OK`" #. type: Plain text #: en/git-receive-pack.txt:95 @@ -41570,7 +40591,7 @@ msgstr "" #: en/git-receive-pack.txt:95 #, no-wrap msgid "`SLOP`" -msgstr "" +msgstr "`SLOP`" #. type: Plain text #: en/git-receive-pack.txt:99 @@ -41614,8 +40635,7 @@ msgstr "" #. type: Title - #: en/git-receive-pack.txt:118 -#, fuzzy, no-wrap -#| msgid "update" +#, no-wrap msgid "update Hook" msgstr "update" @@ -41748,8 +40768,7 @@ msgstr "" #. type: Title - #: en/git-receive-pack.txt:200 -#, fuzzy, no-wrap -#| msgid "update" +#, no-wrap msgid "post-update Hook" msgstr "update" @@ -41791,10 +40810,9 @@ msgstr "" #. type: Title = #: en/git-reflog.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-reflog(1)" -msgstr "git-commit(1)" +msgstr "git-reflog(1)" #. type: Plain text #: en/git-reflog.txt:7 @@ -41928,10 +40946,9 @@ msgstr "" #. type: Labeled list #: en/git-reflog.txt:93 -#, fuzzy, no-wrap -#| msgid "update" +#, no-wrap msgid "--updateref" -msgstr "update" +msgstr "--updateref" #. type: Plain text #: en/git-reflog.txt:97 @@ -41945,7 +40962,7 @@ msgstr "" #: en/git-reflog.txt:98 #, no-wrap msgid "--rewrite" -msgstr "" +msgstr "--rewrite" #. type: Plain text #: en/git-reflog.txt:102 @@ -41958,7 +40975,7 @@ msgstr "" #: en/git-reflog.txt:103 #, no-wrap msgid "--stale-fix" -msgstr "" +msgstr "--stale-fix" #. type: Plain text #: en/git-reflog.txt:108 @@ -41979,12 +40996,6 @@ msgstr "" #. type: Plain text #: en/git-reflog.txt:118 -#, fuzzy -#| msgid "" -#| "-n::\n" -#| "--dry-run::\n" -#| "\tDon't actually add the file(s), just show if they exist and/or will\n" -#| "\tbe ignored.\n" msgid "" "Do not actually prune any entries; just show what would have been pruned." msgstr "" @@ -42014,10 +41025,9 @@ msgstr "" #. type: Title = #: en/git-remote-ext.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-remote-ext(1)" -msgstr "git-commit(1)" +msgstr "git-remote-ext(1)" #. type: Plain text #: en/git-remote-ext.txt:7 @@ -42141,8 +41151,7 @@ msgstr "" #. type: Title - #: en/git-remote-ext.txt:59 -#, fuzzy, no-wrap -#| msgid "ENVIRONMENT AND CONFIGURATION VARIABLES" +#, no-wrap msgid "ENVIRONMENT VARIABLES:" msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION" @@ -42295,10 +41304,9 @@ msgstr "" #. type: Title = #: en/git-remote-fd.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-remote-fd(1)" -msgstr "git-commit(1)" +msgstr "git-remote-fd(1)" #. type: Plain text #: en/git-remote-fd.txt:7 @@ -42390,7 +41398,7 @@ msgstr "" #: en/git-remote-testgit.txt:2 #, no-wrap msgid "git-remote-testgit(1)" -msgstr "" +msgstr "git-remote-testgit(1)" #. type: Plain text #: en/git-remote-testgit.txt:7 @@ -42420,15 +41428,12 @@ msgstr "" #. type: Title = #: en/git-remote.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-remote(1)" -msgstr "git-commit(1)" +msgstr "git-remote(1)" #. type: Plain text #: en/git-remote.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-remote - Manage set of tracked repositories" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -42733,8 +41738,6 @@ msgstr "" # #. type: Plain text #: en/git-remote.txt:169 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Gives some information about the remote <name>." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -42768,8 +41771,7 @@ msgstr "" #. type: Labeled list #: en/git-remote.txt:183 -#, fuzzy, no-wrap -#| msgid "update" +#, no-wrap msgid "'update'" msgstr "update" @@ -42791,10 +41793,6 @@ msgstr "" #. type: Plain text #: en/git-remote.txt:201 -#, fuzzy -#| msgid "" -#| "The default can be changed by the `commit.cleanup` configuration variable " -#| "(see linkgit:git-config[1])." msgid "" "The remote configuration is achieved using the `remote.origin.url` and " "`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])." @@ -42855,10 +41853,6 @@ msgstr "" # #. type: Plain text #: en/git-remote.txt:249 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]" msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -42866,15 +41860,12 @@ msgstr "" #. type: Title = #: en/git-repack.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-repack(1)" -msgstr "git-add(1)" +msgstr "git-repack(1)" #. type: Plain text #: en/git-repack.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-repack - Pack unpacked objects in a repository" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -42933,10 +41924,6 @@ msgstr "" # #. type: Plain text #: en/git-repack.txt:64 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "Pass the `--local` option to 'git pack-objects'. See linkgit:git-pack-" "objects[1]." @@ -42961,10 +41948,6 @@ msgstr "" # #. type: Plain text #: en/git-repack.txt:76 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "Pass the `-q` option to 'git pack-objects'. See linkgit:git-pack-objects[1]." msgstr "" @@ -43011,7 +41994,7 @@ msgstr "" #: en/git-repack.txt:117 #, no-wrap msgid "--write-bitmap-index" -msgstr "" +msgstr "--write-bitmap-index" #. type: Plain text #: en/git-repack.txt:123 @@ -43024,10 +42007,9 @@ msgstr "" #. type: Labeled list #: en/git-repack.txt:124 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--pack-kept-objects" -msgstr "git-commit(1)" +msgstr "--pack-kept-objects" #. type: Plain text #: en/git-repack.txt:132 @@ -43058,7 +42040,7 @@ msgstr "" #: en/git-repack.txt:140 #, no-wrap msgid "--keep-unreachable" -msgstr "" +msgstr "--keep-unreachable" #. type: Plain text #: en/git-repack.txt:145 @@ -43089,10 +42071,9 @@ msgstr "" #. type: Title = #: en/git-replace.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-replace(1)" -msgstr "git-add(1)" +msgstr "git-replace(1)" #. type: Plain text #: en/git-replace.txt:7 @@ -43163,8 +42144,7 @@ msgstr "" #. type: delimited block - #: en/git-replace.txt:44 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git --no-replace-objects cat-file commit foo\n" msgstr "$ git commit\n" @@ -43175,8 +42155,7 @@ msgstr "" #. type: delimited block - #: en/git-replace.txt:50 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git cat-file commit foo\n" msgstr "$ git commit\n" @@ -43226,7 +42205,7 @@ msgstr "" #: en/diff-options.txt:45 #, no-wrap msgid "--raw" -msgstr "" +msgstr "--raw" #. type: Plain text #: en/git-replace.txt:84 @@ -43276,8 +42255,7 @@ msgstr "" #. type: Labeled list #: en/git-replace.txt:101 en/pretty-options.txt:2 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--format=<format>" msgstr "Configuration" @@ -43290,8 +42268,7 @@ msgstr "" #. type: Title - #: en/git-replace.txt:107 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "FORMATS" msgstr "FORMATS DE DATE" @@ -43374,10 +42351,6 @@ msgstr "" # #. type: Plain text #: en/git-replace.txt:153 -#, fuzzy -#| msgid "" -#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-" -#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" msgid "" "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-" "rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] " @@ -43390,7 +42363,7 @@ msgstr "" #: en/git-request-pull.txt:2 #, no-wrap msgid "git-request-pull(1)" -msgstr "" +msgstr "git-request-pull(1)" #. type: Plain text #: en/git-request-pull.txt:7 @@ -43529,10 +42502,9 @@ msgstr "" #. type: Title = #: en/git-rerere.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-rerere(1)" -msgstr "git-add(1)" +msgstr "git-rerere(1)" #. type: Plain text #: en/git-rerere.txt:7 @@ -43607,8 +42579,7 @@ msgstr "" #. type: Labeled list #: en/git-rerere.txt:49 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "'diff'" msgstr "diff" @@ -43622,8 +42593,7 @@ msgstr "" #. type: Labeled list #: en/git-rerere.txt:56 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "'status'" msgstr "status" @@ -43883,10 +42853,9 @@ msgstr "" #. type: Title = #: en/git-reset.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-reset(1)" -msgstr "git-commit(1)" +msgstr "git-reset(1)" #. type: Plain text #: en/git-reset.txt:7 @@ -43956,13 +42925,6 @@ msgstr "" #. type: Plain text #: en/git-reset.txt:45 -#, fuzzy -#| msgid "" -#| "by using the --interactive or --patch switches with the 'commit' command " -#| "to decide one by one which files or hunks should be part of the commit in " -#| "addition to contents in the index, before finalizing the operation. See " -#| "the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to " -#| "operate these modes." msgid "" "This means that `git reset -p` is the opposite of `git add -p`, i.e. you " "can use it to selectively reset hunks. See the ``Interactive Mode'' section " @@ -43976,8 +42938,7 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:46 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "'git reset' [<mode>] [<commit>]" msgstr "$ git commit\n" @@ -43994,7 +42955,7 @@ msgstr "" #: en/git-reset.txt:53 #, no-wrap msgid "--soft" -msgstr "" +msgstr "--soft" #. type: Plain text #: en/git-reset.txt:58 @@ -44008,7 +42969,7 @@ msgstr "" #: en/git-reset.txt:59 #, no-wrap msgid "--mixed" -msgstr "" +msgstr "--mixed" #. type: Plain text #: en/git-reset.txt:63 @@ -44029,7 +42990,7 @@ msgstr "" #: en/git-reset.txt:67 #, no-wrap msgid "--hard" -msgstr "" +msgstr "--hard" #. type: Plain text #: en/git-reset.txt:70 @@ -44148,10 +43109,6 @@ msgstr "" #. type: Plain text #: en/git-reset.txt:140 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Make corrections to working tree files." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -44368,16 +43325,13 @@ msgstr "" #. type: Plain text #: en/git-reset.txt:251 -#, fuzzy -#| msgid "git-commit(1)" msgid "See also linkgit:git-stash[1]." msgstr "git-commit(1)" # #. type: Labeled list #: en/git-reset.txt:252 -#, fuzzy, no-wrap -#| msgid "git-add - Add file contents to the index" +#, no-wrap msgid "Reset a single file in the index" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -44400,10 +43354,6 @@ msgstr "" #. type: Plain text #: en/git-reset.txt:266 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "" "This removes the file from the index while keeping it in the working " "directory." @@ -44419,8 +43369,6 @@ msgstr "" # #. type: Plain text #: en/git-reset.txt:268 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Adds the file to the index again." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -44742,10 +43690,9 @@ msgstr "" #. type: Title = #: en/git-revert.txt:2 -#, fuzzy, no-wrap -#| msgid "revert" +#, no-wrap msgid "git-revert(1)" -msgstr "revert" +msgstr "git-revert(1)" #. type: Plain text #: en/git-revert.txt:7 @@ -44882,14 +43829,13 @@ msgstr "" #: en/git-revert.txt:126 en/cmds-mainporcelain.txt:22 #, no-wrap msgid "linkgit:git-cherry-pick[1]" -msgstr "" +msgstr "linkgit:git-cherry-pick[1]" #. type: Title = #: en/git-rev-list.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-rev-list(1)" -msgstr "git-commit(1)" +msgstr "git-rev-list(1)" #. type: Plain text #: en/git-rev-list.txt:7 @@ -44974,8 +43920,6 @@ msgstr "" #. type: Plain text #: en/git-rev-list.txt:79 -#, fuzzy -#| msgid "support the following date formats:" msgid "Thus, the following command:" msgstr "prend en charge les formats de date suivants혻:" @@ -45035,10 +43979,9 @@ msgstr "" #. type: Title = #: en/git-rev-parse.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-rev-parse(1)" -msgstr "git-add(1)" +msgstr "git-rev-parse(1)" #. type: Plain text #: en/git-rev-parse.txt:7 @@ -45076,7 +44019,7 @@ msgstr "" #: en/git-rev-parse.txt:33 #, no-wrap msgid "--parseopt" -msgstr "" +msgstr "--parseopt" #. type: Plain text #: en/git-rev-parse.txt:35 @@ -45088,7 +44031,7 @@ msgstr "" #: en/git-rev-parse.txt:36 #, no-wrap msgid "--sq-quote" -msgstr "" +msgstr "--sq-quote" #. type: Plain text #: en/git-rev-parse.txt:40 @@ -45108,7 +44051,7 @@ msgstr "" #: en/git-rev-parse.txt:44 #, no-wrap msgid "--keep-dashdash" -msgstr "" +msgstr "--keep-dashdash" #. type: Plain text #: en/git-rev-parse.txt:47 @@ -45119,10 +44062,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:48 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--stop-at-non-option" -msgstr "status" +msgstr "--stop-at-non-option" #. type: Plain text #: en/git-rev-parse.txt:52 @@ -45136,7 +44078,7 @@ msgstr "" #: en/git-rev-parse.txt:53 #, no-wrap msgid "--stuck-long" -msgstr "" +msgstr "--stuck-long" #. type: Plain text #: en/git-rev-parse.txt:56 @@ -45155,7 +44097,7 @@ msgstr "" #: en/git-rev-parse.txt:60 #, no-wrap msgid "--revs-only" -msgstr "" +msgstr "--revs-only" #. type: Plain text #: en/git-rev-parse.txt:63 @@ -45167,7 +44109,7 @@ msgstr "" #: en/git-rev-parse.txt:64 #, no-wrap msgid "--no-revs" -msgstr "" +msgstr "--no-revs" #. type: Plain text #: en/git-rev-parse.txt:67 @@ -45178,7 +44120,7 @@ msgstr "" #: en/git-rev-parse.txt:68 #, no-wrap msgid "--flags" -msgstr "" +msgstr "--flags" #. type: Plain text #: en/git-rev-parse.txt:70 @@ -45189,7 +44131,7 @@ msgstr "" #: en/git-rev-parse.txt:71 #, no-wrap msgid "--no-flags" -msgstr "" +msgstr "--no-flags" #. type: Plain text #: en/git-rev-parse.txt:73 @@ -45204,8 +44146,7 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:77 -#, fuzzy, no-wrap -#| msgid "default" +#, no-wrap msgid "--default <arg>" msgstr "default" @@ -45278,7 +44219,7 @@ msgstr "" #: en/git-rev-parse.txt:120 #, no-wrap msgid "--sq" -msgstr "" +msgstr "--sq" #. type: Plain text #: en/git-rev-parse.txt:128 @@ -45312,8 +44253,7 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:140 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--short=number" msgstr "Configuration" @@ -45329,7 +44269,7 @@ msgstr "" #: en/git-rev-parse.txt:145 #, no-wrap msgid "--symbolic" -msgstr "" +msgstr "--symbolic" #. type: Plain text #: en/git-rev-parse.txt:149 @@ -45343,7 +44283,7 @@ msgstr "" #: en/git-rev-parse.txt:150 #, no-wrap msgid "--symbolic-full-name" -msgstr "" +msgstr "--symbolic-full-name" #. type: Plain text #: en/git-rev-parse.txt:157 @@ -45464,7 +44404,7 @@ msgstr "" #: en/git-rev-parse.txt:205 #, no-wrap msgid "--local-env-vars" -msgstr "" +msgstr "--local-env-vars" #. type: Plain text #: en/git-rev-parse.txt:210 @@ -45476,10 +44416,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:211 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--git-dir" -msgstr "git-add(1)" +msgstr "--git-dir" #. type: Plain text #: en/git-rev-parse.txt:215 @@ -45500,7 +44439,7 @@ msgstr "" #: en/git-rev-parse.txt:220 #, no-wrap msgid "--absolute-git-dir" -msgstr "" +msgstr "--absolute-git-dir" #. type: Plain text #: en/git-rev-parse.txt:223 @@ -45510,10 +44449,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:224 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--git-common-dir" -msgstr "git-commit(1)" +msgstr "--git-common-dir" #. type: Plain text #: en/git-rev-parse.txt:226 @@ -45524,7 +44462,7 @@ msgstr "" #: en/git-rev-parse.txt:227 #, no-wrap msgid "--is-inside-git-dir" -msgstr "" +msgstr "--is-inside-git-dir" #. type: Plain text #: en/git-rev-parse.txt:230 @@ -45537,7 +44475,7 @@ msgstr "" #: en/git-rev-parse.txt:231 #, no-wrap msgid "--is-inside-work-tree" -msgstr "" +msgstr "--is-inside-work-tree" #. type: Plain text #: en/git-rev-parse.txt:234 @@ -45550,7 +44488,7 @@ msgstr "" #: en/git-rev-parse.txt:235 #, no-wrap msgid "--is-bare-repository" -msgstr "" +msgstr "--is-bare-repository" #. type: Plain text #: en/git-rev-parse.txt:237 @@ -45590,7 +44528,7 @@ msgstr "" #: en/git-rev-parse.txt:251 #, no-wrap msgid "--show-cdup" -msgstr "" +msgstr "--show-cdup" #. type: Plain text #: en/git-rev-parse.txt:255 @@ -45604,7 +44542,7 @@ msgstr "" #: en/git-rev-parse.txt:256 #, no-wrap msgid "--show-prefix" -msgstr "" +msgstr "--show-prefix" #. type: Plain text #: en/git-rev-parse.txt:260 @@ -45617,7 +44555,7 @@ msgstr "" #: en/git-rev-parse.txt:261 #, no-wrap msgid "--show-toplevel" -msgstr "" +msgstr "--show-toplevel" #. type: Plain text #: en/git-rev-parse.txt:263 @@ -45639,7 +44577,7 @@ msgstr "" #: en/git-rev-parse.txt:270 #, no-wrap msgid "--shared-index-path" -msgstr "" +msgstr "--shared-index-path" #. type: Plain text #: en/git-rev-parse.txt:273 @@ -45681,8 +44619,7 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:283 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--before=datestring" msgstr "Configuration" @@ -46021,17 +44958,12 @@ msgstr "" #. type: Title = #: en/git-rm.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-rm(1)" -msgstr "git-add(1)" +msgstr "git-rm(1)" #. type: Plain text #: en/git-rm.txt:7 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "git-rm - Remove files from the working tree and from the index" msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -46070,10 +45002,6 @@ msgstr "" #. type: Plain text #: en/git-rm.txt:42 -#, fuzzy -#| msgid "" -#| "--date=<date>::\n" -#| "\tOverride the author date used in the commit.\n" msgid "Override the up-to-date check." msgstr "" "--date=<date>::\n" @@ -46081,12 +45009,6 @@ msgstr "" #. type: Plain text #: en/git-rm.txt:48 -#, fuzzy -#| msgid "" -#| "-n::\n" -#| "--dry-run::\n" -#| "\tDon't actually add the file(s), just show if they exist and/or will\n" -#| "\tbe ignored.\n" msgid "" "Don't actually remove any file(s). Instead, just show if they exist in the " "index and would otherwise be removed by the command." @@ -46112,7 +45034,7 @@ msgstr "" #: en/git-rm.txt:63 #, no-wrap msgid "--ignore-unmatch" -msgstr "" +msgstr "--ignore-unmatch" #. type: Plain text #: en/git-rm.txt:65 @@ -46159,8 +45081,7 @@ msgstr "" #. type: Title ~ #: en/git-rm.txt:93 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Using ``git commit -a''" msgstr "$ git commit\n" @@ -46176,8 +45097,7 @@ msgstr "" #. type: Title ~ #: en/git-rm.txt:102 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Using ``git add -A''" msgstr "$ git commit\n" @@ -46218,8 +45138,7 @@ msgstr "" #. type: delimited block - #: en/git-rm.txt:122 -#, fuzzy, no-wrap -#| msgid "$ git add git-*.sh\n" +#, no-wrap msgid "git add -A\n" msgstr "$ git add git-*.sh\n" @@ -46280,18 +45199,13 @@ msgstr "" #. type: Labeled list #: en/git-rm.txt:160 -#, fuzzy, no-wrap -#| msgid "$ git add Documentation/\\*.txt\n" +#, no-wrap msgid "`git rm Documentation/\\*.txt`" msgstr "$ git add Documentation/\\*.txt\n" # #. type: Plain text #: en/git-rm.txt:163 -#, fuzzy -#| msgid "" -#| "Adds content from all `*.txt` files under `Documentation` directory and " -#| "its subdirectories:" msgid "" "Removes all `*.txt` files from the index that are under the `Documentation` " "directory and any of its subdirectories." @@ -46302,34 +45216,24 @@ msgstr "" # #. type: Plain text #: en/git-rm.txt:167 -#, fuzzy -#| msgid "" -#| "Note that the asterisk `*` is quoted from the shell in this example; this " -#| "lets the command include the files from subdirectories of `Documentation/" -#| "` directory." msgid "" "Note that the asterisk `*` is quoted from the shell in this example; this " "lets Git, and not the shell, expand the pathnames of files and " "subdirectories under the `Documentation/` directory." msgstr "" "Remarquez que l'ast챕risque `*` est 챕chapp챕 du shell dans cet exemple혻; cela " -"permet d'inclure les fichiers dans les sous-r챕pertoires du R챕pertoire " -"`Documentation/`." +"permet d'inclure les fichiers dans les sous-r챕pertoires du R챕pertoire `" +"Documentation/`." #. type: Labeled list #: en/git-rm.txt:168 -#, fuzzy, no-wrap -#| msgid "$ git add git-*.sh\n" +#, no-wrap msgid "`git rm -f git-*.sh`" msgstr "$ git add git-*.sh\n" # #. type: Plain text #: en/git-rm.txt:172 -#, fuzzy -#| msgid "" -#| "Because this example lets the shell expand the asterisk (i.e. you are " -#| "listing the files explicitly), it does not consider `subdir/git-foo.sh`." msgid "" "Because this example lets the shell expand the asterisk (i.e. you are " "listing the files explicitly), it does not remove `subdir/git-foo.sh`." @@ -46353,14 +45257,13 @@ msgstr "" #: en/git-rm.txt:185 en/cmds-mainporcelain.txt:1 #, no-wrap msgid "linkgit:git-add[1]" -msgstr "" +msgstr "linkgit:git-add[1]" #. type: Title = #: en/git-send-email.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-send-email(1)" -msgstr "git-commit(1)" +msgstr "git-send-email(1)" #. type: Plain text #: en/git-send-email.txt:7 @@ -46431,10 +45334,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:48 en/git-tag.txt:60 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--annotate" -msgstr "git-commit(1)" +msgstr "--annotate" #. type: Plain text #: en/git-send-email.txt:52 @@ -46479,7 +45381,7 @@ msgstr "" #: en/git-send-email.txt:65 #, no-wrap msgid "--compose" -msgstr "" +msgstr "--compose" #. type: Plain text #: en/git-send-email.txt:68 @@ -46653,13 +45555,13 @@ msgstr "" #: en/git-send-email.txt:145 #, no-wrap msgid "--xmailer" -msgstr "" +msgstr "--xmailer" #. type: Labeled list #: en/git-send-email.txt:146 #, no-wrap msgid "--no-xmailer" -msgstr "" +msgstr "--no-xmailer" #. type: Plain text #: en/git-send-email.txt:150 @@ -46832,7 +45734,7 @@ msgstr "" #: en/git-send-email.txt:227 #, no-wrap msgid "--smtp-ssl" -msgstr "" +msgstr "--smtp-ssl" #. type: Plain text #: en/git-send-email.txt:229 @@ -46843,7 +45745,7 @@ msgstr "" #: en/git-send-email.txt:230 #, no-wrap msgid "--smtp-ssl-cert-path" -msgstr "" +msgstr "--smtp-ssl-cert-path" #. type: Plain text #: en/git-send-email.txt:240 @@ -46926,7 +45828,7 @@ msgstr "" #: en/git-send-email.txt:266 #, no-wrap msgid "--[no-]chain-reply-to" -msgstr "" +msgstr "--[no-]chain-reply-to" #. type: Plain text #: en/git-send-email.txt:273 @@ -46941,8 +45843,7 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:274 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--identity=<identity>" msgstr "git-commit(1)" @@ -46956,10 +45857,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:280 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--[no-]signed-off-by-cc" -msgstr "git-commit(1)" +msgstr "--[no-]signed-off-by-cc" #. type: Plain text #: en/git-send-email.txt:284 @@ -46973,7 +45873,7 @@ msgstr "" #: en/git-send-email.txt:285 #, no-wrap msgid "--[no-]cc-cover" -msgstr "" +msgstr "--[no-]cc-cover" #. type: Plain text #: en/git-send-email.txt:290 @@ -46988,7 +45888,7 @@ msgstr "" #: en/git-send-email.txt:291 #, no-wrap msgid "--[no-]to-cover" -msgstr "" +msgstr "--[no-]to-cover" #. type: Plain text #: en/git-send-email.txt:296 @@ -47073,7 +45973,7 @@ msgstr "" #: en/git-send-email.txt:319 #, no-wrap msgid "--[no-]suppress-from" -msgstr "" +msgstr "--[no-]suppress-from" #. type: Plain text #: en/git-send-email.txt:323 @@ -47087,7 +45987,7 @@ msgstr "" #: en/git-send-email.txt:324 #, no-wrap msgid "--[no-]thread" -msgstr "" +msgstr "--[no-]thread" #. type: Plain text #: en/git-send-email.txt:330 @@ -47175,10 +46075,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:365 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--[no-]format-patch" -msgstr "git-commit(1)" +msgstr "--[no-]format-patch" #. type: Plain text #: en/git-send-email.txt:370 @@ -47200,7 +46099,7 @@ msgstr "" #: en/git-send-email.txt:375 #, no-wrap msgid "--[no-]validate" -msgstr "" +msgstr "--[no-]validate" #. type: Plain text #: en/git-send-email.txt:378 @@ -47233,8 +46132,7 @@ msgstr "" #. type: Title ~ #: en/git-send-email.txt:392 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Information" msgstr "Configuration" @@ -47242,7 +46140,7 @@ msgstr "Configuration" #: en/git-send-email.txt:394 #, no-wrap msgid "--dump-aliases" -msgstr "" +msgstr "--dump-aliases" #. type: Plain text #: en/git-send-email.txt:399 @@ -47255,8 +46153,7 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:404 en/config.txt:2887 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.aliasesFile" msgstr "git-commit(1)" @@ -47290,8 +46187,7 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:418 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendmail" msgstr "git-commit(1)" @@ -47334,8 +46230,7 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:429 en/config.txt:2897 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.multiEdit" msgstr "git-commit(1)" @@ -47350,8 +46245,7 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:435 en/config.txt:2894 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.confirm" msgstr "git-commit(1)" @@ -47435,10 +46329,6 @@ msgstr "" # #. type: Plain text #: en/git-send-email.txt:479 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)" msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -47446,15 +46336,12 @@ msgstr "" #. type: Title = #: en/git-send-pack.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-send-pack(1)" -msgstr "git-add(1)" +msgstr "git-send-pack(1)" #. type: Plain text #: en/git-send-pack.txt:7 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "git-send-pack - Push objects over Git protocol to another repository" msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" @@ -47505,7 +46392,7 @@ msgstr "" #: en/git-send-pack.txt:68 #, no-wrap msgid "--atomic" -msgstr "" +msgstr "--atomic" #. type: Plain text #: en/git-send-pack.txt:72 @@ -47579,10 +46466,9 @@ msgstr "" #. type: Title = #: en/git-shell.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-shell(1)" -msgstr "git-add(1)" +msgstr "git-shell(1)" #. type: Plain text #: en/git-shell.txt:7 @@ -47771,7 +46657,7 @@ msgstr "" #: en/git-sh-i18n.txt:2 #, no-wrap msgid "git-sh-i18n(1)" -msgstr "" +msgstr "git-sh-i18n(1)" #. type: Plain text #: en/git-sh-i18n.txt:7 @@ -47825,10 +46711,9 @@ msgstr "" #. type: Title = #: en/git-shortlog.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-shortlog(1)" -msgstr "git-commit(1)" +msgstr "git-shortlog(1)" #. type: Plain text #: en/git-shortlog.txt:7 @@ -47878,10 +46763,9 @@ msgstr "" #. type: Labeled list #: en/git-shortlog.txt:39 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--email" -msgstr "git-commit(1)" +msgstr "--email" #. type: Plain text #: en/git-shortlog.txt:41 @@ -47890,8 +46774,7 @@ msgstr "" #. type: Labeled list #: en/git-shortlog.txt:42 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--format[=<format>]" msgstr "Configuration" @@ -47911,10 +46794,9 @@ msgstr "" #. type: Labeled list #: en/git-shortlog.txt:51 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--committer" -msgstr "git-commit(1)" +msgstr "--committer" #. type: Plain text #: en/git-shortlog.txt:53 @@ -47982,7 +46864,7 @@ msgstr "" #: en/git-show-branch.txt:2 #, no-wrap msgid "git-show-branch(1)" -msgstr "" +msgstr "git-show-branch(1)" #. type: Plain text #: en/git-show-branch.txt:7 @@ -48061,7 +46943,7 @@ msgstr "" #: en/git-show-branch.txt:51 #, no-wrap msgid "--current" -msgstr "" +msgstr "--current" #. type: Plain text #: en/git-show-branch.txt:55 @@ -48074,7 +46956,7 @@ msgstr "" #: en/git-show-branch.txt:56 en/rev-list-options.txt:635 #, no-wrap msgid "--topo-order" -msgstr "" +msgstr "--topo-order" #. type: Plain text #: en/git-show-branch.txt:61 @@ -48088,7 +46970,7 @@ msgstr "" #: en/git-show-branch.txt:62 en/rev-list-options.txt:627 #, no-wrap msgid "--date-order" -msgstr "" +msgstr "--date-order" #. type: Plain text #: en/git-show-branch.txt:66 @@ -48103,7 +46985,7 @@ msgstr "" #: en/rev-list-options.txt:466 #, no-wrap msgid "--sparse" -msgstr "" +msgstr "--sparse" #. type: Plain text #: en/git-show-branch.txt:71 @@ -48136,7 +47018,7 @@ msgstr "" #: en/git-show-branch.txt:83 #, no-wrap msgid "--merge-base" -msgstr "" +msgstr "--merge-base" #. type: Plain text #: en/git-show-branch.txt:89 @@ -48158,7 +47040,7 @@ msgstr "" #: en/git-show-branch.txt:94 #, no-wrap msgid "--no-name" -msgstr "" +msgstr "--no-name" #. type: Plain text #: en/git-show-branch.txt:96 @@ -48169,7 +47051,7 @@ msgstr "" #: en/git-show-branch.txt:97 #, no-wrap msgid "--sha1-name" -msgstr "" +msgstr "--sha1-name" #. type: Plain text #: en/git-show-branch.txt:102 @@ -48183,7 +47065,7 @@ msgstr "" #: en/git-show-branch.txt:103 #, no-wrap msgid "--topics" -msgstr "" +msgstr "--topics" #. type: Plain text #: en/git-show-branch.txt:110 @@ -48337,10 +47219,9 @@ msgstr "" #. type: Title = #: en/git-show-index.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-show-index(1)" -msgstr "git-commit(1)" +msgstr "git-show-index(1)" #. type: Plain text #: en/git-show-index.txt:7 @@ -48372,7 +47253,7 @@ msgstr "" #: en/git-show-ref.txt:2 #, no-wrap msgid "git-show-ref(1)" -msgstr "" +msgstr "git-show-ref(1)" #. type: Plain text #: en/git-show-ref.txt:7 @@ -48422,7 +47303,7 @@ msgstr "" #: en/git-show-ref.txt:36 #, no-wrap msgid "--head" -msgstr "" +msgstr "--head" #. type: Plain text #: en/git-show-ref.txt:39 @@ -48441,7 +47322,7 @@ msgstr "" #: en/git-show-ref.txt:48 #, no-wrap msgid "--dereference" -msgstr "" +msgstr "--dereference" #. type: Plain text #: en/git-show-ref.txt:52 @@ -48671,10 +47552,6 @@ msgstr "" # #. type: Plain text #: en/git-show-ref.txt:183 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-" "ref[1], linkgit:gitrepository-layout[5]" @@ -48684,10 +47561,9 @@ msgstr "" #. type: Title = #: en/git-show.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-show(1)" -msgstr "git-add(1)" +msgstr "git-show(1)" #. type: Plain text #: en/git-show.txt:7 @@ -48817,7 +47693,7 @@ msgstr "" #: en/git-sh-setup.txt:2 #, no-wrap msgid "git-sh-setup(1)" -msgstr "" +msgstr "git-sh-setup(1)" #. type: Plain text #: en/git-sh-setup.txt:7 @@ -49006,16 +47882,13 @@ msgstr "" #. type: Title = #: en/git-stage.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-stage(1)" -msgstr "git-add(1)" +msgstr "git-stage(1)" # #. type: Plain text #: en/git-stage.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-stage - Add file contents to the staging area" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -49027,10 +47900,6 @@ msgstr "" #. type: Plain text #: en/git-stage.txt:20 -#, fuzzy -#| msgid "" -#| "This is a synonym for linkgit:git-fsck[1]. Please refer to the " -#| "documentation of that command." msgid "" "This is a synonym for linkgit:git-add[1]. Please refer to the documentation " "of that command." @@ -49040,10 +47909,9 @@ msgstr "" #. type: Title = #: en/git-stash.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-stash(1)" -msgstr "git-add(1)" +msgstr "git-stash(1)" #. type: Plain text #: en/git-stash.txt:7 @@ -49516,10 +48384,6 @@ msgstr "" # #. type: Plain text #: en/git-stash.txt:292 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], " "linkgit:git-reset[1]" @@ -49529,10 +48393,9 @@ msgstr "" #. type: Title = #: en/git-status.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-status(1)" -msgstr "git-add(1)" +msgstr "git-status(1)" #. type: Plain text #: en/git-status.txt:7 @@ -49558,11 +48421,6 @@ msgstr "" #. type: Plain text #: en/git-status.txt:30 -#, fuzzy -#| msgid "" -#| "--long::\n" -#| "\tWhen doing a dry-run, give the output in a the long-format.\n" -#| "\tImplies `--dry-run`.\n" msgid "Give the output in the short-format." msgstr "" "--long::\n" @@ -49592,11 +48450,6 @@ msgstr "" #. type: Plain text #: en/git-status.txt:46 -#, fuzzy -#| msgid "" -#| "--long::\n" -#| "\tWhen doing a dry-run, give the output in a the long-format.\n" -#| "\tImplies `--dry-run`.\n" msgid "Give the output in the long-format. This is the default." msgstr "" "--long::\n" @@ -49623,15 +48476,13 @@ msgstr "" #. type: Plain text #: en/git-status.txt:66 -#, fuzzy, no-wrap -#| msgid "'no' - Show no untracked files\n" +#, no-wrap msgid "'no' - Show no untracked files.\n" msgstr "'no' - Ne montrer aucun fichier non-suivi\n" #. type: Plain text #: en/git-status.txt:67 -#, fuzzy, no-wrap -#| msgid "'normal' - Shows untracked files and directories\n" +#, no-wrap msgid "'normal' - Shows untracked files and directories.\n" msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n" @@ -49674,11 +48525,6 @@ msgstr "" #. type: Plain text #: en/git-status.txt:99 -#, fuzzy -#| msgid "" -#| "-u[<mode>]::\n" -#| "--untracked-files[=<mode>]::\n" -#| "\tShow untracked files.\n" msgid "Show ignored files as well." msgstr "" "-u[<mode>]::\n" @@ -49720,8 +48566,7 @@ msgstr "" #. type: Title ~ #: en/git-status.txt:126 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Short Format" msgstr "Configuration" @@ -49953,8 +48798,6 @@ msgstr "" #. type: Plain text #: en/git-status.txt:247 -#, fuzzy -#| msgid "support the following date formats:" msgid "Ordinary changed entries have the following format:" msgstr "prend en charge les formats de date suivants혻:" @@ -49966,8 +48809,6 @@ msgstr "" #. type: Plain text #: en/git-status.txt:251 -#, fuzzy -#| msgid "support the following date formats:" msgid "Renamed or copied entries have the following format:" msgstr "prend en charge les formats de date suivants혻:" @@ -50060,8 +48901,6 @@ msgstr "" #. type: Plain text #: en/git-status.txt:312 -#, fuzzy -#| msgid "support the following date formats:" msgid "Untracked items have the following format:" msgstr "prend en charge les formats de date suivants혻:" @@ -50073,8 +48912,6 @@ msgstr "" #. type: Plain text #: en/git-status.txt:316 -#, fuzzy -#| msgid "support the following date formats:" msgid "Ignored items have the following format:" msgstr "prend en charge les formats de date suivants혻:" @@ -50098,10 +48935,6 @@ msgstr "" #. type: Plain text #: en/git-status.txt:328 -#, fuzzy -#| msgid "" -#| "The default can be changed by the `commit.cleanup` configuration variable " -#| "(see linkgit:git-config[1])." msgid "" "Without the `-z` option, pathnames with \"unusual\" characters are quoted as " "explained for the configuration variable `core.quotePath` (see linkgit:git-" @@ -50145,7 +48978,7 @@ msgstr "" #: en/git-stripspace.txt:2 #, no-wrap msgid "git-stripspace(1)" -msgstr "" +msgstr "git-stripspace(1)" #. type: Plain text #: en/git-stripspace.txt:7 @@ -50184,10 +49017,6 @@ msgstr "" #. type: Plain text #: en/git-stripspace.txt:27 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "remove empty lines from the beginning and end of the input" msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -50218,7 +49047,7 @@ msgstr "" #: en/git-stripspace.txt:39 #, no-wrap msgid "--strip-comments" -msgstr "" +msgstr "--strip-comments" #. type: Plain text #: en/git-stripspace.txt:41 @@ -50230,7 +49059,7 @@ msgstr "" #: en/git-stripspace.txt:43 #, no-wrap msgid "--comment-lines" -msgstr "" +msgstr "--comment-lines" #. type: Plain text #: en/git-stripspace.txt:47 @@ -50301,10 +49130,9 @@ msgstr "" #. type: Title = #: en/git-submodule.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-submodule(1)" -msgstr "git-add(1)" +msgstr "git-submodule(1)" #. type: Plain text #: en/git-submodule.txt:7 @@ -50800,11 +49628,6 @@ msgstr "" #. type: Plain text #: en/git-submodule.txt:274 -#, fuzzy -#| msgid "" -#| "-q::\n" -#| "--quiet::\n" -#| "\tSuppress commit summary message.\n" msgid "Only print error messages." msgstr "" "-q::\n" @@ -50853,7 +49676,7 @@ msgstr "" #: en/git-submodule.txt:305 #, no-wrap msgid "--files" -msgstr "" +msgstr "--files" #. type: Plain text #: en/git-submodule.txt:309 @@ -50866,7 +49689,7 @@ msgstr "" #: en/git-submodule.txt:311 #, no-wrap msgid "--summary-limit" -msgstr "" +msgstr "--summary-limit" #. type: Plain text #: en/git-submodule.txt:317 @@ -50880,10 +49703,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:318 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--remote" -msgstr "git-commit(1)" +msgstr "--remote" #. type: Plain text #: en/git-submodule.txt:327 @@ -50933,7 +49755,7 @@ msgstr "" #: en/git-submodule.txt:350 #, no-wrap msgid "--no-fetch" -msgstr "" +msgstr "--no-fetch" #. type: Plain text #: en/git-submodule.txt:353 @@ -50944,10 +49766,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:354 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--checkout" -msgstr "git-commit(1)" +msgstr "--checkout" #. type: Plain text #: en/git-submodule.txt:362 @@ -50973,10 +49794,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:373 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--rebase" -msgstr "git-add(1)" +msgstr "--rebase" #. type: Plain text #: en/git-submodule.txt:381 @@ -50993,7 +49813,7 @@ msgstr "" #: en/git-submodule.txt:382 #, no-wrap msgid "--init" -msgstr "" +msgstr "--init" #. type: Plain text #: en/git-submodule.txt:386 @@ -51006,7 +49826,7 @@ msgstr "" #: en/git-submodule.txt:387 #, no-wrap msgid "--name" -msgstr "" +msgstr "--name" #. type: Plain text #: en/git-submodule.txt:391 @@ -51051,7 +49871,7 @@ msgstr "" #: en/git-submodule.txt:406 #, no-wrap msgid "--depth" -msgstr "" +msgstr "--depth" #. type: Plain text #: en/git-submodule.txt:410 @@ -51065,7 +49885,7 @@ msgstr "" #: en/git-submodule.txt:411 #, no-wrap msgid "--[no-]recommend-shallow" -msgstr "" +msgstr "--[no-]recommend-shallow" #. type: Plain text #: en/git-submodule.txt:416 @@ -51103,10 +49923,9 @@ msgstr "" #. type: Title = #: en/git-svn.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-svn(1)" -msgstr "git-add(1)" +msgstr "git-svn(1)" #. type: Plain text #: en/git-svn.txt:7 @@ -51201,7 +50020,7 @@ msgstr "" #: en/git-svn.txt:47 #, no-wrap msgid "--stdlayout" -msgstr "" +msgstr "--stdlayout" #. type: Plain text #: en/git-svn.txt:58 @@ -51219,7 +50038,7 @@ msgstr "" #: en/git-svn.txt:58 #, no-wrap msgid "--no-metadata" -msgstr "" +msgstr "--no-metadata" #. type: Plain text #: en/git-svn.txt:62 @@ -51233,7 +50052,7 @@ msgstr "" #: en/git-svn.txt:62 #, no-wrap msgid "--use-svm-props" -msgstr "" +msgstr "--use-svm-props" #. type: Plain text #: en/git-svn.txt:64 @@ -51244,7 +50063,7 @@ msgstr "" #: en/git-svn.txt:64 #, no-wrap msgid "--use-svnsync-props" -msgstr "" +msgstr "--use-svnsync-props" #. type: Plain text #: en/git-svn.txt:66 @@ -51349,7 +50168,7 @@ msgstr "" #: en/git-svn.txt:106 #, no-wrap msgid "--no-minimize-url" -msgstr "" +msgstr "--no-minimize-url" #. type: Plain text #: en/git-svn.txt:117 @@ -51389,7 +50208,7 @@ msgstr "" #: en/git-svn.txt:127 #, no-wrap msgid "--localtime" -msgstr "" +msgstr "--localtime" #. type: Plain text #: en/git-svn.txt:131 @@ -51412,7 +50231,7 @@ msgstr "" #: en/git-svn.txt:138 en/git-svn.txt:505 #, no-wrap msgid "--parent" -msgstr "" +msgstr "--parent" #. type: Plain text #: en/git-svn.txt:140 @@ -51519,7 +50338,7 @@ msgstr "" #: en/git-svn.txt:199 #, no-wrap msgid "--preserve-empty-dirs" -msgstr "" +msgstr "--preserve-empty-dirs" #. type: Plain text #: en/git-svn.txt:205 @@ -51720,7 +50539,7 @@ msgstr "" #: en/git-svn.txt:293 #, no-wrap msgid "--message" -msgstr "" +msgstr "--message" #. type: Plain text #: en/git-svn.txt:295 @@ -51731,7 +50550,7 @@ msgstr "" #: en/git-svn.txt:297 #, no-wrap msgid "--tag" -msgstr "" +msgstr "--tag" #. type: Plain text #: en/git-svn.txt:300 @@ -51742,8 +50561,7 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:301 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "-d<path>" msgstr "patch" @@ -51782,7 +50600,7 @@ msgstr "" #: en/git-svn.txt:317 #, no-wrap msgid "--username" -msgstr "" +msgstr "--username" #. type: Plain text #: en/git-svn.txt:320 @@ -51793,10 +50611,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:321 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--commit-url" -msgstr "git-commit(1)" +msgstr "--commit-url" #. type: Plain text #: en/git-svn.txt:326 @@ -51815,7 +50632,7 @@ msgstr "" #: en/git-svn.txt:330 en/rev-list-options.txt:786 #, no-wrap msgid "--parents" -msgstr "" +msgstr "--parents" #. type: Plain text #: en/git-svn.txt:334 @@ -51901,10 +50718,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:364 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--show-commit" -msgstr "git-commit(1)" +msgstr "--show-commit" #. type: Plain text #: en/git-svn.txt:366 @@ -51915,7 +50731,7 @@ msgstr "" #: en/git-svn.txt:366 en/pretty-options.txt:31 #, no-wrap msgid "--oneline" -msgstr "" +msgstr "--oneline" #. type: Plain text #: en/git-svn.txt:368 @@ -51953,10 +50769,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:384 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--git-format" -msgstr "git-commit(1)" +msgstr "--git-format" #. type: Plain text #: en/git-svn.txt:389 @@ -51992,7 +50807,7 @@ msgstr "" #: en/git-svn.txt:397 #, no-wrap msgid "--before" -msgstr "" +msgstr "--before" #. type: Plain text #: en/git-svn.txt:401 @@ -52006,7 +50821,7 @@ msgstr "" #: en/git-svn.txt:403 #, no-wrap msgid "--after" -msgstr "" +msgstr "--after" #. type: Plain text #: en/git-svn.txt:407 @@ -52367,7 +51182,7 @@ msgstr "" #: en/git-svn.txt:571 #, no-wrap msgid "--rmdir" -msgstr "" +msgstr "--rmdir" #. type: Plain text #: en/git-svn.txt:573 en/git-svn.txt:586 en/git-svn.txt:597 @@ -52412,7 +51227,7 @@ msgstr "" #: en/git-svn.txt:595 en/diff-options.txt:380 #, no-wrap msgid "--find-copies-harder" -msgstr "" +msgstr "--find-copies-harder" #. type: Plain text #: en/git-svn.txt:600 @@ -52547,7 +51362,7 @@ msgstr "" #: en/git-svn.txt:663 #, no-wrap msgid "--use-log-author" -msgstr "" +msgstr "--use-log-author" #. type: Plain text #: en/git-svn.txt:667 @@ -52567,7 +51382,7 @@ msgstr "" #: en/git-svn.txt:671 #, no-wrap msgid "--add-author-from" -msgstr "" +msgstr "--add-author-from" #. type: Plain text #: en/git-svn.txt:677 @@ -52587,8 +51402,7 @@ msgstr "" #. type: Title - #: en/git-svn.txt:682 -#, fuzzy, no-wrap -#| msgid "OPTIONS" +#, no-wrap msgid "ADVANCED OPTIONS" msgstr "OPTIONS" @@ -52615,8 +51429,7 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:691 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "-R<remote name>" msgstr "contenu supprim챕" @@ -52637,7 +51450,7 @@ msgstr "" #: en/git-svn.txt:697 #, no-wrap msgid "--follow-parent" -msgstr "" +msgstr "--follow-parent" #. type: Plain text #: en/git-svn.txt:712 @@ -52873,8 +51686,7 @@ msgstr "" #. type: Title - #: en/git-svn.txt:816 -#, fuzzy, no-wrap -#| msgid "EXAMPLES" +#, no-wrap msgid "BASIC EXAMPLES" msgstr "EXEMPLES" @@ -53356,13 +52168,13 @@ msgstr "" #: en/git-svn.txt:1133 en/cmds-mainporcelain.txt:79 #, no-wrap msgid "linkgit:git-rebase[1]" -msgstr "" +msgstr "linkgit:git-rebase[1]" #. type: Title = #: en/git-symbolic-ref.txt:2 #, no-wrap msgid "git-symbolic-ref(1)" -msgstr "" +msgstr "git-symbolic-ref(1)" #. type: Plain text #: en/git-symbolic-ref.txt:7 @@ -53455,10 +52267,9 @@ msgstr "" #. type: Title = #: en/git-tag.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-tag(1)" -msgstr "git-add(1)" +msgstr "git-tag(1)" #. type: Plain text #: en/git-tag.txt:7 @@ -53547,7 +52358,7 @@ msgstr "" #: en/git-tag.txt:64 #, no-wrap msgid "--sign" -msgstr "" +msgstr "--sign" #. type: Plain text #: en/git-tag.txt:66 @@ -53655,13 +52466,6 @@ msgstr "" #. type: Plain text #: en/git-tag.txt:137 -#, fuzzy -#| msgid "" -#| "-m <msg>::\n" -#| "--message=<msg>::\n" -#| "\tUse the given <msg> as the commit message.\n" -#| "\tIf multiple `-m` options are given, their values are\n" -#| "\tconcatenated as separate paragraphs.\n" msgid "" "Use the given tag message (instead of prompting). If multiple `-m` options " "are given, their values are concatenated as separate paragraphs. Implies `-" @@ -53675,12 +52479,6 @@ msgstr "" #. type: Plain text #: en/git-tag.txt:144 -#, fuzzy -#| msgid "" -#| "-F <file>::\n" -#| "--file=<file>::\n" -#| "\tTake the commit message from the given file. Use '-' to\n" -#| "\tread the message from the standard input.\n" msgid "" "Take the tag message from the given file. Use '-' to read the message from " "the standard input. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is " @@ -53849,8 +52647,7 @@ msgstr "" #. type: delimited block - #: en/git-tag.txt:243 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "" "\tgit tag -d X\n" "\tgit fetch origin tag X\n" @@ -53870,8 +52667,7 @@ msgstr "" #. type: delimited block - #: en/git-tag.txt:249 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "\tgit rev-parse X\n" msgstr "git-add(1)" @@ -53941,8 +52737,7 @@ msgstr "" #. type: delimited block - #: en/git-tag.txt:285 -#, fuzzy, no-wrap -#| msgid "support the following date formats:" +#, no-wrap msgid "to get the following updates...\n" msgstr "prend en charge les formats de date suivants혻:" @@ -54030,10 +52825,6 @@ msgstr "" # #. type: Plain text #: en/git-tag.txt:348 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]." msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -54043,7 +52834,7 @@ msgstr "" #: en/git-unpack-file.txt:2 #, no-wrap msgid "git-unpack-file(1)" -msgstr "" +msgstr "git-unpack-file(1)" #. type: Plain text #: en/git-unpack-file.txt:7 @@ -54074,7 +52865,7 @@ msgstr "" #: en/git-unpack-objects.txt:2 #, no-wrap msgid "git-unpack-objects(1)" -msgstr "" +msgstr "git-unpack-objects(1)" #. type: Plain text #: en/git-unpack-objects.txt:7 @@ -54141,16 +52932,13 @@ msgstr "" #. type: Title = #: en/git-update-index.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-update-index(1)" -msgstr "git-add(1)" +msgstr "git-update-index(1)" # #. type: Plain text #: en/git-update-index.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "" "git-update-index - Register file contents in the working tree to the index" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -54208,7 +52996,7 @@ msgstr "" #: en/git-update-index.txt:47 #, no-wrap msgid "--remove" -msgstr "" +msgstr "--remove" #. type: Plain text #: en/git-update-index.txt:51 @@ -54238,10 +53026,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:61 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--ignore-submodules" -msgstr "git-add(1)" +msgstr "--ignore-submodules" #. type: Plain text #: en/git-update-index.txt:64 @@ -54295,13 +53082,11 @@ msgstr "" #: en/git-update-index.txt:80 #, no-wrap msgid "--index-info" -msgstr "" +msgstr "--index-info" # #. type: Plain text #: en/git-update-index.txt:82 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Read index information from stdin." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -54314,7 +53099,7 @@ msgstr "" #: en/git-update-index.txt:86 #, no-wrap msgid "--[no-]assume-unchanged" -msgstr "" +msgstr "--[no-]assume-unchanged" #. type: Plain text #: en/git-update-index.txt:98 @@ -54341,7 +53126,7 @@ msgstr "" #: en/git-update-index.txt:104 #, no-wrap msgid "--really-refresh" -msgstr "" +msgstr "--really-refresh" #. type: Plain text #: en/git-update-index.txt:107 @@ -54352,10 +53137,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:108 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--[no-]skip-worktree" -msgstr "git-commit(1)" +msgstr "--[no-]skip-worktree" #. type: Plain text #: en/git-update-index.txt:113 @@ -54370,7 +53154,7 @@ msgstr "" #: en/git-update-index.txt:115 #, no-wrap msgid "--again" -msgstr "" +msgstr "--again" #. type: Plain text #: en/git-update-index.txt:118 @@ -54383,7 +53167,7 @@ msgstr "" #: en/git-update-index.txt:119 #, no-wrap msgid "--unresolve" -msgstr "" +msgstr "--unresolve" #. type: Plain text #: en/git-update-index.txt:122 @@ -54396,7 +53180,7 @@ msgstr "" #: en/git-update-index.txt:123 #, no-wrap msgid "--info-only" -msgstr "" +msgstr "--info-only" #. type: Plain text #: en/git-update-index.txt:127 @@ -54409,14 +53193,10 @@ msgstr "" #: en/git-update-index.txt:128 #, no-wrap msgid "--force-remove" -msgstr "" +msgstr "--force-remove" #. type: Plain text #: en/git-update-index.txt:131 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "" "Remove the file from the index even when the working directory still has " "such a file. (Implies --remove.)" @@ -54426,10 +53206,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:132 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "--replace" -msgstr "git-add(1)" +msgstr "--replace" #. type: Plain text #: en/git-update-index.txt:139 @@ -54480,13 +53259,13 @@ msgstr "" #: en/git-update-index.txt:164 #, no-wrap msgid "--split-index" -msgstr "" +msgstr "--split-index" #. type: Labeled list #: en/git-update-index.txt:165 #, no-wrap msgid "--no-split-index" -msgstr "" +msgstr "--no-split-index" #. type: Plain text #: en/git-update-index.txt:170 @@ -54508,16 +53287,15 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:177 -#, fuzzy, no-wrap -#| msgid "add untracked" +#, no-wrap msgid "--untracked-cache" -msgstr "add untracked" +msgstr "--untracked-cache" #. type: Labeled list #: en/git-update-index.txt:178 #, no-wrap msgid "--no-untracked-cache" -msgstr "" +msgstr "--no-untracked-cache" #. type: Plain text #: en/git-update-index.txt:181 @@ -54540,7 +53318,7 @@ msgstr "" #: en/git-update-index.txt:188 #, no-wrap msgid "--test-untracked-cache" -msgstr "" +msgstr "--test-untracked-cache" #. type: Plain text #: en/git-update-index.txt:197 @@ -54557,7 +53335,7 @@ msgstr "" #: en/git-update-index.txt:198 #, no-wrap msgid "--force-untracked-cache" -msgstr "" +msgstr "--force-untracked-cache" #. type: Plain text #: en/git-update-index.txt:203 @@ -54865,8 +53643,7 @@ msgstr "" #. type: Title - #: en/git-update-index.txt:374 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "Skip-worktree bit" msgstr "git-commit(1)" @@ -55036,10 +53813,6 @@ msgstr "" #. type: Plain text #: en/git-update-index.txt:477 -#, fuzzy -#| msgid "" -#| "The default can be changed by the `commit.cleanup` configuration variable " -#| "(see linkgit:git-config[1])." msgid "" "The untracked cache extension can be enabled by the `core.untrackedCache` " "configuration variable (see linkgit:git-config[1])." @@ -55050,10 +53823,6 @@ msgstr "" # #. type: Plain text #: en/git-update-index.txt:483 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]" msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -55063,7 +53832,7 @@ msgstr "" #: en/git-update-ref.txt:2 #, no-wrap msgid "git-update-ref(1)" -msgstr "" +msgstr "git-update-ref(1)" #. type: Plain text #: en/git-update-ref.txt:7 @@ -55269,8 +54038,7 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:112 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "option" msgstr "status" @@ -55350,7 +54118,7 @@ msgstr "" #: en/git-update-server-info.txt:2 #, no-wrap msgid "git-update-server-info(1)" -msgstr "" +msgstr "git-update-server-info(1)" #. type: Plain text #: en/git-update-server-info.txt:7 @@ -55375,11 +54143,6 @@ msgstr "" #. type: Plain text #: en/git-update-server-info.txt:29 -#, fuzzy -#| msgid "" -#| "-f::\n" -#| "--force::\n" -#| "\tAllow adding otherwise ignored files.\n" msgid "Update the info files from scratch." msgstr "" "-f::\n" @@ -55407,7 +54170,7 @@ msgstr "" #: en/git-upload-archive.txt:2 #, no-wrap msgid "git-upload-archive(1)" -msgstr "" +msgstr "git-upload-archive(1)" #. type: Plain text #: en/git-upload-archive.txt:7 @@ -55499,10 +54262,9 @@ msgstr "" #. type: Title = #: en/git-upload-pack.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-upload-pack(1)" -msgstr "git-add(1)" +msgstr "git-upload-pack(1)" #. type: Plain text #: en/git-upload-pack.txt:7 @@ -55538,8 +54300,7 @@ msgstr "" #. type: delimited block - #: en/git-upload-pack.txt:26 -#, fuzzy, no-wrap -#| msgid "OPTIONS" +#, no-wrap msgid "OPTIONS\n" msgstr "OPTIONS" @@ -55547,7 +54308,7 @@ msgstr "OPTIONS" #: en/git-upload-pack.txt:28 #, no-wrap msgid "--[no-]strict" -msgstr "" +msgstr "--[no-]strict" #. type: Plain text #: en/git-upload-pack.txt:30 @@ -55563,7 +54324,7 @@ msgstr "" #: en/git-upload-pack.txt:34 #, no-wrap msgid "--stateless-rpc" -msgstr "" +msgstr "--stateless-rpc" #. type: Plain text #: en/git-upload-pack.txt:38 @@ -55577,7 +54338,7 @@ msgstr "" #: en/git-upload-pack.txt:39 #, no-wrap msgid "--advertise-refs" -msgstr "" +msgstr "--advertise-refs" #. type: Plain text #: en/git-upload-pack.txt:43 @@ -55594,17 +54355,14 @@ msgstr "" #. type: Plain text #: en/git-upload-pack.txt:50 -#, fuzzy -#| msgid "git-commit(1)" msgid "linkgit:gitnamespaces[7]" msgstr "git-commit(1)" #. type: Title = #: en/git-var.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-var(1)" -msgstr "git-add(1)" +msgstr "git-var(1)" #. type: Plain text #: en/git-var.txt:7 @@ -55714,10 +54472,6 @@ msgstr "" # #. type: Plain text #: en/git-var.txt:67 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]" msgstr "" "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" @@ -55725,10 +54479,9 @@ msgstr "" #. type: Title = #: en/git-verify-commit.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-verify-commit(1)" -msgstr "git-commit(1)" +msgstr "git-verify-commit(1)" #. type: Plain text #: en/git-verify-commit.txt:7 @@ -55767,7 +54520,7 @@ msgstr "" #: en/git-verify-pack.txt:2 #, no-wrap msgid "git-verify-pack(1)" -msgstr "" +msgstr "git-verify-pack(1)" #. type: Plain text #: en/git-verify-pack.txt:7 @@ -55809,7 +54562,7 @@ msgstr "" #: en/git-verify-pack.txt:32 #, no-wrap msgid "--stat-only" -msgstr "" +msgstr "--stat-only" #. type: Plain text #: en/git-verify-pack.txt:35 @@ -55854,10 +54607,9 @@ msgstr "" #. type: Title = #: en/git-verify-tag.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-verify-tag(1)" -msgstr "git-commit(1)" +msgstr "git-verify-tag(1)" #. type: Plain text #: en/git-verify-tag.txt:7 @@ -56159,10 +54911,9 @@ msgstr "" #. type: Title = #: en/git-whatchanged.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-whatchanged(1)" -msgstr "git-add(1)" +msgstr "git-whatchanged(1)" #. type: Plain text #: en/git-whatchanged.txt:7 @@ -56224,10 +54975,9 @@ msgstr "" #. type: Title = #: en/git-worktree.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-worktree(1)" -msgstr "git-commit(1)" +msgstr "git-worktree(1)" #. type: Plain text #: en/git-worktree.txt:7 @@ -56393,10 +55143,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:104 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--[no-]checkout" -msgstr "git-commit(1)" +msgstr "--[no-]checkout" #. type: Plain text #: en/git-worktree.txt:109 @@ -56443,8 +55192,7 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:130 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "<worktree>" msgstr "whitespace" @@ -56657,16 +55405,13 @@ msgstr "" #. type: Title = #: en/git-write-tree.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-write-tree(1)" -msgstr "git-commit(1)" +msgstr "git-write-tree(1)" # #. type: Plain text #: en/git-write-tree.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-write-tree - Create a tree object from the current index" msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" @@ -56701,7 +55446,7 @@ msgstr "" #: en/git-write-tree.txt:30 #, no-wrap msgid "--missing-ok" -msgstr "" +msgstr "--missing-ok" #. type: Plain text #: en/git-write-tree.txt:34 @@ -56736,7 +55481,7 @@ msgstr "" #: en/blame-options.txt:9 #, no-wrap msgid "--show-stats" -msgstr "" +msgstr "--show-stats" #. type: Plain text #: en/blame-options.txt:11 @@ -56816,7 +55561,7 @@ msgstr "" #: en/blame-options.txt:43 #, no-wrap msgid "--line-porcelain" -msgstr "" +msgstr "--line-porcelain" #. type: Plain text #: en/blame-options.txt:47 @@ -56857,8 +55602,7 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:66 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--date <format>" msgstr "Configuration" @@ -56940,8 +55684,7 @@ msgstr "" #. type: Title - #: en/config.txt:2 -#, fuzzy, no-wrap -#| msgid "ENVIRONMENT AND CONFIGURATION VARIABLES" +#, no-wrap msgid "CONFIGURATION FILE" msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION" @@ -57113,8 +55856,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:105 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "`gitdir`" msgstr "git-add(1)" @@ -57181,8 +55923,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:135 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "`gitdir/i`" msgstr "git-add(1)" @@ -57561,8 +56302,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:300 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "statusHints" msgstr "status" @@ -57579,8 +56319,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:306 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "statusUoption" msgstr "status" @@ -57683,13 +56422,11 @@ msgstr "" #: en/config.txt:332 #, no-wrap msgid "core.fileMode" -msgstr "" +msgstr "core.fileMode" # #. type: Plain text #: en/config.txt:335 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "" "Tells Git if the executable bit of files in the working tree is to be " "honored." @@ -57724,10 +56461,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:354 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "core.hideDotFiles" -msgstr "whitespace" +msgstr "core.hideDotFiles" #. type: Plain text #: en/config.txt:359 @@ -57740,10 +56476,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:360 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "core.ignoreCase" -msgstr "whitespace" +msgstr "core.ignoreCase" #. type: Plain text #: en/config.txt:367 @@ -57767,7 +56502,7 @@ msgstr "" #: en/config.txt:372 #, no-wrap msgid "core.precomposeUnicode" -msgstr "" +msgstr "core.precomposeUnicode" #. type: Plain text #: en/config.txt:380 @@ -57784,7 +56519,7 @@ msgstr "" #: en/config.txt:381 #, no-wrap msgid "core.protectHFS" -msgstr "" +msgstr "core.protectHFS" #. type: Plain text #: en/config.txt:385 @@ -57798,7 +56533,7 @@ msgstr "" #: en/config.txt:386 #, no-wrap msgid "core.protectNTFS" -msgstr "" +msgstr "core.protectNTFS" #. type: Plain text #: en/config.txt:391 @@ -57810,10 +56545,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:392 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "core.trustctime" -msgstr "whitespace" +msgstr "core.trustctime" #. type: Plain text #: en/config.txt:398 @@ -57828,7 +56562,7 @@ msgstr "" #: en/config.txt:399 #, no-wrap msgid "core.splitIndex" -msgstr "" +msgstr "core.splitIndex" #. type: Plain text #: en/config.txt:402 @@ -57841,7 +56575,7 @@ msgstr "" #: en/config.txt:403 #, no-wrap msgid "core.untrackedCache" -msgstr "" +msgstr "core.untrackedCache" #. type: Plain text #: en/config.txt:411 @@ -57858,7 +56592,7 @@ msgstr "" #: en/config.txt:412 #, no-wrap msgid "core.checkStat" -msgstr "" +msgstr "core.checkStat" #. type: Plain text #: en/config.txt:417 @@ -57873,7 +56607,7 @@ msgstr "" #: en/config.txt:418 #, no-wrap msgid "core.quotePath" -msgstr "" +msgstr "core.quotePath" #. type: Plain text #: en/config.txt:432 @@ -57895,7 +56629,7 @@ msgstr "" #: en/config.txt:433 #, no-wrap msgid "core.eol" -msgstr "" +msgstr "core.eol" #. type: Plain text #: en/config.txt:440 @@ -57911,7 +56645,7 @@ msgstr "" #: en/config.txt:441 #, no-wrap msgid "core.safecrlf" -msgstr "" +msgstr "core.safecrlf" #. type: Plain text #: en/config.txt:451 @@ -57976,7 +56710,7 @@ msgstr "" #: en/config.txt:486 #, no-wrap msgid "core.autocrlf" -msgstr "" +msgstr "core.autocrlf" #. type: Plain text #: en/config.txt:493 @@ -57992,7 +56726,7 @@ msgstr "" #: en/config.txt:494 #, no-wrap msgid "core.symlinks" -msgstr "" +msgstr "core.symlinks" #. type: Plain text #: en/config.txt:500 @@ -58015,7 +56749,7 @@ msgstr "" #: en/config.txt:505 #, no-wrap msgid "core.gitProxy" -msgstr "" +msgstr "core.gitProxy" #. type: Plain text #: en/config.txt:513 @@ -58048,7 +56782,7 @@ msgstr "" #: en/config.txt:523 #, no-wrap msgid "core.sshCommand" -msgstr "" +msgstr "core.sshCommand" #. type: Plain text #: en/config.txt:529 @@ -58063,7 +56797,7 @@ msgstr "" #: en/config.txt:530 #, no-wrap msgid "core.ignoreStat" -msgstr "" +msgstr "core.ignoreStat" #. type: Plain text #: en/config.txt:534 @@ -58097,7 +56831,7 @@ msgstr "" #: en/config.txt:545 #, no-wrap msgid "core.preferSymlinkRefs" -msgstr "" +msgstr "core.preferSymlinkRefs" #. type: Plain text #: en/config.txt:550 @@ -58111,7 +56845,7 @@ msgstr "" #: en/config.txt:551 #, no-wrap msgid "core.bare" -msgstr "" +msgstr "core.bare" #. type: Plain text #: en/config.txt:556 @@ -58139,10 +56873,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:563 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "core.worktree" -msgstr "whitespace" +msgstr "core.worktree" #. type: Plain text #: en/config.txt:576 @@ -58175,7 +56908,7 @@ msgstr "" #: en/config.txt:587 #, no-wrap msgid "core.logAllRefUpdates" -msgstr "" +msgstr "core.logAllRefUpdates" #. type: Plain text #: en/config.txt:598 @@ -58208,7 +56941,7 @@ msgstr "" #: en/config.txt:606 #, no-wrap msgid "core.repositoryFormatVersion" -msgstr "" +msgstr "core.repositoryFormatVersion" #. type: Plain text #: en/config.txt:609 @@ -58219,7 +56952,7 @@ msgstr "" #: en/config.txt:610 #, no-wrap msgid "core.sharedRepository" -msgstr "" +msgstr "core.sharedRepository" #. type: Plain text #: en/config.txt:624 @@ -58242,7 +56975,7 @@ msgstr "" #: en/config.txt:625 #, no-wrap msgid "core.warnAmbiguousRefs" -msgstr "" +msgstr "core.warnAmbiguousRefs" #. type: Plain text #: en/config.txt:628 @@ -58255,7 +56988,7 @@ msgstr "" #: en/config.txt:629 #, no-wrap msgid "core.compression" -msgstr "" +msgstr "core.compression" #. type: Plain text #: en/config.txt:635 @@ -58270,7 +57003,7 @@ msgstr "" #: en/config.txt:636 #, no-wrap msgid "core.looseCompression" -msgstr "" +msgstr "core.looseCompression" #. type: Plain text #: en/config.txt:642 @@ -58285,7 +57018,7 @@ msgstr "" #: en/config.txt:643 #, no-wrap msgid "core.packedGitWindowSize" -msgstr "" +msgstr "core.packedGitWindowSize" #. type: Plain text #: en/config.txt:651 @@ -58315,7 +57048,7 @@ msgstr "" #: en/config.txt:659 #, no-wrap msgid "core.packedGitLimit" -msgstr "" +msgstr "core.packedGitLimit" #. type: Plain text #: en/config.txt:664 @@ -58338,7 +57071,7 @@ msgstr "" #: en/config.txt:671 #, no-wrap msgid "core.deltaBaseCacheLimit" -msgstr "" +msgstr "core.deltaBaseCacheLimit" #. type: Plain text #: en/config.txt:677 @@ -58361,7 +57094,7 @@ msgstr "" #: en/config.txt:684 #, no-wrap msgid "core.bigFileThreshold" -msgstr "" +msgstr "core.bigFileThreshold" #. type: Plain text #: en/config.txt:690 @@ -58384,7 +57117,7 @@ msgstr "" #: en/config.txt:697 #, no-wrap msgid "core.excludesFile" -msgstr "" +msgstr "core.excludesFile" #. type: Plain text #: en/config.txt:704 @@ -58400,7 +57133,7 @@ msgstr "" #: en/config.txt:705 #, no-wrap msgid "core.askPass" -msgstr "" +msgstr "core.askPass" #. type: Plain text #: en/config.txt:713 @@ -58418,7 +57151,7 @@ msgstr "" #: en/config.txt:714 #, no-wrap msgid "core.attributesFile" -msgstr "" +msgstr "core.attributesFile" #. type: Plain text #: en/config.txt:721 @@ -58434,7 +57167,7 @@ msgstr "" #: en/config.txt:722 #, no-wrap msgid "core.hooksPath" -msgstr "" +msgstr "core.hooksPath" #. type: Plain text #: en/config.txt:728 @@ -58466,7 +57199,7 @@ msgstr "" #: en/config.txt:739 #, no-wrap msgid "core.editor" -msgstr "" +msgstr "core.editor" #. type: Plain text #: en/config.txt:744 @@ -58480,7 +57213,7 @@ msgstr "" #: en/config.txt:745 #, no-wrap msgid "core.commentChar" -msgstr "" +msgstr "core.commentChar" #. type: Plain text #: en/config.txt:750 @@ -58501,7 +57234,7 @@ msgstr "" #: en/config.txt:754 #, no-wrap msgid "core.packedRefsTimeout" -msgstr "" +msgstr "core.packedRefsTimeout" #. type: Plain text #: en/config.txt:759 @@ -58528,10 +57261,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:766 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "core.pager" -msgstr "whitespace" +msgstr "core.pager" #. type: Plain text #: en/config.txt:786 @@ -58560,10 +57292,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:791 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "core.whitespace" -msgstr "whitespace" +msgstr "core.whitespace" #. type: Plain text #: en/config.txt:797 @@ -58635,10 +57366,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:820 -#, fuzzy, no-wrap -#| msgid "git-fsck-objects(1)" +#, no-wrap msgid "core.fsyncObjectFiles" -msgstr "git-fsck-objects(1)" +msgstr "core.fsyncObjectFiles" #. type: Plain text #: en/config.txt:822 @@ -58658,7 +57388,7 @@ msgstr "" #: en/config.txt:828 #, no-wrap msgid "core.preloadIndex" -msgstr "" +msgstr "core.preloadIndex" #. type: Plain text #: en/config.txt:830 @@ -58678,7 +57408,7 @@ msgstr "" #: en/config.txt:837 #, no-wrap msgid "core.createObject" -msgstr "" +msgstr "core.createObject" #. type: Plain text #: en/config.txt:841 @@ -58715,7 +57445,7 @@ msgstr "" #: en/config.txt:855 #, no-wrap msgid "core.sparseCheckout" -msgstr "" +msgstr "core.sparseCheckout" #. type: Plain text #: en/config.txt:858 @@ -58728,7 +57458,7 @@ msgstr "" #: en/config.txt:859 #, no-wrap msgid "core.abbrev" -msgstr "" +msgstr "core.abbrev" #. type: Plain text #: en/config.txt:865 @@ -58841,7 +57571,7 @@ msgstr "" #: en/config.txt:920 #, no-wrap msgid "branch.autoSetupMerge" -msgstr "" +msgstr "branch.autoSetupMerge" #. type: Plain text #: en/config.txt:931 @@ -58860,7 +57590,7 @@ msgstr "" #: en/config.txt:932 #, no-wrap msgid "branch.autoSetupRebase" -msgstr "" +msgstr "branch.autoSetupRebase" #. type: Plain text #: en/config.txt:946 @@ -59025,8 +57755,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1027 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "color.branch" msgstr "Mode interactif" @@ -59139,15 +57868,12 @@ msgstr "" #. type: Labeled list #: en/config.txt:1079 -#, fuzzy, no-wrap -#| msgid "new content" +#, no-wrap msgid "`context`" msgstr "contenu nouveau" #. type: Plain text #: en/config.txt:1081 -#, fuzzy -#| msgid "modifying existing content" msgid "non-matching text in context lines (when using `-A`, `-B`, or `-C`)" msgstr "modification de contenu existant" @@ -59186,8 +57912,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1087 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "`match`" msgstr "patch" @@ -59198,29 +57923,23 @@ msgstr "" #. type: Labeled list #: en/config.txt:1089 -#, fuzzy, no-wrap -#| msgid "new content" +#, no-wrap msgid "`matchContext`" msgstr "contenu nouveau" #. type: Plain text #: en/config.txt:1091 -#, fuzzy -#| msgid "modifying existing content" msgid "matching text in context lines" msgstr "modification de contenu existant" #. type: Labeled list #: en/config.txt:1091 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "`matchSelected`" msgstr "patch" #. type: Plain text #: en/config.txt:1093 -#, fuzzy -#| msgid "modifying existing content" msgid "matching text in selected lines" msgstr "modification de contenu existant" @@ -59232,8 +57951,6 @@ msgstr "" #. type: Plain text #: en/config.txt:1095 -#, fuzzy -#| msgid "modifying existing content" msgid "non-matching text in selected lines" msgstr "modification de contenu existant" @@ -59252,8 +57969,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1100 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "color.interactive" msgstr "Mode interactif" @@ -59269,8 +57985,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1108 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "color.interactive.<slot>" msgstr "Mode interactif" @@ -59284,8 +57999,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1114 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "color.pager" msgstr "status" @@ -59313,8 +58027,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1125 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "color.status" msgstr "status" @@ -59329,8 +58042,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1132 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "color.status.<slot>" msgstr "status" @@ -59348,8 +58060,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1143 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "color.ui" msgstr "status" @@ -59369,8 +58080,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1155 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "column.ui" msgstr "status" @@ -59401,8 +58111,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1166 -#, fuzzy, no-wrap -#| msgid "revert" +#, no-wrap msgid "`never`" msgstr "revert" @@ -59493,8 +58202,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1195 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "column.branch" msgstr "status" @@ -59507,8 +58215,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1199 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "column.clean" msgstr "git-commit(1)" @@ -59521,8 +58228,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1203 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "column.status" msgstr "status" @@ -59535,8 +58241,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1207 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "column.tag" msgstr "status" @@ -59549,8 +58254,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1211 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "commit.cleanup" msgstr "git-commit(1)" @@ -59567,8 +58271,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1220 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "commit.gpgSign" msgstr "git-commit(1)" @@ -59583,19 +58286,12 @@ msgstr "" #. type: Labeled list #: en/config.txt:1228 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "commit.status" msgstr "status" #. type: Plain text #: en/config.txt:1232 -#, fuzzy -#| msgid "" -#| "--no-status::\n" -#| "\tDo not include the output of linkgit:git-status[1] in the\n" -#| "\tcommit message template when using an editor to prepare the\n" -#| "\tdefault commit message.\n" msgid "" "A boolean to enable/disable inclusion of status information in the commit " "message template when using an editor to prepare the commit message. " @@ -59608,8 +58304,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1233 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "commit.template" msgstr "status" @@ -59622,8 +58317,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1237 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "commit.verbose" msgstr "git-commit(1)" @@ -59636,8 +58330,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1241 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "credential.helper" msgstr "git-commit(1)" @@ -59744,8 +58437,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1303 -#, fuzzy, no-wrap -#| msgid "git-fsck-objects(1)" +#, no-wrap msgid "fetch.fsckObjects" msgstr "git-fsck-objects(1)" @@ -59805,8 +58497,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1330 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "format.attach" msgstr "git-commit(1)" @@ -59821,8 +58512,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1337 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.from" msgstr "Configuration" @@ -59841,8 +58531,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1347 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.numbered" msgstr "Configuration" @@ -59857,8 +58546,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1354 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.headers" msgstr "Configuration" @@ -59871,15 +58559,13 @@ msgstr "" #. type: Labeled list #: en/config.txt:1358 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.to" msgstr "Configuration" #. type: Labeled list #: en/config.txt:1359 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.cc" msgstr "Configuration" @@ -59905,8 +58591,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1368 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.signature" msgstr "Configuration" @@ -59920,8 +58605,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1374 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.signatureFile" msgstr "Configuration" @@ -59934,8 +58618,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1378 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.suffix" msgstr "Configuration" @@ -59950,10 +58633,6 @@ msgstr "" # #. type: Plain text #: en/config.txt:1387 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "The default pretty format for log/show/whatchanged command, See linkgit:git-" "log[1], linkgit:git-show[1], linkgit:git-whatchanged[1]." @@ -59963,8 +58642,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1388 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.thread" msgstr "Configuration" @@ -59981,8 +58659,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1398 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.signOff" msgstr "Configuration" @@ -60025,8 +58702,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1414 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "format.useAutoBase" msgstr "Configuration" @@ -60437,29 +59113,25 @@ msgstr "" #. type: Labeled list #: en/config.txt:1602 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.category" msgstr "git-add(1)" #. type: Labeled list #: en/config.txt:1603 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.description" msgstr "git-add(1)" #. type: Labeled list #: en/config.txt:1604 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.owner" msgstr "git-add(1)" #. type: Labeled list #: en/config.txt:1605 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.url" msgstr "git-add(1)" @@ -60470,22 +59142,19 @@ msgstr "" #. type: Labeled list #: en/config.txt:1608 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.avatar" msgstr "git-add(1)" #. type: Labeled list #: en/config.txt:1609 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.blame" msgstr "git-add(1)" #. type: Labeled list #: en/config.txt:1610 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.grep" msgstr "git-add(1)" @@ -60497,22 +59166,19 @@ msgstr "" #. type: Labeled list #: en/config.txt:1612 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.patches" msgstr "git-add(1)" #. type: Labeled list #: en/config.txt:1613 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.pickaxe" msgstr "git-add(1)" #. type: Labeled list #: en/config.txt:1614 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.remote_heads" msgstr "git-add(1)" @@ -60524,8 +59190,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1616 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "gitweb.snapshot" msgstr "git-add(1)" @@ -60575,8 +59240,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:1656 -#, fuzzy, no-wrap -#| msgid "new content" +#, no-wrap msgid "gui.diffContext" msgstr "contenu nouveau" @@ -61487,10 +60151,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2046 -#, fuzzy, no-wrap -#| msgid "" -#| "[i18n]\n" -#| "\tlogoutputencoding = ISO-8859-1\n" +#, no-wrap msgid "i18n.commitEncoding" msgstr "" "[i18n]\n" @@ -61580,8 +60241,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2077 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "instaweb.local" msgstr "git-add(1)" @@ -61619,8 +60279,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2090 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "interactive.singleKey" msgstr "Mode interactif" @@ -61637,8 +60296,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2099 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "interactive.diffFilter" msgstr "Mode interactif" @@ -61661,10 +60319,6 @@ msgstr "" # #. type: Plain text #: en/config.txt:2111 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-" "whatchanged[1] assume `--abbrev-commit`. You may override this option with " @@ -61730,10 +60384,6 @@ msgstr "" # #. type: Plain text #: en/config.txt:2146 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-" "whatchanged[1] assume `--use-mailmap`." @@ -61743,8 +60393,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2147 -#, fuzzy, no-wrap -#| msgid "scissors" +#, no-wrap msgid "mailinfo.scissors" msgstr "scissors" @@ -61813,15 +60462,13 @@ msgstr "" #. type: Labeled list #: en/config.txt:2185 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "mergetool.<tool>.path" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2189 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "mergetool.<tool>.cmd" msgstr "git-commit(1)" @@ -61873,8 +60520,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2217 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "mergetool.keepBackup" msgstr "git-commit(1)" @@ -61918,8 +60564,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2236 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "mergetool.prompt" msgstr "git-commit(1)" @@ -62399,8 +61044,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2501 -#, fuzzy, no-wrap -#| msgid "default" +#, no-wrap msgid "push.default" msgstr "default" @@ -62526,8 +61170,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2572 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "push.recurseSubmodules" msgstr "git-add(1)" @@ -62654,8 +61297,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2651 -#, fuzzy, no-wrap -#| msgid "git-fsck-objects(1)" +#, no-wrap msgid "receive.fsckObjects" msgstr "git-fsck-objects(1)" @@ -62869,8 +61511,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2753 -#, fuzzy, no-wrap -#| msgid "default" +#, no-wrap msgid "remote.pushDefault" msgstr "default" @@ -62943,10 +61584,6 @@ msgstr "" # #. type: Plain text #: en/config.txt:2778 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "The default set of \"refspec\" for linkgit:git-fetch[1]. See linkgit:git-" "fetch[1]." @@ -62963,10 +61600,6 @@ msgstr "" # #. type: Plain text #: en/config.txt:2782 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "The default set of \"refspec\" for linkgit:git-push[1]. See linkgit:git-" "push[1]." @@ -63107,8 +61740,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2835 -#, fuzzy, no-wrap -#| msgid "git-fsck-objects(1)" +#, no-wrap msgid "repack.packKeptObjects" msgstr "git-fsck-objects(1)" @@ -63169,15 +61801,13 @@ msgstr "" #. type: Labeled list #: en/config.txt:2864 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.identity" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2870 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.smtpEncryption" msgstr "git-commit(1)" @@ -63214,8 +61844,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2881 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.<identity>.*" msgstr "git-commit(1)" @@ -63229,155 +61858,132 @@ msgstr "" #. type: Labeled list #: en/config.txt:2889 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.annotate" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2890 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.bcc" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2891 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.cc" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2892 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.ccCmd" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2893 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.chainReplyTo" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2895 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.envelopeSender" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2896 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.from" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2898 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.signedoffbycc" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2899 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.smtpPass" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2900 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.suppresscc" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2901 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.suppressFrom" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2902 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.to" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2903 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.smtpDomain" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2904 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.smtpServer" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2905 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.smtpServerPort" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2906 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.smtpServerOption" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2907 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.smtpUser" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2908 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.thread" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2909 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.transferEncoding" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2910 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.validate" msgstr "git-commit(1)" #. type: Labeled list #: en/config.txt:2911 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "sendemail.xmailer" msgstr "git-commit(1)" #. type: Plain text #: en/config.txt:2913 -#, fuzzy -#| msgid "git-commit(1)" msgid "See linkgit:git-send-email[1] for description." msgstr "git-commit(1)" @@ -63394,18 +62000,13 @@ msgstr "" #. type: Labeled list #: en/config.txt:2917 -#, fuzzy, no-wrap -#| msgid "default" +#, no-wrap msgid "showbranch.default" msgstr "default" # #. type: Plain text #: en/config.txt:2920 -#, fuzzy -#| msgid "" -#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-" -#| "merge[1], linkgit:git-commit-tree[1]" msgid "" "The default set of branches for linkgit:git-show-branch[1]. See linkgit:git-" "show-branch[1]." @@ -63452,8 +62053,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2946 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "status.relativePaths" msgstr "status" @@ -63467,8 +62067,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2952 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "status.short" msgstr "status" @@ -63481,8 +62080,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:2956 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "status.branch" msgstr "status" @@ -63527,22 +62125,16 @@ msgstr "" #. type: Plain text #: en/config.txt:2978 -#, fuzzy -#| msgid "'no' - Show no untracked files\n" msgid "`no` - Show no untracked files." msgstr "'no' - Ne montrer aucun fichier non-suivi\n" #. type: Plain text #: en/config.txt:2979 -#, fuzzy -#| msgid "'normal' - Shows untracked files and directories\n" msgid "`normal` - Show untracked files and directories." msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n" #. type: Plain text #: en/config.txt:2980 -#, fuzzy -#| msgid "'all' - Also shows individual files in untracked directories.\n" msgid "`all` - Show also individual files in untracked directories." msgstr "" "'all' - Montrer aussi les fichiers individuels dans le dossiers non-" @@ -63580,8 +62172,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3002 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "stash.showPatch" msgstr "status" @@ -63595,8 +62186,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3007 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "stash.showStat" msgstr "status" @@ -63610,8 +62200,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3012 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "submodule.<name>.url" msgstr "git-add(1)" @@ -63628,8 +62217,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3020 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "submodule.<name>.update" msgstr "git-add(1)" @@ -63643,8 +62231,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3026 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "submodule.<name>.branch" msgstr "git-add(1)" @@ -63673,8 +62260,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3039 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "submodule.<name>.ignore" msgstr "git-add(1)" @@ -63698,8 +62284,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3055 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "submodule.fetchJobs" msgstr "git-add(1)" @@ -63713,8 +62298,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3061 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "submodule.alternateLocation" msgstr "git-add(1)" @@ -63781,8 +62365,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3090 -#, fuzzy, no-wrap -#| msgid "git-fsck-objects(1)" +#, no-wrap msgid "transfer.fsckObjects" msgstr "git-fsck-objects(1)" @@ -64017,8 +62600,7 @@ msgstr "" #. type: Labeled list #: en/config.txt:3214 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "user.email" msgstr "git-commit(1)" @@ -64178,23 +62760,16 @@ msgstr "Format interne de Git" #. type: Plain text #: en/date-formats.txt:15 -#, fuzzy -#| msgid "" -#| "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is " -#| "the number of seconds since the UNIX epoch. `<time zone offset>` is a " -#| "positive or negative offset from UTC. For example CET (which is 1 hour " -#| "ahead of UTC) is `+0100`." msgid "" "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the " "number of seconds since the UNIX epoch. `<time zone offset>` is a positive " "or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) " "is `+0100`." msgstr "" -"Il est de la forme `<horodatage unix> <d챕calage de fuseau horaire>`, o첫 " -"`<horodatage unix>` est un nombre de secondes depuis l'챕poque UNIX. " -"`<d챕calage de fuseau horaire>` est un d챕calage positif ou n챕gative par " -"rapport 횪 UTC. Par exemple, CET (qui est en avance d'une heure sur UTC) est `" -"+0100`." +"Il est de la forme `<horodatage unix> <d챕calage de fuseau horaire>`, o첫 `<" +"horodatage unix>` est un nombre de secondes depuis l'챕poque UNIX. `<d챕calage " +"de fuseau horaire>` est un d챕calage positif ou n챕gative par rapport 횪 UTC. " +"Par exemple, CET (qui est en avance d'une heure sur UTC) est `+0100`." #. type: Labeled list #: en/date-formats.txt:16 @@ -64204,10 +62779,6 @@ msgstr "RFC 2822" #. type: Plain text #: en/date-formats.txt:19 -#, fuzzy -#| msgid "" -#| "The standard email format as described by RFC 2822, for example `Thu, 07 " -#| "Apr 2005 22:13:13 +0200`." msgid "" "The standard email format as described by RFC 2822, for example `Thu, 07 Apr " "2005 22:13:13 +0200`." @@ -64223,11 +62794,6 @@ msgstr "ISO 8601" #. type: Plain text #: en/date-formats.txt:24 -#, fuzzy -#| msgid "" -#| "Time and date specified by the ISO 8601 standard, for example " -#| "`2005-04-07T22:13:13`. The parser accepts a space instead of the `T` " -#| "character as well." msgid "" "Time and date specified by the ISO 8601 standard, for example " "`2005-04-07T22:13:13`. The parser accepts a space instead of the `T` " @@ -64267,8 +62833,7 @@ msgstr "" #. type: Labeled list #: en/diff-format.txt:10 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-diff-index <tree-ish>" msgstr "git-add(1)" @@ -64279,17 +62844,12 @@ msgstr "" #. type: Labeled list #: en/diff-format.txt:13 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-diff-index --cached <tree-ish>" msgstr "git-add(1)" #. type: Plain text #: en/diff-format.txt:15 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "compares the <tree-ish> and the index." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -64344,10 +62904,6 @@ msgstr "" #. type: Plain text #: en/diff-format.txt:38 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "That is, from the left to the right:" msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -64438,8 +62994,6 @@ msgstr "" # #. type: Plain text #: en/diff-format.txt:61 -#, fuzzy -#| msgid "modifying the contents of context or removal lines" msgid "M: modification of the contents or mode of a file" msgstr "modification de contenu de contexte ou de lignes supprim챕es" @@ -64540,8 +63094,7 @@ msgstr "" #. type: Title - #: en/diff-format.txt:114 -#, fuzzy, no-wrap -#| msgid "Git internal format" +#, no-wrap msgid "other diff formats" msgstr "Format interne de Git" @@ -64667,7 +63220,7 @@ msgstr "" #: en/diff-config.txt:1 #, no-wrap msgid "diff.autoRefreshIndex" -msgstr "" +msgstr "diff.autoRefreshIndex" #. type: Plain text #: en/diff-config.txt:10 @@ -64684,7 +63237,7 @@ msgstr "" #: en/diff-config.txt:11 #, no-wrap msgid "diff.dirstat" -msgstr "" +msgstr "diff.dirstat" #. type: Plain text #: en/diff-config.txt:18 @@ -64780,7 +63333,7 @@ msgstr "" #: en/diff-config.txt:55 #, no-wrap msgid "diff.statGraphWidth" -msgstr "" +msgstr "diff.statGraphWidth" #. type: Plain text #: en/diff-config.txt:58 @@ -64791,10 +63344,9 @@ msgstr "" #. type: Labeled list #: en/diff-config.txt:59 -#, fuzzy, no-wrap -#| msgid "new content" +#, no-wrap msgid "diff.context" -msgstr "contenu nouveau" +msgstr "diff.context" #. type: Plain text #: en/diff-config.txt:62 @@ -64807,7 +63359,7 @@ msgstr "" #: en/diff-config.txt:63 #, no-wrap msgid "diff.interHunkContext" -msgstr "" +msgstr "diff.interHunkContext" #. type: Plain text #: en/diff-config.txt:68 @@ -64819,10 +63371,9 @@ msgstr "" #. type: Labeled list #: en/diff-config.txt:69 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "diff.external" -msgstr "diff" +msgstr "diff.external" #. type: Plain text #: en/diff-config.txt:77 @@ -64839,7 +63390,7 @@ msgstr "" #: en/diff-config.txt:78 #, no-wrap msgid "diff.ignoreSubmodules" -msgstr "" +msgstr "diff.ignoreSubmodules" #. type: Plain text #: en/diff-config.txt:87 @@ -64857,7 +63408,7 @@ msgstr "" #: en/diff-config.txt:88 #, no-wrap msgid "diff.mnemonicPrefix" -msgstr "" +msgstr "diff.mnemonicPrefix" #. type: Plain text #: en/diff-config.txt:93 @@ -64870,8 +63421,7 @@ msgstr "" #. type: Labeled list #: en/diff-config.txt:93 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "`git diff`" msgstr "git-add(1)" @@ -64915,8 +63465,7 @@ msgstr "" #. type: Labeled list #: en/diff-config.txt:101 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "`git diff --no-index a b`" msgstr "git-add(1)" @@ -64929,7 +63478,7 @@ msgstr "" #: en/diff-config.txt:104 #, no-wrap msgid "diff.noprefix" -msgstr "" +msgstr "diff.noprefix" #. type: Plain text #: en/diff-config.txt:106 @@ -64938,10 +63487,9 @@ msgstr "" #. type: Labeled list #: en/diff-config.txt:107 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "diff.orderFile" -msgstr "diff" +msgstr "diff.orderFile" #. type: Plain text #: en/diff-config.txt:112 @@ -64955,7 +63503,7 @@ msgstr "" #: en/diff-config.txt:113 #, no-wrap msgid "diff.renameLimit" -msgstr "" +msgstr "diff.renameLimit" #. type: Plain text #: en/diff-config.txt:116 @@ -64968,7 +63516,7 @@ msgstr "" #: en/diff-config.txt:117 #, no-wrap msgid "diff.renames" -msgstr "" +msgstr "diff.renames" #. type: Plain text #: en/diff-config.txt:125 @@ -64985,7 +63533,7 @@ msgstr "" #: en/diff-config.txt:126 #, no-wrap msgid "diff.suppressBlankEmpty" -msgstr "" +msgstr "diff.suppressBlankEmpty" #. type: Plain text #: en/diff-config.txt:129 @@ -64996,10 +63544,9 @@ msgstr "" #. type: Labeled list #: en/diff-config.txt:130 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "diff.submodule" -msgstr "git-add(1)" +msgstr "diff.submodule" #. type: Plain text #: en/diff-config.txt:137 @@ -65015,7 +63562,7 @@ msgstr "" #: en/diff-config.txt:138 #, no-wrap msgid "diff.wordRegex" -msgstr "" +msgstr "diff.wordRegex" #. type: Plain text #: en/diff-config.txt:143 @@ -65118,7 +63665,7 @@ msgstr "" #: en/diff-config.txt:181 #, no-wrap msgid "diff.indentHeuristic" -msgstr "" +msgstr "diff.indentHeuristic" #. type: Plain text #: en/diff-config.txt:184 @@ -65131,7 +63678,7 @@ msgstr "" #: en/diff-config.txt:185 #, no-wrap msgid "diff.algorithm" -msgstr "" +msgstr "diff.algorithm" #. type: Plain text #: en/diff-config.txt:187 @@ -65188,7 +63735,7 @@ msgstr "" #: en/diff-config.txt:202 #, no-wrap msgid "diff.wsErrorHighlight" -msgstr "" +msgstr "diff.wsErrorHighlight" #. type: Plain text #: en/diff-config.txt:206 @@ -65304,10 +63851,6 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:59 -#, fuzzy -#| msgid "" -#| "The default can be changed by the `commit.cleanup` configuration variable " -#| "(see linkgit:git-config[1])." msgid "" "Pathnames with \"unusual\" characters are quoted as explained for the " "configuration variable `core.quotePath` (see linkgit:git-config[1])." @@ -65338,8 +63881,7 @@ msgstr "" #. type: Title - #: en/diff-generate-patch.txt:74 -#, fuzzy, no-wrap -#| msgid "Git internal format" +#, no-wrap msgid "combined diff format" msgstr "Format interne de Git" @@ -65554,10 +64096,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:31 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "--no-patch" -msgstr "patch" +msgstr "--no-patch" #. type: Plain text #: en/diff-options.txt:34 @@ -65610,7 +64151,7 @@ msgstr "" #: en/diff-options.txt:62 #, no-wrap msgid "--patch-with-raw" -msgstr "" +msgstr "--patch-with-raw" #. type: Plain text #: en/diff-options.txt:64 @@ -65621,13 +64162,13 @@ msgstr "" #: en/diff-options.txt:68 #, no-wrap msgid "--minimal" -msgstr "" +msgstr "--minimal" #. type: Labeled list #: en/diff-options.txt:72 #, no-wrap msgid "--patience" -msgstr "" +msgstr "--patience" #. type: Plain text #: en/diff-options.txt:74 @@ -65638,7 +64179,7 @@ msgstr "" #: en/diff-options.txt:75 #, no-wrap msgid "--histogram" -msgstr "" +msgstr "--histogram" #. type: Plain text #: en/diff-options.txt:77 @@ -65704,7 +64245,7 @@ msgstr "" #: en/diff-options.txt:123 #, no-wrap msgid "--shortstat" -msgstr "" +msgstr "--shortstat" #. type: Plain text #: en/diff-options.txt:127 @@ -65749,7 +64290,7 @@ msgstr "" #: en/diff-options.txt:177 #, no-wrap msgid "--patch-with-stat" -msgstr "" +msgstr "--patch-with-stat" #. type: Plain text #: en/diff-options.txt:179 @@ -65959,7 +64500,7 @@ msgstr "" #: en/diff-options.txt:287 #, no-wrap msgid "--no-renames" -msgstr "" +msgstr "--no-renames" #. type: Plain text #: en/diff-options.txt:290 @@ -66002,7 +64543,7 @@ msgstr "" #: en/diff-options.txt:315 #, no-wrap msgid "--full-index" -msgstr "" +msgstr "--full-index" #. type: Plain text #: en/diff-options.txt:319 @@ -66147,7 +64688,7 @@ msgstr "" #: en/diff-options.txt:390 #, no-wrap msgid "--irreversible-delete" -msgstr "" +msgstr "--irreversible-delete" #. type: Plain text #: en/diff-options.txt:398 @@ -66271,7 +64812,7 @@ msgstr "" #: en/diff-options.txt:457 #, no-wrap msgid "--pickaxe-all" -msgstr "" +msgstr "--pickaxe-all" #. type: Plain text #: en/diff-options.txt:461 @@ -66284,7 +64825,7 @@ msgstr "" #: en/diff-options.txt:462 #, no-wrap msgid "--pickaxe-regex" -msgstr "" +msgstr "--pickaxe-regex" #. type: Plain text #: en/diff-options.txt:465 @@ -66380,7 +64921,7 @@ msgstr "" #: en/diff-options.txt:522 #, no-wrap msgid "--ignore-space-at-eol" -msgstr "" +msgstr "--ignore-space-at-eol" #. type: Plain text #: en/diff-options.txt:524 @@ -66399,7 +64940,7 @@ msgstr "" #: en/diff-options.txt:532 #, no-wrap msgid "--ignore-all-space" -msgstr "" +msgstr "--ignore-all-space" #. type: Plain text #: en/diff-options.txt:536 @@ -66412,7 +64953,7 @@ msgstr "" #: en/diff-options.txt:537 #, no-wrap msgid "--ignore-blank-lines" -msgstr "" +msgstr "--ignore-blank-lines" #. type: Plain text #: en/diff-options.txt:539 @@ -66452,10 +64993,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:562 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "--ext-diff" -msgstr "diff" +msgstr "--ext-diff" #. type: Plain text #: en/diff-options.txt:566 @@ -66469,7 +65009,7 @@ msgstr "" #: en/diff-options.txt:567 #, no-wrap msgid "--no-ext-diff" -msgstr "" +msgstr "--no-ext-diff" #. type: Plain text #: en/diff-options.txt:569 @@ -66530,7 +65070,7 @@ msgstr "" #: en/diff-options.txt:600 #, no-wrap msgid "--no-prefix" -msgstr "" +msgstr "--no-prefix" #. type: Plain text #: en/diff-options.txt:602 @@ -66552,7 +65092,7 @@ msgstr "" #: en/diff-options.txt:606 #, no-wrap msgid "--ita-invisible-in-index" -msgstr "" +msgstr "--ita-invisible-in-index" #. type: Plain text #: en/diff-options.txt:613 @@ -66580,7 +65120,7 @@ msgstr "" #: en/fetch-options.txt:5 #, no-wrap msgid "--append" -msgstr "" +msgstr "--append" #. type: Plain text #: en/fetch-options.txt:9 @@ -66631,7 +65171,7 @@ msgstr "" #: en/fetch-options.txt:31 #, no-wrap msgid "--unshallow" -msgstr "" +msgstr "--unshallow" #. type: Plain text #: en/fetch-options.txt:35 @@ -66651,7 +65191,7 @@ msgstr "" #: en/fetch-options.txt:39 #, no-wrap msgid "--update-shallow" -msgstr "" +msgstr "--update-shallow" #. type: Plain text #: en/fetch-options.txt:44 @@ -66683,7 +65223,7 @@ msgstr "" #: en/fetch-options.txt:63 #, no-wrap msgid "--multiple" -msgstr "" +msgstr "--multiple" #. type: Plain text #: en/fetch-options.txt:66 @@ -66707,7 +65247,7 @@ msgstr "" #: en/fetch-options.txt:82 #, no-wrap msgid "--no-tags" -msgstr "" +msgstr "--no-tags" #. type: Plain text #: en/fetch-options.txt:88 @@ -66767,7 +65307,7 @@ msgstr "" #: en/fetch-options.txt:118 #, no-wrap msgid "-j" -msgstr "" +msgstr "-j" #. type: Labeled list #: en/fetch-options.txt:119 @@ -66824,7 +65364,7 @@ msgstr "" #: en/fetch-options.txt:144 #, no-wrap msgid "--update-head-ok" -msgstr "" +msgstr "--update-head-ok" #. type: Plain text #: en/fetch-options.txt:151 @@ -66972,10 +65512,7 @@ msgstr "" #. type: delimited block - #: en/i18n.txt:46 -#, fuzzy, no-wrap -#| msgid "" -#| "[i18n]\n" -#| "\tcommitencoding = ISO-8859-1\n" +#, no-wrap msgid "" "[i18n]\n" "\tcommitencoding = ISO-8859-1\n" @@ -66985,12 +65522,6 @@ msgstr "" #. type: Plain text #: en/i18n.txt:52 -#, fuzzy -#| msgid "" -#| "Commit objects created with the above setting record the value of `i18n." -#| "commitencoding` in its `encoding` header. This is to help other people " -#| "who look at them later. Lack of this header implies that the commit log " -#| "message is encoded in UTF-8." msgid "" "Commit objects created with the above setting record the value of `i18n." "commitencoding` in its `encoding` header. This is to help other people who " @@ -67004,12 +65535,6 @@ msgstr "" #. type: Plain text #: en/i18n.txt:58 -#, fuzzy -#| msgid "" -#| "'git log', 'git show', 'git blame' and friends look at the `encoding` " -#| "header of a commit object, and try to re-code the log message into UTF-8 " -#| "unless otherwise specified. You can specify the desired output encoding " -#| "with `i18n.logoutputencoding` in `.git/config` file, like this:" msgid "" "'git log', 'git show', 'git blame' and friends look at the `encoding` header " "of a commit object, and try to re-code the log message into UTF-8 unless " @@ -67024,10 +65549,7 @@ msgstr "" #. type: delimited block - #: en/i18n.txt:62 -#, fuzzy, no-wrap -#| msgid "" -#| "[i18n]\n" -#| "\tlogoutputencoding = ISO-8859-1\n" +#, no-wrap msgid "" "[i18n]\n" "\tlogoutputencoding = ISO-8859-1\n" @@ -67037,10 +65559,6 @@ msgstr "" #. type: Plain text #: en/i18n.txt:66 -#, fuzzy -#| msgid "" -#| "If you do not have this configuration variable, the value of `i18n." -#| "commitencoding` is used instead." msgid "" "If you do not have this configuration variable, the value of `i18n." "commitencoding` is used instead." @@ -67139,8 +65657,6 @@ msgstr "" #. type: Plain text #: en/mailmap.txt:15 -#, fuzzy -#| msgid "The possible options are:\n" msgid "The more complex forms are:" msgstr "Les options possibles sont :\n" @@ -67360,8 +65876,7 @@ msgstr "" #. type: Labeled list #: en/merge-config.txt:50 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "merge.tool" msgstr "git-commit(1)" @@ -67489,7 +66004,7 @@ msgstr "" #: en/merge-options.txt:40 #, no-wrap msgid "--ff-only" -msgstr "" +msgstr "--ff-only" #. type: Plain text #: en/merge-options.txt:44 @@ -67529,13 +66044,13 @@ msgstr "" #: en/merge-options.txt:64 #, no-wrap msgid "--squash" -msgstr "" +msgstr "--squash" #. type: Labeled list #: en/merge-options.txt:65 #, no-wrap msgid "--no-squash" -msgstr "" +msgstr "--no-squash" #. type: Plain text #: en/merge-options.txt:73 @@ -67566,8 +66081,7 @@ msgstr "" #. type: Labeled list #: en/merge-options.txt:85 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "-X <option>" msgstr "status" @@ -67580,13 +66094,13 @@ msgstr "" #: en/merge-options.txt:90 #, no-wrap msgid "--verify-signatures" -msgstr "" +msgstr "--verify-signatures" #. type: Labeled list #: en/merge-options.txt:91 #, no-wrap msgid "--no-verify-signatures" -msgstr "" +msgstr "--no-verify-signatures" #. type: Plain text #: en/merge-options.txt:97 @@ -67601,7 +66115,7 @@ msgstr "" #: en/merge-options.txt:99 #, no-wrap msgid "--no-summary" -msgstr "" +msgstr "--no-summary" #. type: Plain text #: en/merge-options.txt:102 @@ -67612,11 +66126,6 @@ msgstr "" #. type: Plain text #: en/merge-options.txt:107 -#, fuzzy -#| msgid "" -#| "-q::\n" -#| "--quiet::\n" -#| "\tSuppress commit summary message.\n" msgid "Operate quietly. Implies --no-progress." msgstr "" "-q::\n" @@ -67635,7 +66144,7 @@ msgstr "" #: en/merge-options.txt:121 #, no-wrap msgid "--allow-unrelated-histories" -msgstr "" +msgstr "--allow-unrelated-histories" #. type: Plain text #: en/merge-options.txt:127 @@ -67674,15 +66183,11 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:7 -#, fuzzy -#| msgid "diff" msgid "diffmerge" msgstr "diff" #. type: Plain text #: en/mergetools-merge.txt:8 -#, fuzzy -#| msgid "diff" msgid "diffuse" msgstr "diff" @@ -67693,43 +66198,31 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:10 -#, fuzzy -#| msgid "git-commit(1)" msgid "emerge" msgstr "git-commit(1)" #. type: Plain text #: en/mergetools-merge.txt:11 -#, fuzzy -#| msgid "diff" msgid "examdiff" msgstr "diff" #. type: Plain text #: en/mergetools-merge.txt:12 -#, fuzzy -#| msgid "diff" msgid "gvimdiff" msgstr "diff" #. type: Plain text #: en/mergetools-merge.txt:13 -#, fuzzy -#| msgid "diff" msgid "gvimdiff2" msgstr "diff" #. type: Plain text #: en/mergetools-merge.txt:14 -#, fuzzy -#| msgid "diff" msgid "gvimdiff3" msgstr "diff" #. type: Plain text #: en/mergetools-merge.txt:15 -#, fuzzy -#| msgid "diff" msgid "kdiff3" msgstr "diff" @@ -67740,8 +66233,6 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:17 -#, fuzzy -#| msgid "diff" msgid "opendiff" msgstr "diff" @@ -67752,8 +66243,6 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:19 -#, fuzzy -#| msgid "diff" msgid "tkdiff" msgstr "diff" @@ -67764,36 +66253,26 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:21 -#, fuzzy -#| msgid "diff" msgid "vimdiff" msgstr "diff" #. type: Plain text #: en/mergetools-merge.txt:22 -#, fuzzy -#| msgid "diff" msgid "vimdiff2" msgstr "diff" #. type: Plain text #: en/mergetools-merge.txt:23 -#, fuzzy -#| msgid "diff" msgid "vimdiff3" msgstr "diff" #. type: Plain text #: en/mergetools-merge.txt:24 -#, fuzzy -#| msgid "git-commit(1)" msgid "winmerge" msgstr "git-commit(1)" #. type: Plain text #: en/mergetools-merge.txt:24 -#, fuzzy -#| msgid "diff" msgid "xxdiff" msgstr "diff" @@ -68094,8 +66573,7 @@ msgstr "" #. type: Title - #: en/pretty-formats.txt:2 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "PRETTY FORMATS" msgstr "FORMATS DE DATE" @@ -68240,8 +66718,6 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:88 -#, fuzzy -#| msgid "Configuration" msgid "'format:<string>'" msgstr "Configuration" @@ -68270,8 +66746,6 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:104 -#, fuzzy -#| msgid "The possible options are:\n" msgid "The placeholders are:" msgstr "Les options possibles sont :\n" @@ -68659,8 +67133,6 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:225 -#, fuzzy -#| msgid "Configuration" msgid "'tformat:'" msgstr "Configuration" @@ -68735,10 +67207,6 @@ msgstr "" #. type: Plain text #: en/pretty-options.txt:16 -#, fuzzy -#| msgid "" -#| "The default can be changed by the `commit.cleanup` configuration variable " -#| "(see linkgit:git-config[1])." msgid "" "Note: you can specify the default pretty format in the repository " "configuration (see linkgit:git-config[1])." @@ -68750,7 +67218,7 @@ msgstr "" #: en/pretty-options.txt:17 #, no-wrap msgid "--abbrev-commit" -msgstr "" +msgstr "--abbrev-commit" #. type: Plain text #: en/pretty-options.txt:22 @@ -68771,7 +67239,7 @@ msgstr "" #: en/pretty-options.txt:26 #, no-wrap msgid "--no-abbrev-commit" -msgstr "" +msgstr "--no-abbrev-commit" #. type: Plain text #: en/pretty-options.txt:30 @@ -68809,13 +67277,13 @@ msgstr "" #: en/pretty-options.txt:46 #, no-wrap msgid "--expand-tabs" -msgstr "" +msgstr "--expand-tabs" #. type: Labeled list #: en/pretty-options.txt:47 #, no-wrap msgid "--no-expand-tabs" -msgstr "" +msgstr "--no-expand-tabs" #. type: Plain text #: en/pretty-options.txt:54 @@ -68879,7 +67347,7 @@ msgstr "" #: en/pretty-options.txt:81 #, no-wrap msgid "--no-notes" -msgstr "" +msgstr "--no-notes" #. type: Plain text #: en/pretty-options.txt:87 @@ -68900,7 +67368,7 @@ msgstr "" #: en/pretty-options.txt:89 #, no-wrap msgid "--[no-]standard-notes" -msgstr "" +msgstr "--[no-]standard-notes" #. type: Plain text #: en/pretty-options.txt:92 @@ -68911,10 +67379,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:94 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--show-signature" -msgstr "Configuration" +msgstr "--show-signature" #. type: Plain text #: en/pretty-options.txt:96 @@ -68939,10 +67406,6 @@ msgstr "" #. type: Plain text #: en/pull-fetch-param.txt:12 -#, fuzzy -#| msgid "" -#| "The default can be changed by the `commit.cleanup` configuration variable " -#| "(see linkgit:git-config[1])." msgid "" "A name referring to a list of repositories as the value of remotes.<group> " "in the configuration file. (See linkgit:git-config[1])." @@ -69746,8 +68209,7 @@ msgstr "" #. type: Title ~ #: en/rev-list-options.txt:2 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Commit Limiting" msgstr "Configuration" @@ -69795,8 +68257,6 @@ msgstr "" #. type: Plain text #: en/rev-list-options.txt:22 -#, fuzzy -#| msgid "but can be used to amend a merge commit." msgid "Limit the number of commits to output." msgstr "mais peut 챗tre utilis챕 pour corriger un commit de fusion." @@ -69870,8 +68330,7 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:41 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--committer=<pattern>" msgstr "status" @@ -69932,7 +68391,7 @@ msgstr "" #: en/rev-list-options.txt:71 #, no-wrap msgid "--invert-grep" -msgstr "" +msgstr "--invert-grep" #. type: Plain text #: en/rev-list-options.txt:74 @@ -69943,10 +68402,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:76 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "--regexp-ignore-case" -msgstr "whitespace" +msgstr "--regexp-ignore-case" #. type: Plain text #: en/rev-list-options.txt:79 @@ -69986,7 +68444,7 @@ msgstr "" #: en/rev-list-options.txt:98 #, no-wrap msgid "--remove-empty" -msgstr "" +msgstr "--remove-empty" #. type: Plain text #: en/rev-list-options.txt:100 @@ -69995,10 +68453,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:101 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--merges" -msgstr "git-commit(1)" +msgstr "--merges" #. type: Plain text #: en/rev-list-options.txt:103 @@ -70008,10 +68465,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:104 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--no-merges" -msgstr "git-commit(1)" +msgstr "--no-merges" #. type: Plain text #: en/rev-list-options.txt:107 @@ -70036,13 +68492,13 @@ msgstr "" #: en/rev-list-options.txt:110 #, no-wrap msgid "--no-min-parents" -msgstr "" +msgstr "--no-min-parents" #. type: Labeled list #: en/rev-list-options.txt:111 #, no-wrap msgid "--no-max-parents" -msgstr "" +msgstr "--no-max-parents" #. type: Plain text #: en/rev-list-options.txt:116 @@ -70148,10 +68604,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:178 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--reflog" -msgstr "git-commit(1)" +msgstr "--reflog" #. type: Plain text #: en/rev-list-options.txt:181 @@ -70169,10 +68624,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:187 en/rev-list-options.txt:569 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--bisect" -msgstr "git-commit(1)" +msgstr "--bisect" #. type: Plain text #: en/rev-list-options.txt:192 @@ -70203,7 +68657,7 @@ msgstr "" #: en/rev-list-options.txt:209 #, no-wrap msgid "--cherry-mark" -msgstr "" +msgstr "--cherry-mark" #. type: Plain text #: en/rev-list-options.txt:212 @@ -70214,10 +68668,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:213 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--cherry-pick" -msgstr "git-commit(1)" +msgstr "--cherry-pick" #. type: Plain text #: en/rev-list-options.txt:217 @@ -70241,13 +68694,13 @@ msgstr "" #: en/rev-list-options.txt:226 #, no-wrap msgid "--left-only" -msgstr "" +msgstr "--left-only" #. type: Labeled list #: en/rev-list-options.txt:227 #, no-wrap msgid "--right-only" -msgstr "" +msgstr "--right-only" #. type: Plain text #: en/rev-list-options.txt:231 @@ -70267,10 +68720,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:238 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--cherry" -msgstr "git-commit(1)" +msgstr "--cherry" #. type: Plain text #: en/rev-list-options.txt:244 @@ -70285,7 +68737,7 @@ msgstr "" #: en/rev-list-options.txt:246 #, no-wrap msgid "--walk-reflogs" -msgstr "" +msgstr "--walk-reflogs" #. type: Plain text #: en/rev-list-options.txt:252 @@ -70351,7 +68803,7 @@ msgstr "" #: en/rev-list-options.txt:282 #, no-wrap msgid "--boundary" -msgstr "" +msgstr "--boundary" #. type: Plain text #: en/rev-list-options.txt:285 @@ -70363,7 +68815,7 @@ msgstr "" #: en/rev-list-options.txt:287 #, no-wrap msgid "--use-bitmap-index" -msgstr "" +msgstr "--use-bitmap-index" #. type: Plain text #: en/rev-list-options.txt:292 @@ -70421,7 +68873,7 @@ msgstr "" #: en/rev-list-options.txt:313 #, no-wrap msgid "--simplify-by-decoration" -msgstr "" +msgstr "--simplify-by-decoration" #. type: Plain text #: en/rev-list-options.txt:315 @@ -70440,8 +68892,7 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:320 en/rev-list-options.txt:394 -#, fuzzy, no-wrap -#| msgid "default" +#, no-wrap msgid "Default mode" msgstr "default" @@ -70457,7 +68908,7 @@ msgstr "" #: en/rev-list-options.txt:326 #, no-wrap msgid "--full-history" -msgstr "" +msgstr "--full-history" #. type: Plain text #: en/rev-list-options.txt:328 @@ -70468,7 +68919,7 @@ msgstr "" #: en/rev-list-options.txt:329 en/rev-list-options.txt:462 #, no-wrap msgid "--dense" -msgstr "" +msgstr "--dense" #. type: Plain text #: en/rev-list-options.txt:332 @@ -70485,7 +68936,7 @@ msgstr "" #: en/rev-list-options.txt:336 en/rev-list-options.txt:473 #, no-wrap msgid "--simplify-merges" -msgstr "" +msgstr "--simplify-merges" #. type: Plain text #: en/rev-list-options.txt:340 @@ -70499,7 +68950,7 @@ msgstr "" #: en/rev-list-options.txt:341 en/rev-list-options.txt:520 #, no-wrap msgid "--ancestry-path" -msgstr "" +msgstr "--ancestry-path" #. type: Plain text #: en/rev-list-options.txt:347 @@ -70950,7 +69401,7 @@ msgstr "" #: en/rev-list-options.txt:593 #, no-wrap msgid "--bisect-vars" -msgstr "" +msgstr "--bisect-vars" #. type: Plain text #: en/rev-list-options.txt:604 @@ -70970,7 +69421,7 @@ msgstr "" #: en/rev-list-options.txt:605 #, no-wrap msgid "--bisect-all" -msgstr "" +msgstr "--bisect-all" #. type: Plain text #: en/rev-list-options.txt:611 @@ -70999,8 +69450,7 @@ msgstr "" #. type: Title ~ #: en/rev-list-options.txt:623 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Commit Ordering" msgstr "Configuration" @@ -71020,7 +69470,7 @@ msgstr "" #: en/rev-list-options.txt:631 #, no-wrap msgid "--author-date-order" -msgstr "" +msgstr "--author-date-order" #. type: Plain text #: en/rev-list-options.txt:634 @@ -71086,10 +69536,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:670 -#, fuzzy, no-wrap -#| msgid "git-fsck-objects(1)" +#, no-wrap msgid "--objects" -msgstr "git-fsck-objects(1)" +msgstr "--objects" #. type: Plain text #: en/rev-list-options.txt:675 @@ -71103,7 +69552,7 @@ msgstr "" #: en/rev-list-options.txt:676 #, no-wrap msgid "--objects-edge" -msgstr "" +msgstr "--objects-edge" #. type: Plain text #: en/rev-list-options.txt:682 @@ -71118,7 +69567,7 @@ msgstr "" #: en/rev-list-options.txt:683 #, no-wrap msgid "--objects-edge-aggressive" -msgstr "" +msgstr "--objects-edge-aggressive" #. type: Plain text #: en/rev-list-options.txt:687 @@ -71132,7 +69581,7 @@ msgstr "" #: en/rev-list-options.txt:688 #, no-wrap msgid "--indexed-objects" -msgstr "" +msgstr "--indexed-objects" #. type: Plain text #: en/rev-list-options.txt:692 @@ -71168,7 +69617,7 @@ msgstr "" #: en/rev-list-options.txt:707 #, no-wrap msgid "--do-walk" -msgstr "" +msgstr "--do-walk" #. type: Plain text #: en/rev-list-options.txt:709 @@ -71177,8 +69626,7 @@ msgstr "" #. type: Title ~ #: en/rev-list-options.txt:711 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Commit Formatting" msgstr "Configuration" @@ -71194,7 +69642,7 @@ msgstr "" #: en/rev-list-options.txt:721 #, no-wrap msgid "--relative-date" -msgstr "" +msgstr "--relative-date" #. type: Plain text #: en/rev-list-options.txt:723 @@ -71203,8 +69651,7 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:724 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--date=<format>" msgstr "Configuration" @@ -71323,7 +69770,7 @@ msgstr "" #: en/rev-list-options.txt:781 #, no-wrap msgid "--header" -msgstr "" +msgstr "--header" #. type: Plain text #: en/rev-list-options.txt:784 @@ -71343,7 +69790,7 @@ msgstr "" #: en/rev-list-options.txt:790 #, no-wrap msgid "--children" -msgstr "" +msgstr "--children" #. type: Plain text #: en/rev-list-options.txt:793 @@ -71356,7 +69803,7 @@ msgstr "" #: en/rev-list-options.txt:795 #, no-wrap msgid "--timestamp" -msgstr "" +msgstr "--timestamp" #. type: Plain text #: en/rev-list-options.txt:797 @@ -71367,7 +69814,7 @@ msgstr "" #: en/rev-list-options.txt:799 #, no-wrap msgid "--left-right" -msgstr "" +msgstr "--left-right" #. type: Plain text #: en/rev-list-options.txt:804 @@ -71421,7 +69868,7 @@ msgstr "" #: en/rev-list-options.txt:828 #, no-wrap msgid "--graph" -msgstr "" +msgstr "--graph" #. type: Plain text #: en/rev-list-options.txt:834 @@ -71472,8 +69919,7 @@ msgstr "" #. type: Title ~ #: en/rev-list-options.txt:860 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Diff Formatting" msgstr "Configuration" @@ -71964,17 +70410,14 @@ msgstr "" # #. type: Plain text #: en/cmds-mainporcelain.txt:3 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Add file contents to the index." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" #. type: Labeled list #: en/cmds-mainporcelain.txt:4 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-am[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-am[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:6 @@ -71983,10 +70426,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:7 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-archive[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-archive[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:9 @@ -71995,10 +70437,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-bisect[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-bisect[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:12 @@ -72007,10 +70448,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:13 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "linkgit:git-branch[1]" -msgstr "git-add(1)" +msgstr "linkgit:git-branch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:15 @@ -72019,10 +70459,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:16 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "linkgit:git-bundle[1]" -msgstr "git-add(1)" +msgstr "linkgit:git-bundle[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:18 @@ -72031,10 +70470,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:19 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-checkout[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:21 @@ -72048,10 +70486,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:25 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-citool[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-citool[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:27 @@ -72060,17 +70497,12 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:28 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-clean[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-clean[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:30 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Remove untracked files from the working tree." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -72078,10 +70510,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:31 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-clone[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-clone[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:33 @@ -72090,24 +70521,20 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:34 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-commit[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-commit[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:36 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Record changes to the repository." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-mainporcelain.txt:37 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-describe[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-describe[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:39 @@ -72121,17 +70548,14 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:45 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Download objects and refs from another repository." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-mainporcelain.txt:46 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-format-patch[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-format-patch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:48 @@ -72140,10 +70564,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:49 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-gc[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-gc[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:51 @@ -72152,10 +70575,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:52 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-grep[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-grep[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:54 @@ -72164,10 +70586,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:55 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-gui[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-gui[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:57 @@ -72176,10 +70597,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:58 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-init[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-init[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:60 @@ -72188,10 +70608,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:61 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-log[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-log[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:63 @@ -72205,10 +70624,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:67 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-mv[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-mv[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:69 @@ -72217,10 +70635,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:70 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-notes[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-notes[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:72 @@ -72234,10 +70651,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:76 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-push[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-push[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:78 @@ -72251,10 +70667,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:82 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-reset[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-reset[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:84 @@ -72268,17 +70683,12 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:88 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-rm[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-rm[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:90 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Remove files from the working tree and from the index." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -72286,10 +70696,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:91 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-shortlog[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-shortlog[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:93 @@ -72298,10 +70707,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:94 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-show[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-show[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:96 @@ -72310,10 +70718,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:97 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-stash[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-stash[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:99 @@ -72322,10 +70729,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:100 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-status[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-status[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:102 @@ -72334,10 +70740,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:103 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "linkgit:git-submodule[1]" -msgstr "git-add(1)" +msgstr "linkgit:git-submodule[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:105 @@ -72346,10 +70751,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:106 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-tag[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-tag[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:108 @@ -72358,10 +70762,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:109 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-worktree[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-worktree[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:111 @@ -72390,10 +70793,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-filter-branch[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-filter-branch[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:12 @@ -72407,10 +70809,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:16 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-pack-refs[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-pack-refs[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:18 @@ -72419,10 +70820,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:19 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-prune[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-prune[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:21 @@ -72431,10 +70831,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:22 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-reflog[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-reflog[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:24 @@ -72443,24 +70842,20 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-remote[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-remote[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:27 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Manage set of tracked repositories." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:28 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-repack[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-repack[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:30 @@ -72469,10 +70864,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:31 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-replace[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-replace[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:33 @@ -72491,10 +70885,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:7 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-cherry[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-cherry[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:9 @@ -72503,10 +70896,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-count-objects[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-count-objects[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:12 @@ -72515,10 +70907,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:13 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-difftool[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-difftool[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:15 @@ -72527,17 +70918,15 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:16 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-fsck[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-fsck[1]" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:19 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-get-tar-commit-id[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-get-tar-commit-id[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:21 @@ -72546,10 +70935,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:22 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-help[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-help[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:24 @@ -72558,10 +70946,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:25 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-instaweb[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-instaweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:27 @@ -72570,10 +70957,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:28 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-merge-tree[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-merge-tree[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:30 @@ -72582,10 +70968,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:31 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-rerere[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-rerere[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:33 @@ -72594,10 +70979,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:34 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "linkgit:git-rev-parse[1]" -msgstr "git-add(1)" +msgstr "linkgit:git-rev-parse[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:36 @@ -72606,10 +70990,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:37 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-show-branch[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-show-branch[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:39 @@ -72618,10 +71001,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:40 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-verify-commit[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-verify-commit[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:42 @@ -72630,10 +71012,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:43 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-verify-tag[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-verify-tag[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:45 @@ -72642,10 +71023,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:46 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "linkgit:git-whatchanged[1]" -msgstr "git-add(1)" +msgstr "linkgit:git-whatchanged[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:48 @@ -72659,10 +71039,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:1 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-archimport[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-archimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:3 @@ -72671,10 +71050,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:4 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-cvsexportcommit[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-cvsexportcommit[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:6 @@ -72683,10 +71061,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:7 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-cvsimport[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-cvsimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:9 @@ -72695,10 +71072,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-cvsserver[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-cvsserver[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:12 @@ -72707,10 +71083,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:13 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "linkgit:git-imap-send[1]" -msgstr "git-add(1)" +msgstr "linkgit:git-imap-send[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:15 @@ -72719,24 +71094,20 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:16 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-p4[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-p4[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:18 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Import from and submit to Perforce repositories." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-foreignscminterface.txt:19 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-quiltimport[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-quiltimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:21 @@ -72745,10 +71116,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:22 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-request-pull[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-request-pull[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:24 @@ -72757,10 +71127,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:25 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-send-email[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-send-email[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:27 @@ -72769,10 +71138,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:28 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-svn[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-svn[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:30 @@ -72781,32 +71149,24 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:1 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-apply[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-apply[1]" # #. type: Plain text #: en/cmds-plumbingmanipulators.txt:3 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Apply a patch to files and/or to the index." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:4 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-checkout-index[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-checkout-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:6 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Copy files from the index to the working tree." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -72814,10 +71174,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:7 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-commit-tree[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-commit-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:9 @@ -72826,10 +71185,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-hash-object[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-hash-object[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:12 @@ -72838,10 +71196,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:13 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-index-pack[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-index-pack[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:15 @@ -72850,10 +71207,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:16 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-merge-file[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-merge-file[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:18 @@ -72862,10 +71218,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:19 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-merge-index[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-merge-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:21 @@ -72874,10 +71229,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:22 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-mktag[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-mktag[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:24 @@ -72886,10 +71240,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:25 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-mktree[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-mktree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:27 @@ -72898,10 +71251,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:28 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-pack-objects[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-pack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:30 @@ -72910,10 +71262,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:31 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-prune-packed[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-prune-packed[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:33 @@ -72922,25 +71273,21 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:34 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-read-tree[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-read-tree[1]" # #. type: Plain text #: en/cmds-plumbingmanipulators.txt:36 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Reads tree information into the index." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:37 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "linkgit:git-symbolic-ref[1]" -msgstr "git-add(1)" +msgstr "linkgit:git-symbolic-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:39 @@ -72949,10 +71296,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:40 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-unpack-objects[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-unpack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:42 @@ -72961,25 +71307,21 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:43 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "linkgit:git-update-index[1]" -msgstr "git-add(1)" +msgstr "linkgit:git-update-index[1]" # #. type: Plain text #: en/cmds-plumbingmanipulators.txt:45 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "Register file contents in the working tree to the index." msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:46 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-update-ref[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-update-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:48 @@ -72993,10 +71335,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:1 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-cat-file[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-cat-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:3 @@ -73005,17 +71346,12 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:4 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-diff-files[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-diff-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:6 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Compares files in the working tree and the index." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -73023,17 +71359,12 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:7 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-diff-index[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-diff-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:9 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "Compare a tree to the working tree or index." msgstr "" "en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " @@ -73041,10 +71372,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-diff-tree[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-diff-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:12 @@ -73053,10 +71383,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:13 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-for-each-ref[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-for-each-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:15 @@ -73065,10 +71394,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:16 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-ls-files[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-ls-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:18 @@ -73077,10 +71405,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:19 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-ls-remote[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-ls-remote[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:21 @@ -73089,10 +71416,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:22 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-ls-tree[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-ls-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:24 @@ -73101,10 +71427,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:25 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-merge-base[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-merge-base[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:27 @@ -73113,10 +71438,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:28 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-name-rev[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-name-rev[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:30 @@ -73125,10 +71449,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:31 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-pack-redundant[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-pack-redundant[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:33 @@ -73137,10 +71460,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:34 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-rev-list[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-rev-list[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:36 @@ -73149,10 +71471,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:37 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-show-index[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-show-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:39 @@ -73166,10 +71487,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:43 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-unpack-file[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-unpack-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:45 @@ -73178,10 +71498,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:46 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-var[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-var[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:48 @@ -73190,10 +71509,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:49 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-verify-pack[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-verify-pack[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:51 @@ -73202,10 +71520,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:1 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-daemon[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-daemon[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:3 @@ -73214,24 +71531,20 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:4 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-fetch-pack[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-fetch-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:6 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Receive missing objects from another repository." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-synchingrepositories.txt:7 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-http-backend[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-http-backend[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:9 @@ -73240,24 +71553,20 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-send-pack[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-send-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:12 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Push objects over Git protocol to another repository." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-synchingrepositories.txt:13 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-update-server-info[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-update-server-info[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:15 @@ -73266,38 +71575,31 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:1 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-http-fetch[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-http-fetch[1]" #. type: Plain text #: en/cmds-synchelpers.txt:3 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Download from a remote Git repository via HTTP." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-synchelpers.txt:4 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-http-push[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-http-push[1]" #. type: Plain text #: en/cmds-synchelpers.txt:6 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Push objects over HTTP/DAV to another repository." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-synchelpers.txt:7 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-parse-remote[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-parse-remote[1]" #. type: Plain text #: en/cmds-synchelpers.txt:9 @@ -73306,24 +71608,20 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-receive-pack[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-receive-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:12 -#, fuzzy -#| msgid "git-commit - Record changes to the repository" msgid "Receive what is pushed into the repository." msgstr "git-commit - Enregistrer les modifications dans le d챕p척t" #. type: Labeled list #: en/cmds-synchelpers.txt:13 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-shell[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-shell[1]" #. type: Plain text #: en/cmds-synchelpers.txt:15 @@ -73332,10 +71630,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:16 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-upload-archive[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-upload-archive[1]" #. type: Plain text #: en/cmds-synchelpers.txt:18 @@ -73344,10 +71641,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:19 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-upload-pack[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-upload-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:21 @@ -73356,10 +71652,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:1 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-check-attr[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-check-attr[1]" #. type: Plain text #: en/cmds-purehelpers.txt:3 @@ -73368,10 +71663,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:4 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-check-ignore[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-check-ignore[1]" #. type: Plain text #: en/cmds-purehelpers.txt:6 @@ -73380,10 +71674,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:7 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-check-mailmap[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-check-mailmap[1]" #. type: Plain text #: en/cmds-purehelpers.txt:9 @@ -73392,10 +71685,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:10 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-check-ref-format[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-check-ref-format[1]" #. type: Plain text #: en/cmds-purehelpers.txt:12 @@ -73404,10 +71696,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:13 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-column[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-column[1]" #. type: Plain text #: en/cmds-purehelpers.txt:15 @@ -73416,10 +71707,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:16 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-credential[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-credential[1]" #. type: Plain text #: en/cmds-purehelpers.txt:18 @@ -73428,10 +71718,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:19 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-credential-cache[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-credential-cache[1]" #. type: Plain text #: en/cmds-purehelpers.txt:21 @@ -73440,10 +71729,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:22 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-credential-store[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-credential-store[1]" #. type: Plain text #: en/cmds-purehelpers.txt:24 @@ -73452,10 +71740,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:25 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-fmt-merge-msg[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-fmt-merge-msg[1]" #. type: Plain text #: en/cmds-purehelpers.txt:27 @@ -73464,10 +71751,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:28 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-interpret-trailers[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-interpret-trailers[1]" #. type: Plain text #: en/cmds-purehelpers.txt:30 @@ -73476,10 +71762,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:31 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-mailinfo[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-mailinfo[1]" #. type: Plain text #: en/cmds-purehelpers.txt:33 @@ -73488,10 +71773,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:34 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-mailsplit[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-mailsplit[1]" #. type: Plain text #: en/cmds-purehelpers.txt:36 @@ -73500,10 +71784,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:37 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-merge-one-file[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-merge-one-file[1]" #. type: Plain text #: en/cmds-purehelpers.txt:39 @@ -73517,10 +71800,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:43 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-sh-i18n[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-sh-i18n[1]" #. type: Plain text #: en/cmds-purehelpers.txt:45 @@ -73529,10 +71811,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:46 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-sh-setup[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-sh-setup[1]" #. type: Plain text #: en/cmds-purehelpers.txt:48 @@ -73541,10 +71822,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:49 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "linkgit:git-stripspace[1]" -msgstr "git-commit(1)" +msgstr "linkgit:git-stripspace[1]" #. type: Plain text #: en/cmds-purehelpers.txt:51 -- GitLab