From 7298ca7b2e80ab0a3aecc9ed90b4c8ce9edf5fd1 Mon Sep 17 00:00:00 2001 From: Jean-Noel Avila Date: Sun, 29 Mar 2015 09:54:56 +0200 Subject: l10n: fr.po v2.4.0-rc0 round 1 Signed-off-by: Jean-Noel Avila --- po/fr.po | 1798 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 908 insertions(+), 890 deletions(-) (limited to 'po') diff --git a/po/fr.po b/po/fr.po index 3235879de0..d6cae341c5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -73,8 +73,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2015-01-21 14:21+0800\n" -"PO-Revision-Date: 2015-01-21 14:57+0800\n" +"POT-Creation-Date: 2015-03-27 13:33+0800\n" +"PO-Revision-Date: 2015-03-30 10:53+0200\n" "Last-Translator: Jean-Noël Avila \n" "Language-Team: Jean-Noël Avila \n" "Language: fr\n" @@ -98,8 +98,8 @@ msgstr "" "nécessaire pour marquer la résolution et valider." #: archive.c:11 -msgid "git archive [options] [...]" -msgstr "git archive [options] [...]" +msgid "git archive [] [...]" +msgstr "git archive [] [...]" #: archive.c:12 msgid "git archive --list" @@ -107,10 +107,8 @@ msgstr "git archive --list" #: archive.c:13 msgid "" -"git archive --remote [--exec ] [options] [...]" -msgstr "" -"git archive --remote [--exec ] [options] [...]" +"git archive --remote [--exec ] [] [...]" +msgstr "git archive --remote [--exec ] [] [...]" #: archive.c:14 msgid "git archive --remote [--exec ] --list" @@ -137,10 +135,10 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fichier" @@ -189,7 +187,7 @@ msgstr "commande" msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: attr.c:258 +#: attr.c:264 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -325,7 +323,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:87 builtin/commit.c:770 +#: bundle.c:87 builtin/commit.c:764 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -334,8 +332,8 @@ msgstr "impossible d'ouvrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" @@ -376,21 +374,21 @@ msgstr "rev-list a disparu" msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:444 +#: bundle.c:443 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:454 +#: bundle.c:453 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:475 +#: bundle.c:474 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -413,58 +411,58 @@ msgstr "%s %s n'est pas un commit !" msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:469 config.c:471 +#: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "ligne %d de fichier de config incorrecte dans %s" -#: config.c:587 +#: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:589 +#: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:674 +#: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:752 config.c:763 +#: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:885 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1211 +#: config.c:1216 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1272 +#: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:1596 +#: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:1598 +#: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:1657 +#: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" @@ -556,7 +554,7 @@ msgstr[1] "il y a %lu ans" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:516 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -586,16 +584,16 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:2957 +#: diff.c:2956 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3352 +#: diff.c:3351 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3515 +#: diff.c:3514 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -604,7 +602,7 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3529 +#: diff.c:3528 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" @@ -1109,7 +1107,7 @@ msgstr "impossible d'analyser le format --pretty" msgid "done" msgstr "fait" -#: read-cache.c:1267 +#: read-cache.c:1273 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1118,7 +1116,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1277 +#: read-cache.c:1283 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1207,23 +1205,31 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: run-command.c:87 +#: revision.c:2348 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent est incompatible avec --bisect" + +#: run-command.c:83 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:89 +#: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "échec de dup2(%d,%d)" -#: send-pack.c:268 +#: send-pack.c:272 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:325 +#: send-pack.c:356 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" +#: send-pack.c:366 +msgid "server does not support --atomic push" +msgstr "le serveur ne gère pas push --atomic" + #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995 #: builtin/merge.c:1005 #, c-format @@ -1254,7 +1260,7 @@ msgstr "" "avec 'git add ' ou 'git rm '\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:211 sequencer.c:856 sequencer.c:939 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" @@ -1290,31 +1296,31 @@ msgstr "Impossible de résoudre le commit HEAD\n" msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:406 +#: sequencer.c:411 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" -#: sequencer.c:411 +#: sequencer.c:416 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" -#: sequencer.c:477 +#: sequencer.c:482 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." -#: sequencer.c:496 +#: sequencer.c:501 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:504 +#: sequencer.c:509 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas le parent %d" -#: sequencer.c:508 +#: sequencer.c:513 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1323,153 +1329,153 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:521 +#: sequencer.c:526 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:525 +#: sequencer.c:530 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" -#: sequencer.c:611 +#: sequencer.c:616 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:612 +#: sequencer.c:617 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:648 +#: sequencer.c:653 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:656 +#: sequencer.c:661 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:660 +#: sequencer.c:665 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:720 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" -#: sequencer.c:742 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." -#: sequencer.c:747 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Aucun commit analysé." -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" -#: sequencer.c:764 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." -#: sequencer.c:771 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" -#: sequencer.c:801 +#: sequencer.c:806 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" -#: sequencer.c:804 +#: sequencer.c:809 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: sequencer.c:816 +#: sequencer.c:821 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" -#: sequencer.c:837 +#: sequencer.c:842 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:838 +#: sequencer.c:843 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:842 +#: sequencer.c:847 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" -#: sequencer.c:858 sequencer.c:943 +#: sequencer.c:863 sequencer.c:948 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:877 sequencer.c:1013 +#: sequencer.c:882 sequencer.c:1018 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:879 +#: sequencer.c:884 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:881 +#: sequencer.c:886 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:903 builtin/apply.c:4128 +#: sequencer.c:908 builtin/apply.c:4286 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" -#: sequencer.c:906 +#: sequencer.c:911 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:907 +#: sequencer.c:912 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:913 +#: sequencer.c:918 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:936 +#: sequencer.c:941 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1081 +#: sequencer.c:1086 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1084 +#: sequencer.c:1089 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1118 +#: sequencer.c:1123 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1119 +#: sequencer.c:1124 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" @@ -1543,38 +1549,38 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:1111 builtin/init-db.c:371 +#: submodule.c:1109 builtin/init-db.c:371 #, c-format msgid "Could not create git link %s" msgstr "Impossible de créer le lien git %s" -#: submodule.c:1122 +#: submodule.c:1120 #, c-format msgid "Could not set core.worktree in %s" msgstr "Impossible de paramétrer core.worktree dans %s" -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 +#: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:552 trailer.c:557 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: trailer.c:590 +#: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "symbole vide dans la ligne de fin '%.*s'" -#: trailer.c:710 +#: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:713 +#: trailer.c:704 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" @@ -1611,28 +1617,28 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: wrapper.c:509 +#: wrapper.c:523 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" -#: wrapper.c:530 +#: wrapper.c:544 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:541 +#: wrapper.c:555 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" "impossible de rechercher l'utilisateur actuel dans le fichier de mots de " "passe : %s" -#: wrapper.c:542 +#: wrapper.c:556 msgid "no such user" msgstr "utilisateur inconnu" -#: wrapper.c:550 +#: wrapper.c:564 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" @@ -1663,11 +1669,11 @@ msgstr "" msgid " (use \"git rm ...\" to mark resolution)" msgstr " (utilisez \"git rm ...\" pour marquer comme résolu)" -#: wt-status.c:198 +#: wt-status.c:198 wt-status.c:878 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:216 +#: wt-status.c:216 wt-status.c:887 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" @@ -1782,15 +1788,15 @@ msgstr "contenu non suivi, " msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:758 +#: wt-status.c:753 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:760 +#: wt-status.c:755 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:839 +#: wt-status.c:835 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1798,68 +1804,68 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus\n" "Tout se qui suit sera éliminé." -#: wt-status.c:930 +#: wt-status.c:946 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:933 +#: wt-status.c:949 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:936 +#: wt-status.c:952 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:939 +#: wt-status.c:955 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:949 +#: wt-status.c:965 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:952 +#: wt-status.c:968 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:956 +#: wt-status.c:972 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:958 +#: wt-status.c:974 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:960 +#: wt-status.c:976 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1020 wt-status.c:1037 +#: wt-status.c:1036 wt-status.c:1053 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1025 wt-status.c:1042 +#: wt-status.c:1041 wt-status.c:1058 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1028 +#: wt-status.c:1044 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1030 +#: wt-status.c:1046 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1032 +#: wt-status.c:1048 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1045 +#: wt-status.c:1061 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1065 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1867,120 +1873,120 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1054 +#: wt-status.c:1070 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1057 +#: wt-status.c:1073 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1061 +#: wt-status.c:1077 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1066 +#: wt-status.c:1082 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1069 +#: wt-status.c:1085 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1071 +#: wt-status.c:1087 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos " "modifications)" -#: wt-status.c:1081 +#: wt-status.c:1097 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1086 +#: wt-status.c:1102 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1089 +#: wt-status.c:1105 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1091 +#: wt-status.c:1107 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1100 +#: wt-status.c:1116 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1105 +#: wt-status.c:1121 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1124 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1126 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1121 +#: wt-status.c:1137 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1125 +#: wt-status.c:1141 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1128 +#: wt-status.c:1144 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1303 +#: wt-status.c:1321 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1310 +#: wt-status.c:1328 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1317 +#: wt-status.c:1333 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1319 +#: wt-status.c:1335 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1322 +#: wt-status.c:1338 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1339 +#: wt-status.c:1355 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1353 +#: wt-status.c:1369 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1355 +#: wt-status.c:1371 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1359 +#: wt-status.c:1375 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1992,32 +1998,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1365 +#: wt-status.c:1381 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1367 +#: wt-status.c:1383 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1373 +#: wt-status.c:1389 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1378 +#: wt-status.c:1394 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1381 +#: wt-status.c:1397 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1384 +#: wt-status.c:1400 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2026,49 +2032,49 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1387 +#: wt-status.c:1403 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1390 +#: wt-status.c:1406 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1393 wt-status.c:1398 +#: wt-status.c:1409 wt-status.c:1414 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1396 +#: wt-status.c:1412 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1400 +#: wt-status.c:1416 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1509 +#: wt-status.c:1525 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1515 +#: wt-status.c:1531 msgid "Initial commit on " msgstr "Validation initiale sur " # à priori on parle d'une branche ici -#: wt-status.c:1547 +#: wt-status.c:1563 msgid "gone" msgstr "disparue" -#: wt-status.c:1549 wt-status.c:1557 +#: wt-status.c:1565 wt-status.c:1573 msgid "behind " msgstr "derrière " @@ -2078,8 +2084,8 @@ msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" #: builtin/add.c:22 -msgid "git add [options] [--] ..." -msgstr "git add [options] [--] ..." +msgid "git add [] [--] ..." +msgstr "git add [] [--] ..." #: builtin/add.c:65 #, c-format @@ -2131,14 +2137,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372 #: builtin/rm.c:269 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "mode verbeux" @@ -2218,82 +2224,82 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: builtin/apply.c:58 -msgid "git apply [options] [...]" -msgstr "git apply [options] [...]" +#: builtin/apply.c:59 +msgid "git apply [] [...]" +msgstr "git apply [] [...]" -#: builtin/apply.c:111 +#: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: builtin/apply.c:126 +#: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: builtin/apply.c:826 +#: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: builtin/apply.c:835 +#: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: builtin/apply.c:916 +#: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: builtin/apply.c:952 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:953 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:960 +#: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: builtin/apply.c:1423 +#: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: builtin/apply.c:1497 +#: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2308,77 +2314,77 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: builtin/apply.c:1657 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: builtin/apply.c:1659 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: builtin/apply.c:1685 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: builtin/apply.c:1721 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: builtin/apply.c:1723 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: builtin/apply.c:1726 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: builtin/apply.c:1872 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: builtin/apply.c:1901 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: builtin/apply.c:2052 +#: builtin/apply.c:2051 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: builtin/apply.c:2142 +#: builtin/apply.c:2141 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/apply.c:2146 +#: builtin/apply.c:2145 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: builtin/apply.c:2754 +#: builtin/apply.c:2778 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: builtin/apply.c:2872 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: builtin/apply.c:2884 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: builtin/apply.c:2890 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" @@ -2387,328 +2393,347 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: builtin/apply.c:2909 +#: builtin/apply.c:2933 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: builtin/apply.c:3010 +#: builtin/apply.c:3034 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: builtin/apply.c:3016 +#: builtin/apply.c:3040 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: builtin/apply.c:3037 +#: builtin/apply.c:3061 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: builtin/apply.c:3161 +#: builtin/apply.c:3185 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286 #, c-format msgid "read of %s failed" msgstr "échec de la lecture de %s" -#: builtin/apply.c:3240 builtin/apply.c:3462 +#: builtin/apply.c:3238 +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "lecture depuis '%s' au-delà d'un lien symbolique" + +#: builtin/apply.c:3266 builtin/apply.c:3488 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: builtin/apply.c:3321 builtin/apply.c:3476 +#: builtin/apply.c:3347 builtin/apply.c:3502 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3330 builtin/apply.c:3484 +#: builtin/apply.c:3356 builtin/apply.c:3510 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: builtin/apply.c:3432 +#: builtin/apply.c:3458 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3501 +#: builtin/apply.c:3527 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: builtin/apply.c:3503 +#: builtin/apply.c:3529 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3604 +#: builtin/apply.c:3688 builtin/apply.c:3690 +#, c-format +msgid "invalid path '%s'" +msgstr "chemin invalide '%s'" + +#: builtin/apply.c:3745 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: builtin/apply.c:3607 +#: builtin/apply.c:3748 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: builtin/apply.c:3627 +#: builtin/apply.c:3768 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: builtin/apply.c:3632 +#: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: builtin/apply.c:3640 +#: builtin/apply.c:3793 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" + +#: builtin/apply.c:3797 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3653 +#: builtin/apply.c:3811 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: builtin/apply.c:3889 +#: builtin/apply.c:4047 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:3918 +#: builtin/apply.c:4076 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:3922 +#: builtin/apply.c:4080 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:3927 +#: builtin/apply.c:4085 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: builtin/apply.c:3930 builtin/apply.c:4038 +#: builtin/apply.c:4088 builtin/apply.c:4196 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: builtin/apply.c:3963 +#: builtin/apply.c:4121 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:4012 +#: builtin/apply.c:4170 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4099 +#: builtin/apply.c:4257 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: builtin/apply.c:4107 +#: builtin/apply.c:4265 msgid "internal error" msgstr "erreur interne" -#: builtin/apply.c:4110 +#: builtin/apply.c:4268 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: builtin/apply.c:4120 +#: builtin/apply.c:4278 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4141 +#: builtin/apply.c:4299 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: builtin/apply.c:4144 +#: builtin/apply.c:4302 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: builtin/apply.c:4234 +#: builtin/apply.c:4392 msgid "unrecognized input" msgstr "entrée non reconnue" -#: builtin/apply.c:4245 +#: builtin/apply.c:4403 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92 -#: builtin/fetch.c:93 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92 +#: builtin/fetch.c:92 msgid "path" msgstr "chemin" -#: builtin/apply.c:4363 +#: builtin/apply.c:4521 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4366 +#: builtin/apply.c:4524 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4368 +#: builtin/apply.c:4526 msgid "num" msgstr "num" -#: builtin/apply.c:4369 +#: builtin/apply.c:4527 msgid "remove leading slashes from traditional diff paths" msgstr "supprimer barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4372 +#: builtin/apply.c:4530 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: builtin/apply.c:4374 +#: builtin/apply.c:4532 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: builtin/apply.c:4378 +#: builtin/apply.c:4536 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: builtin/apply.c:4380 +#: builtin/apply.c:4538 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" -#: builtin/apply.c:4382 +#: builtin/apply.c:4540 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: builtin/apply.c:4384 +#: builtin/apply.c:4542 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: builtin/apply.c:4386 +#: builtin/apply.c:4544 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: builtin/apply.c:4388 +#: builtin/apply.c:4546 +msgid "accept a patch that touches outside the working area" +msgstr "accepter un patch qui touche hors de la copie de travail" + +#: builtin/apply.c:4548 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4390 +#: builtin/apply.c:4550 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: builtin/apply.c:4392 +#: builtin/apply.c:4552 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: builtin/apply.c:4397 +#: builtin/apply.c:4557 msgid "ensure at least lines of context match" msgstr "s'assurer d'au moins lignes de correspondance de contexte" -#: builtin/apply.c:4398 +#: builtin/apply.c:4558 msgid "action" msgstr "action" -#: builtin/apply.c:4399 +#: builtin/apply.c:4559 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: builtin/apply.c:4402 builtin/apply.c:4405 +#: builtin/apply.c:4562 builtin/apply.c:4565 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4408 +#: builtin/apply.c:4568 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4410 +#: builtin/apply.c:4570 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: builtin/apply.c:4412 +#: builtin/apply.c:4572 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: builtin/apply.c:4414 +#: builtin/apply.c:4574 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4417 +#: builtin/apply.c:4577 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: builtin/apply.c:4420 +#: builtin/apply.c:4580 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: builtin/apply.c:4422 +#: builtin/apply.c:4582 msgid "root" msgstr "racine" -#: builtin/apply.c:4423 +#: builtin/apply.c:4583 msgid "prepend to all filenames" msgstr "préfixer tous les noms de fichier avec " -#: builtin/apply.c:4445 +#: builtin/apply.c:4605 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: builtin/apply.c:4453 +#: builtin/apply.c:4613 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: builtin/apply.c:4456 +#: builtin/apply.c:4616 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: builtin/apply.c:4472 +#: builtin/apply.c:4635 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4486 +#: builtin/apply.c:4649 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: builtin/apply.c:4492 builtin/apply.c:4502 +#: builtin/apply.c:4655 builtin/apply.c:4665 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2763,107 +2788,107 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" #: builtin/blame.c:30 -msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "git blame [options] [options-de-révision] [rev] [--] fichier" +msgid "git blame [] [] [] [--] file" +msgstr "git blame [] [] [] [--] fichier" #: builtin/blame.c:35 -msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "[options-de-révision] sont documentés dans git-rev-list(1)" +msgid " are documented in git-rev-list(1)" +msgstr " sont documentés dans git-rev-list(1)" -#: builtin/blame.c:2501 +#: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:2502 +#: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:2504 +#: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2505 +#: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2506 +#: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2508 +#: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2509 +#: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2510 +#: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:2515 +#: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2516 +#: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2517 +#: builtin/blame.c:2516 msgid "Use revisions from instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier au lieu d'appeler git-rev-list" -#: builtin/blame.c:2518 +#: builtin/blame.c:2517 msgid "Use 's contents as the final image" msgstr "Utiliser le contenu de comme image finale" -#: builtin/blame.c:2519 builtin/blame.c:2520 +#: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "score" -#: builtin/blame.c:2519 +#: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2520 +#: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2521 +#: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" @@ -2874,25 +2899,25 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2602 +#: builtin/blame.c:2601 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" #: builtin/branch.c:24 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [options] [-r | -a] [--merged | --no-merged]" +msgid "git branch [] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 -msgid "git branch [options] [-l] [-f] []" -msgstr "git branch [options] [-l] [-f] []" +msgid "git branch [] [-l] [-f] []" +msgstr "git branch [ []" #: builtin/branch.c:26 -msgid "git branch [options] [-r] (-d | -D) ..." -msgstr "git branch [options] [-r] (-d | -D) ..." +msgid "git branch [] [-r] (-d | -D) ..." +msgstr "git branch [] [-r] (-d | -D) ..." #: builtin/branch.c:27 -msgid "git branch [options] (-m | -M) [] " -msgstr "git branch [options] (-m | -M) [] " +msgid "git branch [] (-m | -M) [] " +msgstr "git branch [] (-m | -M) [] " #: builtin/branch.c:152 #, c-format @@ -3033,197 +3058,202 @@ msgstr "(aucune branche, rebasage de %s)" msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:593 +#: builtin/branch.c:596 #, c-format -msgid "(detached from %s)" -msgstr "(détaché de %s)" +msgid "(HEAD detached at %s)" +msgstr "(HEAD détachée sur %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:599 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD détachée depuis %s)" + +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:643 +#: builtin/branch.c:650 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objet '%s' ne pointe pas sur un commit" -#: builtin/branch.c:691 +#: builtin/branch.c:698 msgid "some refs could not be read" msgstr "des références n'ont pas pu être lues" -#: builtin/branch.c:704 +#: builtin/branch.c:711 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:714 +#: builtin/branch.c:721 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:729 +#: builtin/branch.c:736 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:737 +#: builtin/branch.c:744 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:744 +#: builtin/branch.c:751 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:759 +#: builtin/branch.c:766 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: builtin/branch.c:783 +#: builtin/branch.c:790 #, c-format msgid "could not write branch description template: %s" msgstr "impossible d'écrire le modèle de description de branche : %s" -#: builtin/branch.c:813 +#: builtin/branch.c:820 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:815 +#: builtin/branch.c:822 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:816 +#: builtin/branch.c:823 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:817 +#: builtin/branch.c:824 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:819 +#: builtin/branch.c:826 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:823 +#: builtin/branch.c:830 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:824 +#: builtin/branch.c:831 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616 #: builtin/tag.c:622 msgid "commit" msgstr "commit" -#: builtin/branch.c:828 builtin/branch.c:834 +#: builtin/branch.c:835 builtin/branch.c:841 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:840 +#: builtin/branch.c:847 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:841 +#: builtin/branch.c:848 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:843 +#: builtin/branch.c:850 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:844 +#: builtin/branch.c:851 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:845 +#: builtin/branch.c:852 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:846 +#: builtin/branch.c:853 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:847 +#: builtin/branch.c:854 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:848 +#: builtin/branch.c:855 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:850 +#: builtin/branch.c:857 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:851 +#: builtin/branch.c:858 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:854 +#: builtin/branch.c:861 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" -#: builtin/branch.c:860 +#: builtin/branch.c:867 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" -#: builtin/branch.c:864 +#: builtin/branch.c:871 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:877 +#: builtin/branch.c:884 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:881 builtin/clone.c:637 +#: builtin/branch.c:888 builtin/clone.c:637 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:903 +#: builtin/branch.c:910 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:914 builtin/branch.c:953 +#: builtin/branch.c:921 builtin/branch.c:960 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:929 +#: builtin/branch.c:936 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:941 +#: builtin/branch.c:948 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:944 +#: builtin/branch.c:951 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:959 +#: builtin/branch.c:966 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:964 +#: builtin/branch.c:971 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:968 +#: builtin/branch.c:975 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3231,41 +3261,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:975 +#: builtin/branch.c:982 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:991 +#: builtin/branch.c:998 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:997 +#: builtin/branch.c:1004 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:1011 +#: builtin/branch.c:1018 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:1017 +#: builtin/branch.c:1024 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:1020 +#: builtin/branch.c:1027 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3274,7 +3304,7 @@ msgstr "" "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --" "track ou --set-upstream-to\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:1044 #, c-format msgid "" "\n" @@ -3285,12 +3315,12 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1038 +#: builtin/branch.c:1045 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1039 +#: builtin/branch.c:1046 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3308,55 +3338,54 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:328 -msgid "git cat-file (-t|-s|-e|-p||--textconv) " -msgstr "git cat-file (-t|-s|-e|-p||--textconv) " +#: builtin/cat-file.c:326 +msgid "git cat-file (-t | -s | -e | -p | | --textconv) " +msgstr "git cat-file (-t | -s | -e | -p | | --textconv) " -#: builtin/cat-file.c:329 -msgid "git cat-file (--batch|--batch-check) < " -msgstr "git cat-file (--batch|--batch-check) < " +#: builtin/cat-file.c:327 +msgid "git cat-file (--batch | --batch-check) < " +msgstr "git cat-file (--batch | --batch-check) < " -#: builtin/cat-file.c:366 +#: builtin/cat-file.c:364 msgid " can be one of: blob, tree, commit, tag" msgstr " peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:367 +#: builtin/cat-file.c:365 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:368 +#: builtin/cat-file.c:366 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:368 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:369 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:371 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:375 +#: builtin/cat-file.c:373 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:376 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" #: builtin/check-attr.c:11 -msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "git check-attr [-a | --all | attr...] [--] chemin..." +msgid "git check-attr [-a | --all | ...] [--] ..." +msgstr "git check-attr [-a | --all | ...] [--] ..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < " -msgstr "" -"git check-attr --stdin [-z] [-a | --all | attr...] < " +msgid "git check-attr --stdin [-z] [-a | --all | ...] < " +msgstr "git check-attr --stdin [-z] [-a | --all | ...] < " #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3412,8 +3441,8 @@ msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" #: builtin/check-mailmap.c:8 -msgid "git check-mailmap [options] ..." -msgstr "git check-mailmap [options] ..." +msgid "git check-mailmap [] ..." +msgstr "git check-mailmap [] ..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" @@ -3429,8 +3458,8 @@ msgid "no contacts specified" msgstr "aucun contact spécifié" #: builtin/checkout-index.c:126 -msgid "git checkout-index [options] [--] [...]" -msgstr "git checkout-index [options] [--] [...]" +msgid "git checkout-index [] [--] [...]" +msgstr "git checkout-index [] [--] [...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" @@ -3475,12 +3504,12 @@ msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" #: builtin/checkout.c:25 -msgid "git checkout [options] " -msgstr "git checkout [options] " +msgid "git checkout [] " +msgstr "git checkout [] " #: builtin/checkout.c:26 -msgid "git checkout [options] [] -- ..." -msgstr "git checkout [options] [] -- ..." +msgid "git checkout [] [] -- ..." +msgstr "git checkout [] [] -- ..." #: builtin/checkout.c:132 builtin/checkout.c:165 #, c-format @@ -3611,14 +3640,13 @@ msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" -" git branch new_branch_name %s\n" +" git branch %s\n" "\n" msgstr "" -"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon " -"moment\n" +"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n" "pour le faire avec :\n" "\n" -"git branch nouvelle_branche %s\n" +"git branch %s\n" "\n" #: builtin/checkout.c:777 @@ -3734,8 +3762,8 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" #: builtin/checkout.c:1130 -msgid "second guess 'git checkout no-such-branch'" -msgstr "deuxième chance 'git checkout branche-inexistante'" +msgid "second guess 'git checkout '" +msgstr "réessayer d'interpréter 'git checkout '" #: builtin/checkout.c:1153 msgid "-b, -B and --orphan are mutually exclusive" @@ -3858,16 +3886,17 @@ msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" -#: builtin/clean.c:757 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 #, c-format -msgid "remove %s? " -msgstr "supprimer %s ? " +msgid "Remove %s [y/N]? " +msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:782 +#: builtin/clean.c:783 msgid "Bye." msgstr "Au revoir." -#: builtin/clean.c:790 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3885,62 +3914,62 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:818 +#: builtin/clean.c:819 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:826 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:843 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:874 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:876 +#: builtin/clean.c:877 msgid "force" msgstr "forcer" -#: builtin/clean.c:877 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:879 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "motif" -#: builtin/clean.c:881 +#: builtin/clean.c:882 msgid "add to ignore rules" msgstr "ajouter aux règles ignore" -#: builtin/clean.c:882 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:884 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:902 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:906 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3948,7 +3977,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3957,11 +3986,11 @@ msgstr "" "nettoyer" #: builtin/clone.c:37 -msgid "git clone [options] [--] []" -msgstr "git clone [options] [--] []" +msgid "git clone [] [--] []" +msgstr "git clone [] [--] []" -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/push.c:514 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224 +#: builtin/push.c:523 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" @@ -4021,7 +4050,7 @@ msgstr "extraire au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659 msgid "depth" msgstr "profondeur" @@ -4167,7 +4196,7 @@ msgstr "--bare et --separate-git-dir sont incompatibles." msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:815 builtin/fetch.c:1155 +#: builtin/clone.c:815 builtin/fetch.c:1156 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" @@ -4183,60 +4212,60 @@ msgstr "" msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:848 builtin/clone.c:860 +#: builtin/clone.c:850 builtin/clone.c:861 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:851 +#: builtin/clone.c:853 #, c-format -msgid "could not create work tree dir '%s'." -msgstr "impossible de créer le répertoire de la copie de travail '%s'." +msgid "could not create work tree dir '%s'" +msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:870 +#: builtin/clone.c:871 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:872 +#: builtin/clone.c:873 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:897 +#: builtin/clone.c:898 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate est spécifié, mais --reference est absent" -#: builtin/clone.c:912 +#: builtin/clone.c:913 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:915 +#: builtin/clone.c:916 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:920 +#: builtin/clone.c:921 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:924 +#: builtin/clone.c:925 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:975 builtin/clone.c:983 +#: builtin/clone.c:976 builtin/clone.c:984 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:986 +#: builtin/clone.c:987 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." #: builtin/column.c:9 -msgid "git column [options]" -msgstr "git column [options]" +msgid "git column []" +msgstr "git column []" #: builtin/column.c:26 msgid "lookup config vars" @@ -4267,12 +4296,12 @@ msgid "--command must be the first argument" msgstr "--command doit être le premier argument" #: builtin/commit.c:37 -msgid "git commit [options] [--] ..." -msgstr "git commit [options] [--] ..." +msgid "git commit [] [--] ..." +msgstr "git commit [] [--] ..." #: builtin/commit.c:42 -msgid "git status [options] [--] ..." -msgstr "git status [options] [--] ..." +msgid "git status [] [--] ..." +msgstr "git status [] [--] ..." #: builtin/commit.c:47 msgid "" @@ -4417,26 +4446,26 @@ msgstr "impossible de lire l'index" msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:584 +#: builtin/commit.c:578 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:586 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:605 +#: builtin/commit.c:599 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:613 +#: builtin/commit.c:607 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: builtin/commit.c:657 +#: builtin/commit.c:651 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4444,43 +4473,43 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:706 builtin/shortlog.c:273 +#: builtin/commit.c:700 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:702 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:712 +#: builtin/commit.c:706 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:734 +#: builtin/commit.c:728 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:738 +#: builtin/commit.c:732 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:736 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: builtin/commit.c:789 +#: builtin/commit.c:783 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:807 +#: builtin/commit.c:801 #, c-format msgid "" "\n" @@ -4495,7 +4524,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:812 +#: builtin/commit.c:806 #, c-format msgid "" "\n" @@ -4510,7 +4539,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:825 +#: builtin/commit.c:819 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4520,7 +4549,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:826 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4531,147 +4560,147 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:846 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:860 +#: builtin/commit.c:854 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:867 +#: builtin/commit.c:861 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:885 +#: builtin/commit.c:879 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:942 +#: builtin/commit.c:936 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:957 builtin/tag.c:495 +#: builtin/commit.c:951 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1059 +#: builtin/commit.c:1053 #, c-format -msgid "No existing author found with '%s'" -msgstr "Aucun auteur existant trouvé avec '%s'" +msgid "--author '%s' is not 'Name ' and matches no existing author" +msgstr "--author '%s' n'est pas de la forme 'Nom ' ni ne correspond à aucun auteur existant" -#: builtin/commit.c:1074 builtin/commit.c:1314 +#: builtin/commit.c:1068 builtin/commit.c:1308 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1111 +#: builtin/commit.c:1105 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1141 +#: builtin/commit.c:1135 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1150 +#: builtin/commit.c:1144 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1153 +#: builtin/commit.c:1147 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1155 +#: builtin/commit.c:1149 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1158 +#: builtin/commit.c:1152 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1168 +#: builtin/commit.c:1162 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1170 +#: builtin/commit.c:1164 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." -#: builtin/commit.c:1178 +#: builtin/commit.c:1172 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1195 +#: builtin/commit.c:1189 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1197 +#: builtin/commit.c:1191 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1199 +#: builtin/commit.c:1193 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1201 +#: builtin/commit.c:1195 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." -#: builtin/commit.c:1213 builtin/tag.c:728 +#: builtin/commit.c:1207 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1218 +#: builtin/commit.c:1212 msgid "Paths with -a does not make sense." msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1328 builtin/commit.c:1608 +#: builtin/commit.c:1322 builtin/commit.c:1602 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1330 builtin/commit.c:1610 +#: builtin/commit.c:1324 builtin/commit.c:1604 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1335 builtin/commit.c:1614 +#: builtin/commit.c:1329 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1338 builtin/commit.c:1617 +#: builtin/commit.c:1332 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980 #: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "mode" -#: builtin/commit.c:1341 builtin/commit.c:1620 +#: builtin/commit.c:1335 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1338 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1345 parse-options.h:153 +#: builtin/commit.c:1339 parse-options.h:153 msgid "when" msgstr "quand" -#: builtin/commit.c:1346 +#: builtin/commit.c:1340 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4679,209 +4708,209 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1348 +#: builtin/commit.c:1342 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1435 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1437 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1482 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1485 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1578 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1579 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1581 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1582 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:601 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "author" msgstr "auteur" -#: builtin/commit.c:1583 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1584 builtin/gc.c:275 +#: builtin/commit.c:1578 builtin/gc.c:275 msgid "date" msgstr "date" -#: builtin/commit.c:1584 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391 #: builtin/notes.c:554 builtin/tag.c:599 msgid "message" msgstr "message" -#: builtin/commit.c:1585 +#: builtin/commit.c:1579 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1586 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1587 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1588 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1589 +#: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1590 +#: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1592 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1593 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1594 +#: builtin/commit.c:1588 msgid "default" msgstr "défaut" -#: builtin/commit.c:1594 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1595 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92 #: builtin/tag.c:605 msgid "key-id" msgstr "id de clé" -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1600 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1601 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1602 +#: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1603 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1604 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1605 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1606 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1607 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1618 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1619 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1624 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1626 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1655 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1694 builtin/merge.c:519 +#: builtin/commit.c:1688 builtin/merge.c:519 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: builtin/commit.c:1701 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1708 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1727 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1738 +#: builtin/commit.c:1732 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1743 +#: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation du à un message de validation vide\n" -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/commit.c:1791 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4892,8 +4921,8 @@ msgstr "" "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer." #: builtin/config.c:8 -msgid "git config [options]" -msgstr "git config [options]" +msgid "git config []" +msgstr "git config []" #: builtin/config.c:53 msgid "Config file location" @@ -5049,12 +5078,12 @@ msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" #: builtin/describe.c:17 -msgid "git describe [options] *" -msgstr "git describe [options] *" +msgid "git describe [] [...]" +msgstr "git describe [] *" #: builtin/describe.c:18 -msgid "git describe [options] --dirty" -msgstr "git describe [options] --dirty" +msgid "git describe [] --dirty" +msgstr "git describe [] --dirty" #: builtin/describe.c:217 #, c-format @@ -5272,180 +5301,180 @@ msgstr "Appliquer le spécificateur de référence aux références exportées" msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fetch.c:20 +#: builtin/fetch.c:19 msgid "git fetch [] [ [...]]" msgstr "git fetch [] [ [...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:20 msgid "git fetch [] " msgstr "git fetch [] " -#: builtin/fetch.c:22 +#: builtin/fetch.c:21 msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [] [( | )...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:22 msgid "git fetch --all []" msgstr "git fetch --all []" -#: builtin/fetch.c:90 +#: builtin/fetch.c:89 msgid "fetch from all remotes" msgstr "récupérer depuis tous le dépôts distants" -#: builtin/fetch.c:92 +#: builtin/fetch.c:91 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:94 +#: builtin/fetch.c:93 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:95 +#: builtin/fetch.c:94 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:97 +#: builtin/fetch.c:96 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:99 +#: builtin/fetch.c:98 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:101 +#: builtin/fetch.c:100 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:102 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:104 +#: builtin/fetch.c:103 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:105 +#: builtin/fetch.c:104 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:109 +#: builtin/fetch.c:108 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:111 +#: builtin/fetch.c:110 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:114 +#: builtin/fetch.c:113 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:116 +#: builtin/fetch.c:115 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:118 builtin/log.c:1208 +#: builtin/fetch.c:117 builtin/log.c:1208 msgid "dir" msgstr "dir" -#: builtin/fetch.c:119 +#: builtin/fetch.c:118 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:122 +#: builtin/fetch.c:121 msgid "default mode for recursion" msgstr "mode par défaut pour la récursion" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:125 +#: builtin/fetch.c:124 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:376 +#: builtin/fetch.c:375 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:454 +#: builtin/fetch.c:455 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:459 +#: builtin/fetch.c:460 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:473 +#: builtin/fetch.c:474 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)" -#: builtin/fetch.c:474 builtin/fetch.c:560 +#: builtin/fetch.c:475 builtin/fetch.c:561 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:485 +#: builtin/fetch.c:486 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541 msgid " (unable to update local ref)" msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:505 +#: builtin/fetch.c:506 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:556 +#: builtin/fetch.c:557 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:562 +#: builtin/fetch.c:563 msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:595 builtin/fetch.c:828 +#: builtin/fetch.c:596 builtin/fetch.c:829 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" -#: builtin/fetch.c:604 +#: builtin/fetch.c:605 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:622 +#: builtin/fetch.c:623 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:710 builtin/fetch.c:793 +#: builtin/fetch.c:711 builtin/fetch.c:794 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:721 +#: builtin/fetch.c:722 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5454,55 +5483,55 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:773 +#: builtin/fetch.c:774 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:774 +#: builtin/fetch.c:775 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:798 +#: builtin/fetch.c:799 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:799 builtin/remote.c:1060 +#: builtin/fetch.c:800 builtin/remote.c:1060 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:818 +#: builtin/fetch.c:819 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:837 +#: builtin/fetch.c:838 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:840 +#: builtin/fetch.c:841 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:896 +#: builtin/fetch.c:897 #, c-format msgid "Don't know how to fetch from %s" msgstr "Je ne sais pas récupérer depuis %s" -#: builtin/fetch.c:1058 +#: builtin/fetch.c:1059 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1060 builtin/remote.c:90 +#: builtin/fetch.c:1061 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1078 +#: builtin/fetch.c:1079 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5510,41 +5539,41 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1102 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1143 +#: builtin/fetch.c:1144 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1145 +#: builtin/fetch.c:1146 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1169 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1171 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1182 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1190 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" #: builtin/fmt-merge-msg.c:13 -msgid "git fmt-merge-msg [-m ] [--log[=]|--no-log] [--file ]" -msgstr "" -"git fmt-merge-msg [-m ] [--log[=]|--no-log] [--file ]" +msgid "" +"git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" +msgstr "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 @@ -5573,51 +5602,51 @@ msgstr "utiliser comme début de message" msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:676 +#: builtin/for-each-ref.c:675 msgid "unable to parse format" msgstr "impossible d'analyser le format" -#: builtin/for-each-ref.c:1064 -msgid "git for-each-ref [options] []" -msgstr "git for-each-ref [options] []" +#: builtin/for-each-ref.c:1063 +msgid "git for-each-ref [] []" +msgstr "git for-each-ref [] []" -#: builtin/for-each-ref.c:1079 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:1081 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:1085 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" -#: builtin/for-each-ref.c:1088 +#: builtin/for-each-ref.c:1087 msgid "show only matched refs" msgstr "n'afficher que références correspondant" -#: builtin/for-each-ref.c:1089 builtin/replace.c:438 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1089 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1090 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "clé" -#: builtin/for-each-ref.c:1091 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/fsck.c:147 builtin/prune.c:136 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -5626,8 +5655,8 @@ msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" #: builtin/fsck.c:603 -msgid "git fsck [options] [...]" -msgstr "git fsck [options] [...]" +msgid "git fsck [] [...]" +msgstr "git fsck [] [...]" #: builtin/fsck.c:609 msgid "show unreachable objects" @@ -5675,8 +5704,8 @@ msgid "Checking objects" msgstr "Vérification des objets" #: builtin/gc.c:24 -msgid "git gc [options]" -msgstr "git gc [options]" +msgid "git gc []" +msgstr "git gc []" #: builtin/gc.c:79 #, c-format @@ -5739,8 +5768,8 @@ msgstr "" "supprimer." #: builtin/grep.c:23 -msgid "git grep [options] [-e] [...] [[--] ...]" -msgstr "git grep [options] [-e] [...] [[--] ...]" +msgid "git grep [] [-e] [...] [[--] ...]" +msgstr "git grep [] [-e] [...] [[--] ...]" #: builtin/grep.c:218 #, c-format @@ -5780,8 +5809,8 @@ msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" #: builtin/grep.c:644 -msgid "search also in ignored files" -msgstr "rechercher aussi dans les fichiers ignorés" +msgid "ignore files specified via '.gitignore'" +msgstr "ignorer les fichiers spécifiés via '.gitignore'" #: builtin/grep.c:647 msgid "show non-matching lines" @@ -5974,17 +6003,15 @@ msgstr "--cached et des arbres sont fournis en même temps." #: builtin/hash-object.c:82 msgid "" -"git hash-object [-t ] [-w] [--path=|--no-filters] [--stdin] [--] " -"..." -msgstr "" -"git hash-object [-t ] [-w] [--path=|--no-filters] [--stdin] " -"[--] ..." +"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " +"[--] ..." +msgstr "git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] [--] ..." #: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < " msgstr "git hash-object --stdin-paths < " -#: builtin/hash-object.c:94 builtin/tag.c:610 +#: builtin/hash-object.c:94 builtin/tag.c:612 msgid "type" msgstr "type" @@ -6036,8 +6063,8 @@ msgid "show info page" msgstr "afficher la page info" #: builtin/help.c:52 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "git help [--all] [--guides] [--man|--web|--info] [commande]" +msgid "git help [--all] [--guides] [--man | --web | --info] []" +msgstr "git help [--all] [--guides] [--man | --web | --info] []" #: builtin/help.c:64 #, c-format @@ -6246,8 +6273,8 @@ msgstr "grave incohérence dans la décompression (inflate)" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:689 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" @@ -6335,97 +6362,97 @@ msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1298 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1322 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1336 +#: builtin/index-pack.c:1335 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1344 +#: builtin/index-pack.c:1343 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1356 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1367 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1400 #, c-format msgid "bad pack.indexversion=%" msgstr "mauvais pack.indexversion=%" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1406 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1470 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1517 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1553 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1635 +#: builtin/index-pack.c:1634 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1656 +#: builtin/index-pack.c:1655 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -6538,10 +6565,8 @@ msgstr " partagé" #: builtin/init-db.c:475 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" -"shared[=]] [directory]" -msgstr "" -"git init [-q | --quiet] [--bare] [--template=] [--" -"shared[=]] [répertoire]" +"shared[=]] []" +msgstr "git init [-q | --quiet] [--bare] [--template=] [--shared[=]] []" #: builtin/init-db.c:498 msgid "permissions" @@ -6604,8 +6629,8 @@ msgid "git log [] [] [[--] ...]" msgstr "git log [] [] [[--] ...]" #: builtin/log.c:42 -msgid "git show [options] ..." -msgstr "git show [options] ..." +msgid "git show [] ..." +msgstr "git show [] ..." #: builtin/log.c:81 #, c-format @@ -6685,8 +6710,8 @@ msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" #: builtin/log.c:1026 -msgid "git format-patch [options] [ | ]" -msgstr "git format-patch [options] [ | ]" +msgid "git format-patch [] [ | ]" +msgstr "git format-patch [] [ | ]" #: builtin/log.c:1071 msgid "Two output directories?" @@ -6887,98 +6912,98 @@ msgstr "" msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/ls-files.c:401 -msgid "git ls-files [options] [...]" -msgstr "git ls-files [options] [...]" +#: builtin/ls-files.c:358 +msgid "git ls-files [] [...]" +msgstr "git ls-files [] [...]" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "identifier le statut de fichier avec les étiquettes" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:447 msgid "exclude patterns are read from " msgstr "les motifs d'exclusion sont lus depuis " -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in " msgstr "lire des motifs d'exclusion additionnels par répertoire dans " -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au répertoire racine du projet" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:458 msgid "if any is not in the index, treat this as an error" msgstr "si un n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:459 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:460 msgid "pretend that paths removed since are still present" msgstr "" "considérer que les chemins supprimés depuis sont " "toujours présents" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:462 msgid "show debugging data" msgstr "afficher les données de débogage" @@ -7021,12 +7046,12 @@ msgstr "" "full-name)" #: builtin/merge.c:45 -msgid "git merge [options] [...]" -msgstr "git merge [options] [...]" +msgid "git merge [] [...]" +msgstr "git merge [] [...]" #: builtin/merge.c:46 -msgid "git merge [options] HEAD " -msgstr "git merge [options] HEAD " +msgid "git merge [] HEAD " +msgstr "git merge [] HEAD " #: builtin/merge.c:47 msgid "git merge --abort" @@ -7378,12 +7403,12 @@ msgstr "" "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" #: builtin/merge-base.c:29 -msgid "git merge-base [-a|--all] ..." -msgstr "git merge-base [-a|--all] ..." +msgid "git merge-base [-a | --all] ..." +msgstr "git merge-base [-a | --all] ..." #: builtin/merge-base.c:30 -msgid "git merge-base [-a|--all] --octopus ..." -msgstr "git merge-base [-a|--all] --octopus ..." +msgid "git merge-base [-a | --all] --octopus ..." +msgstr "git merge-base [-a | --all] --octopus ..." #: builtin/merge-base.c:31 msgid "git merge-base --independent ..." @@ -7419,11 +7444,9 @@ msgstr "trouver où a divergé du reflog de " #: builtin/merge-file.c:8 msgid "" -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " -"file2" -msgstr "" -"git merge-file [options] [-L nom1 [-L orig [-L nom2]]] fichier1 orig_file " -"fichier2" +"git merge-file [] [-L [-L [-L ]]] " +" " +msgstr "git merge-file [] [-L [-L [-L ]]] " #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -7454,8 +7477,8 @@ msgid "do not warn about conflicts" msgstr "ne pas avertir à propos des conflits" #: builtin/merge-file.c:45 -msgid "set labels for file1/orig_file/file2" -msgstr "définir les labels pour fichier1/orig_file/fichier2" +msgid "set labels for file1/orig-file/file2" +msgstr "définir les labels pour fichier1/fichier-orig/fichier2" #: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" @@ -7474,8 +7497,8 @@ msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" #: builtin/mv.c:15 -msgid "git mv [options] ... " -msgstr "git mv [options] ... " +msgid "git mv [] ... " +msgstr "git mv [] ... " #: builtin/mv.c:69 #, c-format @@ -7562,22 +7585,22 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" #: builtin/name-rev.c:255 -msgid "git name-rev [options] ..." -msgstr "git name-rev [options] ..." +msgid "git name-rev [] ..." +msgstr "git name-rev [] ..." #: builtin/name-rev.c:256 -msgid "git name-rev [options] --all" -msgstr "git name-rev [options] --all" +msgid "git name-rev [] --all" +msgstr "git name-rev [] --all" #: builtin/name-rev.c:257 -msgid "git name-rev [options] --stdin" -msgstr "git name-rev [options] --stdin" +msgid "git name-rev [] --stdin" +msgstr "git name-rev [] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" @@ -7609,44 +7632,37 @@ msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" #: builtin/notes.c:24 -msgid "git notes [--ref ] [list []]" -msgstr "git notes [--ref ] [list []]" +msgid "git notes [--ref ] [list []]" +msgstr "git notes [--ref ] [list []]" #: builtin/notes.c:25 msgid "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " +"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " "| (-c | -C) ] []" -msgstr "" -"git notes [--ref ] add [-f] [--allow-empty] [-m " -"| -F | (-c | -C) ] []" +msgstr "git notes [--ref ] add [-f] [--allow-empty] [-m | -F | (-c | -C) ] []" #: builtin/notes.c:26 -msgid "git notes [--ref ] copy [-f] " -msgstr "" -"git notes [--ref ] copy [-f] " +msgid "git notes [--ref ] copy [-f] " +msgstr "git notes [--ref ] copy [-f] " #: builtin/notes.c:27 msgid "" -"git notes [--ref ] append [--allow-empty] [-m | -F | " +"git notes [--ref ] append [--allow-empty] [-m | -F | " "(-c | -C) ] []" -msgstr "" -"git notes [--ref ] append [--allow-empty] [-m | -" -"F | (-c | -C) ] []" +msgstr "git notes [--ref ] append [--allow-empty] [-m | -F | (-c | -C) ] []" #: builtin/notes.c:28 -msgid "git notes [--ref ] edit [--allow-empty] []" -msgstr "git notes [--ref ] edit [--allow-empty] []" +msgid "git notes [--ref ] edit [--allow-empty] []" +msgstr "git notes [--ref ] edit [--allow-empty] []" #: builtin/notes.c:29 -msgid "git notes [--ref ] show []" -msgstr "git notes [--ref ] show []" +msgid "git notes [--ref ] show []" +msgstr "git notes [--ref ] show []" #: builtin/notes.c:30 msgid "" -"git notes [--ref ] merge [-v | -q] [-s ] " -msgstr "" -"git notes [--ref ] merge [-v | -q] [-s ] " -"" +"git notes [--ref ] merge [-v | -q] [-s ] " +msgstr "git notes [--ref ] merge [-v | -q] [-s ] " #: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" @@ -7657,16 +7673,16 @@ msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:33 -msgid "git notes [--ref ] remove [...]" -msgstr "git notes [--ref ] remove [...]" +msgid "git notes [--ref ] remove [...]" +msgstr "git notes [--ref ] remove [...]" #: builtin/notes.c:34 -msgid "git notes [--ref ] prune [-n | -v]" -msgstr "git notes [--ref ] prune [-n | -v]" +msgid "git notes [--ref ] prune [-n | -v]" +msgstr "git notes [--ref ] prune [-n | -v]" #: builtin/notes.c:35 -msgid "git notes [--ref ] get-ref" -msgstr "git notes [--ref ] get-ref" +msgid "git notes [--ref ] get-ref" +msgstr "git notes [--ref ] get-ref" #: builtin/notes.c:40 msgid "git notes [list []]" @@ -7697,8 +7713,8 @@ msgid "git notes show []" msgstr "git notes show []" #: builtin/notes.c:71 -msgid "git notes merge [] " -msgstr "git notes merge [] " +msgid "git notes merge [] " +msgstr "git notes merge [] " #: builtin/notes.c:72 msgid "git notes merge --commit []" @@ -7936,8 +7952,8 @@ msgid "notes-ref" msgstr "références-notes" #: builtin/notes.c:954 -msgid "use notes from " -msgstr "utiliser les notes depuis " +msgid "use notes from " +msgstr "utiliser les notes depuis " #: builtin/notes.c:989 builtin/remote.c:1621 #, c-format @@ -7954,196 +7970,196 @@ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" "git pack-objects [options...] base-name [< liste-références | < liste-objets]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:773 +#: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1013 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:2175 +#: builtin/pack-objects.c:2173 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2570 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2574 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2597 #, c-format msgid "option %s does not accept negative form" msgstr "l'option %s n'accepte pas de valeur négative" -#: builtin/pack-objects.c:2603 +#: builtin/pack-objects.c:2601 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "impossible d'analyser la valeur '%s' pour l'option %s" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2621 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2623 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2625 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2628 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2629 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2630 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2633 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2635 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2637 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2639 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2643 +#: builtin/pack-objects.c:2641 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2643 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2645 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2647 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2649 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2651 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleurs correspondance des " "deltas" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2653 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2655 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2657 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2660 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2663 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:2668 +#: builtin/pack-objects.c:2666 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2669 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2671 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2673 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2676 parse-options.h:140 +#: builtin/pack-objects.c:2674 parse-options.h:140 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2675 msgid "unpack unreachable objects newer than