diff options
| -rw-r--r-- | po/fr.po | 2743 |
1 files changed, 1513 insertions, 1230 deletions
@@ -72,8 +72,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-08-06 14:10+0800\n" -"PO-Revision-Date: 2013-10-05 21:17+0200\n" +"POT-Creation-Date: 2013-11-02 08:06+0800\n" +"PO-Revision-Date: 2013-11-07 21:41+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -123,71 +123,76 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:323 +#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "le chemin '%s' ne correspond à aucun fichier" + +#: archive.c:327 msgid "fmt" msgstr "fmt" -#: archive.c:323 +#: archive.c:327 msgid "archive format" msgstr "format d'archive" -#: archive.c:324 builtin/log.c:1173 +#: archive.c:328 builtin/log.c:1193 msgid "prefix" msgstr "préfixe" -#: archive.c:325 +#: archive.c:329 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292 -#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673 -#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77 -#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 +#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 +#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 msgid "file" msgstr "fichier" -#: archive.c:327 builtin/archive.c:89 +#: archive.c:331 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:329 +#: archive.c:333 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:330 +#: archive.c:334 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:331 +#: archive.c:335 msgid "store only" msgstr "stockage seulement" -#: archive.c:332 +#: archive.c:336 msgid "compress faster" msgstr "compression rapide" -#: archive.c:340 +#: archive.c:344 msgid "compress better" msgstr "compression efficace" -#: archive.c:343 +#: archive.c:347 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85 +#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84 msgid "repo" msgstr "dépôt" -#: archive.c:346 builtin/archive.c:91 +#: archive.c:350 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487 +#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487 msgid "command" msgstr "commande" -#: archive.c:348 builtin/archive.c:93 +#: archive.c:352 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" @@ -275,19 +280,19 @@ msgstr "Une branche nommée '%s' existe déjà." msgid "Cannot force update the current branch." msgstr "Impossible de forcer la mise à jour de la branche courante." -#: branch.c:216 +#: branch.c:215 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " "pas une branche." -#: branch.c:218 +#: branch.c:217 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" -#: branch.c:220 +#: branch.c:219 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -307,26 +312,26 @@ msgstr "" "sa jumelle distante, vous souhaiterez utiliser \"git push -u\"\n" "pour paramétrer le suivi distant en même temps que vous poussez." -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'." -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'." -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:296 +#: branch.c:295 msgid "Failed to lock ref for update" msgstr "Échec du verrouillage de la référence pour mise à jour" -#: branch.c:314 +#: branch.c:313 msgid "Failed to write ref" msgstr "Échec de l'écriture de la référence" @@ -340,7 +345,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:89 builtin/commit.c:697 +#: bundle.c:89 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -349,9 +354,9 @@ msgstr "impossible d'ouvrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis :" -#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331 -#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364 -#: builtin/shortlog.c:156 +#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" @@ -377,7 +382,7 @@ msgstr[1] "Le colis exige ces %d références :" msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259 +#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -529,7 +534,7 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:3487 +#: diff.c:3490 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -538,7 +543,7 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3501 +#: diff.c:3504 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" @@ -565,17 +570,17 @@ msgstr "impossible de créer un fichier temporaire '%s' : %s" msgid "failed writing detached signature to '%s': %s" msgstr "impossible d'écrire la signature détachée dans '%s' : %s" -#: grep.c:1623 +#: grep.c:1695 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1640 +#: grep.c:1712 #, c-format msgid "'%s': %s" msgstr "'%s' : %s" -#: grep.c:1651 +#: grep.c:1723 #, c-format msgid "'%s': short read %s" msgstr "'%s' : lecture tronquée %s" @@ -649,8 +654,8 @@ msgstr "%s: %s - %s" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 -#: builtin/clone.c:656 +#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 +#: builtin/clone.c:655 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -699,7 +704,7 @@ msgstr "impossible de lire l'objet %s '%s'" msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:774 builtin/clone.c:312 +#: merge-recursive.c:774 builtin/clone.c:311 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" @@ -835,7 +840,7 @@ msgstr "%s sauté (fusion identique à l'existant)" msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1634 git-submodule.sh:1118 +#: merge-recursive.c:1634 git-submodule.sh:1125 msgid "submodule" msgstr "sous-module" @@ -931,58 +936,121 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" -#: object.c:204 +#: object.c:202 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: parse-options.c:489 +#: parse-options.c:537 msgid "..." msgstr "..." -#: parse-options.c:507 +#: parse-options.c:555 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:511 +#: parse-options.c:559 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:514 +#: parse-options.c:562 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:548 +#: parse-options.c:596 msgid "-NUM" msgstr "-NUM" -#: pathspec.c:83 +#: pathspec.c:118 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont incompatibles" + +#: pathspec.c:128 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "le réglage global de spécificateur de chemin 'literal' est incompatible avec tous les autres réglages globaux de spécificateur de chemin" + +#: pathspec.c:158 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'" + +#: pathspec.c:164 +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'" + +#: pathspec.c:168 +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'" + +#: pathspec.c:186 +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "Spécificateur magique '%c' non implémenté dans '%s'" + +#: pathspec.c:211 +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s : 'literal' et 'glob' sont incompatibles" + +#: pathspec.c:222 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "%s : '%s' est hors du dépôt" + +#: pathspec.c:278 #, c-format -msgid "Path '%s' is in submodule '%.*s'" +msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Le chemin '%s' est dans le sous-module '%.*s'" -#: pathspec.c:99 +#. +#. * We may want to substitute "this command" with a command +#. * name. E.g. when add--interactive dies when running +#. * "checkout -p" +#. +#: pathspec.c:340 #, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "'%s' est au delà d'un lien symbolique" +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "%s : le spécificateur magique de chemin n'est pas supporté par cette commande : %s" -#: remote.c:1788 +#: pathspec.c:415 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "le chemin '%s' est au-delà d'un lien symbolique" + +#: remote.c:1833 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" + +#: remote.c:1837 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " (utilisez \"git branch -unset-upstream\" pour corriger)\n" + +#: remote.c:1840 +#, c-format +msgid "Your branch is up-to-date with '%s'.\n" +msgstr "Votre branche est à jour avec '%s'.\n" + +#: remote.c:1844 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:1794 +#: remote.c:1850 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:1797 +#: remote.c:1853 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -994,11 +1062,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:1805 +#: remote.c:1861 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:1808 +#: remote.c:1864 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1013,7 +1081,7 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:1818 +#: remote.c:1874 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" @@ -1057,7 +1125,7 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:245 sequencer.c:869 sequencer.c:952 +#: sequencer.c:245 sequencer.c:870 sequencer.c:953 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" @@ -1077,47 +1145,47 @@ msgstr "Vos modifications locales seraient écrasées par revert." #: sequencer.c:268 msgid "Commit your changes or stash them to proceed." -msgstr "Validez vos modifications ou remisez-les pour continuer." +msgstr "Validez vos modifications ou les remiser pour continuer." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:324 +#: sequencer.c:325 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:355 +#: sequencer.c:356 msgid "Could not resolve HEAD commit\n" msgstr "Impossible de résoudre le commit HEAD\n" -#: sequencer.c:377 +#: sequencer.c:378 msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:422 +#: sequencer.c:423 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" -#: sequencer.c:427 +#: sequencer.c:428 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" -#: sequencer.c:493 +#: sequencer.c:494 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." -#: sequencer.c:512 +#: sequencer.c:513 #, 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:520 +#: sequencer.c:521 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas le parent %d" -#: sequencer.c:524 +#: sequencer.c:525 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1126,153 +1194,153 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:537 +#: sequencer.c:538 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:541 +#: sequencer.c:542 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" -#: sequencer.c:627 +#: sequencer.c:628 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:628 +#: sequencer.c:629 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:664 +#: sequencer.c:665 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:672 +#: sequencer.c:673 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:677 +#: sequencer.c:678 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:735 +#: sequencer.c:736 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" -#: sequencer.c:757 +#: sequencer.c:758 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." -#: sequencer.c:762 +#: sequencer.c:763 msgid "No commits parsed." msgstr "Aucun commit analysé." -#: sequencer.c:775 +#: sequencer.c:776 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" -#: sequencer.c:779 +#: sequencer.c:780 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." -#: sequencer.c:786 +#: sequencer.c:787 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" -#: sequencer.c:814 +#: sequencer.c:815 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" -#: sequencer.c:817 +#: sequencer.c:818 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: sequencer.c:829 +#: sequencer.c:830 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" -#: sequencer.c:850 +#: sequencer.c:851 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:851 +#: sequencer.c:852 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:855 +#: sequencer.c:856 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" -#: sequencer.c:871 sequencer.c:956 +#: sequencer.c:872 sequencer.c:957 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:890 sequencer.c:1024 +#: sequencer.c:891 sequencer.c:1025 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:892 +#: sequencer.c:893 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:894 +#: sequencer.c:895 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:916 builtin/apply.c:4061 +#: sequencer.c:917 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" -#: sequencer.c:919 +#: sequencer.c:920 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:920 +#: sequencer.c:921 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:926 +#: sequencer.c:927 #, 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:949 +#: sequencer.c:950 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1092 +#: sequencer.c:1093 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1095 +#: sequencer.c:1096 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1129 +#: sequencer.c:1130 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1130 +#: sequencer.c:1131 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" @@ -1301,261 +1369,354 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1097 +#: sha1_name.c:1112 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: sha1_name.c:1100 +#: sha1_name.c:1115 #, c-format msgid "No such branch: '%s'" msgstr "Branche inconnue : '%s'" -#: sha1_name.c:1102 +#: sha1_name.c:1117 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Aucune branche amont configurée pour la branche '%s'" -#: sha1_name.c:1106 +#: sha1_name.c:1121 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "La branche amont '%s' n'est pas stockée comme branche de suivi" -#: wrapper.c:408 +#: submodule.c:64 submodule.c:98 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "Modification impossible de .gitmodules non fusionné, résolvez les conflits d'abord" + +#: submodule.c:68 submodule.c:102 +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "Impossible de trouver une section où path=%s dans .gitmodules" + +#. Maybe the user already did that, don't error out here +#: submodule.c:76 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" + +# ici %s est un chemin +#. Maybe the user already did that, don't error out here +#: submodule.c:109 +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" + +#: submodule.c:127 +msgid "could not find .gitmodules in index" +msgstr "impossible de trouver .gitmodules dans l'index" + +#: submodule.c:133 +msgid "reading updated .gitmodules failed" +msgstr "échec de la lecture du .gitmodules mis à jour" + +#: submodule.c:135 +msgid "unable to stat updated .gitmodules" +msgstr "échec de stat du .gitmodules mis à jour" + +#: submodule.c:139 +msgid "unable to remove .gitmodules from index" +msgstr "suppression du .gitmodules dans l'index impossible" + +#: submodule.c:141 +msgid "adding updated .gitmodules failed" +msgstr "échec de l'ajout du .gitmodules mis à jour" + +#: submodule.c:143 +msgid "staging updated .gitmodules failed" +msgstr "échec de la mise en index du .gitmodules mis à jour" + +#: submodule.c:1144 builtin/init-db.c:363 +#, c-format +msgid "Could not create git link %s" +msgstr "Impossible de créer le lien git %s" + +#: submodule.c:1155 +#, c-format +msgid "Could not set core.worktree in %s" +msgstr "Impossible de paramétrer core.worktree dans %s" + +#: urlmatch.c:120 +msgid "invalid URL scheme name or missing '://' suffix" +msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant" + +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#, c-format +msgid "invalid %XX escape sequence" +msgstr "séquence d'échappement %XX invalide" + +#: urlmatch.c:172 +msgid "missing host and scheme is not 'file:'" +msgstr "hôte manquant et le schéma n'est pas 'file:'" + +#: urlmatch.c:189 +msgid "a 'file:' URL may not have a port number" +msgstr "une URL 'file:' ne peut pas contenir de numéro de port" + +#: urlmatch.c:199 +msgid "invalid characters in host name" +msgstr "caractères invalides dans le nom d'hôte" + +#: urlmatch.c:244 urlmatch.c:255 +msgid "invalid port number" +msgstr "numéro de port invalide" + +#: urlmatch.c:322 +msgid "invalid '..' path segment" +msgstr "segment de chemin '..' invalide" + +#: wrapper.c:422 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" -#: wrapper.c:429 +#: wrapper.c:443 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:440 +#: wrapper.c:454 #, 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:441 +#: wrapper.c:455 msgid "no such user" msgstr "utilisateur inconnu" -#: wt-status.c:141 +#: wt-status.c:146 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" -#: wt-status.c:168 wt-status.c:195 +#: wt-status.c:173 wt-status.c:200 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)" -#: wt-status.c:170 wt-status.c:197 +#: wt-status.c:175 wt-status.c:202 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)" -#: wt-status.c:174 +#: wt-status.c:179 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:176 wt-status.c:180 +#: wt-status.c:181 wt-status.c:185 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " "résolu)" -#: wt-status.c:178 +#: wt-status.c:183 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:189 +#: wt-status.c:194 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:207 +#: wt-status.c:212 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" -#: wt-status.c:211 +#: wt-status.c:216 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" -#: wt-status.c:213 +#: wt-status.c:218 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " "validé)" -#: wt-status.c:214 +#: wt-status.c:219 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " "dans la copie de travail)" -#: wt-status.c:216 +#: wt-status.c:221 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" -#: wt-status.c:228 +#: wt-status.c:233 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" -#: wt-status.c:245 +#: wt-status.c:250 msgid "bug" msgstr "bogue" -#: wt-status.c:250 +#: wt-status.c:255 msgid "both deleted:" msgstr "supprimé des deux côtés :" -#: wt-status.c:251 +#: wt-status.c:256 msgid "added by us:" msgstr "ajouté par nous :" -#: wt-status.c:252 +#: wt-status.c:257 msgid "deleted by them:" msgstr "supprimé par eux :" -#: wt-status.c:253 +#: wt-status.c:258 msgid "added by them:" msgstr "ajouté par eux :" -#: wt-status.c:254 +#: wt-status.c:259 msgid "deleted by us:" msgstr "supprimé par nous :" -#: wt-status.c:255 +#: wt-status.c:260 msgid "both added:" msgstr "ajouté de deux côtés :" -#: wt-status.c:256 +#: wt-status.c:261 msgid "both modified:" msgstr "modifié des deux côtés :" -#: wt-status.c:286 +#: wt-status.c:291 msgid "new commits, " msgstr "nouveaux commits, " -#: wt-status.c:288 +#: wt-status.c:293 msgid "modified content, " msgstr "contenu modifié, " -#: wt-status.c:290 +#: wt-status.c:295 msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:307 +#: wt-status.c:312 #, c-format msgid "new file: %s" msgstr "nouveau : %s" -#: wt-status.c:310 +#: wt-status.c:315 #, c-format msgid "copied: %s -> %s" msgstr "copié : %s -> %s" -#: wt-status.c:313 +#: wt-status.c:318 #, c-format msgid "deleted: %s" msgstr "supprimé : %s" -#: wt-status.c:316 +#: wt-status.c:321 #, c-format msgid "modified: %s" msgstr "modifié : %s" -#: wt-status.c:319 +#: wt-status.c:324 #, c-format msgid "renamed: %s -> %s" msgstr "renommé : %s -> %s" -#: wt-status.c:322 +#: wt-status.c:327 #, c-format msgid "typechange: %s" msgstr "nv type : %s" -#: wt-status.c:325 +#: wt-status.c:330 #, c-format msgid "unknown: %s" msgstr "inconnu : %s" -#: wt-status.c:328 +#: wt-status.c:333 #, c-format msgid "unmerged: %s" msgstr "non fus. : %s" -#: wt-status.c:331 +#: wt-status.c:336 #, c-format msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:803 +#: wt-status.c:703 +msgid "Submodules changed but not updated:" +msgstr "Sous-modules modifiés mais non mis à jour :" + +#: wt-status.c:705 +msgid "Submodule changes to be committed:" +msgstr "Changements du sous-module à valider :" + +#: wt-status.c:848 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:806 +#: wt-status.c:851 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:809 +#: wt-status.c:854 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:812 +#: wt-status.c:857 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:822 +#: wt-status.c:867 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:825 +#: wt-status.c:870 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:829 +#: wt-status.c:874 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:831 +#: wt-status.c:876 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:833 +#: wt-status.c:878 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:893 wt-status.c:910 +#: wt-status.c:938 wt-status.c:955 #, 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:898 wt-status.c:915 +#: wt-status.c:943 wt-status.c:960 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:901 +#: wt-status.c:946 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:903 +#: wt-status.c:948 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:905 +#: wt-status.c:950 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:918 +#: wt-status.c:963 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:922 +#: wt-status.c:967 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1563,119 +1724,120 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:927 +#: wt-status.c:972 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:930 +#: wt-status.c:975 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:934 +#: wt-status.c:979 #, 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:939 +#: wt-status.c:984 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:942 +#: wt-status.c:987 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:944 +#: wt-status.c:989 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:954 -msgid "You are currently cherry-picking." -msgstr "Vous êtes actuellement en train de picorer." +#: wt-status.c:999 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:958 +#: wt-status.c:1004 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:961 +#: wt-status.c:1007 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:963 +#: wt-status.c:1009 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:972 +#: wt-status.c:1018 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:977 +#: wt-status.c:1023 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:980 +#: wt-status.c:1026 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:982 +#: wt-status.c:1028 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:993 +#: wt-status.c:1039 #, 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:997 +#: wt-status.c:1043 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1000 +#: wt-status.c:1046 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:1173 +#: wt-status.c:1221 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1180 +#: wt-status.c:1228 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1187 +#: wt-status.c:1235 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1189 +#: wt-status.c:1237 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1192 +#: wt-status.c:1240 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1209 +#: wt-status.c:1257 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1223 +#: wt-status.c:1271 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1225 +#: wt-status.c:1273 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1229 +#: wt-status.c:1277 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1687,32 +1849,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1235 +#: wt-status.c:1283 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1237 +#: wt-status.c:1285 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1243 +#: wt-status.c:1291 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1248 +#: wt-status.c:1296 #, 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:1251 +#: wt-status.c:1299 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1254 +#: wt-status.c:1302 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1721,56 +1883,61 @@ 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:1257 +#: wt-status.c:1305 #, 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:1260 +#: wt-status.c:1308 #, 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:1263 wt-status.c:1268 +#: wt-status.c:1311 wt-status.c:1316 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1266 +#: wt-status.c:1314 #, 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:1270 +#: wt-status.c:1318 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1378 +#: wt-status.c:1427 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1384 +#: wt-status.c:1433 msgid "Initial commit on " msgstr "Validation initiale sur " -#: wt-status.c:1399 +# à priori on parle d'une branche ici +#: wt-status.c:1463 +msgid "gone" +msgstr "disparue" + +#: wt-status.c:1465 msgid "behind " msgstr "derrière " -#: wt-status.c:1402 wt-status.c:1405 +#: wt-status.c:1468 wt-status.c:1471 msgid "ahead " msgstr "devant " -#: wt-status.c:1407 +#: wt-status.c:1473 msgid ", behind " msgstr ", derrière " -#: compat/precompose_utf8.c:58 builtin/clone.c:351 +#: compat/precompose_utf8.c:55 builtin/clone.c:350 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" @@ -1859,7 +2026,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "status de diff inattendu %c" -#: builtin/add.c:149 builtin/commit.c:252 +#: builtin/add.c:149 builtin/commit.c:260 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" @@ -1868,145 +2035,140 @@ msgstr "échec de la mise à jour des fichiers" msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:253 +#: builtin/add.c:237 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "le chemin '%s' ne correspond à aucun fichier" - -#: builtin/add.c:339 +#: builtin/add.c:299 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:350 +#: builtin/add.c:310 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." -#: builtin/add.c:354 +#: builtin/add.c:314 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:359 +#: builtin/add.c:319 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:361 +#: builtin/add.c:321 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:367 +#: builtin/add.c:327 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:377 +#: builtin/add.c:337 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:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253 -#: builtin/rm.c:268 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 +#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/rm.c:269 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19 -#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613 -#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113 +#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 +#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 msgid "be verbose" msgstr "mode verbeux" -#: builtin/add.c:397 +#: builtin/add.c:357 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261 +#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:399 +#: builtin/add.c:359 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:400 +#: builtin/add.c:360 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:401 +#: builtin/add.c:361 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:402 +#: builtin/add.c:362 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" -#: builtin/add.c:403 +#: builtin/add.c:363 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" #. takes no arguments -#: builtin/add.c:406 +#: builtin/add.c:366 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:408 +#: builtin/add.c:368 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:409 +#: builtin/add.c:369 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" -#: builtin/add.c:410 +#: builtin/add.c:370 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" -#: builtin/add.c:432 +#: builtin/add.c:392 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" -#: builtin/add.c:433 +#: builtin/add.c:393 msgid "no files added" msgstr "aucun fichier ajouté" -#: builtin/add.c:439 +#: builtin/add.c:399 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:478 +#: builtin/add.c:438 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:496 +#: builtin/add.c:456 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" -#: builtin/add.c:526 +#: builtin/add.c:486 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:527 +#: builtin/add.c:487 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919 -#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297 +#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 +#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432 +#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" @@ -2268,7 +2430,7 @@ msgstr "%s : le patch ne s'applique pas" msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" @@ -2350,8 +2512,8 @@ msgstr "entrée non reconnue" msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91 -#: builtin/fetch.c:63 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 +#: builtin/fetch.c:77 msgid "path" msgstr "chemin" @@ -2413,7 +2575,7 @@ 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:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" @@ -2547,108 +2709,108 @@ msgstr "effectuer 'git bisect next'" 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:26 +#: builtin/blame.c:27 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "git blame [options] [options-de-révision] [rev] [--] fichier" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[options-de-révision] sont documentés dans git-rev-list(1)" -#: builtin/blame.c:2276 +#: builtin/blame.c:2248 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:2277 +#: builtin/blame.c:2249 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:2278 +#: builtin/blame.c:2250 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:2279 +#: builtin/blame.c:2251 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2280 +#: builtin/blame.c:2252 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2281 +#: builtin/blame.c:2253 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2282 +#: builtin/blame.c:2254 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2283 +#: builtin/blame.c:2255 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2284 +#: builtin/blame.c:2256 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2285 +#: builtin/blame.c:2257 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:2286 +#: builtin/blame.c:2258 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2287 +#: builtin/blame.c:2259 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2288 +#: builtin/blame.c:2260 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:2289 +#: builtin/blame.c:2261 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:2290 +#: builtin/blame.c:2262 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2291 +#: builtin/blame.c:2263 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2292 +#: builtin/blame.c:2264 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:2293 +#: builtin/blame.c:2265 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2294 builtin/blame.c:2295 +#: builtin/blame.c:2266 builtin/blame.c:2267 msgid "score" msgstr "score" -#: builtin/blame.c:2294 +#: builtin/blame.c:2266 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2295 +#: builtin/blame.c:2267 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2296 +#: builtin/blame.c:2268 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2296 +#: builtin/blame.c:2268 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" @@ -2753,240 +2915,251 @@ msgstr "Branche %s supprimée (précédemment %s).\n" msgid "branch '%s' does not point at a commit" msgstr "la branche '%s' ne pointe pas sur un commit" +# féminin pour une branche #: builtin/branch.c:453 #, c-format +msgid "[%s: gone]" +msgstr "[%s: disparue]" + +#: builtin/branch.c:456 +#, c-format +msgid "[%s]" +msgstr "[%s]" + +#: builtin/branch.c:459 +#, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" -#: builtin/branch.c:455 +#: builtin/branch.c:461 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" -#: builtin/branch.c:459 +#: builtin/branch.c:465 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" -#: builtin/branch.c:461 +#: builtin/branch.c:467 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" -#: builtin/branch.c:464 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s : en avance de %d, en retard de %d]" -#: builtin/branch.c:467 +#: builtin/branch.c:473 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" -#: builtin/branch.c:490 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " **** référence invalide ****" -#: builtin/branch.c:582 +#: builtin/branch.c:588 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: builtin/branch.c:585 +#: builtin/branch.c:591 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:588 +#: builtin/branch.c:594 #, c-format msgid "(detached from %s)" msgstr "(détaché de %s)" -#: builtin/branch.c:591 +#: builtin/branch.c:597 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:637 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objet '%s' ne pointe pas sur un commit" -#: builtin/branch.c:669 +#: builtin/branch.c:675 msgid "some refs could not be read" msgstr "des références n'ont pas pu être lues" -#: builtin/branch.c:682 +#: builtin/branch.c:688 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:692 +#: builtin/branch.c:698 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:707 +#: builtin/branch.c:713 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:711 +#: builtin/branch.c:717 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:715 +#: builtin/branch.c:721 #, 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:722 +#: builtin/branch.c:728 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:737 +#: builtin/branch.c:743 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: builtin/branch.c:761 +#: builtin/branch.c:767 #, 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:791 +#: builtin/branch.c:797 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:793 +#: builtin/branch.c:799 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:794 +#: builtin/branch.c:800 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:795 +#: builtin/branch.c:801 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:797 +#: builtin/branch.c:803 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:801 +#: builtin/branch.c:807 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:802 +#: builtin/branch.c:808 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 -#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434 -#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468 +#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 +#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "commit" -#: builtin/branch.c:806 builtin/branch.c:812 +#: builtin/branch.c:812 builtin/branch.c:818 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:818 +#: builtin/branch.c:824 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:819 +#: builtin/branch.c:825 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:821 +#: builtin/branch.c:827 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:822 +#: builtin/branch.c:828 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:823 +#: builtin/branch.c:829 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:824 +#: builtin/branch.c:830 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:825 +#: builtin/branch.c:831 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:826 +#: builtin/branch.c:832 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:828 +#: builtin/branch.c:834 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:829 +#: builtin/branch.c:835 msgid "force creation (when already exists)" msgstr "forcer la création (même si la cible existe)" -#: builtin/branch.c:832 +#: builtin/branch.c:838 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" -#: builtin/branch.c:838 +#: builtin/branch.c:844 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" -#: builtin/branch.c:842 +#: builtin/branch.c:848 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:855 +#: builtin/branch.c:861 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:860 builtin/clone.c:630 +#: builtin/branch.c:866 builtin/clone.c:629 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:883 +#: builtin/branch.c:890 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:889 builtin/branch.c:928 +#: builtin/branch.c:896 builtin/branch.c:935 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:904 +#: builtin/branch.c:911 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:909 +#: builtin/branch.c:916 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:916 +#: builtin/branch.c:923 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:919 +#: builtin/branch.c:926 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:934 +#: builtin/branch.c:941 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:939 +#: builtin/branch.c:946 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:943 +#: builtin/branch.c:950 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -2994,41 +3167,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990 +#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:950 +#: builtin/branch.c:957 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:962 +#: builtin/branch.c:969 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:966 +#: builtin/branch.c:973 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:972 +#: builtin/branch.c:979 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:987 +#: builtin/branch.c:994 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:993 +#: builtin/branch.c:1000 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:996 +#: builtin/branch.c:1003 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3037,7 +3210,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:1013 +#: builtin/branch.c:1020 #, c-format msgid "" "\n" @@ -3048,12 +3221,12 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1014 +#: builtin/branch.c:1021 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1015 +#: builtin/branch.c:1022 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch -set-upstream-to %s\n" @@ -3071,44 +3244,44 @@ 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:285 +#: builtin/cat-file.c:312 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<type>|--textconv) <objet>" -#: builtin/cat-file.c:286 +#: builtin/cat-file.c:313 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <liste_d_objets>" -#: builtin/cat-file.c:323 +#: builtin/cat-file.c:350 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:324 +#: builtin/cat-file.c:351 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:325 +#: builtin/cat-file.c:352 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:327 +#: builtin/cat-file.c:354 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:328 +#: builtin/cat-file.c:355 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:330 +#: builtin/cat-file.c:357 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:332 +#: builtin/cat-file.c:359 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:335 +#: builtin/cat-file.c:362 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" @@ -3134,10 +3307,10 @@ msgid "read file names from stdin" msgstr "lire les noms de fichier depuis l'entrée standard" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 -msgid "input paths are terminated by a null character" -msgstr "les chemins en entrée sont terminés par le caractère nul" +msgid "terminate input and output records by a NUL character" +msgstr "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -3145,27 +3318,31 @@ msgstr "supprimer l'état d'avancement" msgid "show non-matching input paths" msgstr "afficher les chemins en entrée qui ne correspondent pas" -#: builtin/check-ignore.c:143 +#: builtin/check-ignore.c:28 +msgid "ignore index when checking" +msgstr "ignorer l'index pendant la vérification" + +#: builtin/check-ignore.c:154 msgid "cannot specify pathnames with --stdin" msgstr "impossible de spécifier les chemins avec --stdin" -#: builtin/check-ignore.c:146 +#: builtin/check-ignore.c:157 msgid "-z only makes sense with --stdin" msgstr "-z n'a de sens qu'avec l'option --stdin" -#: builtin/check-ignore.c:148 +#: builtin/check-ignore.c:159 msgid "no path specified" msgstr "aucun chemin spécifié" -#: builtin/check-ignore.c:152 +#: builtin/check-ignore.c:163 msgid "--quiet is only valid with a single pathname" msgstr "--quiet n'est valide qu'avec un seul chemin" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:165 msgid "cannot have both --quiet and --verbose" msgstr "impossible d'avoir --quiet et --verbose" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:168 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" @@ -3240,108 +3417,108 @@ msgstr "git checkout [options] <branche>" msgid "git checkout [options] [<branch>] -- <file>..." msgstr "git checkout [options] [<branche>] -- <fichier>..." -#: builtin/checkout.c:117 builtin/checkout.c:150 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:119 builtin/checkout.c:152 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:135 +#: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" -#: builtin/checkout.c:179 +#: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:196 +#: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:213 +#: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243 -#: builtin/checkout.c:246 +#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238 +#: builtin/checkout.c:241 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:249 builtin/checkout.c:252 +#: builtin/checkout.c:244 builtin/checkout.c:247 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:255 +#: builtin/checkout.c:250 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:266 builtin/checkout.c:458 +#: builtin/checkout.c:261 builtin/checkout.c:451 msgid "corrupt index file" msgstr "fichier d'index corrompu" -#: builtin/checkout.c:329 builtin/checkout.c:336 +#: builtin/checkout.c:322 builtin/checkout.c:329 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:480 +#: builtin/checkout.c:473 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:601 +#: builtin/checkout.c:594 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Impossible de faire un reflog pour '%s'\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:632 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:646 +#: builtin/checkout.c:639 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:649 +#: builtin/checkout.c:642 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:653 +#: builtin/checkout.c:646 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:655 builtin/checkout.c:997 +#: builtin/checkout.c:648 builtin/checkout.c:1033 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:657 +#: builtin/checkout.c:650 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:713 +#: builtin/checkout.c:706 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" #. The singular version -#: builtin/checkout.c:719 +#: builtin/checkout.c:712 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3364,7 +3541,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:737 +#: builtin/checkout.c:730 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3380,136 +3557,140 @@ msgstr "" "git branche nouvelle_branche %s\n" "\n" -#: builtin/checkout.c:767 +#: builtin/checkout.c:760 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:771 +#: builtin/checkout.c:764 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était" -#: builtin/checkout.c:798 builtin/checkout.c:992 +#: builtin/checkout.c:791 builtin/checkout.c:1028 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#. case (1) -#: builtin/checkout.c:928 +#: builtin/checkout.c:935 +#, c-format +msgid "only one reference expected, %d given." +msgstr "une seule référence attendue, %d fournies." + +#: builtin/checkout.c:974 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" #. case (1): want a tree -#: builtin/checkout.c:967 +#: builtin/checkout.c:1003 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1006 +#: builtin/checkout.c:1042 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1009 builtin/checkout.c:1013 +#: builtin/checkout.c:1045 builtin/checkout.c:1049 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" -#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025 -#: builtin/checkout.c:1028 +#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061 +#: builtin/checkout.c:1064 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1033 +#: builtin/checkout.c:1069 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89 +#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1092 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1094 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1095 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1096 msgid "detach the HEAD at named commit" msgstr "détacher la HEAD à la validation nommée" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1097 msgid "set upstream info for new branch" msgstr "paramétrer l'information de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1099 msgid "new branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1063 +#: builtin/checkout.c:1099 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1100 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1102 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1104 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1069 +#: builtin/checkout.c:1105 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1070 builtin/merge.c:232 +#: builtin/checkout.c:1106 builtin/merge.c:232 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 msgid "style" msgstr "style" -#: builtin/checkout.c:1072 +#: builtin/checkout.c:1108 msgid "conflict style (merge or diff3)" msgstr "style de conflit (fusion ou diff3)" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1111 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:1077 +#: builtin/checkout.c:1113 msgid "second guess 'git checkout no-such-branch'" msgstr "deuxième chance 'git checkout branche-inexistante'" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1136 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1153 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1160 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1197 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1204 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3519,12 +3700,12 @@ msgstr "" "en même temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" -#: builtin/checkout.c:1172 +#: builtin/checkout.c:1209 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1213 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3532,38 +3713,38 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/clean.c:25 +#: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." -#: builtin/clean.c:29 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "Ignore le dépôt %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dépôt %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:293 +#: builtin/clean.c:294 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -3575,7 +3756,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner" -#: builtin/clean.c:297 +#: builtin/clean.c:298 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -3595,35 +3776,35 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection" -#: builtin/clean.c:515 +#: builtin/clean.c:516 #, c-format msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: builtin/clean.c:658 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:695 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:716 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" -#: builtin/clean.c:756 +#: builtin/clean.c:757 #, c-format msgid "remove %s? " msgstr "supprimer %s ? " -#: builtin/clean.c:781 +#: builtin/clean.c:782 msgid "Bye." msgstr "Au revoir." -#: builtin/clean.c:789 +#: builtin/clean.c:790 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3641,21 +3822,21 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:816 +#: builtin/clean.c:817 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:817 +#: builtin/clean.c:818 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:825 +#: builtin/clean.c:826 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:842 +#: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." @@ -3675,8 +3856,8 @@ msgstr "nettoyage interactif" msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716 -#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186 +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 +#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 msgid "pattern" msgstr "motif" @@ -3716,8 +3897,8 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [options] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229 -#: builtin/push.c:462 +#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 +#: builtin/push.c:474 msgid "force progress reporting" msgstr "forcer l'état d'avancement" @@ -3729,123 +3910,123 @@ msgstr "ne pas créer d'extraction" msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:72 +#: builtin/clone.c:71 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:74 +#: builtin/clone.c:73 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:76 +#: builtin/clone.c:75 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:78 +#: builtin/clone.c:77 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:80 builtin/clone.c:82 +#: builtin/clone.c:79 builtin/clone.c:81 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:83 builtin/init-db.c:485 +#: builtin/clone.c:82 builtin/init-db.c:485 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:84 builtin/init-db.c:486 +#: builtin/clone.c:83 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:86 +#: builtin/clone.c:85 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:88 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:90 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:92 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661 +#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:94 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:96 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:97 builtin/init-db.c:494 +#: builtin/clone.c:96 builtin/init-db.c:494 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:98 builtin/init-db.c:495 +#: builtin/clone.c:97 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:99 +#: builtin/clone.c:98 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:253 +#: builtin/clone.c:252 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: builtin/clone.c:316 +#: builtin/clone.c:315 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/clone.c:318 builtin/diff.c:77 +#: builtin/clone.c:317 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: builtin/clone.c:320 +#: builtin/clone.c:319 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:334 +#: builtin/clone.c:333 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:356 +#: builtin/clone.c:355 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:360 +#: builtin/clone.c:359 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:383 +#: builtin/clone.c:382 builtin/clone.c:559 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:396 +#: builtin/clone.c:395 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3855,108 +4036,103 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer l'extraction avec 'git checkout -f HEAD'\n" -#: builtin/clone.c:475 +#: builtin/clone.c:474 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:555 +#: builtin/clone.c:554 #, c-format msgid "Checking connectivity... " msgstr "Vérification de la connectivité... " -#: builtin/clone.c:558 +#: builtin/clone.c:557 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:560 -#, c-format -msgid "done\n" -msgstr "fait\n" - -#: builtin/clone.c:621 +#: builtin/clone.c:620 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:652 +#: builtin/clone.c:651 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:760 +#: builtin/clone.c:759 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:764 +#: builtin/clone.c:763 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:775 +#: builtin/clone.c:774 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:778 +#: builtin/clone.c:777 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:791 +#: builtin/clone.c:790 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:796 +#: builtin/clone.c:795 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:798 +#: builtin/clone.c:797 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:808 +#: builtin/clone.c:807 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:818 +#: builtin/clone.c:817 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:831 builtin/clone.c:843 +#: builtin/clone.c:830 builtin/clone.c:842 #, 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:834 +#: builtin/clone.c:833 #, c-format 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:853 +#: builtin/clone.c:852 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:855 +#: builtin/clone.c:854 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:890 +#: builtin/clone.c:888 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:942 +#: builtin/clone.c:939 builtin/clone.c:947 #, 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:949 +#: builtin/clone.c:950 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -3992,15 +4168,15 @@ msgstr "Remplissage d'espace entre les colonnes" msgid "--command must be the first argument" msgstr "--command doit être le premier argument" -#: builtin/commit.c:35 +#: builtin/commit.c:36 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [options] [--] <spécification-de-chemin>..." -#: builtin/commit.c:40 +#: builtin/commit.c:41 msgid "git status [options] [--] <pathspec>..." msgstr "git status [options] [--] <spécification-de-chemin>..." -#: builtin/commit.c:45 +#: builtin/commit.c:46 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4026,7 +4202,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:57 +#: builtin/commit.c:58 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4037,7 +4213,7 @@ msgstr "" "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n" "supprimer complètement le commit avec \"git reset HEAD^\".\n" -#: builtin/commit.c:62 +#: builtin/commit.c:63 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4052,11 +4228,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:69 +#: builtin/commit.c:70 msgid "Otherwise, please use 'git reset'\n" msgstr "Sinon, veuillez utiliser 'git reset'\n" -#: builtin/commit.c:72 +#: builtin/commit.c:73 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4072,93 +4248,93 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:279 +#: builtin/commit.c:287 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:321 +#: builtin/commit.c:329 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:327 +#: builtin/commit.c:335 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431 +#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:412 +#: builtin/commit.c:420 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:414 +#: builtin/commit.c:422 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:424 +#: builtin/commit.c:432 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:444 +#: builtin/commit.c:452 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:535 builtin/commit.c:541 +#: builtin/commit.c:543 builtin/commit.c:549 #, c-format msgid "invalid commit: %s" msgstr "commit invalide : %s" -#: builtin/commit.c:563 +#: builtin/commit.c:571 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:583 +#: builtin/commit.c:591 #, c-format msgid "Malformed ident string: '%s'" msgstr "Chaîne ident mal formée : '%s'" -#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982 +#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:633 builtin/shortlog.c:271 +#: builtin/commit.c:642 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:635 +#: builtin/commit.c:644 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:639 +#: builtin/commit.c:648 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:645 +#: builtin/commit.c:654 msgid "commit has empty message" msgstr "le commit a un message vide" -#: builtin/commit.c:661 +#: builtin/commit.c:670 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:665 +#: builtin/commit.c:674 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:669 +#: builtin/commit.c:678 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: builtin/commit.c:730 +#: builtin/commit.c:749 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:741 +#: builtin/commit.c:760 #, c-format msgid "" "\n" @@ -4173,7 +4349,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:746 +#: builtin/commit.c:765 #, c-format msgid "" "\n" @@ -4188,7 +4364,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:758 +#: builtin/commit.c:777 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4198,7 +4374,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:763 +#: builtin/commit.c:782 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4209,142 +4385,142 @@ 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:776 +#: builtin/commit.c:795 #, c-format msgid "%sAuthor: %s" msgstr "%sAuteur : %s" -#: builtin/commit.c:783 +#: builtin/commit.c:802 #, c-format msgid "%sCommitter: %s" msgstr "%sValidateur : %s" -#: builtin/commit.c:803 +#: builtin/commit.c:822 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:845 +#: builtin/commit.c:865 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:860 builtin/tag.c:359 +#: builtin/commit.c:880 builtin/tag.c:359 #, 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:957 +#: builtin/commit.c:982 #, c-format msgid "No existing author found with '%s'" msgstr "Aucun auteur existant trouvé avec '%s'" -#: builtin/commit.c:972 builtin/commit.c:1208 +#: builtin/commit.c:997 builtin/commit.c:1237 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1009 +#: builtin/commit.c:1034 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1039 +#: builtin/commit.c:1064 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:1050 +#: builtin/commit.c:1075 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1053 +#: builtin/commit.c:1078 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1055 +#: builtin/commit.c:1080 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:1058 +#: builtin/commit.c:1083 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:1068 +#: builtin/commit.c:1093 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:1070 +#: builtin/commit.c:1095 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:1078 +#: builtin/commit.c:1103 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:1095 +#: builtin/commit.c:1120 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:1097 +#: builtin/commit.c:1122 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:1099 +#: builtin/commit.c:1124 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1101 +#: builtin/commit.c:1126 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." -#: builtin/commit.c:1111 builtin/tag.c:575 +#: builtin/commit.c:1136 builtin/tag.c:572 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1116 +#: builtin/commit.c:1141 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:1222 builtin/commit.c:1455 +#: builtin/commit.c:1251 builtin/commit.c:1482 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1224 builtin/commit.c:1457 +#: builtin/commit.c:1253 builtin/commit.c:1484 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1229 builtin/commit.c:1461 +#: builtin/commit.c:1258 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1232 builtin/commit.c:1464 +#: builtin/commit.c:1261 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667 -#: builtin/fast-export.c:670 builtin/tag.c:459 +#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674 +#: builtin/fast-export.c:677 builtin/tag.c:459 msgid "mode" msgstr "mode" -#: builtin/commit.c:1235 builtin/commit.c:1467 +#: builtin/commit.c:1264 builtin/commit.c:1494 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:1238 +#: builtin/commit.c:1267 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1239 parse-options.h:154 +#: builtin/commit.c:1268 parse-options.h:156 msgid "when" msgstr "quand" -#: builtin/commit.c:1240 +#: builtin/commit.c:1269 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4352,217 +4528,217 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1242 +#: builtin/commit.c:1271 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1313 +#: builtin/commit.c:1340 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1315 +#: builtin/commit.c:1342 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1356 +#: builtin/commit.c:1383 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1358 +#: builtin/commit.c:1385 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1425 +#: builtin/commit.c:1452 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1426 +#: builtin/commit.c:1453 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1428 +#: builtin/commit.c:1455 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1429 builtin/tag.c:457 +#: builtin/commit.c:1456 builtin/tag.c:457 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1430 +#: builtin/commit.c:1457 msgid "author" msgstr "auteur" -#: builtin/commit.c:1430 +#: builtin/commit.c:1457 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1431 builtin/gc.c:178 +#: builtin/commit.c:1458 builtin/gc.c:260 msgid "date" msgstr "date" -#: builtin/commit.c:1431 +#: builtin/commit.c:1458 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "message" -#: builtin/commit.c:1432 +#: builtin/commit.c:1459 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1433 +#: builtin/commit.c:1460 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1434 +#: builtin/commit.c:1461 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1435 +#: builtin/commit.c:1462 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message formaté par autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1436 +#: builtin/commit.c:1463 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message formaté par autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1437 +#: builtin/commit.c:1464 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:1438 builtin/log.c:1160 builtin/revert.c:111 +#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1439 +#: builtin/commit.c:1466 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1440 +#: builtin/commit.c:1467 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1441 +#: builtin/commit.c:1468 msgid "default" msgstr "défaut" -#: builtin/commit.c:1441 builtin/tag.c:460 +#: builtin/commit.c:1468 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1442 +#: builtin/commit.c:1469 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 msgid "key id" msgstr "identifiant de clé" -#: builtin/commit.c:1444 builtin/merge.c:231 +#: builtin/commit.c:1471 builtin/merge.c:231 msgid "GPG sign commit" msgstr "signer la validation avec GPG" #. end commit message options -#: builtin/commit.c:1447 +#: builtin/commit.c:1474 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1448 +#: builtin/commit.c:1475 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1449 +#: builtin/commit.c:1476 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1450 +#: builtin/commit.c:1477 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1451 +#: builtin/commit.c:1478 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1452 +#: builtin/commit.c:1479 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1453 +#: builtin/commit.c:1480 msgid "bypass pre-commit hook" msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1454 +#: builtin/commit.c:1481 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1465 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1466 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1471 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1474 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1507 +#: builtin/commit.c:1529 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1545 builtin/merge.c:525 +#: builtin/commit.c:1567 builtin/merge.c:525 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: builtin/commit.c:1552 +#: builtin/commit.c:1574 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1559 +#: builtin/commit.c:1581 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1578 +#: builtin/commit.c:1600 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1592 +#: builtin/commit.c:1614 #, 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:1597 +#: builtin/commit.c:1619 #, 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:1612 builtin/merge.c:861 builtin/merge.c:886 +#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/commit.c:1633 +#: builtin/commit.c:1655 msgid "cannot lock HEAD ref" msgstr "impossible de verrouiller la référence HEAD" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "cannot update HEAD ref" msgstr "impossible de mettre à jour la référence HEAD" -#: builtin/commit.c:1648 +#: builtin/commit.c:1670 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4572,128 +4748,132 @@ msgstr "" "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n" "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer." -#: builtin/config.c:7 +#: builtin/config.c:8 msgid "git config [options]" msgstr "git config [options]" -#: builtin/config.c:52 +#: builtin/config.c:54 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:53 +#: builtin/config.c:55 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:54 +#: builtin/config.c:56 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:55 +#: builtin/config.c:57 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:56 +#: builtin/config.c:58 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "Action" msgstr "Action" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "get all values: key [value-regex]" msgstr "obtenir toutes le valeurs : clé [regex-de-valeur]" -#: builtin/config.c:61 +#: builtin/config.c:63 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" -#: builtin/config.c:62 +#: builtin/config.c:64 +msgid "get value specific for the URL: section[.var] URL" +msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" + +#: builtin/config.c:65 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:63 +#: builtin/config.c:66 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:64 +#: builtin/config.c:67 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:65 +#: builtin/config.c:68 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:66 +#: builtin/config.c:69 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:67 +#: builtin/config.c:70 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:68 +#: builtin/config.c:71 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:69 +#: builtin/config.c:72 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:70 builtin/config.c:71 +#: builtin/config.c:73 builtin/config.c:74 msgid "slot" msgstr "emplacement" -#: builtin/config.c:70 +#: builtin/config.c:73 msgid "find the color configured: [default]" msgstr "trouver la couleur configurée : [par défaut]" -#: builtin/config.c:71 +#: builtin/config.c:74 msgid "find the color setting: [stdout-is-tty]" msgstr "trouver le réglage de la couleur : [stdout-est-tty]" -#: builtin/config.c:72 +#: builtin/config.c:75 msgid "Type" msgstr "Type" -#: builtin/config.c:73 +#: builtin/config.c:76 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) our \"false\" (faux)" -#: builtin/config.c:74 +#: builtin/config.c:77 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:75 +#: builtin/config.c:78 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:76 +#: builtin/config.c:79 msgid "value is a path (file or directory name)" msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" -#: builtin/config.c:77 +#: builtin/config.c:80 msgid "Other" msgstr "Autre" -#: builtin/config.c:78 +#: builtin/config.c:81 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:79 +#: builtin/config.c:82 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" @@ -4705,7 +4885,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" -#: builtin/describe.c:15 +#: builtin/describe.c:16 msgid "git describe [options] <commit-ish>*" msgstr "git describe [options] <commit ou apparenté>*" @@ -4843,7 +5023,7 @@ msgstr "--long et --abbrev=0 sont incompatibles" msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:481 +#: builtin/describe.c:489 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" @@ -4880,40 +5060,40 @@ msgstr "objet non géré '%s' spécifié." msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:666 +#: builtin/fast-export.c:673 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:668 +#: builtin/fast-export.c:675 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:671 +#: builtin/fast-export.c:678 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:674 +#: builtin/fast-export.c:681 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:676 +#: builtin/fast-export.c:683 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:678 +#: builtin/fast-export.c:685 msgid "Fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:680 +#: builtin/fast-export.c:687 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:682 +#: builtin/fast-export.c:689 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:683 +#: builtin/fast-export.c:690 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" @@ -4933,146 +5113,146 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:60 +#: builtin/fetch.c:74 msgid "fetch from all remotes" msgstr "récupérer depuis tous le dépôts distants" -#: builtin/fetch.c:62 +#: builtin/fetch.c:76 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:64 +#: builtin/fetch.c:78 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:65 +#: builtin/fetch.c:79 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:67 +#: builtin/fetch.c:81 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:69 +#: builtin/fetch.c:83 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:71 +#: builtin/fetch.c:85 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:73 +#: builtin/fetch.c:87 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:74 +#: builtin/fetch.c:88 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:75 +#: builtin/fetch.c:89 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:79 +#: builtin/fetch.c:93 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:81 +#: builtin/fetch.c:95 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:84 +#: builtin/fetch.c:98 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:86 +#: builtin/fetch.c:100 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:88 builtin/log.c:1177 +#: builtin/fetch.c:102 builtin/log.c:1197 msgid "dir" msgstr "dir" -#: builtin/fetch.c:89 +#: builtin/fetch.c:103 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:92 +#: builtin/fetch.c:106 msgid "default mode for recursion" msgstr "mode par défaut pour la récursion" -#: builtin/fetch.c:220 +#: builtin/fetch.c:236 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:273 +#: builtin/fetch.c:290 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:278 +#: builtin/fetch.c:295 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:292 +#: builtin/fetch.c:309 #, 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:293 builtin/fetch.c:379 +#: builtin/fetch.c:310 builtin/fetch.c:396 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:304 +#: builtin/fetch.c:321 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359 +#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 msgid " (unable to update local ref)" msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:324 +#: builtin/fetch.c:341 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:327 +#: builtin/fetch.c:344 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:330 +#: builtin/fetch.c:347 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:375 +#: builtin/fetch.c:392 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:375 +#: builtin/fetch.c:392 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:381 +#: builtin/fetch.c:398 msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:412 builtin/fetch.c:718 +#: builtin/fetch.c:429 builtin/fetch.c:735 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" -#: builtin/fetch.c:421 +#: builtin/fetch.c:438 #, 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:520 +#: builtin/fetch.c:537 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:531 +#: builtin/fetch.c:548 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5081,55 +5261,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:581 +#: builtin/fetch.c:598 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:582 +#: builtin/fetch.c:599 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:589 +#: builtin/fetch.c:606 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:590 builtin/remote.c:1055 +#: builtin/fetch.c:607 builtin/remote.c:1055 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:708 +#: builtin/fetch.c:725 #, 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:742 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "Je ne sais pas récupérer depuis %s" - -#: builtin/fetch.c:823 +#: builtin/fetch.c:744 #, 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:826 +#: builtin/fetch.c:747 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:928 +#: builtin/fetch.c:801 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Je ne sais pas récupérer depuis %s" + +#: builtin/fetch.c:976 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:930 builtin/remote.c:100 +#: builtin/fetch.c:978 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:949 +#: builtin/fetch.c:997 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5137,32 +5317,32 @@ 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:969 +#: builtin/fetch.c:1020 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1068 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1017 +#: builtin/fetch.c:1070 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:1036 +#: builtin/fetch.c:1089 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1038 +#: builtin/fetch.c:1091 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:1049 +#: builtin/fetch.c:1102 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1057 +#: builtin/fetch.c:1110 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 " @@ -5173,9 +5353,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 msgid "n" msgstr "n" @@ -5199,118 +5379,122 @@ msgstr "utiliser <texte> comme début de message" msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:979 +#: builtin/for-each-ref.c:995 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [options] [<motif>]" -#: builtin/for-each-ref.c:994 +#: builtin/for-each-ref.c:1010 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:996 +#: builtin/for-each-ref.c:1012 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:998 +#: builtin/for-each-ref.c:1014 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:1000 +#: builtin/for-each-ref.c:1016 msgid "quote placeholders suitably for tcl" msgstr "échapper les champs réservés pour tcl" -#: builtin/for-each-ref.c:1003 +#: builtin/for-each-ref.c:1019 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:1004 +#: builtin/for-each-ref.c:1020 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1004 +#: builtin/for-each-ref.c:1020 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1005 +#: builtin/for-each-ref.c:1021 msgid "key" msgstr "clé" -#: builtin/for-each-ref.c:1006 +#: builtin/for-each-ref.c:1022 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/fsck.c:608 +#: builtin/fsck.c:607 msgid "git fsck [options] [<object>...]" msgstr "git fsck [options] [<objet>...]" -#: builtin/fsck.c:614 +#: builtin/fsck.c:613 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:615 +#: builtin/fsck.c:614 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:616 +#: builtin/fsck.c:615 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:617 +#: builtin/fsck.c:616 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:618 +#: builtin/fsck.c:617 msgid "make index objects head nodes" msgstr "considérer les objets de l'index comme nœuds tête" # translated from man page -#: builtin/fsck.c:619 +#: builtin/fsck.c:618 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:620 +#: builtin/fsck.c:619 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:621 +#: builtin/fsck.c:620 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:623 +#: builtin/fsck.c:622 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:624 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:134 msgid "show progress" msgstr "afficher la progression" -#: builtin/gc.c:22 +#: builtin/gc.c:23 msgid "git gc [options]" msgstr "git gc [options]" -#: builtin/gc.c:63 +#: builtin/gc.c:79 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: builtin/gc.c:90 +#: builtin/gc.c:106 #, c-format msgid "insanely long object directory %.*s" msgstr "objet répertoire démentiellement long %.*s" -#: builtin/gc.c:179 +#: builtin/gc.c:261 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:181 +#: builtin/gc.c:263 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:182 +#: builtin/gc.c:264 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:222 +#: builtin/gc.c:265 +msgid "force running gc even if there may be another gc running" +msgstr "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes tourne déjà" + +#: builtin/gc.c:305 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -5321,43 +5505,50 @@ msgstr "" "lancer \"git gc\" manuellement. Voir \"git help gc\" pour plus " "d'information.\n" -#: builtin/gc.c:249 +#. be quiet on --auto +#: builtin/gc.c:315 +#, c-format +msgid "" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" +msgstr "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> (utilisez --force si ce n'est pas le cas)" + +#: builtin/gc.c:340 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " "supprimer." -#: builtin/grep.c:22 +#: builtin/grep.c:23 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [options] [-e] <motif> [<révision>...] [[--] <chemin>...]" -#: builtin/grep.c:217 +#: builtin/grep.c:218 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep : échec de création du fil: %s" -#: builtin/grep.c:364 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "Échec de chdir: %s" -#: builtin/grep.c:442 builtin/grep.c:477 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:492 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:550 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend un valeur numérique" -#: builtin/grep.c:567 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -5399,167 +5590,171 @@ msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" #: builtin/grep.c:662 +msgid "process binary files with textconv filters" +msgstr "traiter les fichiers binaires avec les filtres textconv" + +#: builtin/grep.c:664 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:669 +#: builtin/grep.c:671 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:672 +#: builtin/grep.c:674 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:675 +#: builtin/grep.c:677 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:678 +#: builtin/grep.c:680 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:680 +#: builtin/grep.c:682 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:689 +#: builtin/grep.c:691 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:691 +#: builtin/grep.c:693 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:694 +#: builtin/grep.c:696 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:696 +#: builtin/grep.c:698 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:701 +#: builtin/grep.c:703 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:704 +#: builtin/grep.c:706 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:706 +#: builtin/grep.c:708 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:707 +#: builtin/grep.c:709 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:715 +#: builtin/grep.c:717 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:717 +#: builtin/grep.c:719 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:719 +#: builtin/grep.c:721 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:731 +#: builtin/grep.c:733 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:733 +#: builtin/grep.c:735 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:735 +#: builtin/grep.c:737 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:742 +#: builtin/grep.c:744 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:743 builtin/show-ref.c:188 +#: builtin/grep.c:745 builtin/show-ref.c:187 msgid "show usage" msgstr "afficher l'usage" -#: builtin/grep.c:810 +#: builtin/grep.c:812 msgid "no pattern given." msgstr "aucun motif fourni." -#: builtin/grep.c:865 +#: builtin/grep.c:870 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:888 +#: builtin/grep.c:893 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index." -#: builtin/grep.c:893 +#: builtin/grep.c:898 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions." -#: builtin/grep.c:896 +#: builtin/grep.c:901 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi." -#: builtin/grep.c:904 +#: builtin/grep.c:909 msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en même temps." @@ -5815,8 +6010,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:669 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:669 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:263 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" @@ -5845,156 +6040,156 @@ msgstr "Erreur dans l'objet" msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:838 builtin/index-pack.c:868 +#: builtin/index-pack.c:839 builtin/index-pack.c:869 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1009 +#: builtin/index-pack.c:1010 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1009 +#: builtin/index-pack.c:1010 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1035 +#: builtin/index-pack.c:1036 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1040 +#: builtin/index-pack.c:1041 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1043 +#: builtin/index-pack.c:1044 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1054 +#: builtin/index-pack.c:1055 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1077 +#: builtin/index-pack.c:1078 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1087 +#: builtin/index-pack.c:1088 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1129 +#: builtin/index-pack.c:1130 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1137 +#: builtin/index-pack.c:1138 #, c-format msgid "completed with %d local objects" msgstr "complété avec %d objets locaux" -#: builtin/index-pack.c:1147 +#: builtin/index-pack.c:1148 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1152 #, c-format msgid "pack has %d unresolved delta" 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:1176 +#: builtin/index-pack.c:1177 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1256 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1279 +#: builtin/index-pack.c:1280 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1293 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1301 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1314 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1324 +#: builtin/index-pack.c:1325 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1357 +#: builtin/index-pack.c:1358 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1363 +#: builtin/index-pack.c:1364 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/index-pack.c:1367 builtin/index-pack.c:1545 +#: builtin/index-pack.c:1368 builtin/index-pack.c:1546 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1426 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1428 #, 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:1474 +#: builtin/index-pack.c:1475 #, 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:1481 +#: builtin/index-pack.c:1482 #, 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:1509 +#: builtin/index-pack.c:1510 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1557 builtin/index-pack.c:1560 -#: builtin/index-pack.c:1572 builtin/index-pack.c:1576 +#: builtin/index-pack.c:1558 builtin/index-pack.c:1561 +#: builtin/index-pack.c:1573 builtin/index-pack.c:1577 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1590 +#: builtin/index-pack.c:1591 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1594 builtin/index-pack.c:1604 +#: builtin/index-pack.c:1595 builtin/index-pack.c:1605 #, 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:1613 +#: builtin/index-pack.c:1614 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -6084,11 +6279,6 @@ msgstr "impossible de traiter le fichier de type %d" msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" -#: builtin/init-db.c:363 -#, c-format -msgid "Could not create git link %s" -msgstr "Impossible de créer le lien git %s" - #. #. * TRANSLATORS: The first '%s' is either "Reinitialized #. * existing" or "Initialized empty", the second " shared" or @@ -6131,7 +6321,7 @@ msgstr "permissions" msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:493 builtin/prune-packed.c:75 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 msgid "be quiet" msgstr "être silencieux" @@ -6171,248 +6361,248 @@ msgstr "git log [<options>] [<page de révisions>] [[--] <chemin>...]\n" msgid " or: git show [options] <object>..." msgstr " ou : git show [options] <objet>..." -#: builtin/log.c:124 +#: builtin/log.c:125 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: builtin/log.c:125 +#: builtin/log.c:126 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:126 +#: builtin/log.c:127 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:127 +#: builtin/log.c:128 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:230 +#: builtin/log.c:231 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:453 builtin/log.c:545 +#: builtin/log.c:473 builtin/log.c:565 #, c-format msgid "Could not read object %s" msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:569 +#: builtin/log.c:589 #, c-format msgid "Unknown type: %d" msgstr "Type inconnu : %d" -#: builtin/log.c:669 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:751 +#: builtin/log.c:771 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:767 +#: builtin/log.c:787 #, c-format msgid "Cannot open patch file %s" msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:781 +#: builtin/log.c:801 msgid "Need exactly one range." msgstr "Exactement une plage nécessaire." -#: builtin/log.c:789 +#: builtin/log.c:809 msgid "Not a range." msgstr "Pas une plage." -#: builtin/log.c:891 +#: builtin/log.c:911 msgid "Cover letter needs email format" msgstr "La lettre de motivation doit être au format e-mail" -#: builtin/log.c:967 +#: builtin/log.c:987 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:995 +#: builtin/log.c:1015 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [options] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1040 +#: builtin/log.c:1060 msgid "Two output directories?" msgstr "Deux répertoires de sortie ?" -#: builtin/log.c:1155 +#: builtin/log.c:1175 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1158 +#: builtin/log.c:1178 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1162 +#: builtin/log.c:1182 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1164 +#: builtin/log.c:1184 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1166 +#: builtin/log.c:1186 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1167 +#: builtin/log.c:1187 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1168 +#: builtin/log.c:1188 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1170 +#: builtin/log.c:1190 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1172 +#: builtin/log.c:1192 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1174 +#: builtin/log.c:1194 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1177 +#: builtin/log.c:1197 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1180 +#: builtin/log.c:1200 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1183 +#: builtin/log.c:1203 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1185 +#: builtin/log.c:1205 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1187 +#: builtin/log.c:1207 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1189 +#: builtin/log.c:1209 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1190 +#: builtin/log.c:1210 msgid "header" msgstr "en-tête" -#: builtin/log.c:1191 +#: builtin/log.c:1211 msgid "add email header" msgstr "ajouter l'en-tête d'e-mail" -#: builtin/log.c:1192 builtin/log.c:1194 +#: builtin/log.c:1212 builtin/log.c:1214 msgid "email" msgstr "e-mail" -#: builtin/log.c:1192 +#: builtin/log.c:1212 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1194 +#: builtin/log.c:1214 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1196 +#: builtin/log.c:1216 msgid "ident" msgstr "ident" -#: builtin/log.c:1197 +#: builtin/log.c:1217 msgid "set From address to <ident> (or committer ident if absent)" -msgstr "Renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" +msgstr "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1199 +#: builtin/log.c:1219 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1200 +#: builtin/log.c:1220 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1201 builtin/log.c:1204 +#: builtin/log.c:1221 builtin/log.c:1224 msgid "boundary" msgstr "frontière" -#: builtin/log.c:1202 +#: builtin/log.c:1222 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1205 +#: builtin/log.c:1225 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1209 +#: builtin/log.c:1229 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1211 +#: builtin/log.c:1231 msgid "signature" msgstr "signature" -#: builtin/log.c:1212 +#: builtin/log.c:1232 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1214 +#: builtin/log.c:1233 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1288 +#: builtin/log.c:1307 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1303 +#: builtin/log.c:1322 msgid "-n and -k are mutually exclusive." msgstr "-n et -k sont mutuellement exclusifs." -#: builtin/log.c:1305 +#: builtin/log.c:1324 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix et -k sont mutuellement exclusifs." -#: builtin/log.c:1313 +#: builtin/log.c:1332 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1315 +#: builtin/log.c:1334 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1317 +#: builtin/log.c:1336 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1340 +#: builtin/log.c:1359 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1342 +#: builtin/log.c:1361 #, c-format msgid "Could not create directory '%s'" msgstr "Impossible de créer le répertoire '%s'" -#: builtin/log.c:1490 +#: builtin/log.c:1509 msgid "Failed to create output files" msgstr "Échec de création des fichiers en sortie" -#: builtin/log.c:1539 +#: builtin/log.c:1558 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1594 +#: builtin/log.c:1613 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -6420,139 +6610,139 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621 +#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 #, c-format msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/ls-files.c:408 +#: builtin/ls-files.c:398 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [options] [<fichier>...]" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:455 msgid "identify the file status with tags" msgstr "identifier le statut de fichier avec les étiquettes" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:457 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:459 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:461 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:463 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:465 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:477 +#: builtin/ls-files.c:467 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:470 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:472 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:484 +#: builtin/ls-files.c:474 msgid "show 'other' directories' name only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:487 +#: builtin/ls-files.c:477 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:480 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:482 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:494 +#: builtin/ls-files.c:484 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:497 +#: builtin/ls-files.c:487 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:490 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:492 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:505 +#: builtin/ls-files.c:495 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:508 +#: builtin/ls-files.c:498 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:499 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:500 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considérer que les chemins supprimés depuis <arbre ou apparenté> sont " "toujours présents" -#: builtin/ls-files.c:512 +#: builtin/ls-files.c:502 msgid "show debugging data" msgstr "afficher les données de débogage" -#: builtin/ls-tree.c:27 +#: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]" -#: builtin/ls-tree.c:125 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "afficher seulement les arbres" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "parcourir les sous-arbres" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "afficher les arbres en les parcourant" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "terminer les éléments avec un octet NUL" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "inclure la taille d'objet" -#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "afficher seulement les noms de fichiers" -#: builtin/ls-tree.c:140 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "utiliser les noms de chemins complets" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "afficher l'arbre entier ; pas seulement le répertoire courant (implique --" @@ -6631,7 +6821,7 @@ msgstr "abandonner si l'avance rapide n'est pas possible" msgid "Verify that the named commit has a valid GPG signature" msgstr "Vérifier que la validation a une signature GPG valide" -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114 +#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "stratégie" @@ -7004,76 +7194,85 @@ msgstr "autoriser les objets manquants" msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" -#: builtin/mv.c:14 +#: builtin/mv.c:15 msgid "git mv [options] <source>... <destination>" msgstr "git mv [options] <source>... <destination>" -#: builtin/mv.c:64 +#: builtin/mv.c:67 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:65 +#: builtin/mv.c:68 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" -#: builtin/mv.c:108 +#: builtin/mv.c:113 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vérification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:112 +#: builtin/mv.c:117 msgid "bad source" msgstr "mauvaise source" -#: builtin/mv.c:115 +#: builtin/mv.c:120 msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" -#: builtin/mv.c:118 +#: builtin/mv.c:123 msgid "cannot move directory over file" msgstr "impossible de déplacer un répertoire sur un fichier" -#: builtin/mv.c:128 +#: builtin/mv.c:129 +#, c-format +msgid "Huh? Directory %s is in index and no submodule?" +msgstr "Hein ? Le répertoire %s est dans l'index et pourtant aucun sous-module ?" + +#: builtin/mv.c:131 builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour continuer" + +#: builtin/mv.c:147 #, c-format msgid "Huh? %.*s is in index?" msgstr "Hein ? %.*s est dans l'index ?" -#: builtin/mv.c:140 +#: builtin/mv.c:159 msgid "source directory is empty" msgstr "le répertoire source est vide" -#: builtin/mv.c:171 +#: builtin/mv.c:191 msgid "not under version control" msgstr "pas sous le contrôle de version" -#: builtin/mv.c:173 +#: builtin/mv.c:193 msgid "destination exists" msgstr "la destination existe" -#: builtin/mv.c:181 +#: builtin/mv.c:201 #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" -#: builtin/mv.c:184 +#: builtin/mv.c:204 msgid "Cannot overwrite" msgstr "Impossible d'écraser" -#: builtin/mv.c:187 +#: builtin/mv.c:207 msgid "multiple sources for the same target" msgstr "multiples sources pour la même destination" -#: builtin/mv.c:202 +#: builtin/mv.c:222 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:212 +#: builtin/mv.c:232 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:215 builtin/remote.c:731 +#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" @@ -7112,8 +7311,8 @@ msgid "read from stdin" msgstr "lire depuis l'entrée standard" #: builtin/name-rev.c:320 -msgid "allow to print `undefined` names" -msgstr "autoriser l'affichage des noms `non définis`" +msgid "allow to print `undefined` names (default)" +msgstr "autoriser l'affichage des noms `non définis` (par défaut)" #: builtin/name-rev.c:326 msgid "dereference tags in the input (internal use)" @@ -7268,12 +7467,12 @@ msgstr "impossible d'écrire l'objet note" msgid "The note contents has been left in %s" msgstr "Le contenu de la note a été laissé dans %s" -#: builtin/notes.c:248 builtin/tag.c:540 +#: builtin/notes.c:248 builtin/tag.c:537 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:250 builtin/tag.c:543 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" @@ -7281,7 +7480,7 @@ msgstr "impossible d'ouvrir ou lire '%s'" #: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 #: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 #: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 -#: builtin/notes.c:839 builtin/tag.c:556 +#: builtin/notes.c:839 builtin/tag.c:553 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." @@ -7456,154 +7655,154 @@ 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:183 builtin/pack-objects.c:186 +#: builtin/pack-objects.c:184 builtin/pack-objects.c:187 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:2397 +#: builtin/pack-objects.c:2398 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2401 +#: builtin/pack-objects.c:2402 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2424 +#: builtin/pack-objects.c:2425 #, 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:2428 +#: builtin/pack-objects.c:2429 #, 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:2447 +#: builtin/pack-objects.c:2448 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2449 +#: builtin/pack-objects.c:2450 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2451 +#: builtin/pack-objects.c:2452 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:2454 +#: builtin/pack-objects.c:2455 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:2455 +#: builtin/pack-objects.c:2456 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2457 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:2459 +#: builtin/pack-objects.c:2460 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2461 +#: builtin/pack-objects.c:2462 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2463 +#: builtin/pack-objects.c:2464 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2465 +#: builtin/pack-objects.c:2466 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2467 +#: builtin/pack-objects.c:2468 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:2469 +#: builtin/pack-objects.c:2470 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:2471 +#: builtin/pack-objects.c:2472 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2473 +#: builtin/pack-objects.c:2474 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2475 +#: builtin/pack-objects.c:2476 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2477 +#: builtin/pack-objects.c:2478 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:2479 +#: builtin/pack-objects.c:2480 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2481 +#: builtin/pack-objects.c:2482 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2483 +#: builtin/pack-objects.c:2484 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:2486 +#: builtin/pack-objects.c:2487 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2489 +#: builtin/pack-objects.c:2490 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:2492 +#: builtin/pack-objects.c:2493 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2494 +#: builtin/pack-objects.c:2495 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:2496 +#: builtin/pack-objects.c:2497 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2497 parse-options.h:141 +#: builtin/pack-objects.c:2498 parse-options.h:143 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2498 +#: builtin/pack-objects.c:2499 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2501 +#: builtin/pack-objects.c:2502 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2503 +#: builtin/pack-objects.c:2504 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2505 +#: builtin/pack-objects.c:2506 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2507 +#: builtin/pack-objects.c:2508 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" @@ -7643,15 +7842,15 @@ msgstr "faire expirer les objets plus vieux que <heure>" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:45 +#: builtin/push.c:47 msgid "tag shorthand without <tag>" msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:64 +#: builtin/push.c:66 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:99 +#: builtin/push.c:101 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7660,7 +7859,7 @@ msgstr "" "Pour choisir l'option de manière permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:102 +#: builtin/push.c:104 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7685,7 +7884,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:117 +#: builtin/push.c:119 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7700,7 +7899,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:131 +#: builtin/push.c:133 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7714,13 +7913,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:139 +#: builtin/push.c:141 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branche courante %s a de multiples branches amont, impossible de pousser." -#: builtin/push.c:142 +#: builtin/push.c:144 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7731,7 +7930,7 @@ msgstr "" "pas une branche amont de votre branche courante '%s', sans me dire\n" "quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:165 +#: builtin/push.c:167 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7765,14 +7964,14 @@ msgstr "" "'current' au lieu de 'simple' si vous utilisez de temps en temps d'anciennes " "versions de Git)" -#: builtin/push.c:225 +#: builtin/push.c:227 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Vous n'avez pas spécifié de spécifications de référence à pousser, et push." "default est \"nothing\"." -#: builtin/push.c:232 +#: builtin/push.c:234 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7787,7 +7986,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:238 +#: builtin/push.c:240 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7803,7 +8002,7 @@ msgstr "" "'push.default' à 'simple', 'current' ou 'upstream' pour pousser seulement la " "branche courante." -#: builtin/push.c:244 +#: builtin/push.c:246 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -7818,7 +8017,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:250 +#: builtin/push.c:252 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -7836,13 +8035,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:257 +#: builtin/push.c:259 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " "branche distante." -#: builtin/push.c:260 +#: builtin/push.c:262 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -7854,22 +8053,22 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:320 +#: builtin/push.c:328 #, c-format msgid "Pushing to %s\n" msgstr "Poussage vers %s\n" -#: builtin/push.c:324 +#: builtin/push.c:332 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:357 +#: builtin/push.c:365 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:358 +#: builtin/push.c:366 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7891,88 +8090,96 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:373 +#: builtin/push.c:381 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:374 +#: builtin/push.c:382 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:379 +#: builtin/push.c:387 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:380 +#: builtin/push.c:388 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:385 +#: builtin/push.c:393 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:445 +#: builtin/push.c:453 msgid "repository" msgstr "dépôt" -#: builtin/push.c:446 +#: builtin/push.c:454 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:447 +#: builtin/push.c:455 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:449 +#: builtin/push.c:457 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:450 +#: builtin/push.c:458 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:453 +#: builtin/push.c:461 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:454 +#: builtin/push.c:463 +msgid "refname>:<expect" +msgstr "nom de référence>:<attendu" + +#: builtin/push.c:464 +msgid "require old value of ref to be at this value" +msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" + +#: builtin/push.c:466 msgid "check" msgstr "check" -#: builtin/push.c:455 +#: builtin/push.c:467 msgid "control recursive pushing of submodules" msgstr "contrôler le poussage récursif des sous-modules" -#: builtin/push.c:457 +#: builtin/push.c:469 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:458 builtin/push.c:459 +#: builtin/push.c:470 builtin/push.c:471 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:460 +#: builtin/push.c:472 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:463 +#: builtin/push.c:475 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:465 +#: builtin/push.c:477 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:466 +#: builtin/push.c:478 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:476 +#: builtin/push.c:488 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:478 +#: builtin/push.c:490 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" @@ -8049,14 +8256,14 @@ msgstr "sauter l'application du filtre d'extraction creuse" #: builtin/read-tree.c:138 msgid "debug unpack-trees" -msgstr "deboguer unpack-trees" +msgstr "déboguer unpack-trees" -#: builtin/reflog.c:500 +#: builtin/reflog.c:499 #, c-format msgid "%s' for '%s' is not a valid timestamp" msgstr "%s' pour '%s' n'est pas un horodatage valide" -#: builtin/reflog.c:616 builtin/reflog.c:621 +#: builtin/reflog.c:615 builtin/reflog.c:620 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" @@ -8081,9 +8288,9 @@ msgstr "git remote rename <ancienne> <nouvelle>" msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:15 builtin/remote.c:42 -msgid "git remote set-head <name> (-a | -d | <branch>)" -msgstr "git remote set-head <nom> (-a | -d | <branche>)" +#: builtin/remote.c:15 +msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" +msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)" #: builtin/remote.c:16 msgid "git remote [-v | --verbose] show [-n] <name>" @@ -8120,6 +8327,10 @@ msgstr "git remote set-url --delete <nom> <URL>" msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" +#: builtin/remote.c:42 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" + #: builtin/remote.c:47 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." @@ -8221,7 +8432,9 @@ msgstr "plus d'un %s" #: builtin/remote.c:339 #, c-format msgid "Could not get fetch map for refspec %s" -msgstr "Impossible d'obtenir une correspondance distante pour la spécification de référence %s" +msgstr "" +"Impossible d'obtenir une correspondance distante pour la spécification de " +"référence %s" #: builtin/remote.c:440 builtin/remote.c:448 msgid "(matching)" @@ -8565,6 +8778,67 @@ msgstr "Pas de suppression de toutes les URLs non-push" msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" +#: builtin/repack.c:15 +msgid "git repack [options]" +msgstr "git repack [options]" + +#: builtin/repack.c:143 +msgid "pack everything in a single pack" +msgstr "empaqueter tout dans un seul paquet" + +#: builtin/repack.c:145 +msgid "same as -a, and turn unreachable objects loose" +msgstr "identique à -a et transformer les objets inaccessibles en suspens" + +#: builtin/repack.c:148 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "supprimer les paquets redondants et lancer git-prune-packed" + +#: builtin/repack.c:150 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "passer --no-reuse-delta à git-pack-objects" + +#: builtin/repack.c:152 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "passer --no-reuse-object à git-pack-objects" + +#: builtin/repack.c:154 +msgid "do not run git-update-server-info" +msgstr "ne pas lancer git update-server-info" + +#: builtin/repack.c:157 +msgid "pass --local to git-pack-objects" +msgstr "passer --local à git-pack-objects" + +#: builtin/repack.c:158 +msgid "approxidate" +msgstr "date approximative" + +#: builtin/repack.c:159 +msgid "with -A, do not loosen objects older than this" +msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" + +#: builtin/repack.c:161 +msgid "size of the window used for delta compression" +msgstr "taille de la fenêtre utilisée pour la compression des deltas" + +#: builtin/repack.c:163 +msgid "same as the above, but limit memory size instead of entries count" +msgstr "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" + +#: builtin/repack.c:165 +msgid "limits the maximum delta depth" +msgstr "limite la profondeur maximale des deltas" + +#: builtin/repack.c:167 +msgid "maximum size of each packfile" +msgstr "taille maximum de chaque fichier paquet" + +#: builtin/repack.c:345 +#, c-format +msgid "removing '%s' failed" +msgstr "la suppression de '%s' a échoué" + #: builtin/replace.c:17 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objet> <remplacement>" @@ -8577,23 +8851,23 @@ msgstr "git replace -d <objet>..." msgid "git replace -l [<pattern>]" msgstr "git replace -l [<motif>]" -#: builtin/replace.c:121 +#: builtin/replace.c:131 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:122 +#: builtin/replace.c:132 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:123 +#: builtin/replace.c:133 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/rerere.c:11 +#: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget chemin... | status | remaining | diff | gc]" -#: builtin/rerere.c:56 +#: builtin/rerere.c:57 msgid "register clean resolutions in index" msgstr "enregistrer des résolutions propres dans l'index" @@ -8654,71 +8928,71 @@ msgstr "HEAD est maintenant à %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:251 +#: builtin/reset.c:262 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" -#: builtin/reset.c:253 +#: builtin/reset.c:264 msgid "reset HEAD and index" msgstr "réinitialiser HEAD et l'index" -#: builtin/reset.c:254 +#: builtin/reset.c:265 msgid "reset only HEAD" msgstr "réinitialiser seulement HEAD" -#: builtin/reset.c:256 builtin/reset.c:258 +#: builtin/reset.c:267 builtin/reset.c:269 msgid "reset HEAD, index and working tree" msgstr "réinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:260 +#: builtin/reset.c:271 msgid "reset HEAD but keep local changes" msgstr "réinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:278 +#: builtin/reset.c:289 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Échec de résolution de '%s' comme une révision valide." -#: builtin/reset.c:281 builtin/reset.c:289 +#: builtin/reset.c:292 builtin/reset.c:300 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/reset.c:286 +#: builtin/reset.c:297 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Échec de résolution de '%s' comme un arbre valide." -#: builtin/reset.c:295 +#: builtin/reset.c:306 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch est incompatible avec --{hard,mixed,soft}" -#: builtin/reset.c:304 +#: builtin/reset.c:315 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " "place." -#: builtin/reset.c:306 +#: builtin/reset.c:317 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:316 +#: builtin/reset.c:327 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu" -#: builtin/reset.c:336 +#: builtin/reset.c:344 +msgid "Unstaged changes after reset:" +msgstr "Modifications non indexées après reset :" + +#: builtin/reset.c:350 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." -#: builtin/reset.c:342 -msgid "Unstaged changes after reset:" -msgstr "Modifications non indexées après reset :" - -#: builtin/reset.c:347 +#: builtin/reset.c:355 msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." @@ -8765,84 +9039,84 @@ msgstr "git cherry-pick [options] <commit ou apparenté>..." msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <sous-commande>" -#: builtin/revert.c:71 builtin/revert.c:94 +#: builtin/revert.c:71 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s : %s ne peut pas être utilisé avec %s" -#: builtin/revert.c:105 +#: builtin/revert.c:80 msgid "end revert or cherry-pick sequence" msgstr "mettre fin au retour ou picorage" -#: builtin/revert.c:106 +#: builtin/revert.c:81 msgid "resume revert or cherry-pick sequence" msgstr "reprendre le retour ou picorage" -#: builtin/revert.c:107 +#: builtin/revert.c:82 msgid "cancel revert or cherry-pick sequence" msgstr "annuler le retour ou picorage" -#: builtin/revert.c:108 +#: builtin/revert.c:83 msgid "don't automatically commit" msgstr "ne pas valider automatiquement" -#: builtin/revert.c:109 +#: builtin/revert.c:84 msgid "edit the commit message" msgstr "éditer le message de validation" -#: builtin/revert.c:112 +#: builtin/revert.c:87 msgid "parent number" msgstr "numéro de parent" -#: builtin/revert.c:114 +#: builtin/revert.c:89 msgid "merge strategy" msgstr "stratégie de fusion" -#: builtin/revert.c:115 +#: builtin/revert.c:90 msgid "option" msgstr "option" -#: builtin/revert.c:116 +#: builtin/revert.c:91 msgid "option for merge strategy" msgstr "option pour la stratégie de fusion" -#: builtin/revert.c:127 +#: builtin/revert.c:102 msgid "append commit name" msgstr "ajouter le nom de validation" -#: builtin/revert.c:128 +#: builtin/revert.c:103 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/revert.c:129 +#: builtin/revert.c:104 msgid "preserve initially empty commits" msgstr "préserver les validations vides initialement" -#: builtin/revert.c:130 +#: builtin/revert.c:105 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/revert.c:131 +#: builtin/revert.c:106 msgid "keep redundant, empty commits" msgstr "garder les validations redondantes, vides" -#: builtin/revert.c:135 +#: builtin/revert.c:110 msgid "program error" msgstr "erreur du programme" -#: builtin/revert.c:225 +#: builtin/revert.c:195 msgid "revert failed" msgstr "revert a échoué" -#: builtin/revert.c:240 +#: builtin/revert.c:210 msgid "cherry-pick failed" msgstr "le picorage a échoué" -#: builtin/rm.c:16 +#: builtin/rm.c:17 msgid "git rm [options] [--] <file>..." msgstr "git rm [options] [--] <fichier>..." -#: builtin/rm.c:64 +#: builtin/rm.c:65 msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" @@ -8856,7 +9130,7 @@ msgstr[1] "" "les sous-modules suivants (ou un de ses sous-modules imbriqués)\n" "utilisent un répertoire .git :" -#: builtin/rm.c:70 +#: builtin/rm.c:71 msgid "" "\n" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -8865,7 +9139,7 @@ msgstr "" "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: builtin/rm.c:230 +#: builtin/rm.c:231 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -8879,7 +9153,7 @@ msgstr[1] "" "les fichiers suivants ont du contenu indexé différent\n" "du fichier et de HEAD :" -#: builtin/rm.c:235 +#: builtin/rm.c:236 msgid "" "\n" "(use -f to force removal)" @@ -8887,13 +9161,13 @@ msgstr "" "\n" "(utilisez -f pour forcer la suppression)" -#: builtin/rm.c:239 +#: builtin/rm.c:240 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "le fichier suivant a des changements indexés :" msgstr[1] "les fichiers suivants ont des changements indexés :" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:244 builtin/rm.c:255 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -8901,38 +9175,38 @@ msgstr "" "\n" "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)" -#: builtin/rm.c:251 +#: builtin/rm.c:252 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "le fichier suivant a des modifications locales :" msgstr[1] "les fichiers suivants ont des modifications locales :" -#: builtin/rm.c:269 +#: builtin/rm.c:270 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimés" -#: builtin/rm.c:270 +#: builtin/rm.c:271 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:271 +#: builtin/rm.c:272 msgid "override the up-to-date check" msgstr "outrepasser la vérification des fichiers à jour" -#: builtin/rm.c:272 +#: builtin/rm.c:273 msgid "allow recursive removal" msgstr "autoriser la suppression récursive" -#: builtin/rm.c:274 +#: builtin/rm.c:275 msgid "exit with a zero status even if nothing matched" msgstr "sortir avec un statut zéro même si rien ne correspondait" -#: builtin/rm.c:345 +#: builtin/rm.c:336 #, c-format msgid "not removing '%s' recursively without -r" msgstr "pas de suppression récursive de '%s' sans -r" -#: builtin/rm.c:384 +#: builtin/rm.c:375 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" @@ -8946,25 +9220,25 @@ msgstr "git shortlog [<options>] [<intervalle révisions>] [[--] [<chemin>...]]" msgid "Missing author: %s" msgstr "Auteur manquant : %s" -#: builtin/shortlog.c:228 +#: builtin/shortlog.c:230 msgid "sort output according to the number of commits per author" msgstr "trier la sortie sur le nombre de validations par auteur" -#: builtin/shortlog.c:230 +#: builtin/shortlog.c:232 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Supprimer les descriptions de validation, fournit seulement le nombre de " "validations" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:234 msgid "Show the email address of each author" msgstr "Afficher l'adresse e-mail de chaque auteur" -#: builtin/shortlog.c:233 +#: builtin/shortlog.c:235 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:234 +#: builtin/shortlog.c:236 msgid "Linewrap output" msgstr "Couper les lignes" @@ -9076,24 +9350,24 @@ msgstr "" "vérification de référence plus stricte, nécessite un chemin de référence " "exact" -#: builtin/show-ref.c:173 builtin/show-ref.c:176 +#: builtin/show-ref.c:173 builtin/show-ref.c:175 msgid "show the HEAD reference, even if it would be filtered out" msgstr "afficher la référence HEAD, même si elle serait filtrée" -#: builtin/show-ref.c:178 +#: builtin/show-ref.c:177 msgid "dereference tags into object IDs" msgstr "déréférencer les étiquettes en IDs d'objet" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:179 msgid "only show SHA1 hash using <n> digits" msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres" -#: builtin/show-ref.c:184 +#: builtin/show-ref.c:183 msgid "do not print results to stdout (useful with --verify)" msgstr "" "ne pas afficher les résultats sur la sortie standard (pratique avec --verify)" -#: builtin/show-ref.c:186 +#: builtin/show-ref.c:185 msgid "show refs from stdin that aren't in local repository" msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " @@ -9120,11 +9394,11 @@ msgstr "supprimer la référence symbolique" msgid "shorten ref output" msgstr "raccourcir l'affichage de la référence" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 msgid "reason of the update" msgstr "raison de la mise à jour" @@ -9290,189 +9564,201 @@ msgstr "afficher seulement les étiquettes qui contiennent la validation" msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:504 +#: builtin/tag.c:501 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:521 +#: builtin/tag.c:518 msgid "-n option is only allowed with -l." msgstr "l'option -n est autorisée seulement avec -l." -#: builtin/tag.c:523 +#: builtin/tag.c:520 msgid "--contains option is only allowed with -l." msgstr "l'option --contains est autorisée seulement avec -l." -#: builtin/tag.c:525 +#: builtin/tag.c:522 msgid "--points-at option is only allowed with -l." msgstr "l'option --points-at est autorisée seulement avec -l." -#: builtin/tag.c:533 +#: builtin/tag.c:530 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:553 +#: builtin/tag.c:550 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:559 +#: builtin/tag.c:556 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:564 +#: builtin/tag.c:561 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:582 +#: builtin/tag.c:579 #, c-format msgid "%s: cannot lock the ref" msgstr "%s : impossible de verrouiller la référence" -#: builtin/tag.c:584 +#: builtin/tag.c:581 #, c-format msgid "%s: cannot update the ref" msgstr "%s : impossible de mettre à jour la référence" -#: builtin/tag.c:586 +#: builtin/tag.c:583 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était %s)\n" -#: builtin/update-index.c:401 +#: builtin/update-index.c:402 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [options] [--] [<fichier>...]" -#: builtin/update-index.c:718 +#: builtin/update-index.c:720 msgid "continue refresh even when index needs update" msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour" -#: builtin/update-index.c:721 +#: builtin/update-index.c:723 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:724 +#: builtin/update-index.c:726 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:726 +#: builtin/update-index.c:728 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:728 +#: builtin/update-index.c:730 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:730 +#: builtin/update-index.c:732 msgid "refresh even if index contains unmerged entries" msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:733 +#: builtin/update-index.c:735 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:737 +#: builtin/update-index.c:739 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:741 +#: builtin/update-index.c:743 msgid "<mode> <object> <path>" msgstr "<mode> <objet> <chemin>" -#: builtin/update-index.c:742 +#: builtin/update-index.c:744 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:746 +#: builtin/update-index.c:748 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:747 +#: builtin/update-index.c:749 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/update-index.c:751 +#: builtin/update-index.c:753 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:754 +#: builtin/update-index.c:756 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:757 +#: builtin/update-index.c:759 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:760 +#: builtin/update-index.c:762 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:763 +#: builtin/update-index.c:765 msgid "add to index only; do not add content to object database" msgstr "" "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " "données des objets" -#: builtin/update-index.c:765 +#: builtin/update-index.c:767 msgid "remove named paths even if present in worktree" msgstr "" "supprimer les chemins nommés même s'ils sont présents dans la copie de " "travail" -#: builtin/update-index.c:767 +#: builtin/update-index.c:769 msgid "with --stdin: input lines are terminated by null bytes" msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls" -#: builtin/update-index.c:769 +#: builtin/update-index.c:771 msgid "read list of paths to be updated from standard input" msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard" -#: builtin/update-index.c:773 +#: builtin/update-index.c:775 msgid "add entries from standard input to the index" msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:777 +#: builtin/update-index.c:779 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés" -#: builtin/update-index.c:781 +#: builtin/update-index.c:783 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:785 +#: builtin/update-index.c:787 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:788 +#: builtin/update-index.c:790 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:790 +#: builtin/update-index.c:792 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:794 +#: builtin/update-index.c:796 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-ref.c:7 +#: builtin/update-ref.c:9 msgid "git update-ref [options] -d <refname> [<oldval>]" msgstr "git update-ref [options] -d <nomréférence> [<anciennevaleur>]" -#: builtin/update-ref.c:8 +#: builtin/update-ref.c:10 msgid "git update-ref [options] <refname> <newval> [<oldval>]" msgstr "" "git update-ref [options] <nomréférence> <nouvellevaleur> " "[<anciennevaleur>]" -#: builtin/update-ref.c:19 +#: builtin/update-ref.c:11 +msgid "git update-ref [options] --stdin [-z]" +msgstr "git update-ref [options] --stdin [-z]" + +#: builtin/update-ref.c:255 msgid "delete the reference" msgstr "supprimer la référence" -#: builtin/update-ref.c:21 +#: builtin/update-ref.c:257 msgid "update <refname> not the one it points to" msgstr "mettre à jour <nomréférence> et non la référence pointée par lui" +#: builtin/update-ref.c:258 +msgid "stdin has NUL-terminated arguments" +msgstr "l'entrée standard a des arguments qui se terminent par NUL" + +#: builtin/update-ref.c:259 +msgid "read updates from stdin" +msgstr "lire les mises à jour depuis l'entrée standard" + #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" @@ -9527,33 +9813,33 @@ msgstr "" "quelques concepts. Voir 'git help <command>' ou 'git help <concept>'\n" "pour en lire plus à propos d'une commande spécifique ou d'un concept." -#: parse-options.h:144 +#: parse-options.h:146 msgid "expiry date" msgstr "date d'expiration" -#: parse-options.h:159 +#: parse-options.h:161 msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" -#: parse-options.h:236 +#: parse-options.h:238 msgid "be more verbose" msgstr "être plus verbeux" -#: parse-options.h:238 +#: parse-options.h:240 msgid "be more quiet" msgstr "être plus silencieux" -#: parse-options.h:244 +#: parse-options.h:246 msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" #: common-cmds.h:8 msgid "Add file contents to the index" -msgstr "Ajouter le contenu du fichier dans l'index" +msgstr "Ajouter le contenu de fichiers dans l'index" #: common-cmds.h:9 msgid "Find by binary search the change that introduced a bug" -msgstr "Rechercher de manière binaire le changement qui a introduit un bogue" +msgstr "Trouver par recherche binaire la modification qui a introduit un bogue" #: common-cmds.h:10 msgid "List, create, or delete branches" @@ -9569,7 +9855,7 @@ msgstr "Cloner un dépôt dans un nouveau répertoire" #: common-cmds.h:13 msgid "Record changes to the repository" -msgstr "Enregistrer les changements dans le dépôt" +msgstr "Enregistrer les modifications dans le dépôt" #: common-cmds.h:14 msgid "Show changes between commits, commit and working tree, etc" @@ -9595,7 +9881,7 @@ msgstr "Afficher l'historique des validations" #: common-cmds.h:19 msgid "Join two or more development histories together" -msgstr "Joindre deux ou plusieurs historiques de développement ensemble" +msgstr "Fusionner deux ou plusieurs historiques de développement ensemble" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" @@ -9603,7 +9889,7 @@ msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique" #: common-cmds.h:21 msgid "Fetch from and integrate with another repository or a local branch" -msgstr "Rapatrier et intégrer avec un autre dépôt ou une branche locale" +msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale" #: common-cmds.h:22 msgid "Update remote refs along with associated objects" @@ -9612,7 +9898,7 @@ msgstr "Mettre à jour les références distantes ainsi que les objets associés #: common-cmds.h:23 msgid "Forward-port local commits to the updated upstream head" msgstr "" -"Reporter en avant les validations locales dans la tête en amont mise à jour" +"Reporter les validations locales sur le sommet mis à jour d'une branche amont" #: common-cmds.h:24 msgid "Reset current HEAD to the specified state" @@ -9620,7 +9906,7 @@ msgstr "Réinitialiser la HEAD courante à l'état spécifié" #: common-cmds.h:25 msgid "Remove files from the working tree and from the index" -msgstr "Supprimer les fichiers de la copie de travail et de l'index" +msgstr "Supprimer des fichiers de la copie de travail et de l'index" #: common-cmds.h:26 msgid "Show various types of objects" @@ -9991,7 +10277,7 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "Le pull n'est pas possible car vous avez des fichiers non fusionnés." -#: git-pull.sh:203 +#: git-pull.sh:223 msgid "updating an unborn branch with changes added to the index" msgstr "" "mise à jour d'une branche non encore créée avec les changements ajoutés dans " @@ -10001,7 +10287,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:235 +#: git-pull.sh:255 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10012,11 +10298,11 @@ msgstr "" "Attention : mise à jour en avance rapide de votre copie de travail\n" "Attention : depuis la validation $orig_head." -#: git-pull.sh:260 +#: git-pull.sh:280 msgid "Cannot merge multiple branches into empty head" msgstr "Impossible de fusionner de multiples branches sur une tête vide" -#: git-pull.sh:264 +#: git-pull.sh:284 msgid "Cannot rebase onto multiple branches" msgstr "Impossible de rebaser sur de multiples branches" @@ -10051,33 +10337,33 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: git-rebase.sh:190 +#: git-rebase.sh:199 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:195 +#: git-rebase.sh:204 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Il semble que git-am soit en cours. Impossible de rebaser." -#: git-rebase.sh:329 +#: git-rebase.sh:338 msgid "The --exec option must be used with the --interactive option" msgstr "L'option --exec doit être utilisée avec l'option --interactive" -#: git-rebase.sh:334 +#: git-rebase.sh:343 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:345 +#: git-rebase.sh:354 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: git-rebase.sh:352 +#: git-rebase.sh:361 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:355 +#: git-rebase.sh:364 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10085,12 +10371,12 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:373 +#: git-rebase.sh:382 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" -#: git-rebase.sh:392 +#: git-rebase.sh:401 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10103,74 +10389,75 @@ msgid "" "valuable there." msgstr "" "Il semble qu'il y ait déjà un répertoire $state_dir_base, et je me demande\n" -"si vous n'êtes pas au milieu d'un autre rebasage. Si c'est le cas,\n" -"merci d'essayer\n" +"si un autre rebasage n'est pas déjà en cours. Si c'est le cas,\n" +"essayez\n" "\t$cmd_live_rebase\n" -"Si ça n'est pas le cas, merci de\n" +"Sinon, essayez\n" "\t$cmd_clear_stale_rebase\n" "puis relancez-moi à nouveau. Je m'arrête au cas où vous auriez quelque " "chose\n" "d'important ici." -#: git-rebase.sh:437 +#: git-rebase.sh:446 #, sh-format msgid "invalid upstream $upstream_name" msgstr "invalide $upstream_name en amont" -#: git-rebase.sh:461 +#: git-rebase.sh:470 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name : il y a plus d'une base de fusion" -#: git-rebase.sh:464 git-rebase.sh:468 +#: git-rebase.sh:473 git-rebase.sh:477 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name : il n'y a pas de base de fusion" -#: git-rebase.sh:473 +#: git-rebase.sh:482 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Ne pointe pas sur une validation valide : $onto_name" -#: git-rebase.sh:496 +#: git-rebase.sh:505 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal : pas de branche : $branch_name" -#: git-rebase.sh:519 +#: git-rebase.sh:528 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:524 +#: git-rebase.sh:533 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:528 +#: git-rebase.sh:537 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:548 +#: git-rebase.sh:557 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:552 +#: git-rebase.sh:561 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branche courante $branch_name est à jour, rebasage forcé." -#: git-rebase.sh:563 +#: git-rebase.sh:572 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" #. Detach HEAD and reset the tree -#: git-rebase.sh:572 +#: git-rebase.sh:581 msgid "First, rewinding head to replay your work on top of it..." -msgstr "Premièrement, retour de head pour rejouer votre travail par-dessus..." +msgstr "" +"Premièrement, rembobinons head pour rejouer votre travail par-dessus..." -#: git-rebase.sh:582 +#: git-rebase.sh:591 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -10218,7 +10505,7 @@ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:241 +#: git-stash.sh:237 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -10227,98 +10514,85 @@ msgstr "" "erreur: option inconnue pour 'stash save': $option\n" " Pour fournir un message, utilisez git stash save -- '$option'" -#: git-stash.sh:262 +#: git-stash.sh:258 msgid "No local changes to save" -msgstr "Pas de changements en local à sauver" - -#: git-stash.sh:268 -msgid "" -"The following untracked files would NOT be saved but need to be removed by " -"stash save:" -msgstr "" -"Les fichiers suivants non suivis ne seront PAS sauvés mais doivent être " -"supprimés par l'état du remisage :" +msgstr "Pas de modifications locales à sauver" -#: git-stash.sh:270 -msgid "" -"Aborting. Consider using either the --force or --include-untracked option." -msgstr "Abandon. Utilisez l'option --force ou --include-untracked." - -#: git-stash.sh:274 +#: git-stash.sh:262 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: git-stash.sh:278 +#: git-stash.sh:266 msgid "Cannot save the current status" msgstr "Impossible de sauver le statut courant" -#: git-stash.sh:296 +#: git-stash.sh:284 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: git-stash.sh:395 +#: git-stash.sh:383 msgid "No stash found." msgstr "Pas de remisage trouvé." -#: git-stash.sh:402 +#: git-stash.sh:390 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-stash.sh:408 +#: git-stash.sh:396 #, sh-format msgid "$reference is not valid reference" msgstr "$reference n'est pas une référence valide" -#: git-stash.sh:436 +#: git-stash.sh:424 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' n'est pas une validation de type remisage" -#: git-stash.sh:447 +#: git-stash.sh:435 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' n'est pas une référence de remisage" -#: git-stash.sh:455 +#: git-stash.sh:443 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-stash.sh:459 +#: git-stash.sh:447 msgid "Cannot apply a stash in the middle of a merge" -msgstr "Impossible d'appliquer un remisage au milieu d'une fusion" +msgstr "Impossible d'appliquer un remisage en cours de fusion" -#: git-stash.sh:467 +#: git-stash.sh:455 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-stash.sh:469 +#: git-stash.sh:457 msgid "Could not save index tree" msgstr "Impossible de sauver l'arbre d'index" -#: git-stash.sh:503 +#: git-stash.sh:491 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-stash.sh:518 +#: git-stash.sh:506 msgid "Index was not unstashed." -msgstr "L'index n'a pas été sorti de remise" +msgstr "L'index n'a pas été sorti de remise." -#: git-stash.sh:535 +#: git-stash.sh:523 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-stash.sh:536 +#: git-stash.sh:524 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:543 +#: git-stash.sh:531 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:615 +#: git-stash.sh:603 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" @@ -10604,46 +10878,55 @@ msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" #. unexpected type -#: git-submodule.sh:1066 +#: git-submodule.sh:1073 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:1086 +#: git-submodule.sh:1093 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:1089 +#: git-submodule.sh:1096 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:1092 +#: git-submodule.sh:1099 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Attention : $display_name ne contient pas les validations $sha1_src et " "$sha1_dst" -#: git-submodule.sh:1117 +#: git-submodule.sh:1124 msgid "blob" msgstr "blob" -#: git-submodule.sh:1155 -msgid "Submodules changed but not updated:" -msgstr "Sous-modules modifiés mais non mis à jour :" - -#: git-submodule.sh:1157 -msgid "Submodule changes to be committed:" -msgstr "Changements du sous-module à valider :" - -#: git-submodule.sh:1242 +#: git-submodule.sh:1238 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" -#: git-submodule.sh:1306 +#: git-submodule.sh:1302 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" + +#~ msgid "input paths are terminated by a null character" +#~ msgstr "les chemins en entrée sont terminés par le caractère nul" + +#~ msgid "done\n" +#~ msgstr "fait\n" + +#~ msgid "" +#~ "The following untracked files would NOT be saved but need to be removed " +#~ "by stash save:" +#~ msgstr "" +#~ "Les fichiers suivants non suivis ne seront PAS sauvés mais doivent être " +#~ "supprimés par le remisage :" + +#~ msgid "" +#~ "Aborting. Consider using either the --force or --include-untracked option." +#~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked." |