diff --git a/po/documentation.fr.po b/po/documentation.fr.po index cef8ea2c34d3286fb792eb0dd5dd1645c964ee49..dd95d1dde00a8d2ad490f7eb7879f1175684c678 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -1,12 +1,12 @@ # French translations for Git Manual Pages. # Copyright (C) 2017 Jean-No챘l Avila <jn.avila@free.fr> # This file is distributed under the same license as the Git package. -# Jean-No챘l Avila <jn.avila@free.fr>, 2017. +# Jean-No챘l Avila <jn.avila@free.fr>, 2019. msgid "" msgstr "" "Project-Id-Version: git documentation\n" "POT-Creation-Date: 2019-01-04 23:29+0100\n" -"PO-Revision-Date: 2019-01-14 20:58+0100\n" +"PO-Revision-Date: 2019-01-20 18:21+0100\n" "Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -6925,9 +6925,8 @@ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis." #. type: Plain text #: en/config.txt:2980 -#, fuzzy msgid "`all` - Show also individual files in untracked directories." -msgstr "'all' - Montrer aussi les fichiers individuels dans le dossiers non-suivis." +msgstr "`all` - Montrer aussi les fichiers individuels dans le dossiers non-suivis." #. type: Plain text #: en/config.txt:2985 @@ -9925,7 +9924,7 @@ msgstr "" #: en/fmt-merge-msg-config.txt:1 #, no-wrap msgid "merge.branchdesc" -msgstr "" +msgstr "merge.branchdesc" #. type: Plain text #: en/fmt-merge-msg-config.txt:5 @@ -9936,7 +9935,7 @@ msgstr "" #: en/fmt-merge-msg-config.txt:6 #, no-wrap msgid "merge.log" -msgstr "" +msgstr "merge.log" #. type: Plain text #: en/fmt-merge-msg-config.txt:10 @@ -12029,7 +12028,7 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:50 msgid "Report progress to stderr." -msgstr "Mode bavard." +msgstr "Afficher l'챕tat d'avancement sur stderr.." #. type: Labeled list #: en/git-archive.txt:51 en/git-read-tree.txt:84 en/git-write-tree.txt:35 @@ -14688,10 +14687,8 @@ 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 de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "Ne prendre en compte `.gitattributes` dans l'index seulement, en ignorant l'arbre de travail." #. type: Labeled list #: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 @@ -15073,10 +15070,8 @@ 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" +msgstr "git-checkout-index - Copie les fichiers depuis l'index dans l'arbre de travail" #. type: Plain text #: en/git-checkout-index.txt:17 @@ -15091,10 +15086,8 @@ 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)." -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'," +msgstr "Va copier tous les fichiers indiqu챕s depuis l'index dans l'arbre de travail (sans 챕craser les fichiers existants)." #. type: Plain text #: en/git-checkout-index.txt:29 @@ -15103,23 +15096,13 @@ 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" +msgstr "rester silencieux si les fichiers existent ou ne sont pas dans 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" -"--force::\n" -"\tForce l'ajout de fichiers qui sont normalement ignor챕s.\n" +msgstr "forcer l'챕crasement de fichiers existants" #. type: Plain text #: en/git-checkout-index.txt:42 @@ -16449,10 +16432,9 @@ 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" +msgstr "-X<option>" #. type: Labeled list #: en/git-cherry-pick.txt:147 en/git-revert.txt:100 en/merge-options.txt:86 @@ -16822,10 +16804,8 @@ 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 de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "git-clean - Supprime les fichiers non suivis de l'arbre de travail" #. type: Plain text #: en/git-clean.txt:12 @@ -16865,18 +16845,8 @@ 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" -"--dry-run::\n" -"\tN'ajoute pas r챕ellement les fichiers. Montrer juste s'ils existent\n" -"\tou seront ignor챕s.\n" +msgstr "Ne rien supprimer effectivement, montrer juste ce qui serait fait." #. type: Plain text #: en/git-clean.txt:55 @@ -16918,19 +16888,12 @@ 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." -msgstr "Quand la commande entre en mode interactif, elle affiche le r챕sultat de la sous-commande 'status', puis entre en boucle de commande interactive." +msgstr "Quand la commande entre en mode interactif, elle affiche les fichiers et r챕pertoires 횪 supprimer, puis entre en boucle de commande interactive." #. 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" @@ -16938,23 +16901,19 @@ msgid "" " What now> 1\n" msgstr "" " *** Commands ***\n" -" 1: status 2: update 3: revert 4: add untracked\n" -" 5: patch 6: diff 7: quit 8: help\n" +"\t1: clean 2: filter by pattern 3: select by numbers\n" +"\t4: ask each 5: quit 6: help\n" " What now> 1\n" #. 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 "Vous pouvez indiquer `s` ou `sta` ou `status` dans le cas si dessus, 횪 condition que le choix soit unique." +msgstr "Vous pouvez indiquer `c` ou `clean` ci-dessus, 횪 condition que le choix soit unique." #. 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) et quit (quitter))." +msgstr "La boucle de commande principale propose 6 sous-commandes." #. type: Labeled list #: en/git-clean.txt:96 @@ -16986,10 +16945,8 @@ 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, 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 items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu." -msgstr "Affiche l'information d'챕tat et un prompt \"Update>>\". Quand le prompt se termine par un double '>', vous pouvez s챕lectionner plus d'une option, concat챕n챕es avec des espaces ou des virgules. Vous pouvez aussi indiquer des intervalles. Par exemple \"2-5 7,9\" pour choisir 2, 3, 4, 5, 7 et 9 dans la liste. Si le second nombre d'un intervalle est absent, tous les patchs restants sont s챕lectionn챕s. Par ex. \"7-\" choisit 7, 8 et 9 dans la liste. '*' permet de tout s챕lectionner." +msgstr "Affiche les fichiers et les r챕pertoires 횪 supprimer et un prompt \"Slect items to delete>>\". Quand le prompt se termine par un double '>', comme ceci, vous pouvez s챕lectionner plus d'une option, concat챕n챕es avec des espaces ou des virgules. Vous pouvez aussi indiquer des intervalles. Par exemple \"2-5 7,9\" pour choisir 2, 3, 4, 5, 7 et 9 dans la liste. Si le second nombre d'un intervalle est absent, tous les items restants sont s챕lectionn챕s. Par ex. \"7-\" choisit 7, 8 et 9 dans la liste. Vous pouvez indiquer '*' pour tout s챕lectionner. Enfin, quand le resultat filtr챕 est satisfaisant, pressez ENTR횋E (vide) pour retourner au menu principal." #. type: Labeled list #: en/git-clean.txt:121 @@ -17065,10 +17022,8 @@ 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.url` and `remote.origin.fetch` configuration variables." -msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])." +msgstr "La configuration par d챕faut peut 챗tre accomplie en cr챕ant des r챕f챕rences sur les t챗tes des branches distantes sous `ref/remotes/origin` et en initialisant les variables de configuration `remote.origin.url` et `remote.origin.fetch`." #. type: Labeled list #: en/git-clone.txt:43 en/git-config.txt:127 en/git-instaweb.txt:24 @@ -17220,10 +17175,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:163 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "--branch <name>" -msgstr "Mode interactif" +msgstr "--branch <nom>" #. type: Labeled list #: en/git-clone.txt:164 @@ -17238,10 +17192,9 @@ 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)" +msgstr "-u <packet-de-t챕l챕versement>" #. type: Plain text #: en/git-clone.txt:177 @@ -17552,10 +17505,8 @@ 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" +msgstr "git-commit - Cr챕e un nouvel objet commit" #. type: Plain text #: en/git-commit-tree.txt:15 @@ -17633,18 +17584,8 @@ msgstr "-F <fichier>" #. 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." -msgstr "" -"-F <fichier>::\n" -"--file=<fichier>::\n" -"\tPrendre le message de validation depuis le fichier indiqu챕.\n" -"\tUtilisez '-' pour lire le message depuis l'entr챕e standard.\n" +msgstr "Lire le message de validation depuis le fichier indiqu챕. Utilisez '-' pour lire le message depuis l'entr챕e standard." #. type: Labeled list #: en/git-commit-tree.txt:63 en/git-commit.txt:332 @@ -17659,10 +17600,9 @@ msgstr "" #. type: Title - #: en/git-commit-tree.txt:69 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Commit Information" -msgstr "Configuration" +msgstr "Information de validation" #. type: Plain text #: en/git-commit-tree.txt:72 @@ -17801,9 +17741,8 @@ msgstr "en utilisant les options --interactive ou --patch avec la commande 'comm #. 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)." -msgstr "L'option `--dry-run` peut 챗tre utilis챕e pour obtenir un r챕sum챕 de ce qui sera inclus par une des commandes ci-dessus pour la prochaine validation en fournissant le jeu de param챔tres (options et chemins)." +msgstr "L'option `--dry-run` peut 챗tre utilis챕e pour obtenir un r챕sum챕 de ce qui sera inclus par une des commandes ci-dessus pour la prochaine validation en fournissant le m챗me jeu de param챔tres (options et chemins)." #. type: Plain text #: en/git-commit.txt:56 @@ -17839,10 +17778,9 @@ msgstr "Prendre un objet commit existant et r챕utiliser son message de validatio #. type: Labeled list #: en/git-commit.txt:78 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "-c <commit>" -msgstr "git-commit(1)" +msgstr "-c <commit>" #. type: Labeled list #: en/git-commit.txt:79 @@ -17863,9 +17801,8 @@ msgstr "--fixup=<commit>" #. type: Plain text #: en/git-commit.txt:88 -#, fuzzy 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 "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." +msgstr "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챕e de 짬혻fixup! 혻쨩. R챕f챕rez-vous 횪 linkgit:git-rebase[1] pour de plus amples d챕tails." #. type: Labeled list #: en/git-commit.txt:89 @@ -18086,8 +18023,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 the message is to be edited. \"`#`\" can be customized with core.commentChar." 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." @@ -18131,7 +18066,6 @@ msgstr "--amend" #. type: Plain text #: en/git-commit.txt:234 -#, fuzzy 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 and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as `-m`, `-F`, `-c`, etc. The new commit has the same parents and author as the current one (the `--reset-author` option can countermand this)." msgstr "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)." @@ -18453,10 +18387,8 @@ 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" +msgstr "git-config - Lire et 챕crire les options du d챕p척t et les options globales" #. type: Plain text #: en/git-config.txt:27 @@ -18699,10 +18631,8 @@ 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 de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "Supprimer la section indiqu챕e du fichier de configuration." #. type: Labeled list #: en/git-config.txt:150 @@ -18874,10 +18804,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:249 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "~/.gitconfig" -msgstr "git-commit(1)" +msgstr "~/.gitconfig" #. type: Plain text #: en/git-config.txt:252 @@ -18892,10 +18821,8 @@ msgstr "" #. type: Plain text #: en/git-config.txt:255 -#, fuzzy -#| msgid "by using 'git rm' to remove files from the working tree and the index, again before using the 'commit' command;" msgid "Repository specific configuration file." -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'," +msgstr "Fichier de configuration sp챕cifique au d챕p척t." #. type: Plain text #: en/git-config.txt:261 @@ -19202,10 +19129,8 @@ 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." +msgstr "compte혻: le nombre d'objets perdus" #. type: Plain text #: en/git-count-objects.txt:28 @@ -19353,10 +19278,9 @@ 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)" +msgstr "git credential-cache exit\n" #. type: Plain text #: en/git-credential-cache.txt:56 en/git-credential-store.txt:75 @@ -19427,10 +19351,9 @@ msgstr "" #. type: Labeled list #: en/git-credential-store.txt:32 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "--file=<path>" -msgstr "patch" +msgstr "--file=<chemin>" #. type: Plain text #: en/git-credential-store.txt:42 @@ -19444,10 +19367,9 @@ msgstr "" #. type: Labeled list #: en/git-credential-store.txt:50 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "~/.git-credentials" -msgstr "git-commit(1)" +msgstr "~/.git-credentials" #. type: Plain text #: en/git-credential-store.txt:52 @@ -19501,10 +19423,9 @@ msgstr "" #. type: Title - #: en/git-credential-store.txt:88 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "STORAGE FORMAT" -msgstr "FORMATS DE DATE" +msgstr "FORMAT DE STOCKAGE" #. type: Plain text #: en/git-credential-store.txt:92 @@ -19828,10 +19749,9 @@ 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)" +msgstr "cvsexportcommit.cvsdir" #. type: Plain text #: en/git-cvsexportcommit.txt:89 @@ -19960,10 +19880,9 @@ 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)" +msgstr "<module_CVS>" #. type: Plain text #: en/git-cvsimport.txt:66 @@ -20910,10 +20829,8 @@ 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" +msgstr "git-daemon - un serveur vraiment tr챔s simple pour les d챕p척ts Git" #. type: Plain text #: en/git-daemon.txt:24 @@ -21234,10 +21151,9 @@ 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)" +msgstr "upload-pack" #. type: Plain text #: en/git-daemon.txt:218 @@ -21246,10 +21162,9 @@ 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)" +msgstr "upload-archive" #. type: Plain text #: en/git-daemon.txt:223 @@ -21258,10 +21173,9 @@ 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)" +msgstr "receive-pack" #. type: Plain text #: en/git-daemon.txt:233 @@ -21644,10 +21558,8 @@ 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 de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "git-diff-files - Compare les fichiers dans l'arbre de travail et dans l'index" #. type: Plain text #: en/git-diff-files.txt:13 @@ -21713,10 +21625,8 @@ 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" +msgstr "git-diff-index - Compare un arbre avec l'arbre de travail ou l'index" #. type: Plain text #: en/git-diff-index.txt:13 @@ -21736,10 +21646,8 @@ 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챕." +msgstr "Ne pas consid챕rer le fichier sur disque" #. type: Plain text #: en/git-diff-index.txt:37 @@ -21937,10 +21845,9 @@ 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" +msgstr "--tool=<outil>" #. type: Plain text #: en/git-difftool.txt:42 @@ -21996,10 +21903,9 @@ 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)" +msgstr "-x <commande>" #. type: Labeled list #: en/git-difftool.txt:82 @@ -22484,10 +22390,8 @@ 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 de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "Modifications dans l'arbre de travail pas encore index챕es pour la prochaine validation." #. type: Plain text #: en/git-diff.txt:122 @@ -22616,10 +22520,8 @@ 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]" -msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]" #. type: Title = #: en/git-fast-export.txt:2 @@ -22802,10 +22704,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:117 -#, fuzzy, no-wrap -#| msgid "<git-rev-list-args>" +#, no-wrap msgid "[<git-rev-list-args>...]" -msgstr "<git-rev-list-args>" +msgstr "[<git-rev-list-args>...]" #. type: Plain text #: en/git-fast-export.txt:123 @@ -23110,17 +23011,14 @@ 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)" +msgstr "Voir linkgit:git-config[1]" #. type: Title - #: en/git-fast-import.txt:143 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Performance" -msgstr "Configuration" +msgstr "Performance" #. type: Plain text #: en/git-fast-import.txt:150 @@ -23182,10 +23080,9 @@ 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" +msgstr "Format d'entr챕e" #. type: Plain text #: en/git-fast-import.txt:214 @@ -23199,10 +23096,9 @@ 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" +msgstr "Commentaires dans le flux\n" #. type: Plain text #: en/git-fast-import.txt:231 @@ -23259,10 +23155,8 @@ 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 exemple `Thu, 07 Apr 2005 22:13:13 +0200`." +msgstr "C'est le standard de format des courriels tel que d챕crit par la RFC 2822." #. type: Plain text #: en/git-fast-import.txt:269 @@ -23642,10 +23536,9 @@ 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" +msgstr "Format externe de donn챕es" #. type: Plain text #: en/git-fast-import.txt:530 @@ -23665,10 +23558,9 @@ 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" +msgstr "Format en ligne de donn챕es" #. type: Plain text #: en/git-fast-import.txt:545 @@ -24096,10 +23988,9 @@ 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" +msgstr "Format d챕limit챕" #. type: Plain text #: en/git-fast-import.txt:870 @@ -24872,10 +24763,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:1442 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "per active tree" -msgstr "Mode interactif" +msgstr "par arbre actif" #. type: Plain text #: en/git-fast-import.txt:1447 @@ -24884,10 +24774,9 @@ 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" +msgstr "par entr챕e active de fichier" #. type: Plain text #: en/git-fast-import.txt:1455 @@ -24918,10 +24807,8 @@ 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" +msgstr "git-fetch-pack - Recevoir les objets manquants depuis un autre d챕p척t" #. type: Plain text #: en/git-fetch-pack.txt:16 @@ -24997,10 +24884,9 @@ 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)" +msgstr "--upload-pack=<pack-de-t챕l챕versement-git>" #. type: Plain text #: en/git-fetch-pack.txt:81 @@ -25009,10 +24895,9 @@ 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)" +msgstr "--exec=<pack-de-t챕l챕versement-git>" #. type: Plain text #: en/git-fetch-pack.txt:84 @@ -25064,23 +24949,13 @@ 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" -"--verbose::\n" -" Mode bavard.\n" +msgstr "Mode bavard." #. 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" +msgstr "L'URL du d챕p척t distant." #. type: Labeled list #: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:68 @@ -25106,10 +24981,8 @@ 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" +msgstr "git-fetch - T챕l챕charger les objets et r챕f챕rences depuis un autre d챕p척t" #. type: Plain text #: en/git-fetch.txt:16 @@ -25355,10 +25228,9 @@ 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" +msgstr "$ git fetch origin\n" #. type: Plain text #: en/git-fetch.txt:167 @@ -25372,10 +25244,9 @@ 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" +msgstr "$ git fetch origin +pu:pu maint:tmp\n" #. type: Plain text #: en/git-fetch.txt:177 @@ -26082,24 +25953,14 @@ 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" -"--file=<fichier>::\n" -"\tPrendre le message de validation depuis le fichier indiqu챕.\n" -"\tUtilisez '-' pour lire le message depuis l'entr챕e standard.\n" +msgstr "Prendre la liste des objets fusionn챕s depuis <fichier> au lieu de lire depuis l'entr챕e standard." #. type: Labeled list #: en/git-fmt-merge-msg.txt:56 #, no-wrap msgid "merge.summary" -msgstr "" +msgstr "merge.summary" #. type: Plain text #: en/git-fmt-merge-msg.txt:59 @@ -26127,10 +25988,8 @@ 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" +msgstr "git-for-each-ref - Affiche des informations sur chaque r챕f챕rence" #. type: Plain text #: en/git-for-each-ref.txt:15 @@ -26171,10 +26030,9 @@ 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" +msgstr "<format>" #. type: Plain text #: en/git-for-each-ref.txt:51 @@ -26380,10 +26238,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:171 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "if" -msgstr "diff" +msgstr "if" #. type: Plain text #: en/git-for-each-ref.txt:183 @@ -27058,10 +26915,9 @@ 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)" +msgstr "--base=<commit>" #. type: Plain text #: en/git-format-patch.txt:278 @@ -27295,10 +27151,9 @@ msgstr "" #. type: Title ^ #: en/git-format-patch.txt:440 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Approach #1 (add-on)" -msgstr "Configuration" +msgstr "Approche n째1 (add-on)" #. type: Plain text #: en/git-format-patch.txt:448 @@ -27307,10 +27162,9 @@ msgstr "" #. type: Title ^ #: en/git-format-patch.txt:450 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Approach #2 (configuration)" -msgstr "Configuration" +msgstr "Approche n째2 (configuration)" #. type: Plain text #: en/git-format-patch.txt:452 @@ -27349,10 +27203,9 @@ msgstr "" #. type: Title ^ #: en/git-format-patch.txt:478 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Approach #3 (external editor)" -msgstr "Configuration" +msgstr "Approche n째3 (챕diteur externe)" #. type: Plain text #: en/git-format-patch.txt:483 @@ -27449,10 +27302,9 @@ 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" +msgstr "INFORMATION D'ARBRE DE BASE" #. type: Plain text #: en/git-format-patch.txt:544 @@ -27592,8 +27444,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" msgstr "git-fsck-objects - V챕rifier la connectivit챕 et la validit챕 des objets en base de donn챕es" @@ -27605,10 +27455,8 @@ 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." -msgstr "Ceci est un synonyme pour linkgit:git-fsck[1]. Veuillez vous r챕f챕rer 횪 la documentation de cette commande." +msgstr "Ceci est un synonyme pour linkgit:git-fsck[1]. Veuillez vous r챕f챕rer 횪 la documentation de cette commande." #. type: Title = #: en/git-fsck.txt:2 @@ -27618,8 +27466,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" msgstr "git-fsck - V챕rifier la connectivit챕 et la validit챕 des objets dans la base de donn챕es" @@ -27639,14 +27485,8 @@ msgstr "" #. 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" -"\tUn objet 횪 traiter comme la t챗te d'une trace d'inaccessibilit챕.\n" +msgstr "Un objet 횪 traiter comme la t챗te d'une trace d'inaccessibilit챕." #. type: Plain text #: en/git-fsck.txt:29 @@ -27693,14 +27533,8 @@ 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." -msgstr "" -"<objet>::\n" -"\tUn objet 횪 traiter comme la t챗te d'une trace d'inaccessibilit챕.\n" +msgstr "Consid챕rer aussi un objet enregistr챕 dans l'index comme la t챗te d'une trace d'inaccessibilit챕." #. type: Labeled list #: en/git-fsck.txt:48 @@ -27885,16 +27719,14 @@ 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" +msgstr "utilis챕 pour sp챕cifier le fichier d'index de l'index" #. type: Labeled list #: en/git-fsck.txt:154 #, no-wrap msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES" -msgstr "" +msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES" #. type: Plain text #: en/git-fsck.txt:156 @@ -27990,23 +27822,13 @@ 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." +msgstr "Ne pas supprimer les objets esseul챕s." #. 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" -"--quiet::\n" -"\tSupprimer le message de r챕sum챕 de commit.\n" +msgstr "Supprimer les rapports d'avancement." #. type: Plain text #: en/git-gc.txt:80 @@ -28094,10 +27916,8 @@ 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." -msgstr "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." +msgstr "La commande 'git gc --auto' peut lancer le crochet `pre-auto-gc`. Voir linkgit:githooks[5] pour de plus amples informations." #. type: Plain text #: en/git-gc.txt:183 @@ -28191,10 +28011,8 @@ 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." -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'," +msgstr "Au lieu de rechercher les fichiers suivis dans l'arbre de travail, rechercher les blobs enregistr챕s dans le fichier d'index." #. type: Plain text #: en/git-grep.txt:78 @@ -28209,10 +28027,8 @@ 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." -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'," +msgstr "En plus de rechercher dans les fichiers suivis dans l'arbre de travail, rechercher aussi dans les fichiers non-suivis." #. type: Labeled list #: en/git-grep.txt:83 @@ -28641,10 +28457,8 @@ 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." -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'," +msgstr "Au lieu de rechercher les fichiers suivis dans l'arbre de travail, rechercher les blobs enregistr챕s dans les arbres fournis." #. type: Plain text #: en/git-grep.txt:292 @@ -28664,10 +28478,8 @@ 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." -msgstr "Ajouter le contenu de tous le fichiers `*.txt` sous le r챕pertoire `Documentation` et ses sous r챕pertoires." +msgstr "Recherche `time_t` dans tous les fichiers suivis `.c` et `.h` dans le r챕pertoire de travail et ses sous-r챕pertoires." #. type: Labeled list #: en/git-grep.txt:304 @@ -28810,10 +28622,9 @@ 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" +msgstr "`git gui citool`" #. type: Plain text #: en/git-gui.txt:79 @@ -28822,10 +28633,9 @@ 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" +msgstr "`git gui citool --amend`" #. type: Plain text #: en/git-gui.txt:84 @@ -28834,10 +28644,9 @@ 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" +msgstr "`git gui citool --nocommit`" #. type: Plain text #: en/git-gui.txt:91 @@ -28846,23 +28655,20 @@ 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" +msgstr "`git citool`" #. type: Plain text #: en/git-gui.txt:95 -#, fuzzy -#| msgid "$ git commit\n" msgid "Same as `git gui citool` (above)." -msgstr "$ git commit\n" +msgstr "Identique 횪 `git gui citool` (ci-dessus)." #. type: Labeled list #: en/git-gui.txt:96 #, no-wrap msgid "`git gui browser maint`" -msgstr "" +msgstr "`git gui browser maint`" #. type: Plain text #: en/git-gui.txt:101 @@ -28944,10 +28750,8 @@ 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" +msgstr "횋crire r챕ellement l'objet dans la base de donn챕es d'objets." #. type: Plain text #: en/git-hash-object.txt:36 @@ -29108,10 +28912,9 @@ 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" +msgstr "VARIABLES DE CONFIGURATION" #. type: Plain text #: en/git-help.txt:87 @@ -29671,10 +29474,8 @@ 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" +msgstr "git-http-fetch - T챕l챕charger depuis un d챕p척t Git distant via HTTP" #. type: Plain text #: en/git-http-fetch.txt:13 @@ -29684,10 +29485,8 @@ 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" +msgstr "T챕l챕charger un d챕p척t Git distant via HTTP." #. type: Plain text #: en/git-http-fetch.txt:20 @@ -29769,10 +29568,8 @@ 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" +msgstr "git-http-push - Pousse des objets via HTTP/DAV sur un autre d챕p척t" #. type: Plain text #: en/git-http-push.txt:13 @@ -30168,7 +29965,7 @@ msgstr "" #. type: Plain text #: en/git-imap-send.txt:180 msgid "linkgit:git-format-patch[1], linkgit:git-send-email[1], mbox(5)" -msgstr "" +msgstr "linkgit:git-format-patch[1], linkgit:git-send-email[1], mbox(5)" #. type: Title = #: en/git-index-pack.txt:2 @@ -30316,10 +30113,8 @@ 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" +msgstr "git-init-db - Cr챕e un d챕p척t Git vide" #. type: Plain text #: en/git-init-db.txt:13 @@ -30329,10 +30124,8 @@ 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." -msgstr "Ceci est un synonyme pour linkgit:git-fsck[1]. Veuillez vous r챕f챕rer 횪 la documentation de cette commande." +msgstr "Ceci est un synonyme pour linkgit:git-init[1]. Veuillez vous r챕f챕rer 횪 la documentation de cette commande." #. type: Title = #: en/git-init.txt:2 @@ -30342,10 +30135,8 @@ 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" +msgstr "git-init - Cr챕e un d챕p척t Git vide ou r챕initialise un d챕p척t existant" #. type: Plain text #: en/git-init.txt:15 @@ -30545,10 +30336,8 @@ 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" +msgstr "Ajouter tous les fichiers existants 횪 l'index" #. type: Plain text #: en/git-init.txt:155 @@ -30710,10 +30499,8 @@ 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" +msgstr "git-interpret-trailers - aide 횪 ajouter de l'information structur챕e dans les messages de validation" #. type: Plain text #: en/git-interpret-trailers.txt:12 @@ -31337,10 +31124,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:86 en/git-shortlog.txt:72 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "[\\--] <path>..." -msgstr "patch" +msgstr "[\\--] <chemin>..." #. type: Plain text #: en/git-log.txt:91 @@ -31538,10 +31324,8 @@ 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" +msgstr "git-ls-files - Affiche des informations sur les fichiers de l'index et de l'arbre de travail" #. type: Plain text #: en/git-ls-files.txt:23 @@ -31796,10 +31580,8 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:127 -#, fuzzy -#| msgid "removed content" msgid "removed/deleted" -msgstr "contenu supprim챕" +msgstr "supprim챕/effac챕" #. type: Labeled list #: en/git-ls-files.txt:127 @@ -31809,10 +31591,8 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:128 -#, fuzzy -#| msgid "modified content" msgid "modified/changed" -msgstr "contenu modifi챕" +msgstr "modifi챕/chang챕" #. type: Labeled list #: en/git-ls-files.txt:128 @@ -32024,10 +31804,9 @@ 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)" +msgstr "--upload-pack=<exec>" #. type: Plain text #: en/git-ls-remote.txt:45 @@ -32174,10 +31953,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-tree.txt:76 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "[<path>...]" -msgstr "patch" +msgstr "[<chemin>...]" #. type: Plain text #: en/git-ls-tree.txt:80 @@ -32337,10 +32115,9 @@ 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" +msgstr "<rustine>" #. type: Plain text #: en/git-mailinfo.txt:99 @@ -32384,18 +32161,8 @@ 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 "" -"-F <fichier>::\n" -"--file=<fichier>::\n" -"\tPrendre le message de validation depuis le fichier indiqu챕.\n" -"\tUtilisez '-' pour lire le message depuis l'entr챕e standard.\n" +msgstr "Fichier mbox 횪 d챕couper. Si aucun n'est fourni, le mbox est lu depuis l'entr챕e standard." #. type: Labeled list #: en/git-mailsplit.txt:28 @@ -32497,10 +32264,9 @@ msgstr "" #. type: Title - #: en/git-merge-base.txt:29 -#, fuzzy, no-wrap -#| msgid "OPTIONS" +#, no-wrap msgid "OPERATION MODES" -msgstr "OPTIONS" +msgstr "MODES D'OP횋RATION" #. type: Plain text #: en/git-merge-base.txt:33 @@ -32720,12 +32486,13 @@ 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" -msgstr "$ git commit\n" +msgstr "" +" $ fork_point=$(git merge-base --fork-point origin/master topic)\n" +" $ git rebase --onto origin/master $fork_point topic\n" #. type: Title - #: en/git-merge-base.txt:176 @@ -33005,10 +32772,9 @@ 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" +msgstr "FONCTIONS" #. type: Labeled list #: en/git-mergetool--lib.txt:30 @@ -33257,20 +33023,8 @@ 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 option without a space." -msgstr "" -"-S[<idcl챕>]::\n" -"--gpg-sign[=<idcl챕>]::\n" -"\tSigner les commits avec GPG. L'argument `idcl챕` est optionnel\n" -"\tavec par d챕faut l'indentit챕 du validateur혻; si sp챕cifi챕e, elle\n" -"\tdoit 챗tre coll챕e 횪 l'option sans aucun espace.\n" +msgstr "Signer le commit r챕sultant de la fusion avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace." #. type: Plain text #: en/git-merge.txt:81 @@ -33594,10 +33348,9 @@ 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" +msgstr "$ git merge --no-commit maint\n" #. type: Plain text #: en/git-merge.txt:335 @@ -33680,16 +33433,14 @@ 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" +msgstr "git-mktree - Construit un objet arbre depuis du texte au format ls-tree" #. type: Plain text #: en/git-mktree.txt:13 #, no-wrap msgid "'git mktree' [-z] [--missing] [--batch]\n" -msgstr "" +msgstr "'git mktree' [-z] [--missing] [--batch]\n" #. type: Plain text #: en/git-mktree.txt:20 @@ -33774,16 +33525,8 @@ 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" -"--verbose::\n" -" Mode bavard.\n" +msgstr "Affiche les noms des fichiers au fur 횪 mesure de leur d챕placement." #. type: Title - #: en/git-mv.txt:48 en/git-rm.txt:138 @@ -33879,10 +33622,8 @@ msgstr "" #. type: Plain text #: en/git-name-rev.txt:73 -#, fuzzy -#| msgid "git-add(1)" msgid "Enter 'git name-rev':" -msgstr "git-add(1)" +msgstr "Utilisez 'git name-rev'혻:" #. type: delimited block - #: en/git-name-rev.txt:77 @@ -34111,35 +33852,13 @@ 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 starting with `#` and empty lines other than a single line between paragraphs will be stripped out." -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" +msgstr "Utiliser le message de note fourni (au lieu de le demander). Si plusieurs options `-m` sont fournies, leurs valeurs sont concat챕n챕es comme paragraphes s챕par챕s. Les lignes commen챌ant par `#` et les lignes vides sont supprim챕es si elles ne sont pas uniques entre paragraphes." #. 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 a single line between paragraphs will be stripped out." -msgstr "" -"-F <fichier>::\n" -"--file=<fichier>::\n" -"\tPrendre le message de validation depuis le fichier indiqu챕.\n" -"\tUtilisez '-' pour lire le message depuis l'entr챕e standard.\n" +msgstr "Prendre le message de note depuis le fichier indiqu챕. Utilisez '-' pour lire le message depuis l'entr챕e standard. Les lignes commen챌ant par `#` et les lignes vides sont supprim챕es si elles ne sont pas uniques entre paragraphes." #. type: Labeled list #: en/git-notes.txt:147 @@ -34172,18 +33891,8 @@ 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." -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" +msgstr "Comme '-C', mais avec '-c', l'챕diteur est appel챕 pour permettre 횪 l'utilisateur de modifier le message de note." #. type: Plain text #: en/git-notes.txt:161 @@ -34463,10 +34172,8 @@ 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" +msgstr "git-p4 - Importe depuis et soumet 횪 des d챕p척ts Perforce" #. type: Plain text #: en/git-p4.txt:16 @@ -34531,10 +34238,9 @@ 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" +msgstr "$ git p4 submit\n" #. type: Title ~ #: en/git-p4.txt:66 @@ -34591,10 +34297,9 @@ 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" +msgstr "$ git p4 sync\n" #. type: Plain text #: en/git-p4.txt:96 @@ -34719,10 +34424,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:180 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "--branch <ref>" -msgstr "Mode interactif" +msgstr "--branch <r챕f>" #. type: Plain text #: en/git-p4.txt:184 @@ -34782,14 +34486,8 @@ 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" -"\tNe pas interpr챕ter les arguments qui suivent comme options.\n" +msgstr "Ne pas afficher d'information d'avancement." #. type: Labeled list #: en/git-p4.txt:211 @@ -34870,10 +34568,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:255 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "-/ <path>" -msgstr "patch" +msgstr "-/ <chemin>" #. type: Plain text #: en/git-p4.txt:257 @@ -34904,10 +34601,8 @@ 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)" +msgstr "R챕aliser un clone nu. Voir linkgit:git-clone[1]." #. type: Title ~ #: en/git-p4.txt:272 @@ -34922,10 +34617,9 @@ 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)" +msgstr "--origin <commit>" #. type: Plain text #: en/git-p4.txt:279 @@ -35010,10 +34704,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:322 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "--branch <branch>" -msgstr "Mode interactif" +msgstr "--branch <branche>" #. type: Plain text #: en/git-p4.txt:326 @@ -35217,10 +34910,9 @@ 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)" +msgstr "git-p4.user" #. type: Plain text #: en/git-p4.txt:459 @@ -35231,7 +34923,7 @@ msgstr "" #: en/git-p4.txt:460 #, no-wrap msgid "git-p4.password" -msgstr "" +msgstr "git-p4.password" #. type: Plain text #: en/git-p4.txt:464 @@ -35240,10 +34932,9 @@ 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)" +msgstr "git-p4.port" #. type: Plain text #: en/git-p4.txt:469 @@ -35252,10 +34943,9 @@ 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)" +msgstr "git-p4.host" #. type: Plain text #: en/git-p4.txt:474 @@ -35264,10 +34954,9 @@ 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)" +msgstr "git-p4.client" #. type: Plain text #: en/git-p4.txt:478 @@ -35276,10 +34965,9 @@ 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)" +msgstr "git-p4.retries" #. type: Plain text #: en/git-p4.txt:484 @@ -35296,7 +34984,7 @@ msgstr "" #: en/git-p4.txt:487 #, no-wrap msgid "git-p4.syncFromOrigin" -msgstr "" +msgstr "git-p4.syncFromOrigin" #. type: Plain text #: en/git-p4.txt:493 @@ -35307,7 +34995,7 @@ msgstr "" #: en/git-p4.txt:494 #, no-wrap msgid "git-p4.branchUser" -msgstr "" +msgstr "git-p4.branchUser" #. type: Plain text #: en/git-p4.txt:499 @@ -35318,7 +35006,7 @@ msgstr "" #: en/git-p4.txt:500 #, no-wrap msgid "git-p4.branchList" -msgstr "" +msgstr "git-p4.branchList" #. type: Plain text #: en/git-p4.txt:505 @@ -35348,7 +35036,7 @@ msgstr "" #: en/git-p4.txt:515 #, no-wrap msgid "git-p4.importLabels" -msgstr "" +msgstr "git-p4.importLabels" #. type: Plain text #: en/git-p4.txt:517 @@ -35359,7 +35047,7 @@ msgstr "" #: en/git-p4.txt:518 #, no-wrap msgid "git-p4.labelImportRegexp" -msgstr "" +msgstr "git-p4.labelImportRegexp" #. type: Plain text #: en/git-p4.txt:521 @@ -35370,7 +35058,7 @@ msgstr "" #: en/git-p4.txt:522 #, no-wrap msgid "git-p4.useClientSpec" -msgstr "" +msgstr "git-p4.useClientSpec" #. type: Plain text #: en/git-p4.txt:527 @@ -35381,7 +35069,7 @@ msgstr "" #: en/git-p4.txt:528 #, no-wrap msgid "git-p4.pathEncoding" -msgstr "" +msgstr "git-p4.pathEncoding" #. type: Plain text #: en/git-p4.txt:534 @@ -35392,7 +35080,7 @@ msgstr "" #: en/git-p4.txt:535 #, no-wrap msgid "git-p4.largeFileSystem" -msgstr "" +msgstr "git-p4.largeFileSystem" #. type: Plain text #: en/git-p4.txt:541 @@ -35409,7 +35097,7 @@ msgstr "" #: en/git-p4.txt:546 #, no-wrap msgid "git-p4.largeFileExtensions" -msgstr "" +msgstr "git-p4.largeFileExtensions" #. type: Plain text #: en/git-p4.txt:549 @@ -35420,7 +35108,7 @@ msgstr "" #: en/git-p4.txt:550 #, no-wrap msgid "git-p4.largeFileThreshold" -msgstr "" +msgstr "git-p4.largeFileThreshold" #. type: Plain text #: en/git-p4.txt:554 @@ -35431,7 +35119,7 @@ msgstr "" #: en/git-p4.txt:555 #, no-wrap msgid "git-p4.largeFileCompressedThreshold" -msgstr "" +msgstr "git-p4.largeFileCompressedThreshold" #. type: Plain text #: en/git-p4.txt:560 @@ -35442,7 +35130,7 @@ msgstr "" #: en/git-p4.txt:561 #, no-wrap msgid "git-p4.largeFilePush" -msgstr "" +msgstr "git-p4.largeFilePush" #. type: Plain text #: en/git-p4.txt:564 @@ -35453,7 +35141,7 @@ msgstr "" #: en/git-p4.txt:565 #, no-wrap msgid "git-p4.keepEmptyCommits" -msgstr "" +msgstr "git-p4.keepEmptyCommits" #. type: Plain text #: en/git-p4.txt:568 @@ -35464,7 +35152,7 @@ msgstr "" #: en/git-p4.txt:569 #, no-wrap msgid "git-p4.mapUser" -msgstr "" +msgstr "git-p4.mapUser" #. type: Plain text #: en/git-p4.txt:572 @@ -35492,7 +35180,7 @@ msgstr "" #: en/git-p4.txt:582 #, no-wrap msgid "git-p4.detectRenames" -msgstr "" +msgstr "git-p4.detectRenames" #. type: Plain text #: en/git-p4.txt:585 @@ -35503,7 +35191,7 @@ msgstr "" #: en/git-p4.txt:586 #, no-wrap msgid "git-p4.detectCopies" -msgstr "" +msgstr "git-p4.detectCopies" #. type: Plain text #: en/git-p4.txt:589 @@ -35514,7 +35202,7 @@ msgstr "" #: en/git-p4.txt:590 #, no-wrap msgid "git-p4.detectCopiesHarder" -msgstr "" +msgstr "git-p4.detectCopiesHarder" #. type: Plain text #: en/git-p4.txt:592 @@ -35525,7 +35213,7 @@ msgstr "" #: en/git-p4.txt:593 #, no-wrap msgid "git-p4.preserveUser" -msgstr "" +msgstr "git-p4.preserveUser" #. type: Plain text #: en/git-p4.txt:596 @@ -35547,7 +35235,7 @@ msgstr "" #: en/git-p4.txt:602 #, no-wrap msgid "git-p4.skipSubmitEdit" -msgstr "" +msgstr "git-p4.skipSubmitEdit" #. type: Plain text #: en/git-p4.txt:606 @@ -35558,7 +35246,7 @@ msgstr "" #: en/git-p4.txt:607 #, no-wrap msgid "git-p4.skipSubmitEditCheck" -msgstr "" +msgstr "git-p4.skipSubmitEditCheck" #. type: Plain text #: en/git-p4.txt:611 @@ -35569,7 +35257,7 @@ msgstr "" #: en/git-p4.txt:612 #, no-wrap msgid "git-p4.allowSubmit" -msgstr "" +msgstr "git-p4.allowSubmit" #. type: Plain text #: en/git-p4.txt:618 @@ -35580,7 +35268,7 @@ msgstr "" #: en/git-p4.txt:619 #, no-wrap msgid "git-p4.skipUserNameCheck" -msgstr "" +msgstr "git-p4.skipUserNameCheck" #. type: Plain text #: en/git-p4.txt:623 @@ -35591,7 +35279,7 @@ msgstr "" #: en/git-p4.txt:624 #, no-wrap msgid "git-p4.attemptRCSCleanup" -msgstr "" +msgstr "git-p4.attemptRCSCleanup" #. type: Plain text #: en/git-p4.txt:629 @@ -35602,7 +35290,7 @@ msgstr "" #: en/git-p4.txt:630 #, no-wrap msgid "git-p4.exportLabels" -msgstr "" +msgstr "git-p4.exportLabels" #. type: Plain text #: en/git-p4.txt:632 @@ -35613,7 +35301,7 @@ msgstr "" #: en/git-p4.txt:633 #, no-wrap msgid "git-p4.labelExportRegexp" -msgstr "" +msgstr "git-p4.labelExportRegexp" #. type: Plain text #: en/git-p4.txt:636 @@ -35622,10 +35310,9 @@ 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)" +msgstr "git-p4.conflict" #. type: Plain text #: en/git-p4.txt:640 @@ -36186,18 +35873,8 @@ 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." -msgstr "" -"-n::\n" -"--dry-run::\n" -"\tN'ajoute pas r챕ellement les fichiers. Montrer juste s'ils existent\n" -"\tou seront ignor챕s.\n" +msgstr "Ne pas r챕ellement supprimer des objets, montrer seulement ce qui aurait 챕t챕 supprim챕." #. type: Plain text #: en/git-prune-packed.txt:39 @@ -36217,10 +35894,8 @@ 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" +msgstr "git-prune - 횋lague tous les objets non joignables de la base de donn챕es d'objets" #. type: Plain text #: en/git-prune.txt:13 @@ -36245,31 +35920,13 @@ 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" -"--dry-run::\n" -"\tN'ajoute pas r챕ellement les fichiers. Montrer juste s'ils existent\n" -"\tou seront ignor챕s.\n" +msgstr "Ne rien supprimer r챕ellement혻; montrer seulement ce qui serait supprim챕." #. 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" -"--verbose::\n" -" Mode bavard.\n" +msgstr "Afficher tous les objets supprim챕s." #. type: Labeled list #: en/git-prune.txt:48 en/git-worktree.txt:124 @@ -36567,10 +36224,9 @@ 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" +msgstr "$ git pull, git pull origin\n" #. type: Plain text #: en/git-pull.txt:219 @@ -36793,17 +36449,15 @@ 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)" +msgstr "--receive-pack=<git-receive-pack>" #. 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)" +msgstr "--exec=<git-receive-pack>" #. type: Plain text #: en/git-push.txt:171 en/git-send-pack.txt:33 @@ -37011,10 +36665,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:346 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "rejected" -msgstr "contenu supprim챕" +msgstr "rejet챕" #. type: Plain text #: en/git-push.txt:349 @@ -37023,10 +36676,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:350 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "remote rejected" -msgstr "contenu supprim챕" +msgstr "le distant a rejet챕" #. type: Plain text #: en/git-push.txt:358 @@ -37035,10 +36687,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:359 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "remote failure" -msgstr "contenu supprim챕" +msgstr "챕chec distant" #. type: Plain text #: en/git-push.txt:363 @@ -37160,10 +36811,9 @@ 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)" +msgstr "`git push`" #. type: Plain text #: en/git-push.txt:473 @@ -37172,10 +36822,9 @@ 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" +msgstr "`git push origin`" #. type: Plain text #: en/git-push.txt:479 @@ -37194,10 +36843,9 @@ 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" +msgstr "`git push origin :`" #. type: Plain text #: en/git-push.txt:493 @@ -37206,10 +36854,9 @@ 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" +msgstr "`git push origin master`" #. type: Plain text #: en/git-push.txt:500 @@ -37218,10 +36865,9 @@ 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" +msgstr "`git push origin HEAD`" #. type: Plain text #: en/git-push.txt:504 @@ -37411,10 +37057,8 @@ 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" +msgstr "git-read-tree - Lit l'information d'arbre dans l'index" #. type: Plain text #: en/git-read-tree.txt:16 @@ -38107,10 +37751,8 @@ 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혻:" +msgstr "Nous pouvons l'obtenir en utilisant la commande suivante혻:" #. type: Plain text #: en/git-rebase.txt:131 @@ -38338,10 +37980,9 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:293 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "-X <strategy-option>" -msgstr "status" +msgstr "-X <option-de-strategie>" #. type: Labeled list #: en/git-rebase.txt:294 @@ -38361,16 +38002,8 @@ 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" -"--verbose::\n" -" Mode bavard.\n" +msgstr "Mode bavard. Implique --stat." #. type: Plain text #: en/git-rebase.txt:317 @@ -38384,18 +38017,8 @@ 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 "" -"-n::\n" -"--no-verify::\n" -"\tCette option court-circuite les crochets pre-commit et commit-msg.\n" -"\tVoir aussi linkgit:githooks[5].\n" +msgstr "Cette option court-circuite le crochet pre-rebase. Voir aussi linkgit:githooks[5]." #. type: Labeled list #: en/git-rebase.txt:325 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 @@ -38597,10 +38220,8 @@ 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." -msgstr "Vous devriez comprendre les implications d'une r챕챕criture de l'historique si vous modifiez un commit qui a d챕j횪 챕t챕 publi챕 (Voir la section 짬혻RATTRAPPER UN REBASAGE AMONT혻쨩 dans linkgit:git-rebase[1])." +msgstr "Vous devriez comprendre les implications de l'utilisation de 'git rebase' sur un d챕p척t partag챕. Voir la section 짬혻RATTRAPER UN REBASAGE AMONT혻쨩 ci-dessous." #. type: Plain text #: en/git-rebase.txt:475 @@ -38665,10 +38286,8 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:498 -#, fuzzy -#| msgid "git-commit(1)" msgid "commit" -msgstr "git-commit(1)" +msgstr "valider" #. type: Plain text #: en/git-rebase.txt:500 @@ -38687,10 +38306,8 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:504 -#, fuzzy -#| msgid "git-commit(1)" msgid "commit it" -msgstr "git-commit(1)" +msgstr "le valider" #. type: Plain text #: en/git-rebase.txt:510 @@ -39124,10 +38741,8 @@ 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" +msgstr "git-receive-pack - Re챌oit ce qui a 챕t챕 pouss챕 dans un d챕p척t" #. type: Plain text #: en/git-receive-pack.txt:13 @@ -39325,10 +38940,9 @@ msgstr "" #. type: Title - #: en/git-receive-pack.txt:118 -#, fuzzy, no-wrap -#| msgid "update" +#, no-wrap msgid "update Hook" -msgstr "update" +msgstr "Crochet update" #. type: Plain text #: en/git-receive-pack.txt:121 @@ -39423,10 +39037,9 @@ msgstr "" #. type: Title - #: en/git-receive-pack.txt:200 -#, fuzzy, no-wrap -#| msgid "update" +#, no-wrap msgid "post-update Hook" -msgstr "update" +msgstr "Crochet post-update" #. type: Plain text #: en/git-receive-pack.txt:205 @@ -39600,18 +39213,8 @@ 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 "" -"-n::\n" -"--dry-run::\n" -"\tN'ajoute pas r챕ellement les fichiers. Montrer juste s'ils existent\n" -"\tou seront ignor챕s.\n" +msgstr "Ne pas r챕ellement 챕laguer les entr챕es. Montrer juste ce qui aurait 챕t챕 챕lagu챕.<\n" #. type: Plain text #: en/git-reflog.txt:121 @@ -39739,10 +39342,9 @@ 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" +msgstr "VARIABLES D'ENVIRONNEMENT :" #. type: Labeled list #: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33 @@ -39785,10 +39387,9 @@ msgstr "" #. type: Title - #: en/git-remote-ext.txt:77 -#, fuzzy, no-wrap -#| msgid "EXAMPLES" +#, no-wrap msgid "EXAMPLES:" -msgstr "EXEMPLES" +msgstr "EXEMPLES혻:" #. type: Plain text #: en/git-remote-ext.txt:82 @@ -39905,10 +39506,9 @@ msgstr "" #. type: Title - #: en/git-remote-fd.txt:32 -#, fuzzy, no-wrap -#| msgid "ENVIRONMENT AND CONFIGURATION VARIABLES" +#, no-wrap msgid "ENVIRONMENT VARIABLES" -msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION" +msgstr "VARIABLES D'ENVIRONNEMENT" #. type: Labeled list #: en/git-remote-fd.txt:38 @@ -39979,10 +39579,8 @@ 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" +msgstr "git-remote - G챔re un ensemble de d챕p척ts suivis" #. type: Plain text #: en/git-remote.txt:25 @@ -40209,10 +39807,8 @@ 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" +msgstr "Fournir quelques informations sur le d챕p척t <nom>." #. type: Plain text #: en/git-remote.txt:172 @@ -40237,10 +39833,9 @@ msgstr "" #. type: Labeled list #: en/git-remote.txt:183 -#, fuzzy, no-wrap -#| msgid "update" +#, no-wrap msgid "'update'" -msgstr "update" +msgstr "'update'" #. type: Plain text #: en/git-remote.txt:191 @@ -40254,10 +39849,8 @@ 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])." -msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])." +msgstr "Le param챔trage des informations de connexion est r챕alis챕 par les variables de configuration `remote.origin.url` et `remote.origin.fetch`. (Voir linkgit:git-config[1])." #. type: Plain text #: en/git-remote.txt:206 @@ -40322,10 +39915,8 @@ 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" +msgstr "git-repack - Empaqu챔te les objets non empaquet챕s dans le d챕p척t" #. type: Plain text #: en/git-repack.txt:13 @@ -40360,10 +39951,8 @@ 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]." -msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgstr "Passer l'option `--local` 횪 'git pack-objects'. Voir linkgit:git-pack-objects[1]." #. type: Plain text #: en/git-repack.txt:68 @@ -40377,10 +39966,8 @@ 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 "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgstr "Passer l'option `-q` 횪 'git pack-objects'. Voir linkgit:git-pack-objects[1]." #. type: Plain text #: en/git-repack.txt:83 @@ -40515,10 +40102,9 @@ 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" +msgstr "$ git --no-replace-objects cat-file commit foo\n" #. type: Plain text #: en/git-replace.txt:47 @@ -40527,10 +40113,9 @@ 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" +msgstr "$ git cat-file commit foo\n" #. type: Plain text #: en/git-replace.txt:53 @@ -40598,10 +40183,9 @@ 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" +msgstr "--format=<format>" #. type: Plain text #: en/git-replace.txt:105 @@ -40610,10 +40194,9 @@ msgstr "" #. type: Title - #: en/git-replace.txt:107 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "FORMATS" -msgstr "FORMATS DE DATE" +msgstr "FORMATS" #. type: Plain text #: en/git-replace.txt:110 @@ -40678,10 +40261,8 @@ 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] linkgit:git-var[1] linkgit:git[1]" -msgstr "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]" +msgstr "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] linkgit:git-var[1] linkgit:git[1]" #. type: Title = #: en/git-request-pull.txt:2 @@ -40863,10 +40444,9 @@ msgstr "" #. type: Labeled list #: en/git-rerere.txt:49 -#, fuzzy, no-wrap -#| msgid "diff" +#, no-wrap msgid "'diff'" -msgstr "diff" +msgstr "'diff'" #. type: Plain text #: en/git-rerere.txt:55 @@ -40875,10 +40455,9 @@ msgstr "" #. type: Labeled list #: en/git-rerere.txt:56 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "'status'" -msgstr "status" +msgstr "'status'" #. type: Plain text #: en/git-rerere.txt:59 @@ -41122,17 +40701,14 @@ 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 of linkgit:git-add[1] to learn how to operate the `--patch` mode." -msgstr "en utilisant les options --interactive ou --patch avec la commande 'commit' pour choisir quels fichiers ou sections de fichier doivent 챗tre inclus dans le commit en plus de l'index, avant finalisation de l'op챕ration. R챕f챕rez-vous 횪 la section 짬혻Mode interactif혻쨩 de linkgit:git-add[1] pour la description de ces modes." +msgstr "Ceci signifie que `git reset -p` est l'oppos챕 de `git add -p`, autrement dit, vous pouvez l'utiliser pour r챕initialiser s챕lectivement les sections. Voir la section 짬혻Mode interactif혻쨩 de linkgit:git-add[1] pour apprendre comment utiliser le mode `--patch`." #. 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" +msgstr "'git reset' [<mode>] [<commit>]" #. type: Plain text #: en/git-reset.txt:51 @@ -41262,10 +40838,8 @@ 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 de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "Corriger les fichiers de l'arbre de travail." #. type: Plain text #: en/git-reset.txt:143 @@ -41438,17 +41012,14 @@ 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)" +msgstr "Voir aussi linkgit:git-stash[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" +msgstr "R챕initialiser un seul fichier dans l'index" #. type: Plain text #: en/git-reset.txt:257 @@ -41466,10 +41037,8 @@ 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." -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'," +msgstr "Ceci supprime un fichier de l'index tout en le conservant dans le r챕pertoire de travail." #. type: Plain text #: en/git-reset.txt:267 @@ -41478,10 +41047,8 @@ 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" +msgstr "Ajouter 횪 nouveau le fichier 횪 l'index." #. type: Labeled list #: en/git-reset.txt:269 @@ -41904,10 +41471,8 @@ 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혻:" +msgstr "Ainsi, la commande suivante혻:" #. type: delimited block - #: en/git-rev-list.txt:82 @@ -42103,10 +41668,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:77 -#, fuzzy, no-wrap -#| msgid "default" +#, no-wrap msgid "--default <arg>" -msgstr "default" +msgstr "--default <arg>" #. type: Plain text #: en/git-rev-parse.txt:80 @@ -42183,10 +41747,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:140 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--short=number" -msgstr "Configuration" +msgstr "--short=number" #. type: Plain text #: en/git-rev-parse.txt:144 @@ -42488,10 +42051,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:283 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--before=datestring" -msgstr "Configuration" +msgstr "--before=datestring" #. type: Plain text #: en/git-rev-parse.txt:286 @@ -42783,10 +42345,8 @@ 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 de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "git-rm - Supprime des fichiers de l'arbre de travail et de l'index" #. type: Plain text #: en/git-rm.txt:12 @@ -42806,29 +42366,13 @@ 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" -"\tSurcharger la date d'auteur utilis챕e dans le commit.\n" +msgstr "Surcharger la v챕rification de synchronisation." #. 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." -msgstr "" -"-n::\n" -"--dry-run::\n" -"\tN'ajoute pas r챕ellement les fichiers. Montrer juste s'ils existent\n" -"\tou seront ignor챕s.\n" +msgstr "Ne pas supprimer r챕ellement les fichiers. � la place, montrer juste s'ils existent dans l'index et seraient de ce fait supprim챕s par la commande." #. type: Plain text #: en/git-rm.txt:52 @@ -42879,10 +42423,9 @@ 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" +msgstr "En utilisant ``git commit -a''" #. type: Plain text #: en/git-rm.txt:100 @@ -42891,10 +42434,9 @@ 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" +msgstr "En utilisant ``git add -A''" #. type: Plain text #: en/git-rm.txt:106 @@ -42924,10 +42466,9 @@ 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" +msgstr "git add -A\n" #. type: Plain text #: en/git-rm.txt:125 @@ -42968,38 +42509,30 @@ 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" +msgstr "`git rm Documentation/\\*.txt`" #. 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." -msgstr "Ajouter le contenu de tous le fichiers `*.txt` sous le r챕pertoire `Documentation` et ses sous r챕pertoires." +msgstr "Supprimer tous les fichiers `*.txt` de l'index qui sont sous le r챕pertoire `Documentation` et ses sous-r챕pertoires." #. 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/`." +msgstr "Remarquez que l'ast챕risque `*` est 챕chapp챕 du shell dans cet exemple혻; cela permet, par l'expansion des chemins par Git et non par le shell, 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" +msgstr "`git rm -f git-*.sh`" #. 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`." -msgstr "Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque (c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il ne traite pas `subdir/git-foo.sh`." +msgstr "Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque (c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il ne supprime pas `subdir/git-foo.sh`." #. type: Plain text #: en/git-rm.txt:181 @@ -43452,10 +42985,9 @@ 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)" +msgstr "--identity=<identit챕>" #. type: Labeled list #: en/git-send-email.txt:280 @@ -43685,10 +43217,9 @@ msgstr "" #. type: Title ~ #: en/git-send-email.txt:392 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Information" -msgstr "Configuration" +msgstr "Information" #. type: Labeled list #: en/git-send-email.txt:394 @@ -43718,10 +43249,9 @@ 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)" +msgstr "sendmail" #. type: Plain text #: en/git-send-email.txt:420 @@ -43830,10 +43360,8 @@ 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-merge[1], linkgit:git-commit-tree[1]" +msgstr "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)" #. type: Title = #: en/git-send-pack.txt:2 @@ -43843,10 +43371,8 @@ 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" +msgstr "git-send-pack - Pousse des objets par le protocole Git vers un autre d챕p척t" #. type: Plain text #: en/git-send-pack.txt:16 @@ -44199,10 +43725,9 @@ msgstr "" #. type: Labeled list #: en/git-shortlog.txt:42 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--format[=<format>]" -msgstr "Configuration" +msgstr "--format[=<format>]" #. type: Plain text #: en/git-shortlog.txt:47 @@ -45114,10 +44639,8 @@ 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" +msgstr "git-stage - Ajoute le contenu de fichiers 횪 l'index" #. type: Plain text #: en/git-stage.txt:13 @@ -45127,10 +44650,8 @@ 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." -msgstr "Ceci est un synonyme pour linkgit:git-fsck[1]. Veuillez vous r챕f챕rer 횪 la documentation de cette commande." +msgstr "Ceci est un synonyme pour linkgit:git-add[1]. Veuillez vous r챕f챕rer 횪 la documentation de cette commande." #. type: Title = #: en/git-stash.txt:2 @@ -45515,16 +45036,8 @@ 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" -"\tSeulement avec '--dry-run', donner la sortie en format\n" -"\tlong.\n" +msgstr "Afficher la sortie en format court." #. type: Labeled list #: en/git-status.txt:35 @@ -45544,16 +45057,8 @@ 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" -"\tSeulement avec '--dry-run', donner la sortie en format\n" -"\tlong.\n" +msgstr "Afficher la sortie en format long. Option par d챕faut." #. type: Plain text #: en/git-status.txt:54 @@ -45567,17 +45072,15 @@ 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" +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" +msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis.\n" #. type: Plain text #: en/git-status.txt:78 @@ -45591,16 +45094,8 @@ 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" -"--untracked-files[=<mode>]::\n" -"\tMontrer les fichiers non-suivis.\n" +msgstr "Montrer les aussi fichiers ignor챕s." #. type: Plain text #: en/git-status.txt:103 @@ -45624,10 +45119,9 @@ msgstr "" #. type: Title ~ #: en/git-status.txt:126 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Short Format" -msgstr "Configuration" +msgstr "Format court" #. type: Plain text #: en/git-status.txt:129 @@ -45813,10 +45307,8 @@ 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혻:" +msgstr "Les entr챕es modifi챕es normales ont le format suivant혻:" #. type: Plain text #: en/git-status.txt:249 @@ -45826,10 +45318,8 @@ 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혻:" +msgstr "Les entr챕es renomm챕es ou copi챕es ont le format suivant혻:" #. type: Plain text #: en/git-status.txt:253 @@ -45916,10 +45406,8 @@ 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혻:" +msgstr "Les entr챕es non-suivies ont le format suivant혻:" #. type: Plain text #: en/git-status.txt:314 @@ -45929,10 +45417,8 @@ 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혻:" +msgstr "Les entr챕es ignor챕es ont le format suivant혻:" #. type: Plain text #: en/git-status.txt:318 @@ -45952,10 +45438,8 @@ 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-config[1])." -msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])." +msgstr "Sans l'option `-z`, les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])." #. type: Plain text #: en/git-status.txt:337 @@ -46013,10 +45497,8 @@ 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 de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "supprimer les lignes vides au d챕but et 횪 la fin de l'entr챕e" #. type: Plain text #: en/git-stripspace.txt:28 @@ -46457,16 +45939,8 @@ 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" -"--quiet::\n" -"\tSupprimer le message de r챕sum챕 de commit.\n" +msgstr "N'afficher que les messages d'erreur." #. type: Plain text #: en/git-submodule.txt:278 @@ -47153,10 +46627,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:301 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "-d<path>" -msgstr "patch" +msgstr "-d<chemin>" #. type: Labeled list #: en/git-svn.txt:302 @@ -47828,10 +47301,9 @@ msgstr "" #. type: Title - #: en/git-svn.txt:682 -#, fuzzy, no-wrap -#| msgid "OPTIONS" +#, no-wrap msgid "ADVANCED OPTIONS" -msgstr "OPTIONS" +msgstr "OPTIONS AVANC횋ES" #. type: Labeled list #: en/git-svn.txt:684 @@ -47852,10 +47324,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:691 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "-R<remote name>" -msgstr "contenu supprim챕" +msgstr "-R<nom distant>" #. type: Labeled list #: en/git-svn.txt:692 @@ -48041,9 +47512,8 @@ msgstr "" #. type: Title - #: en/git-svn.txt:816 #, fuzzy, no-wrap -#| msgid "EXAMPLES" msgid "BASIC EXAMPLES" -msgstr "EXEMPLES" +msgstr "EXEMPLES DE BASE" #. type: Plain text #: en/git-svn.txt:820 @@ -48611,35 +48081,13 @@ 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 `-a` if none of `-a`, `-s`, or `-u <keyid>` is given." -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" +msgstr "Utiliser le message d'챕tiquette fourni (au lieu de le demander). Si plusieurs options `-m` sont fournies, leurs valeurs sont concat챕n챕es comme paragraphes s챕par챕s. Implique `-a` si ni `-a`, ni `-s` et ni `-u <idcl챕>` n'est fourni.\n" #. 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 given." -msgstr "" -"-F <fichier>::\n" -"--file=<fichier>::\n" -"\tPrendre le message de validation depuis le fichier indiqu챕.\n" -"\tUtilisez '-' pour lire le message depuis l'entr챕e standard.\n" +msgstr "Prendre le message d'챕tiquette fourni dans le fichier indiqu챕. Utiliser '-' pour lire le message depuis l'entr챕e standard. Implique `-a` si ni `-a`, ni `-s` et ni `-u <idcl챕>` n'est fourni.\n" #. type: Plain text #: en/git-tag.txt:151 @@ -48664,10 +48112,9 @@ msgstr "" #. type: Labeled list #: en/git-tag.txt:165 en/git.txt:789 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "<commit>" -msgstr "git-commit(1)" +msgstr "<commit>" #. type: Plain text #: en/git-tag.txt:169 @@ -48762,12 +48209,13 @@ 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" -msgstr "$ git commit\n" +msgstr "" +"\tgit tag -d X\n" +"\tgit fetch origin tag X\n" #. type: delimited block - #: en/git-tag.txt:245 @@ -48783,10 +48231,9 @@ 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)" +msgstr "\tgit rev-parse X\n" #. type: delimited block - #: en/git-tag.txt:251 @@ -48840,10 +48287,9 @@ 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혻:" +msgstr "pour r챕cup챕rer les mises 횪 jour suivantes��\n" #. type: Plain text #: en/git-tag.txt:288 @@ -48900,10 +48346,8 @@ 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-merge[1], linkgit:git-commit-tree[1]" +msgstr "linkgit:git-check-ref-format[1]. linkgit:git-config[1]." #. type: Title = #: en/git.txt:2 @@ -49440,10 +48884,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:548 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "-C <path>" -msgstr "patch" +msgstr "-C <chemin>" #. type: Plain text #: en/git.txt:553 @@ -49558,10 +49001,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:606 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "--work-tree=<path>" -msgstr "whitespace" +msgstr "--work-tree=<chemin>" #. type: Plain text #: en/git.txt:613 @@ -49767,10 +49209,9 @@ msgstr "" #. type: Title - #: en/git.txt:750 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Configuration Mechanism" -msgstr "Configuration" +msgstr "M챕canisme de configuration" #. type: Plain text #: en/git.txt:755 @@ -49850,10 +49291,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:798 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "<commit-ish>" -msgstr "git-commit(1)" +msgstr "<commit-esque>" #. type: Plain text #: en/git.txt:803 @@ -50072,10 +49512,9 @@ msgstr "" #. type: Title ~ #: en/git.txt:938 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Git Commits" -msgstr "$ git commit\n" +msgstr "Commits Git" #. type: Labeled list #: en/git.txt:939 @@ -50121,17 +49560,14 @@ msgstr "" #. type: Plain text #: en/git.txt:947 -#, fuzzy -#| msgid "git-commit(1)" msgid "see linkgit:git-commit-tree[1]" -msgstr "git-commit(1)" +msgstr "voir linkgit:git-commit-tree[1]" #. type: Title ~ #: en/git.txt:949 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Git Diffs" -msgstr "$ git commit\n" +msgstr "Diffs Git" #. type: Labeled list #: en/git.txt:950 @@ -50683,10 +50119,8 @@ msgstr "" #. type: Plain text #: en/git.txt:1293 -#, 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: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]" -msgstr "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]" +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]" #. type: Title = #: en/git-unpack-file.txt:2 @@ -50784,10 +50218,8 @@ 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" +msgstr "git-update-index - Enregistre le contenu de fichiers de l'arbre de travail 횪 l'index" #. type: Plain text #: en/git-update-index.txt:27 @@ -50913,10 +50345,8 @@ 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" +msgstr "Lire l'information d'index depuis stdin." #. type: Plain text #: en/git-update-index.txt:85 @@ -51002,10 +50432,8 @@ 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.)" -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'," +msgstr "Supprime le fichier de l'index m챗me quand le r챕pertoire de travail contient encore ce fichier. (Implique --remove.)" #. type: Labeled list #: en/git-update-index.txt:132 @@ -51352,10 +50780,9 @@ 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)" +msgstr "Skip-worktree bit" #. type: Plain text #: en/git-update-index.txt:380 @@ -51464,10 +50891,8 @@ 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])." -msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])." +msgstr "L'extension de cache des non-suivis peut 챗tre activ챕e par la variable de configuration `core.untrackedCache` (voir linkgit:git-config[1])." #. type: Plain text #: en/git-update-index.txt:483 @@ -51713,16 +51138,8 @@ 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" -"--force::\n" -"\tForce l'ajout de fichiers qui sont normalement ignor챕s.\n" +msgstr "Mettre 횪 jour les fichiers d'information 횪 partir de rien." #. type: Plain text #: en/git-update-server-info.txt:37 @@ -51847,10 +51264,9 @@ msgstr "" #. type: delimited block - #: en/git-upload-pack.txt:26 -#, fuzzy, no-wrap -#| msgid "OPTIONS" +#, no-wrap msgid "OPTIONS\n" -msgstr "OPTIONS" +msgstr "OPTIONS\n" #. type: Labeled list #: en/git-upload-pack.txt:28 @@ -52085,10 +51501,9 @@ msgstr "" #. type: Title - #: en/git-verify-pack.txt:40 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "OUTPUT FORMAT" -msgstr "FORMATS DE DATE" +msgstr "FORMAT DE SORTIE" #. type: Plain text #: en/git-verify-pack.txt:42 @@ -52538,17 +51953,15 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:91 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "-b <new-branch>" -msgstr "Mode interactif" +msgstr "-b <nouvelle-branche>" #. type: Labeled list #: en/git-worktree.txt:92 -#, fuzzy, no-wrap -#| msgid "Interactive mode" +#, no-wrap msgid "-B <new-branch>" -msgstr "Mode interactif" +msgstr "-B <nouvelle-branche>" #. type: Plain text #: en/git-worktree.txt:99 @@ -52604,10 +52017,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:130 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "<worktree>" -msgstr "whitespace" +msgstr "<arbre-de-travail>" #. type: Plain text #: en/git-worktree.txt:133 @@ -52760,10 +52172,8 @@ 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" +msgstr "git-write-tree - Cr챕e un objet arbre depuis l'index actuel" #. type: Plain text #: en/git-write-tree.txt:13 @@ -52935,10 +52345,8 @@ 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" +msgstr "Les formes plus complexes sont혻:\n" #. type: Plain text #: en/mailmap.txt:17 @@ -53049,7 +52457,7 @@ msgstr "" #: en/merge-config.txt:1 #, no-wrap msgid "merge.conflictStyle" -msgstr "" +msgstr "merge.conflictStyle" #. type: Plain text #: en/merge-config.txt:8 @@ -53060,7 +52468,7 @@ msgstr "" #: en/merge-config.txt:9 #, no-wrap msgid "merge.defaultToUpstream" -msgstr "" +msgstr "merge.defaultToUpstream" #. type: Plain text #: en/merge-config.txt:18 @@ -53071,7 +52479,7 @@ msgstr "" #: en/merge-config.txt:19 #, no-wrap msgid "merge.ff" -msgstr "" +msgstr "merge.ff" #. type: Plain text #: en/merge-config.txt:28 @@ -53082,7 +52490,7 @@ msgstr "" #: en/merge-config.txt:31 #, no-wrap msgid "merge.renameLimit" -msgstr "" +msgstr "merge.renameLimit" #. type: Plain text #: en/merge-config.txt:35 @@ -53093,7 +52501,7 @@ msgstr "" #: en/merge-config.txt:36 #, no-wrap msgid "merge.renormalize" -msgstr "" +msgstr "merge.renormalize" #. type: Plain text #: en/merge-config.txt:45 @@ -53104,7 +52512,7 @@ msgstr "" #: en/merge-config.txt:46 #, no-wrap msgid "merge.stat" -msgstr "" +msgstr "merge.stat" #. type: Plain text #: en/merge-config.txt:49 @@ -53113,10 +52521,9 @@ 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)" +msgstr "merge.tool" #. type: Plain text #: en/merge-config.txt:55 @@ -53127,7 +52534,7 @@ msgstr "" #: en/merge-config.txt:58 #, no-wrap msgid "merge.verbosity" -msgstr "" +msgstr "merge.verbosity" #. type: Plain text #: en/merge-config.txt:65 @@ -53262,10 +52669,9 @@ msgstr "" #. type: Labeled list #: en/merge-options.txt:85 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "-X <option>" -msgstr "status" +msgstr "-X <option>" #. type: Plain text #: en/merge-options.txt:89 @@ -53302,16 +52708,8 @@ 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" -"--quiet::\n" -"\tSupprimer le message de r챕sum챕 de commit.\n" +msgstr "Mode Silencieux. Implique --no-progress." #. type: Plain text #: en/merge-options.txt:118 @@ -53579,17 +52977,13 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:7 -#, fuzzy -#| msgid "diff" msgid "diffmerge" -msgstr "diff" +msgstr "diffmerge" #. type: Plain text #: en/mergetools-merge.txt:8 -#, fuzzy -#| msgid "diff" msgid "diffuse" -msgstr "diff" +msgstr "diffuse" #. type: Plain text #: en/mergetools-merge.txt:9 @@ -53598,17 +52992,13 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:10 -#, fuzzy -#| msgid "git-commit(1)" msgid "emerge" -msgstr "git-commit(1)" +msgstr "emerge" #. type: Plain text #: en/mergetools-merge.txt:11 -#, fuzzy -#| msgid "diff" msgid "examdiff" -msgstr "diff" +msgstr "examdiff" #. type: Plain text #: en/mergetools-merge.txt:12 @@ -53617,31 +53007,23 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:13 -#, fuzzy -#| msgid "diff" msgid "gvimdiff" -msgstr "diff" +msgstr "gvimdiff" #. type: Plain text #: en/mergetools-merge.txt:14 -#, fuzzy -#| msgid "diff" msgid "gvimdiff2" -msgstr "diff" +msgstr "gvimdiff2" #. type: Plain text #: en/mergetools-merge.txt:15 -#, fuzzy -#| msgid "diff" msgid "gvimdiff3" -msgstr "diff" +msgstr "gvimdiff3" #. type: Plain text #: en/mergetools-merge.txt:16 -#, fuzzy -#| msgid "diff" msgid "kdiff3" -msgstr "diff" +msgstr "kdiff3" #. type: Plain text #: en/mergetools-merge.txt:17 @@ -53650,10 +53032,8 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:18 -#, fuzzy -#| msgid "diff" msgid "opendiff" -msgstr "diff" +msgstr "opendiff" #. type: Plain text #: en/mergetools-merge.txt:19 @@ -53662,10 +53042,8 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:20 -#, fuzzy -#| msgid "diff" msgid "tkdiff" -msgstr "diff" +msgstr "tkdiff" #. type: Plain text #: en/mergetools-merge.txt:21 @@ -53674,45 +53052,34 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:22 -#, fuzzy -#| msgid "diff" msgid "vimdiff" -msgstr "diff" +msgstr "vimdiff" #. type: Plain text #: en/mergetools-merge.txt:23 -#, fuzzy -#| msgid "diff" msgid "vimdiff2" -msgstr "diff" +msgstr "vimdiff2" #. type: Plain text #: en/mergetools-merge.txt:24 -#, fuzzy -#| msgid "diff" msgid "vimdiff3" -msgstr "diff" +msgstr "vimdiff3" #. type: Plain text #: en/mergetools-merge.txt:25 -#, fuzzy -#| msgid "git-commit(1)" msgid "winmerge" -msgstr "git-commit(1)" +msgstr "winmerge" #. type: Plain text #: en/mergetools-merge.txt:25 -#, fuzzy -#| msgid "diff" msgid "xxdiff" -msgstr "diff" +msgstr "xxdiff" #. type: Title - #: en/pretty-formats.txt:2 -#, fuzzy, no-wrap -#| msgid "DATE FORMATS" +#, no-wrap msgid "PRETTY FORMATS" -msgstr "FORMATS DE DATE" +msgstr "FORMATS AUTOMATIQUES" #. type: Plain text #: en/pretty-formats.txt:13 @@ -53837,10 +53204,8 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:88 -#, fuzzy -#| msgid "Configuration" msgid "'format:<string>'" -msgstr "Configuration" +msgstr "'format:<cha챤ne>'" #. type: Plain text #: en/pretty-formats.txt:93 @@ -53862,10 +53227,8 @@ 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" +msgstr "Les espaces r챕serv챕s sont혻:" #. type: Plain text #: en/pretty-formats.txt:106 @@ -54189,10 +53552,8 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:225 -#, fuzzy -#| msgid "Configuration" msgid "'tformat:'" -msgstr "Configuration" +msgstr "'tformat:'" #. type: Plain text #: en/pretty-formats.txt:233 @@ -54250,10 +53611,8 @@ 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])." -msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])." +msgstr "Note혻: vous pouvez sp챕cifier le format par d챕faut dans la configuration du d챕p척t `commit.cleanup` (voir linkgit:git-config[1])." #. type: Labeled list #: en/pretty-options.txt:17 @@ -54398,10 +53757,8 @@ 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])." -msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])." +msgstr "Un nom faisant r챕f챕rence 횪 une liste des d챕p척ts comme la valeur de remotes.<groupe> dans le fichier de configuration. (voir linkgit:git-config[1])." #. type: Labeled list #: en/pull-fetch-param.txt:14 @@ -54996,10 +54353,9 @@ msgstr "" #. type: Title ~ #: en/rev-list-options.txt:2 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Commit Limiting" -msgstr "Configuration" +msgstr "Limitation de commit" #. type: Plain text #: en/rev-list-options.txt:7 @@ -55036,10 +54392,8 @@ 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." +msgstr "Limite le nombre de commits dans la sortie." #. type: Labeled list #: en/rev-list-options.txt:23 @@ -55111,10 +54465,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:41 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--committer=<pattern>" -msgstr "status" +msgstr "--committer=<patron>" #. type: Plain text #: en/rev-list-options.txt:47 @@ -55547,10 +54900,9 @@ 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" +msgstr "Mode par d챕faut" #. type: Plain text #: en/rev-list-options.txt:325 @@ -55967,10 +55319,9 @@ msgstr "" #. type: Title ~ #: en/rev-list-options.txt:623 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Commit Ordering" -msgstr "Configuration" +msgstr "Ordre des commits" #. type: Plain text #: en/rev-list-options.txt:626 @@ -56111,10 +55462,9 @@ msgstr "" #. type: Title ~ #: en/rev-list-options.txt:711 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Commit Formatting" -msgstr "Configuration" +msgstr "Formatage des commits" #. type: Plain text #: en/rev-list-options.txt:717 @@ -56134,10 +55484,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:724 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--date=<format>" -msgstr "Configuration" +msgstr "--date=<format>" #. type: Plain text #: en/rev-list-options.txt:731 @@ -56346,10 +55695,9 @@ msgstr "" #. type: Title ~ #: en/rev-list-options.txt:860 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "Diff Formatting" -msgstr "Configuration" +msgstr "Formatage des diffs" #. type: Plain text #: en/rev-list-options.txt:865 diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po index def3010f6f6af884e6d04d77108468ca889e204a..b7d2a09e9e97a7fcef92163350a103cca955d6a5 100755 --- a/scripts/pre-translate-po +++ b/scripts/pre-translate-po @@ -9,8 +9,8 @@ def main (f): for entry in po: if (re.fullmatch(r'-[-a-z0-9[\]]+', entry.msgid)) \ - or re.fullmatch(r'((linkgit:)?git[-a-z0-9[\]]+(\[[157]\]|\([157]\))(,|;)?(\n| )?)+', entry.msgid) \ - or re.fullmatch(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|mergetool|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|difftool|credential|commit|column|core|branch|diff|apply|color)\.[a-zA-Z_.]+', entry.msgid): + or re.fullmatch(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+', entry.msgid) \ + or re.fullmatch(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|merge(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+', entry.msgid): entry.msgstr = entry.msgid entry.flags.append("ignore-translated") flags = set(entry.flags)