diff options
Diffstat (limited to 'po/fr.po')
| -rw-r--r-- | po/fr.po | 7463 |
1 files changed, 4387 insertions, 3076 deletions
@@ -8,6 +8,7 @@ # # English | French # -----------------+--------------------------------- +# 3-way merge | fusion à 3 points # #NN | n°NN # a commit | un commit # backward | @@ -17,35 +18,54 @@ # blob | blob # bug | bogue # bundle | colis +# bypass | éviter d'utiliser +# to checkout | extraire # cherry-pick | picorer +# to commit | valider +# commit-ish | commit ou apparenté +# config file | fichier de configuration # dangling | en suspens +# to debug | déboguer # debugging | débogage +# to deflate | compresser +# email | e-mail +# entry | élément # fast-forward | avance rapide # fast-forwarded | mis à jour en avance rapide +# to fetch | rapatrier +# fix conflicts | réglez les conflits +# to format | formater # glob | glob # hash | hachage # HEAD | HEAD (genre féminin) -# hook | hook +# hook | crochet # hunk | section +# to inflate | décompresser +# to list | afficher +# mapping | mise en correspondance # merge | fusion +# pack | paquet +# patches | patchs # pattern | motif +# to prune | éliminer +# to push | pousser +# to rebase | rebaser # repository | dépôt # remote | distante (ou serveur distant) # revision | révision +# shallow | superficiel +# shell | interpréteur de commandes # stash | remisage +# to stash | remiser # tag | étiquette # template | modèle -# to checkout | extraire -# to commit | valider -# to fetch | rapatrier -# to prune | élaguer -# to push | pousser -# to rebase | rebaser -# to stash | remiser +# thread | fil # to track | suivre +# tree | arbre +# tree-ish | arbre ou apparenté # to unstage | désindexer -# tree-ish | arbre # upstream | amont +# viewer | visualiseur # worktree / | # work(ing) tree | copie de travail # @@ -53,27 +73,22 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-04-30 08:25+0800\n" -"PO-Revision-Date: 2013-08-27 19:43+0200\n" -"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" +"POT-Creation-Date: 2014-04-19 12:50+0800\n" +"PO-Revision-Date: 2014-04-22 21:28+0200\n" +"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -"X-Generator: Poedit 1.5.4\n" -#: advice.c:53 +#: advice.c:55 #, c-format msgid "hint: %.*s\n" msgstr "astuce: %.*s\n" -#. -#. * Message used both when 'git commit' fails and when -#. * other commands doing a merge do. -#. -#: advice.c:83 +#: advice.c:85 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -87,7 +102,7 @@ msgstr "" #: archive.c:10 msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git archive [options] <arbre> [<chemin>...]" +msgstr "git archive [options] <arbre ou apparenté> [<chemin>...]" #: archive.c:11 msgid "git archive --list" @@ -96,77 +111,84 @@ msgstr "git archive --list" #: archive.c:12 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" -msgstr "git archive --remote <dépôt> [--exec <commande>] [options] <arbre> [<chemin>...]" +msgstr "" +"git archive --remote <dépôt> [--exec <commande>] [options] <arbre ou " +"apparenté> [<chemin>...]" #: archive.c:13 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:323 +#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "le chemin '%s' ne correspond à aucun fichier" + +#: archive.c:328 msgid "fmt" msgstr "fmt" -#: archive.c:323 +#: archive.c:328 msgid "archive format" msgstr "format d'archive" -#: archive.c:324 builtin/log.c:1126 +#: archive.c:329 builtin/log.c:1193 msgid "prefix" msgstr "préfixe" -#: archive.c:325 +#: archive.c:330 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:2371 -#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 -#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 -#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258 +#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680 +#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 +#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 msgid "file" msgstr "fichier" -#: archive.c:327 builtin/archive.c:89 +#: archive.c:332 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:329 +#: archive.c:334 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:330 +#: archive.c:335 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:331 +#: archive.c:336 msgid "store only" msgstr "stockage seulement" -#: archive.c:332 +#: archive.c:337 msgid "compress faster" msgstr "compression rapide" -#: archive.c:340 +#: archive.c:345 msgid "compress better" msgstr "compression efficace" -#: archive.c:343 +#: archive.c:348 msgid "list supported archive formats" -msgstr "lister les formats d'archive supportés" +msgstr "afficher les formats d'archive supportés" -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 +#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 msgid "repo" msgstr "dépôt" -#: archive.c:346 builtin/archive.c:91 +#: archive.c:351 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:615 +#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 msgid "command" msgstr "commande" -#: archive.c:348 builtin/archive.c:93 +#: archive.c:353 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" @@ -183,81 +205,85 @@ msgstr "" msgid "Not setting branch %s as its own upstream." msgstr "La branche %s ne peut pas être sa propre branche amont." -#: branch.c:82 +#: branch.c:83 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." -msgstr "La branche %s est paramétrée pour suivre la branche distante %s de %s en rebasant." +msgstr "" +"La branche %s est paramétrée pour suivre la branche distante %s de %s en " +"rebasant." -#: branch.c:83 +#: branch.c:84 #, c-format msgid "Branch %s set up to track remote branch %s from %s." -msgstr "La branche %s est paramétrée pour suivre la branche distante %s depuis %s." +msgstr "" +"La branche %s est paramétrée pour suivre la branche distante %s depuis %s." -#: branch.c:87 +#: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "La branche %s est paramétrée pour suivre la branche locale %s en rebasant." +msgstr "" +"La branche %s est paramétrée pour suivre la branche locale %s en rebasant." -#: branch.c:88 +#: branch.c:89 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "La branche %s est paramétrée pour suivre la branche locale %s." -#: branch.c:92 +#: branch.c:94 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "La branche %s est paramétrée pour suivre la référence distante %s en rebasant." +msgstr "" +"La branche %s est paramétrée pour suivre la référence distante %s en " +"rebasant." -#: branch.c:93 +#: branch.c:95 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "La branche %s est paramétrée pour suivre la référence distante %s." -#: branch.c:97 +#: branch.c:99 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." -msgstr "La branche %s est paramétrée pour suivre la référence locale %s en rebasant." +msgstr "" +"La branche %s est paramétrée pour suivre la référence locale %s en rebasant." -#: branch.c:98 +#: branch.c:100 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "La branche %s est paramétrée pour suivre la référence locale %s." -#: branch.c:118 -#, c-format -msgid "Tracking not set up: name too long: %s" -msgstr "Suivi de branche non paramétré : le nom est trop long : %s" - -#: branch.c:137 +#: branch.c:133 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Pas de suivi : information ambiguë pour la référence %s" -#: branch.c:182 +#: branch.c:178 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' n'est pas un nom de branche valide." -#: branch.c:187 +#: branch.c:183 #, c-format msgid "A branch named '%s' already exists." msgstr "Une branche nommée '%s' existe déjà." -#: branch.c:195 +#: branch.c:191 msgid "Cannot force update the current branch." msgstr "Impossible de forcer la mise à jour de la branche courante." -#: branch.c:201 +#: branch.c:211 #, 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." +msgstr "" +"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " +"pas une branche." -#: branch.c:203 +#: branch.c:213 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" -#: branch.c:205 +#: branch.c:215 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -277,113 +303,113 @@ 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:250 +#: branch.c:260 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'." -#: branch.c:270 +#: branch.c:280 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'." -#: branch.c:275 +#: branch.c:285 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:281 +#: branch.c:291 msgid "Failed to lock ref for update" msgstr "Échec du verrouillage de la référence pour mise à jour" -#: branch.c:299 +#: branch.c:309 msgid "Failed to write ref" msgstr "Échec de l'écriture de la référence" -#: bundle.c:36 +#: bundle.c:33 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ne semble pas être un fichier bundle v2" -#: bundle.c:63 +#: bundle.c:60 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:89 builtin/commit.c:676 +#: bundle.c:86 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" -#: bundle.c:140 +#: bundle.c:138 msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis :" -#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 -#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 -#: builtin/shortlog.c:155 +#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 +#: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: bundle.c:186 +#: bundle.c:184 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" -#: bundle.c:193 +#: bundle.c:191 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:195 +#: bundle.c:193 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:294 +#: bundle.c:293 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 +#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:335 +#: bundle.c:334 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:380 +#: bundle.c:379 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:398 +#: bundle.c:395 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:416 +#: bundle.c:413 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:419 +#: bundle.c:416 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:441 +#: bundle.c:438 msgid "index-pack died" msgstr "l'index de groupe a disparu" -#: commit.c:50 +#: commit.c:54 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" -#: commit.c:52 +#: commit.c:56 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" @@ -392,19 +418,19 @@ msgstr "%s %s n'est pas un commit !" msgid "memory exhausted" msgstr "plus de mémoire" -#: connected.c:39 +#: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:48 +#: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "impossible d'écrire dans la rev-list : %s" -#: connected.c:56 +#: connected.c:98 #, c-format msgid "failed to close rev-list's stdin: %s" -msgstr "impossible de fermer le stdin du rev-list : %s" +msgstr "impossible de fermer l'entrée standard du rev-list : %s" #: date.c:95 msgid "in the future" @@ -459,6 +485,7 @@ msgid_plural "%lu years" msgstr[0] "%lu an" msgstr[1] "%lu ans" +#. TRANSLATORS: "%s" is "<n> years" #: date.c:149 #, c-format msgid "%s, %lu month ago" @@ -473,38 +500,51 @@ msgid_plural "%lu years ago" msgstr[0] "il y a %lu an" msgstr[1] "il y a %lu ans" -#: diff.c:112 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "impossible de lire le fichier de commande '%s'" + +#: diffcore-rename.c:517 +msgid "Performing inexact rename detection" +msgstr "Détection de renommage inexact en cours" + +#: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" +msgstr "" +" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:117 +#: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:210 +#: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" +msgstr "" +"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:260 +#: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" -msgstr "Erreurs dans la variable de configuration 'diff.dirstat' :\n" +msgstr "" +"Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:3481 +#: diff.c:3495 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" -msgstr "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" +msgstr "" +"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3495 +#: diff.c:3509 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" @@ -531,35 +571,35 @@ 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:1698 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1640 +#: grep.c:1715 #, c-format msgid "'%s': %s" msgstr "'%s' : %s" -#: grep.c:1651 +#: grep.c:1726 #, c-format msgid "'%s': short read %s" msgstr "'%s' : lecture tronquée %s" -#: help.c:212 +#: help.c:209 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" -#: help.c:219 +#: help.c:216 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" -#: help.c:235 +#: help.c:232 msgid "The most commonly used git commands are:" msgstr "Les commandes git les plus utilisées sont :" -#: help.c:292 +#: help.c:289 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -568,45 +608,55 @@ msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" -#: help.c:349 +#: help.c:346 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:371 +#: help.c:368 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" -msgstr "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas.\n" +msgstr "" +"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe " +"pas.\n" "Poursuite en supposant que vous avez voulu dire '%s'" -#: help.c:376 +#: help.c:373 #, c-format msgid "in %0.1f seconds automatically..." msgstr "dans %0.1f secondes automatiquement..." -#: help.c:383 +#: help.c:380 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." -#: help.c:387 +#: help.c:384 help.c:443 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" -msgstr[0] "\n" +msgstr[0] "" +"\n" "Vouliez-vous dire cela ?" -msgstr[1] "\nVouliez-vous dire un de ceux-là ?" +msgstr[1] "" +"\n" +"Vouliez-vous dire un de ceux-là ?" + +#: help.c:439 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s - %s" #: merge.c:56 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:645 +#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558 +#: builtin/clone.c:661 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -615,311 +665,457 @@ msgstr "impossible d'écrire le nouveau fichier d'index" msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:206 +#: merge-recursive.c:208 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "échec de addinfo_cache pour le chemin '%s'" -#: merge-recursive.c:268 +#: merge-recursive.c:271 msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:672 +#: merge-recursive.c:675 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:683 +#: merge-recursive.c:686 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#. something else exists -#. .. but not some other error (who really cares what?) -#: merge-recursive.c:697 merge-recursive.c:718 +#: merge-recursive.c:700 merge-recursive.c:721 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:708 +#: merge-recursive.c:711 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:748 +#: merge-recursive.c:751 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:750 +#: merge-recursive.c:753 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:773 builtin/clone.c:313 +#: merge-recursive.c:776 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: merge-recursive.c:781 +#: merge-recursive.c:784 #, c-format msgid "failed to symlink '%s'" msgstr "échec à la création du lien symbolique '%s'" -#: merge-recursive.c:784 +#: merge-recursive.c:787 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:922 +#: merge-recursive.c:925 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:926 +#: merge-recursive.c:929 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:942 +#: merge-recursive.c:945 msgid "unsupported object type in the tree" msgstr "type d'objet non supporté dans l'arbre" -#: merge-recursive.c:1021 merge-recursive.c:1035 +#: merge-recursive.c:1024 merge-recursive.c:1038 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de %s laissée dans l'arbre." +msgstr "" +"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " +"%s laissée dans l'arbre." -#: merge-recursive.c:1027 merge-recursive.c:1040 +#: merge-recursive.c:1030 merge-recursive.c:1043 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de %s laissée dans l'arbre dans le fichier %s." +msgstr "" +"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " +"%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1081 +#: merge-recursive.c:1084 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1081 +#: merge-recursive.c:1084 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1137 +#: merge-recursive.c:1140 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1159 +#: merge-recursive.c:1162 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" -msgstr "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche \"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" +msgstr "" +"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " +"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1164 +#: merge-recursive.c:1167 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1218 +#: merge-recursive.c:1221 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'->'%s' dans %s" +msgstr "" +"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" +">'%s' dans %s" -#: merge-recursive.c:1248 +#: merge-recursive.c:1251 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renommage de %s en %s et de %s en %s à la place" -#: merge-recursive.c:1447 +#: merge-recursive.c:1450 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -msgstr "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" +msgstr "" +"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1457 +#: merge-recursive.c:1460 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:1462 merge-recursive.c:1660 +#: merge-recursive.c:1465 merge-recursive.c:1663 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:1513 +#: merge-recursive.c:1516 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:1516 +#: merge-recursive.c:1519 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:1564 +#: merge-recursive.c:1567 msgid "modify" msgstr "modification" -#: merge-recursive.c:1564 +#: merge-recursive.c:1567 msgid "modified" msgstr "modifié" -#: merge-recursive.c:1574 +#: merge-recursive.c:1577 msgid "content" msgstr "contenu" -#: merge-recursive.c:1581 +#: merge-recursive.c:1584 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:1615 +#: merge-recursive.c:1618 #, c-format msgid "Skipped %s (merged same as existing)" -msgstr "%s ignoré (fusion identique à l'existant)" +msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:1629 +#: merge-recursive.c:1632 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1633 git-submodule.sh:1029 +#: merge-recursive.c:1636 git-submodule.sh:1149 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:1634 +#: merge-recursive.c:1637 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:1724 +#: merge-recursive.c:1727 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:1749 +#: merge-recursive.c:1752 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:1755 +#: merge-recursive.c:1758 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1760 +#: merge-recursive.c:1763 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" +msgstr "" +"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:1770 +#: merge-recursive.c:1773 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1787 +#: merge-recursive.c:1790 msgid "Fatal merge failure, shouldn't happen." msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." -#: merge-recursive.c:1806 +#: merge-recursive.c:1809 msgid "Already up-to-date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1815 +#: merge-recursive.c:1818 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:1845 +#: merge-recursive.c:1848 #, c-format msgid "Unprocessed path??? %s" msgstr "Chemin non traité ??? %s" -#: merge-recursive.c:1890 +#: merge-recursive.c:1893 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:1903 +#: merge-recursive.c:1906 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:1940 +#: merge-recursive.c:1943 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:1997 +#: merge-recursive.c:2000 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2009 builtin/merge.c:658 +#: merge-recursive.c:2012 builtin/merge.c:668 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." -#: object.c:195 +#: notes-utils.c:40 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "Impossible de valider un arbre de notes non initialisé/référencé" + +#: notes-utils.c:81 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Mauvaise valeur de notes.rewriteMode : '%s'" + +#: notes-utils.c:91 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:118 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Mauvaise valeur de %s : '%s'" + +#: object.c:229 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: parse-options.c:489 +#: parse-options.c:532 msgid "..." msgstr "..." -#: parse-options.c:507 +#: parse-options.c:550 #, 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:554 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:514 +#: parse-options.c:557 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:548 +#: parse-options.c:591 msgid "-NUM" msgstr "-NUM" -#: pathspec.c:83 +#: pathspec.c:133 +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:143 +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:177 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'" + +#: pathspec.c:183 +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'" + +#: pathspec.c:187 +#, 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:205 +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "Spécificateur magique '%c' non implémenté dans '%s'" + +#: pathspec.c:230 +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s : 'literal' et 'glob' sont incompatibles" + +#: pathspec.c:241 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "%s : '%s' est hors du dépôt" + +#: pathspec.c:291 #, 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 +#: pathspec.c:353 +#, c-format +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" + +#: pathspec.c:433 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "le chemin '%s' est au-delà d'un lien symbolique" + +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" +"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n" +"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?" + +#: progress.c:224 +msgid "done" +msgstr "fait" + +#: read-cache.c:1238 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"version d'index renseignée, mais la valeur est invalide.\n" +"Utilisation de la version %i" + +#: read-cache.c:1248 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" +"Utilisation de la version %i" + +#: remote.c:758 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Impossible de récupérer à la fois %s et %s pour %s" + +#: remote.c:762 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s suit habituellement %s, pas %s" + +#: remote.c:766 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s suit à la fois %s et %s" + +#: remote.c:774 +msgid "Internal error" +msgstr "Erreur interne" + +#: remote.c:1948 +#, 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:1952 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" + +#: remote.c:1955 #, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "'%s' est au delà d'un lien symbolique" +msgid "Your branch is up-to-date with '%s'.\n" +msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:1781 +#: remote.c:1959 #, 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:1787 +#: remote.c:1965 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:1790 +#: remote.c:1968 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour en avance rapide.\n" -msgstr[1] "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour en avance rapide.\n" +msgstr[0] "" +"Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour " +"en avance rapide.\n" +msgstr[1] "" +"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " +"en avance rapide.\n" -#: remote.c:1798 +#: remote.c:1976 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:1801 +#: remote.c:1979 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -927,23 +1123,35 @@ msgid "" msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" -msgstr[0] "Votre branche et '%s' ont divergé,\n" +msgstr[0] "" +"Votre branche et '%s' ont divergé,\n" "et ont %d et %d commit différent chacune respectivement.\n" -msgstr[1] "Votre branche et '%s' ont divergé,\n" +msgstr[1] "" +"Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:1811 +#: remote.c:1989 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" +msgstr "" +" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 -#: builtin/merge.c:1009 +#: run-command.c:80 +msgid "open /dev/null failed" +msgstr "échec de l'ouverture de /dev/null" + +#: run-command.c:82 +#, c-format +msgid "dup2(%d,%d) failed" +msgstr "échec de dup2(%d,%d)" + +#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899 +#: builtin/merge.c:1009 builtin/merge.c:1019 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 -#: builtin/merge.c:1001 builtin/merge.c:1014 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789 +#: builtin/merge.c:1011 builtin/merge.c:1024 #, c-format msgid "Could not write to '%s'" msgstr "Impossible d'écrire dans '%s'" @@ -952,7 +1160,8 @@ msgstr "Impossible d'écrire dans '%s'" msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" -msgstr "après résolution des conflits, marquez les chemins corrigés\n" +msgstr "" +"après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" #: sequencer.c:232 @@ -965,7 +1174,7 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:245 sequencer.c:859 sequencer.c:942 +#: sequencer.c:245 sequencer.c:879 sequencer.c:962 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" @@ -985,856 +1194,931 @@ 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:319 +#: sequencer.c:325 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:350 +#: sequencer.c:356 msgid "Could not resolve HEAD commit\n" msgstr "Impossible de résoudre le commit HEAD\n" -#: sequencer.c:371 +#: sequencer.c:378 msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:416 +#: sequencer.c:430 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" -#: sequencer.c:421 +#: sequencer.c:435 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" -#: sequencer.c:487 +#: sequencer.c:501 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." -#: sequencer.c:506 +#: sequencer.c:520 #, 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:514 +#: sequencer.c:528 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas le parent %d" -#: sequencer.c:518 +#: sequencer.c:532 #, c-format msgid "Mainline was specified but commit %s is not a merge." -msgstr "Une branche principale a été spécifiée mais le commit %s n'est pas une fusion." +msgstr "" +"Une branche principale a été spécifiée mais le commit %s n'est pas une " +"fusion." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:531 +#: sequencer.c:545 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:535 +#: sequencer.c:549 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" -#: sequencer.c:621 +#: sequencer.c:635 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:622 +#: sequencer.c:636 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:654 +#: sequencer.c:672 msgid "empty commit set passed" -msgstr "l'ensemble de commits spéficifié est vide" +msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:662 +#: sequencer.c:680 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:667 +#: sequencer.c:685 #, c-format msgid "git %s: failed to refresh the index" -msgstr "git %s : échec du raffraîchissement de l'index" +msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:725 +#: sequencer.c:743 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" -#: sequencer.c:747 +#: sequencer.c:765 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." -#: sequencer.c:752 +#: sequencer.c:770 msgid "No commits parsed." msgstr "Aucun commit analysé." -#: sequencer.c:765 +#: sequencer.c:783 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" -#: sequencer.c:769 +#: sequencer.c:787 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." -#: sequencer.c:776 +#: sequencer.c:794 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" -#: sequencer.c:804 +#: sequencer.c:824 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" -#: sequencer.c:807 +#: sequencer.c:827 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: sequencer.c:819 +#: sequencer.c:839 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" -#: sequencer.c:840 +#: sequencer.c:860 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:841 +#: sequencer.c:861 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:845 +#: sequencer.c:865 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" -#: sequencer.c:861 sequencer.c:946 +#: sequencer.c:881 sequencer.c:966 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:880 sequencer.c:1014 +#: sequencer.c:900 sequencer.c:1036 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:882 +#: sequencer.c:902 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:884 +#: sequencer.c:904 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:906 builtin/apply.c:4060 +#: sequencer.c:926 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" -#: sequencer.c:909 +#: sequencer.c:929 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:910 +#: sequencer.c:930 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:916 +#: sequencer.c:936 #, 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:939 +#: sequencer.c:959 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1083 +#: sequencer.c:1104 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1085 +#: sequencer.c:1107 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1119 +#: sequencer.c:1141 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1120 +#: sequencer.c:1142 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" -#: sha1_name.c:1036 +#: sha1_name.c:439 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git ne créé normalement jamais de référence qui se termine par 40 caractères " +"hexa\n" +"car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n" +"peuvent être créées par erreur. Par exemple,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa " +"est créée.\n" +"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce " +"message\n" +"en lançant \"git config advice.objectNameWarning false\"" + +#: sha1_name.c:1072 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: sha1_name.c:1039 +#: sha1_name.c:1075 #, c-format msgid "No such branch: '%s'" msgstr "Branche inconnue : '%s'" -#: sha1_name.c:1041 +#: sha1_name.c:1077 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Aucune branche amont configurée pour la branche '%s'" -#: sha1_name.c:1044 +#: sha1_name.c:1081 #, 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" + +#: 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 +#: 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:120 +msgid "staging updated .gitmodules failed" +msgstr "échec de la mise en index du .gitmodules mis à jour" + +#: submodule.c:1121 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:1132 +#, c-format +msgid "Could not set core.worktree in %s" +msgstr "Impossible de paramétrer core.worktree dans %s" + +#: unpack-trees.c:206 +msgid "Checking out files" +msgstr "Extraction des fichiers" + +#: 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:423 +#: wrapper.c:443 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:434 +#: 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" +msgstr "" +"impossible de rechercher l'utilisateur actuel dans le fichier de mots de " +"passe : %s" -#: wrapper.c:435 +#: wrapper.c:455 msgid "no such user" msgstr "utilisateur inconnu" -#: wt-status.c:140 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" -#: wt-status.c:167 wt-status.c:194 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)" -#: wt-status.c:169 wt-status.c:196 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)" -#: wt-status.c:173 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:175 wt-status.c:179 +#: wt-status.c:185 wt-status.c:189 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)" +msgstr "" +" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " +"résolu)" -#: wt-status.c:177 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:188 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:206 +#: wt-status.c:216 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" -#: wt-status.c:210 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" +msgstr "" +" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" -#: wt-status.c:212 +#: wt-status.c:222 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é)" +msgstr "" +" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " +"validé)" -#: wt-status.c:213 +#: wt-status.c:223 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)" +msgstr "" +" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " +"dans la copie de travail)" -#: wt-status.c:215 +#: wt-status.c:225 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)" +msgstr "" +" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" -#: wt-status.c:227 +#: wt-status.c:237 #, 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:244 -msgid "bug" -msgstr "bogue" +msgstr "" +" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" -#: wt-status.c:249 +#: wt-status.c:252 msgid "both deleted:" msgstr "supprimé des deux côtés :" -#: wt-status.c:250 +#: wt-status.c:254 msgid "added by us:" msgstr "ajouté par nous :" -#: wt-status.c:251 +#: wt-status.c:256 msgid "deleted by them:" msgstr "supprimé par eux :" -#: wt-status.c:252 +#: wt-status.c:258 msgid "added by them:" msgstr "ajouté par eux :" -#: wt-status.c:253 +#: wt-status.c:260 msgid "deleted by us:" msgstr "supprimé par nous :" -#: wt-status.c:254 +#: wt-status.c:262 msgid "both added:" msgstr "ajouté de deux côtés :" -#: wt-status.c:255 +#: wt-status.c:264 msgid "both modified:" msgstr "modifié des deux côtés :" -#: wt-status.c:285 -msgid "new commits, " -msgstr "nouveaux commits, " +#: wt-status.c:266 +#, c-format +msgid "bug: unhandled unmerged status %x" +msgstr "bogue : état de non-fusion non géré %x" -#: wt-status.c:287 -msgid "modified content, " -msgstr "contenu modifié, " +#: wt-status.c:274 +msgid "new file:" +msgstr "nouveau fichier :" -#: wt-status.c:289 -msgid "untracked content, " -msgstr "contenu non suivi, " +#: wt-status.c:276 +msgid "copied:" +msgstr "copié :" -#: wt-status.c:306 -#, c-format -msgid "new file: %s" -msgstr "nouveau : %s" +#: wt-status.c:278 +msgid "deleted:" +msgstr "supprimé :" -#: wt-status.c:309 -#, c-format -msgid "copied: %s -> %s" -msgstr "copié : %s -> %s" +#: wt-status.c:280 +msgid "modified:" +msgstr "modifié :" -#: wt-status.c:312 -#, c-format -msgid "deleted: %s" -msgstr "supprimé : %s" +#: wt-status.c:282 +msgid "renamed:" +msgstr "renommé :" -#: wt-status.c:315 -#, c-format -msgid "modified: %s" -msgstr "modifié : %s" +#: wt-status.c:284 +msgid "typechange:" +msgstr "modif. type :" -#: wt-status.c:318 -#, c-format -msgid "renamed: %s -> %s" -msgstr "renommé : %s -> %s" +#: wt-status.c:286 +msgid "unknown:" +msgstr "inconnu :" -#: wt-status.c:321 -#, c-format -msgid "typechange: %s" -msgstr "nv type : %s" +#: wt-status.c:288 +msgid "unmerged:" +msgstr "non fusionné :" -#: wt-status.c:324 -#, c-format -msgid "unknown: %s" -msgstr "inconnu : %s" +#: wt-status.c:370 +msgid "new commits, " +msgstr "nouveaux commits, " -#: wt-status.c:327 -#, c-format -msgid "unmerged: %s" -msgstr "non fus. : %s" +#: wt-status.c:372 +msgid "modified content, " +msgstr "contenu modifié, " + +#: wt-status.c:374 +msgid "untracked content, " +msgstr "contenu non suivi, " -#: wt-status.c:330 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" -#: wt-status.c:803 +#: wt-status.c:765 +msgid "Submodules changed but not updated:" +msgstr "Sous-modules modifiés mais non mis à jour :" + +#: wt-status.c:767 +msgid "Submodule changes to be committed:" +msgstr "Changements du sous-module à valider :" + +#: wt-status.c:846 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" +"Ne touchez pas à la ligne ci-dessus\n" +"Tout se qui suit sera éliminé." + +#: wt-status.c:937 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:806 wt-status.c:958 +#: wt-status.c:940 msgid " (fix conflicts and run \"git commit\")" -msgstr " (réglez les conflits et lancez \"git commit\")" +msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:809 +#: wt-status.c:943 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:946 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:822 +#: wt-status.c:956 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:959 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:829 -msgid " (fix conflicts and then run \"git am --resolved\")" -msgstr " (réglez les conflits puis lancez \"git am --resolved\")" +#: wt-status.c:963 +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:965 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:967 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:1027 wt-status.c:1044 #, 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:1032 wt-status.c:1049 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:901 +#: wt-status.c:1035 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " (résolvez les conflits puis lancez \"git rebase --continue\")" +msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:903 +#: wt-status.c:1037 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:1039 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:1052 msgid " (all conflicts fixed: run \"git rebase --continue\")" -msgstr " (tous les conflits sont résolus : lancez \"git rebase --continue\")" +msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:922 +#: wt-status.c:1056 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "Vous êtes actuellement en train de fractionner un commit pendant un rebasage de la branche '%s' sur '%s'." +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:1061 msgid "You are currently splitting a commit during a rebase." -msgstr "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." +msgstr "" +"Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:930 +#: wt-status.c:1064 msgid " (Once your working directory is clean, run \"git rebase --continue\")" -msgstr " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" +msgstr "" +" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:934 +#: wt-status.c:1068 #, 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'." +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:1073 msgid "You are currently editing a commit during a rebase." -msgstr "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." +msgstr "" +"Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:942 +#: wt-status.c:1076 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:1078 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos modifications)" +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:1088 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:961 -msgid " (all conflicts fixed: run \"git commit\")" -msgstr " (tous les conflits sont résolus : lancez \"git commit\")" +#: wt-status.c:1093 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:970 +#: wt-status.c:1096 +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:1098 +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:1107 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:975 +#: wt-status.c:1112 msgid " (fix conflicts and run \"git revert --continue\")" -msgstr " (résolvez les conflits et lancez \"git revert --continue\")" +msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:978 +#: wt-status.c:1115 msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " (tous les conflits sont résolus : lancez \"git revert --continue\")" +msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:980 +#: wt-status.c:1117 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:991 +#: wt-status.c:1128 #, 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:995 +#: wt-status.c:1132 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:998 +#: wt-status.c:1135 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:1310 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1184 +#: wt-status.c:1317 +msgid "rebase in progress; onto " +msgstr "rebasage en cours ; sur " + +#: wt-status.c:1324 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1186 +#: wt-status.c:1326 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1189 +#: wt-status.c:1329 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1206 +#: wt-status.c:1346 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1220 +#: wt-status.c:1360 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1222 +#: wt-status.c:1362 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1226 +#: wt-status.c:1366 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" "may speed it up, but you have to be careful not to forget to add\n" "new files yourself (see 'git help status')." -msgstr "L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n" -"peut l'accélerer, mais vous devez alors faire attention à ne pas\n" -"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help status')." +msgstr "" +"L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n" +"peut l'accélérer, mais vous devez alors faire attention à ne pas\n" +"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " +"status')." -#: wt-status.c:1232 +#: wt-status.c:1372 #, c-format msgid "Untracked files not listed%s" -msgstr "Fichiers non suivis non listés%s" +msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1234 +#: wt-status.c:1374 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1240 +#: wt-status.c:1380 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1245 +#: wt-status.c:1385 #, 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" +msgstr "" +"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " +"\"git commit -a\")\n" -#: wt-status.c:1248 +#: wt-status.c:1388 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1251 +#: wt-status.c:1391 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" -msgstr "aucune modification ajoutée à la validation mais des fichiers non suivis sont présents (utilisez \"git add\" pour les suivre)\n" +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:1254 +#: wt-status.c:1394 #, 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" +msgstr "" +"aucune modification ajoutée à la validation mais des fichiers non suivis " +"sont présents\n" -#: wt-status.c:1257 +#: wt-status.c:1397 #, 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" +msgstr "" +"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " +"suivre)\n" -#: wt-status.c:1260 wt-status.c:1265 +#: wt-status.c:1400 wt-status.c:1405 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1263 +#: wt-status.c:1403 #, 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:1267 +#: wt-status.c:1407 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1375 +#: wt-status.c:1516 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1381 +#: wt-status.c:1522 msgid "Initial commit on " msgstr "Validation initiale sur " -#: wt-status.c:1396 +# à priori on parle d'une branche ici +#: wt-status.c:1554 +msgid "gone" +msgstr "disparue" + +#: wt-status.c:1556 wt-status.c:1564 msgid "behind " msgstr "derrière " -#: wt-status.c:1399 wt-status.c:1402 -msgid "ahead " -msgstr "devant " - -#: wt-status.c:1404 -msgid ", behind " -msgstr ", derrière " - -#: compat/precompose_utf8.c:58 builtin/clone.c:352 +#: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" -msgstr "echec lors de l'unlink de '%s'" +msgstr "échec lors de l'unlink de '%s'" -#: builtin/add.c:20 +#: builtin/add.c:21 msgid "git add [options] [--] <pathspec>..." msgstr "git add [options] [--] <chemin>..." -#. -#. * To be consistent with "git add -p" and most Git -#. * commands, we should default to being tree-wide, but -#. * this is not the original behavior and can't be -#. * changed until users trained themselves not to type -#. * "git add -u" or "git add -A". For now, we warn and -#. * keep the old behavior. Later, the behavior can be changed -#. * to tree-wide, keeping the warning for a while, and -#. * eventually we can drop the warning. -#. -#: builtin/add.c:58 -#, c-format -msgid "" -"The behavior of 'git add %s (or %s)' with no path argument from a\n" -"subdirectory of the tree will change in Git 2.0 and should not be used " -"anymore.\n" -"To add content for the whole tree, run:\n" -"\n" -" git add %s :/\n" -" (or git add %s :/)\n" -"\n" -"To restrict the command to the current directory, run:\n" -"\n" -" git add %s .\n" -" (or git add %s .)\n" -"\n" -"With the current Git version, the command is restricted to the current " -"directory.\n" -msgstr "" -"Le comportement de 'git add %s (ou %s)' sans argument de chemin depuis un\n" -"sous-répertoire du projet va changer dans Git 2.0 et ne doit plus être utilisé.\n" -"Pour ajouter le contenu de toute l'arborescence, lancez :\n" -"\n" -" git add %s :/\n" -" (ou git add %s :/)\n" -"\n" -"Pour restreindre la commande au répertoire courant, lancez :\n" -"\n" -" git add %s .\n" -" (ou git add %s .)\n" -"\n" -"Avec la version actuelle de Git, la commande est restreinte au répertoire courant.\n" - -#: builtin/add.c:100 -#, c-format -msgid "" -"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" -"whose behaviour will change in Git 2.0 with respect to paths you removed.\n" -"Paths like '%s' that are\n" -"removed from your working tree are ignored with this version of Git.\n" -"\n" -"* 'git add --ignore-removal <pathspec>', which is the current default,\n" -" ignores paths you removed from your working tree.\n" -"\n" -"* 'git add --all <pathspec>' will let you also record the removals.\n" -"\n" -"Run 'git status' to check the paths you removed from your working tree.\n" -msgstr "" -"Vous avez lancé 'git add' sans '-A (--all)' ni '--ignore-removal',\n" -"dont le comportement va changer dans Git 2.0 avec le respect des chemins que vous supprimez.\n" -"Les chemins tels que '%s' qui ont été\n" -"retirés de votre copie de travail sont ignorés avec cette version de Git.\n" -"\n" -"* 'git add --ignore-removal <chemin>', qui est l'option par défaut actuelle,\n" -" ignore les chemins que vous avez supprimés de votre copie de travail.\n" -"\n" -"* 'git add --all <chemin>' permet d'enregistrer aussi les suppressions.\n" -"\n" -"Lancez 'git status' pour vérifier les chemins que vous avez supprimés de votre copie de travail.\n" - -#: builtin/add.c:144 +#: builtin/add.c:64 #, c-format msgid "unexpected diff status %c" msgstr "status de diff inattendu %c" -#: builtin/add.c:149 builtin/commit.c:233 +#: builtin/add.c:69 builtin/commit.c:261 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" -#: builtin/add.c:163 +#: builtin/add.c:79 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:253 +#: builtin/add.c:133 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:572 builtin/rm.c:275 -#, 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:193 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:349 +#: builtin/add.c:204 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." -#: builtin/add.c:353 +#: builtin/add.c:208 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:358 +#: builtin/add.c:213 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:360 +#: builtin/add.c:215 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:366 +#: builtin/add.c:221 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:376 +#: builtin/add.c:231 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" +msgstr "" +"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 -#: builtin/rm.c:206 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344 +#: builtin/rm.c:269 msgid "dry run" -msgstr "à vide" +msgstr "simuler l'action" -#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 -#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 -#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19 +#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "mode verbeux" -#: builtin/add.c:396 +#: builtin/add.c:251 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:398 +#: builtin/add.c:253 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:399 +#: builtin/add.c:254 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:400 +#: builtin/add.c:255 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:401 +#: builtin/add.c:256 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:402 +#: builtin/add.c:257 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:405 +#: builtin/add.c:260 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)" +msgstr "" +"ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:407 +#: builtin/add.c:262 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:408 +#: builtin/add.c:263 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" +msgstr "" +"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " +"d'erreurs" -#: builtin/add.c:409 +#: builtin/add.c:264 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:431 +#: builtin/add.c:286 #, 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:432 +#: builtin/add.c:287 msgid "no files added" msgstr "aucun fichier ajouté" -#: builtin/add.c:438 +#: builtin/add.c:293 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:477 +#: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:495 +#: builtin/add.c:337 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" +msgstr "" +"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" -#: builtin/add.c:525 +#: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:526 +#: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 -#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" @@ -1850,7 +2134,7 @@ msgstr "option d'espace non reconnue '%s'" #: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" -msgstr "option d'ignorance d'espce non reconnue '%s'" +msgstr "option d'ignorance d'espace non reconnue '%s'" #: builtin/apply.c:823 #, c-format @@ -1870,27 +2154,34 @@ msgstr "nom de fichier du patch introuvable à la ligne %d" #: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la ligne %d" +msgstr "" +"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " +"ligne %d" #: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant à la ligne %d" +msgstr "" +"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " +"à la ligne %d" #: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant à la ligne %d" +msgstr "" +"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " +"à la ligne %d" #: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" +msgstr "" +"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" #: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" -msgstr "recount : ligne inattendue : %.*s" +msgstr "recomptage : ligne inattendue : %.*s" #: builtin/apply.c:1479 #, c-format @@ -1905,8 +2196,12 @@ msgid "" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" -msgstr[0] "information de nom de fichier manquante dans l'en-tête de git diff lors de la suppression de %d composant de préfixe de chemin (ligne %d)" -msgstr[1] "information de nom de fichier manquante dans l'en-tête de git diff lors de la suppression de %d composants de préfixe de chemin (ligne %d)" +msgstr[0] "" +"information de nom de fichier manquante dans l'en-tête de git diff lors de " +"la suppression de %d composant de préfixe de chemin (ligne %d)" +msgstr[1] "" +"information de nom de fichier manquante dans l'en-tête de git diff lors de " +"la suppression de %d composants de préfixe de chemin (ligne %d)" #: builtin/apply.c:1656 msgid "new file depends on old contents" @@ -1941,7 +2236,6 @@ msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#. there has to be one hunk (forward hunk) #: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" @@ -1984,7 +2278,8 @@ msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" msgid "" "while searching for:\n" "%.*s" -msgstr "pendant la recherche de :\n" +msgstr "" +"pendant la recherche de :\n" "%.*s" #: builtin/apply.c:2843 @@ -2000,7 +2295,9 @@ msgstr "le patch binaire ne s'applique par correctement à '%s'" #: builtin/apply.c:2952 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s trouvé)" +msgstr "" +"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " +"trouvé)" #: builtin/apply.c:2973 #, c-format @@ -2012,293 +2309,301 @@ msgstr "le patch a échoué : %s:%ld" msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 #, c-format msgid "read of %s failed" -msgstr "echec de la lecture de %s" +msgstr "échec de la lecture de %s" -#: builtin/apply.c:3173 builtin/apply.c:3395 +#: builtin/apply.c:3174 builtin/apply.c:3396 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: builtin/apply.c:3254 builtin/apply.c:3409 +#: builtin/apply.c:3255 builtin/apply.c:3410 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3263 builtin/apply.c:3417 +#: builtin/apply.c:3264 builtin/apply.c:3418 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: builtin/apply.c:3365 +#: builtin/apply.c:3366 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3434 +#: builtin/apply.c:3435 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: builtin/apply.c:3436 +#: builtin/apply.c:3437 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3537 +#: builtin/apply.c:3538 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: builtin/apply.c:3540 +#: builtin/apply.c:3541 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: builtin/apply.c:3560 +#: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: builtin/apply.c:3565 +#: builtin/apply.c:3566 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" +msgstr "" +"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: builtin/apply.c:3573 +#: builtin/apply.c:3574 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3586 +#: builtin/apply.c:3587 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 #, c-format msgid "make_cache_entry failed for path '%s'" -msgstr "echec de make_cache_entry pour le chemin '%s'" +msgstr "échec de make_cache_entry pour le chemin '%s'" -#: builtin/apply.c:3822 +#: builtin/apply.c:3823 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:3850 +#: builtin/apply.c:3851 #, c-format -msgid "corrupt patch for subproject %s" -msgstr "patch corrompu pour le sous-projet %s" +msgid "corrupt patch for submodule %s" +msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:3854 +#: builtin/apply.c:3855 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:3859 +#: builtin/apply.c:3860 #, c-format msgid "unable to create backing store for newly created file %s" -msgstr "création du magasin de stockage pour le fichier nouvellement créé %s impossible" +msgstr "" +"création du magasin de stockage pour le fichier nouvellement créé %s " +"impossible" -#: builtin/apply.c:3862 builtin/apply.c:3970 +#: builtin/apply.c:3863 builtin/apply.c:3971 #, c-format msgid "unable to add cache entry for %s" -msgstr "ajout de l'entrée de cache %s impossible" +msgstr "ajout de l'élément de cache %s impossible" -#: builtin/apply.c:3895 +#: builtin/apply.c:3896 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:3944 +#: builtin/apply.c:3945 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4031 +#: builtin/apply.c:4032 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: builtin/apply.c:4039 +#: builtin/apply.c:4040 msgid "internal error" msgstr "erreur interne" -#. Say this even without --verbose -#: builtin/apply.c:4042 +#: builtin/apply.c:4043 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: builtin/apply.c:4052 +#: builtin/apply.c:4053 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4073 +#: builtin/apply.c:4074 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: builtin/apply.c:4076 +#: builtin/apply.c:4077 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: builtin/apply.c:4226 +#: builtin/apply.c:4227 msgid "unrecognized input" msgstr "entrée non reconnue" -#: builtin/apply.c:4237 +#: builtin/apply.c:4238 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 -#: builtin/fetch.c:63 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 +#: builtin/fetch.c:78 msgid "path" msgstr "chemin" -#: builtin/apply.c:4357 +#: builtin/apply.c:4358 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4360 +#: builtin/apply.c:4361 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4362 +#: builtin/apply.c:4363 msgid "num" msgstr "num" -#: builtin/apply.c:4363 +#: builtin/apply.c:4364 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4366 +#: builtin/apply.c:4367 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: builtin/apply.c:4368 +#: builtin/apply.c:4369 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: builtin/apply.c:4372 +#: builtin/apply.c:4373 msgid "show number of added and deleted lines in decimal notation" -msgstr "afficher le nombre de lignes ajoutées et supprimées en notation décimale" +msgstr "" +"afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: builtin/apply.c:4374 +#: builtin/apply.c:4375 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" -#: builtin/apply.c:4376 +#: builtin/apply.c:4377 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: builtin/apply.c:4378 +#: builtin/apply.c:4379 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: builtin/apply.c:4380 +#: builtin/apply.c:4381 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: builtin/apply.c:4382 +#: builtin/apply.c:4383 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4384 +#: builtin/apply.c:4385 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: builtin/apply.c:4386 +#: builtin/apply.c:4387 msgid "build a temporary index based on embedded index information" -msgstr "construire un index temporaire fondé sur l'information de l'index embarqué" +msgstr "" +"construire un index temporaire fondé sur l'information de l'index embarqué" -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: builtin/apply.c:4391 +#: builtin/apply.c:4392 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: builtin/apply.c:4392 +#: builtin/apply.c:4393 msgid "action" msgstr "action" -#: builtin/apply.c:4393 +#: builtin/apply.c:4394 msgid "detect new or modified lines that have whitespace errors" -msgstr "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs d'espace" +msgstr "" +"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " +"d'espace" -#: builtin/apply.c:4396 builtin/apply.c:4399 +#: builtin/apply.c:4397 builtin/apply.c:4400 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4402 +#: builtin/apply.c:4403 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4404 +#: builtin/apply.c:4405 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: builtin/apply.c:4406 +#: builtin/apply.c:4407 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: builtin/apply.c:4408 +#: builtin/apply.c:4409 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4411 +#: builtin/apply.c:4412 msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "tolérer des erreurs de détection de retours chariot manquants en fin de fichier" +msgstr "" +"tolérer des erreurs de détection de retours chariot manquants en fin de " +"fichier" -#: builtin/apply.c:4414 +#: builtin/apply.c:4415 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: builtin/apply.c:4416 +#: builtin/apply.c:4417 msgid "root" msgstr "racine" -#: builtin/apply.c:4417 +#: builtin/apply.c:4418 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: builtin/apply.c:4439 +#: builtin/apply.c:4440 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: builtin/apply.c:4447 +#: builtin/apply.c:4448 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: builtin/apply.c:4450 +#: builtin/apply.c:4451 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: builtin/apply.c:4466 +#: builtin/apply.c:4467 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4480 +#: builtin/apply.c:4481 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: builtin/apply.c:4486 builtin/apply.c:4496 +#: builtin/apply.c:4487 builtin/apply.c:4497 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2352,105 +2657,111 @@ 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:25 +#: 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:30 +#: 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:2355 +#: builtin/blame.c:2242 msgid "Show blame entries as we find them, incrementally" -msgstr "Montrer les entrée de blâme au fur et à mesure de leur découverte, de manière incrémentale" +msgstr "" +"Montrer les éléments de blâme au fur et à mesure de leur découverte, de " +"manière incrémentale" -#: builtin/blame.c:2356 +#: builtin/blame.c:2243 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:2357 +#: builtin/blame.c:2244 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" +msgstr "" +"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:2358 +#: builtin/blame.c:2245 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2359 +#: builtin/blame.c:2246 msgid "Show output score for blame entries" -msgstr "Montrer le score de sortie pour les entrées de blâme" +msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2360 +#: builtin/blame.c:2247 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2361 +#: builtin/blame.c:2248 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2362 +#: builtin/blame.c:2249 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2363 +#: builtin/blame.c:2250 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2364 +#: builtin/blame.c:2251 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:2365 +#: builtin/blame.c:2252 msgid "Show raw timestamp (Default: off)" -msgstr "Afficher les horodatages bruts (Défaut: désactivé)" +msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2366 +#: builtin/blame.c:2253 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2367 +#: builtin/blame.c:2254 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:2368 +#: builtin/blame.c:2255 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:2369 +#: builtin/blame.c:2256 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2370 +#: builtin/blame.c:2257 msgid "Spend extra cycles to find better match" -msgstr "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" +msgstr "" +"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2371 +#: builtin/blame.c:2258 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" +msgstr "" +"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:2372 +#: builtin/blame.c:2259 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2373 builtin/blame.c:2374 +#: builtin/blame.c:2260 builtin/blame.c:2261 msgid "score" msgstr "score" -#: builtin/blame.c:2373 +#: builtin/blame.c:2260 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2374 +#: builtin/blame.c:2261 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2375 +#: builtin/blame.c:2262 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2375 +#: builtin/blame.c:2262 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" +msgstr "" +"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" #: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" @@ -2458,7 +2769,7 @@ msgstr "git branch [options] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "git branch [options] [-l] [-f] <nomdebranch> [<point-de-départ>]" +msgstr "git branch [options] [-l] [-f] <nomdebranche> [<point-de-départ>]" #: builtin/branch.c:26 msgid "git branch [options] [-r] (-d | -D) <branchname>..." @@ -2502,7 +2813,7 @@ msgstr "" #: builtin/branch.c:185 msgid "Update of config-file failed" -msgstr "Échec de la mise à jour du fichier de config" +msgstr "Échec de la mise à jour du fichier de configuration" #: builtin/branch.c:213 msgid "cannot use -a with -d" @@ -2552,300 +2863,322 @@ 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" -#: builtin/branch.c:453 +# féminin pour une branche +#: builtin/branch.c:454 +#, c-format +msgid "[%s: gone]" +msgstr "[%s: disparue]" + +#: builtin/branch.c:459 +#, c-format +msgid "[%s]" +msgstr "[%s]" + +#: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" -#: builtin/branch.c:455 +#: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" -#: builtin/branch.c:459 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" -#: builtin/branch.c:461 +#: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" -#: builtin/branch.c:464 +#: builtin/branch.c:475 #, 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:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" -#: builtin/branch.c:490 +#: builtin/branch.c:502 msgid " **** invalid ref ****" msgstr " **** référence invalide ****" -#: builtin/branch.c:582 +#: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: builtin/branch.c:585 +#: builtin/branch.c:597 #, 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:600 #, c-format msgid "(detached from %s)" msgstr "(détaché de %s)" -#: builtin/branch.c:591 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:637 +#: builtin/branch.c:649 #, 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:681 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:694 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:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:707 +#: builtin/branch.c:719 msgid "Branch rename failed" -msgstr "Echec de renommage de la branche" +msgstr "Échec de renommage de la branche" -#: builtin/branch.c:711 +#: builtin/branch.c:723 #, 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:727 #, 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:734 msgid "Branch is renamed, but update of config-file failed" -msgstr "La branche est renommée, mais la mise à jour du fichier de config a échoué" +msgstr "" +"La branche est renommée, mais la mise à jour du fichier de configuration a " +"échoué" -#: builtin/branch.c:737 +#: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: builtin/branch.c:761 +#: builtin/branch.c:773 #, 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:803 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:793 +#: builtin/branch.c:805 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:806 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:795 +#: builtin/branch.c:807 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:809 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:801 +#: builtin/branch.c:813 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:802 +#: builtin/branch.c:814 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:1368 builtin/commit.c:1369 -#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495 +#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527 +#: builtin/tag.c:533 msgid "commit" -msgstr "valider" +msgstr "commit" -#: builtin/branch.c:806 builtin/branch.c:812 +#: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:818 +#: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:819 +#: builtin/branch.c:831 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:833 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:822 +#: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:823 +#: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:824 +#: builtin/branch.c:836 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:837 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:826 +#: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:828 +#: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:829 +#: builtin/branch.c:841 msgid "force creation (when already exists)" msgstr "forcer la création (même si la cible existe)" -#: builtin/branch.c:832 +#: builtin/branch.c:844 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" -#: builtin/branch.c:838 +#: builtin/branch.c:850 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" -#: builtin/branch.c:842 +#: builtin/branch.c:854 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:855 +#: builtin/branch.c:867 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:619 +#: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:883 +#: builtin/branch.c:896 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:889 builtin/branch.c:928 +#: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:904 +#: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:909 +#: builtin/branch.c:922 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:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:919 +#: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:934 +#: builtin/branch.c:947 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:952 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:956 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur aucune branche." +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:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:950 +#: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:962 +#: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:966 +#: builtin/branch.c:979 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." +msgstr "" +"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " +"aucune branche." -#: builtin/branch.c:972 +#: builtin/branch.c:985 #, 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:999 msgid "it does not make sense to create 'HEAD' manually" -msgstr "créer manuellement 'HEAD' n'a aucun sens" +msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:993 +#: builtin/branch.c:1005 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" +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:1008 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" -msgstr "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --track ou --set-upstream-to\n" +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:1025 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\n" -msgstr "\n" +msgstr "" +"\n" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1014 +#: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1015 +#: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" -msgstr " git branch -set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" #: builtin/bundle.c:47 #, c-format @@ -2860,43 +3193,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:176 +#: builtin/cat-file.c:331 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:177 +#: builtin/cat-file.c:332 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <liste_d_objets>" -#: builtin/cat-file.c:195 +#: builtin/cat-file.c:369 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:196 +#: builtin/cat-file.c:370 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:197 +#: builtin/cat-file.c:371 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:199 +#: builtin/cat-file.c:373 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:200 +#: builtin/cat-file.c:374 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:202 +#: builtin/cat-file.c:376 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:204 +#: builtin/cat-file.c:378 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" +msgstr "" +"afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:207 +#: builtin/cat-file.c:381 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" @@ -2906,7 +3240,8 @@ msgstr "git check-attr [-a | --all | attr...] [--] chemin..." #: builtin/check-attr.c:12 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" -msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <liste-de-chemins>" +msgstr "" +"git check-attr --stdin [-z] [-a | --all | attr...] < <liste-de-chemins>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -2918,36 +3253,66 @@ msgstr "utiliser .gitattributes seulement depuis l'index" #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" -msgstr "lire les noms de fichier depuis 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:1044 builtin/gc.c:177 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" -#: builtin/check-ignore.c:146 +#: builtin/check-ignore.c:26 +msgid "show non-matching input paths" +msgstr "afficher les chemins en entrée qui ne correspondent pas" + +#: 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:149 +#: 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:151 +#: builtin/check-ignore.c:159 msgid "no path specified" msgstr "aucun chemin spécifié" -#: builtin/check-ignore.c:155 +#: 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:157 +#: builtin/check-ignore.c:165 msgid "cannot have both --quiet and --verbose" msgstr "impossible d'avoir --quiet et --verbose" +#: builtin/check-ignore.c:168 +msgid "--non-matching is only valid with --verbose" +msgstr "--non-matching n'est valide qu'avec --verbose" + +#: builtin/check-mailmap.c:8 +msgid "git check-mailmap [options] <contact>..." +msgstr "git check-mailmap [options] <contact>..." + +#: builtin/check-mailmap.c:13 +msgid "also read contacts from stdin" +msgstr "lire aussi les contacts depuis l'entrée standard" + +#: builtin/check-mailmap.c:24 +#, c-format +msgid "unable to parse contact: %s" +msgstr "impossible d'analyser le contact : %s" + +#: builtin/check-mailmap.c:47 +msgid "no contacts specified" +msgstr "aucun contact spécifié" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "git checkout-index [options] [--] [<fichier>...]" @@ -2962,7 +3327,9 @@ msgstr "forcer l'écrasement des fichiers existants" #: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" -msgstr "pas d'avertissement pour les fichiers existants et les fichiers absents de l'index" +msgstr "" +"pas d'avertissement pour les fichiers existants et les fichiers absents de " +"l'index" #: builtin/checkout-index.c:192 msgid "don't checkout new files" @@ -3000,106 +3367,107 @@ 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." +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:450 msgid "corrupt index file" msgstr "fichier d'index corrompu" -#: builtin/checkout.c:329 builtin/checkout.c:336 +#: builtin/checkout.c:321 builtin/checkout.c:328 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:480 +#: builtin/checkout.c:472 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:593 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Impossible de faire un reflog pour '%s'\n" -#: builtin/checkout.c:634 +#: builtin/checkout.c:631 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:641 +#: builtin/checkout.c:638 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:644 +#: builtin/checkout.c:641 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:648 +#: builtin/checkout.c:645 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:650 builtin/checkout.c:987 +#: builtin/checkout.c:647 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:652 +#: builtin/checkout.c:649 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:708 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#. The singular version -#: builtin/checkout.c:714 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3122,7 +3490,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3131,156 +3499,161 @@ msgid "" " git branch new_branch_name %s\n" "\n" msgstr "" -"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n" +"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon " +"moment\n" "de le faire avec :\n" "\n" -"git branche nouvelle_branche %s\n" +"git branch nouvelle_branche %s\n" "\n" -#: builtin/checkout.c:762 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:766 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était" -#: builtin/checkout.c:793 builtin/checkout.c:982 +#: builtin/checkout.c:790 builtin/checkout.c:1027 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:918 +#: builtin/checkout.c:934 +#, c-format +msgid "only one reference expected, %d given." +msgstr "une seule référence attendue, %d fournies." + +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#. case (1): want a tree -#: builtin/checkout.c:957 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:999 builtin/checkout.c:1003 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, 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:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1068 #, 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:1045 builtin/checkout.c:1047 builtin/clone.c:90 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1046 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1049 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" -msgstr "créer un refog pour une nouvelle branche" +msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1050 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "détacher la HEAD à la validation nommée" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "paramétrer l'information de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1053 -msgid "new branch" +#: builtin/checkout.c:1098 +msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1054 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1104 msgid "perform a 3-way merge with the new branch" -msgstr "réaliser une fusion à 3 points avec la nouvelle branche" +msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1060 builtin/merge.c:217 +#: builtin/checkout.c:1105 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245 msgid "style" msgstr "style" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "style de conflit (fusion ou diff3)" -#: builtin/checkout.c:1065 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" -msgstr "ne pas limiter les spécificateurs de chemins aux seules entrées creuses" +msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" -#: builtin/checkout.c:1067 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "deuxième chance 'git checkout branche-inexistante'" -#: builtin/checkout.c:1091 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1159 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1196 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1203 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"Impossible de mettre à jour les chemins et de basculer sur la branche '%s' en même temps.\n" +"Impossible de mettre à jour les chemins et de basculer sur la branche '%s' " +"en même temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1208 #, 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:1166 +#: builtin/checkout.c:1212 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3288,305 +3661,443 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/clean.c:20 -msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "git clean [-d] [-f] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." +#: 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:24 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" -#: builtin/clean.c:25 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" -#: builtin/clean.c:26 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "Ignore le dépôt %s\n" -#: builtin/clean.c:27 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dépôt %s\n" -#: builtin/clean.c:28 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:160 +#: builtin/clean.c:295 +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing" +msgstr "" +"Aide en ligne :\n" +"1 - sélectionner un élément numéroté\n" +"foo - sélectionner un élément par un préfixe unique\n" +" - (vide) ne rien sélectionner" + +#: builtin/clean.c:299 +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting" +msgstr "" +"Aide en ligne :\n" +"1 - sélectionner un seul élément\n" +"3-5 - sélectionner une plage d'éléments\n" +"2-3,6-9 - sélectionner plusieurs plages\n" +"foo - sélectionner un élément par un préfixe unique\n" +"-... - désélectionner les éléments spécifiés\n" +"* - choisir tous les éléments\n" +" - (vide) terminer la sélection" + +#: builtin/clean.c:517 +#, c-format +msgid "Huh (%s)?" +msgstr "Hein (%s) ?" + +#: builtin/clean.c:660 +#, c-format +msgid "Input ignore patterns>> " +msgstr "Entrez les motifs à ignorer>> " + +#: builtin/clean.c:697 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" + +#: builtin/clean.c:718 +msgid "Select items to delete" +msgstr "Sélectionner les éléments à supprimer" + +#: builtin/clean.c:758 +#, c-format +msgid "remove %s? " +msgstr "supprimer %s ? " + +#: builtin/clean.c:783 +msgid "Bye." +msgstr "Au revoir." + +#: builtin/clean.c:791 +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "" +"clean - démarrer le nettoyage\n" +"filter by pattern - exclure des éléments par motif\n" +"select by numbers - sélectionner les éléments à supprimer par numéros\n" +"ask each - confirmer chaque suppression (comme \"rm -i\")\n" +"quit - arrêter le nettoyage\n" +"help - cet écran\n" +"? - aide pour la sélection en ligne" + +#: builtin/clean.c:818 +msgid "*** Commands ***" +msgstr "*** Commandes ***" + +#: builtin/clean.c:819 +msgid "What now" +msgstr "Et maintenant ?" + +#: builtin/clean.c:827 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "Supprimerait l'élément suivant :" +msgstr[1] "Supprimerait les éléments suivants :" + +#: builtin/clean.c:844 +msgid "No more files to clean, exiting." +msgstr "Plus de fichier à nettoyer, sortie." + +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:162 +#: builtin/clean.c:877 msgid "force" msgstr "forcer" -#: builtin/clean.c:164 +#: builtin/clean.c:878 +msgid "interactive cleaning" +msgstr "nettoyage interactif" + +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 -#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716 +#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "motif" -#: builtin/clean.c:166 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:167 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:169 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:187 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:191 +#: builtin/clean.c:907 msgid "" -"clean.requireForce set to true and neither -n nor -f given; refusing to clean" -msgstr "clean.requireForce positionné à true et ni -n ni -f fourni ; refus de nettoyer" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" +msgstr "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de nettoyer" -#: builtin/clean.c:194 +#: builtin/clean.c:910 msgid "" -"clean.requireForce defaults to true and neither -n nor -f given; refusing to " -"clean" -msgstr "clean.requireForce à true par défaut et ni -n ni -f fourni ; refus de nettoyer" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" +msgstr "" +"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " +"nettoyer" -#: builtin/clone.c:37 +#: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [options] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 -#: builtin/push.c:436 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:504 msgid "force progress reporting" msgstr "forcer l'état d'avancement" -#: builtin/clone.c:67 +#: builtin/clone.c:66 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:73 +#: 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:75 +#: builtin/clone.c:73 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:77 +#: 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:79 +#: builtin/clone.c:77 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:81 builtin/clone.c:83 +#: 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:84 builtin/init-db.c:485 +#: builtin/clone.c:82 builtin/init-db.c:483 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:85 builtin/init-db.c:486 +#: builtin/clone.c:83 builtin/init-db.c:484 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:87 +#: builtin/clone.c:85 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:88 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:89 +#: 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:91 +#: 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:93 +#: 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:94 builtin/fetch.c:83 builtin/grep.c:662 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:95 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:97 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:98 builtin/init-db.c:494 +#: builtin/clone.c:96 builtin/init-db.c:492 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:99 builtin/init-db.c:495 +#: builtin/clone.c:97 builtin/init-db.c:493 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:100 +#: builtin/clone.c:98 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:101 +#: 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:254 +#: 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:317 +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "le dépôt de référence '%s' est superficiel" + +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "le dépôt de référence '%s' est greffé" + +#: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/clone.c:319 builtin/diff.c:77 +#: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: builtin/clone.c:321 +#: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:335 +#: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:357 +#: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:361 +#: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:384 +#: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:397 +#: builtin/clone.c:401 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" -msgstr "Le clone a réussi, mais l'extraction a échoué.\n" +msgstr "" +"Le clone a réussi, mais l'extraction a échoué.\n" "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:476 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:550 +#: builtin/clone.c:560 +#, c-format +msgid "Checking connectivity... " +msgstr "Vérification de la connectivité... " + +#: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:610 +#: builtin/clone.c:626 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" +msgstr "" +"la HEAD distante réfère à une référence non existante, impossible de " +"l'extraire.\n" -#: builtin/clone.c:641 +#: builtin/clone.c:657 msgid "unable to checkout working tree" -msgstr "inpossible d'extraire la copie de travail" +msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:749 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:753 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:764 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:767 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:780 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:785 +#: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." +msgstr "" +"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." + +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "le dépôt source est superficiel, option --local ignorée" + +#: builtin/clone.c:810 +msgid "--local is ignored" +msgstr "--local est ignoré" -#: builtin/clone.c:795 +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "la profondeur %s n'est pas un entier positif" + +#: builtin/clone.c:824 #, 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." +msgstr "" +"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:805 +#: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:818 builtin/clone.c:830 +#: builtin/clone.c:847 builtin/clone.c:859 #, 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:821 +#: builtin/clone.c:850 #, 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:840 +#: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:842 +#: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:877 +#: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:926 +#: builtin/clone.c:957 builtin/clone.c:965 #, 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:933 +#: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -3622,15 +4133,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:34 +#: builtin/commit.c:36 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [options] [--] <spécification-de-chemin>..." -#: builtin/commit.c:39 +#: builtin/commit.c:41 msgid "git status [options] [--] <pathspec>..." msgstr "git status [options] [--] <spécification-de-chemin>..." -#: builtin/commit.c:44 +#: 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" @@ -3643,8 +4154,10 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Votre nom et votre adresse e-mail ont été configurés automatiquement en se fondant\n" -"sur votre nom d'utilisateur et votre nom d'ordinateur. Veuillez vérifier qu'ils sont corrects.\n" +"Votre nom et votre adresse e-mail ont été configurés automatiquement en se " +"fondant\n" +"sur votre nom d'utilisateur et votre nom d'ordinateur. Veuillez vérifier " +"qu'ils sont corrects.\n" "Vous pouvez supprimer ce message en les paramétrant explicitement :\n" "\n" " git config --global user.name \"Votre Nom\"\n" @@ -3654,118 +4167,139 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:56 +#: 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" "remove the commit entirely with \"git reset HEAD^\".\n" -msgstr "Vous avez demandé de corriger le commit le plus récent, mais le faire le rendrait\n" +msgstr "" +"Vous avez demandé de corriger le commit le plus récent, mais le faire le " +"rendrait\n" "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:61 +#: 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" "\n" " git commit --allow-empty\n" "\n" -"Otherwise, please use 'git reset'\n" msgstr "" -"Le picorage précédent est à présent vide, vraisemblablement dû à une résolution de conflit.\n" +"Le picorage précédent est à présent vide, vraisemblablement dû à une " +"résolution de conflit.\n" "Si vous souhaitez tout de même le valider, utilisez :\n" "\n" " git commit --allow-empty\n" "\n" -"Sinon, utilisez 'git reset'\n" -#: builtin/commit.c:260 +#: builtin/commit.c:70 +msgid "Otherwise, please use 'git reset'\n" +msgstr "Sinon, veuillez utiliser 'git reset'\n" + +#: builtin/commit.c:73 +msgid "" +"If you wish to skip this commit, use:\n" +"\n" +" git reset\n" +"\n" +"Then \"git cherry-pick --continue\" will resume cherry-picking\n" +"the remaining commits.\n" +msgstr "" +"Si vous souhaitez sauter ce commit, utilisez :\n" +"\n" +" git reset\n" +"\n" +"Puis \"git cherry-pick --continue\" continuera le picorage \n" +"des commits restants.\n" + +#: builtin/commit.c:288 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:302 +#: builtin/commit.c:330 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:308 +#: builtin/commit.c:336 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 +#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:393 +#: builtin/commit.c:421 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:395 +#: builtin/commit.c:423 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:405 +#: builtin/commit.c:433 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:425 +#: builtin/commit.c:453 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:513 builtin/commit.c:519 +#: builtin/commit.c:544 builtin/commit.c:550 #, c-format msgid "invalid commit: %s" msgstr "commit invalide : %s" -#: builtin/commit.c:542 +#: builtin/commit.c:572 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:562 +#: builtin/commit.c:592 #, c-format msgid "Malformed ident string: '%s'" msgstr "Chaîne ident mal formée : '%s'" -#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 +#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:612 builtin/shortlog.c:270 +#: builtin/commit.c:641 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:614 +#: builtin/commit.c:643 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:618 +#: builtin/commit.c:647 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:624 +#: builtin/commit.c:654 msgid "commit has empty message" msgstr "le commit a un message vide" -#: builtin/commit.c:640 +#: builtin/commit.c:670 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:644 +#: builtin/commit.c:674 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:648 +#: builtin/commit.c:678 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: builtin/commit.c:709 +#: builtin/commit.c:749 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:720 +#: builtin/commit.c:764 #, c-format msgid "" "\n" @@ -3780,7 +4314,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:725 +#: builtin/commit.c:769 #, c-format msgid "" "\n" @@ -3795,16 +4329,17 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:737 +#: builtin/commit.c:782 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "Veuillez saisir le message de validation pour vos modifications. Les lignes\n" -"commençant par '%c' seront ignorées, et un message vide abandonne la validation.\n" +"commençant par '%c' seront ignorées, et un message vide abandonne la " +"validation.\n" -#: builtin/commit.c:742 +#: builtin/commit.c:789 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -3815,1802 +4350,1914 @@ 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:755 +#: builtin/commit.c:802 #, c-format msgid "%sAuthor: %s" msgstr "%sAuteur : %s" -#: builtin/commit.c:762 +#: builtin/commit.c:809 #, c-format msgid "%sCommitter: %s" msgstr "%sValidateur : %s" -#: builtin/commit.c:782 +#: builtin/commit.c:829 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:819 +#: builtin/commit.c:872 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:834 builtin/tag.c:359 +#: builtin/commit.c:887 builtin/tag.c:391 #, 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:931 +#: builtin/commit.c:989 #, c-format msgid "No existing author found with '%s'" msgstr "Aucun auteur existant trouvé avec '%s'" -#: builtin/commit.c:946 builtin/commit.c:1140 +#: builtin/commit.c:1004 builtin/commit.c:1244 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:976 +#: builtin/commit.c:1041 +msgid "--long and -z are incompatible" +msgstr "--long et -z sont incompatibles" + +#: builtin/commit.c:1071 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:987 +#: builtin/commit.c:1080 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:990 +#: builtin/commit.c:1083 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:992 +#: builtin/commit.c:1085 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:995 +#: builtin/commit.c:1088 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:1005 +#: builtin/commit.c:1098 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:1007 +#: builtin/commit.c:1100 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:1015 +#: builtin/commit.c:1108 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:1032 +#: builtin/commit.c:1125 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." +msgstr "" +"Une seule option parmi --include/--only/--all/--interactive/--patch peut " +"être utilisée." -#: builtin/commit.c:1034 +#: builtin/commit.c:1127 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:1036 +#: builtin/commit.c:1129 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1038 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." -msgstr "" +#: builtin/commit.c:1131 +msgid "Explicit paths specified without -i or -o; assuming --only paths..." +msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." -#: builtin/commit.c:1048 builtin/tag.c:575 +#: builtin/commit.c:1143 builtin/tag.c:639 #, c-format msgid "Invalid cleanup mode %s" -msgstr "" +msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1053 +#: builtin/commit.c:1148 msgid "Paths with -a does not make sense." -msgstr "" - -#: builtin/commit.c:1059 builtin/commit.c:1194 -msgid "--long and -z are incompatible" -msgstr "" +msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1154 builtin/commit.c:1390 +#: builtin/commit.c:1258 builtin/commit.c:1516 msgid "show status concisely" -msgstr "" +msgstr "afficher le statut avec concision" -#: builtin/commit.c:1156 builtin/commit.c:1392 +#: builtin/commit.c:1260 builtin/commit.c:1518 msgid "show branch information" -msgstr "" +msgstr "afficher l'information de branche" -#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 +#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490 msgid "machine-readable output" -msgstr "" +msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1161 builtin/commit.c:1396 +#: builtin/commit.c:1265 builtin/commit.c:1522 msgid "show status in long format (default)" -msgstr "" +msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1164 builtin/commit.c:1399 +#: builtin/commit.c:1268 builtin/commit.c:1525 msgid "terminate entries with NUL" -msgstr "" +msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 -#: builtin/fast-export.c:662 builtin/tag.c:459 +#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674 +#: builtin/fast-export.c:677 builtin/tag.c:514 msgid "mode" -msgstr "" +msgstr "mode" -#: builtin/commit.c:1167 builtin/commit.c:1402 +#: builtin/commit.c:1271 builtin/commit.c:1528 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:1170 +#: builtin/commit.c:1274 msgid "show ignored files" -msgstr "" +msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1171 parse-options.h:151 +#: builtin/commit.c:1275 parse-options.h:153 msgid "when" -msgstr "" +msgstr "quand" -#: builtin/commit.c:1172 +#: builtin/commit.c:1276 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" +"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " +"(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1174 +#: builtin/commit.c:1278 msgid "list untracked files in columns" -msgstr "" +msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1248 +#: builtin/commit.c:1347 msgid "couldn't look up newly created commit" -msgstr "" +msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1250 +#: builtin/commit.c:1349 msgid "could not parse newly created commit" -msgstr "" +msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1291 +#: builtin/commit.c:1390 msgid "detached HEAD" -msgstr "" +msgstr "HEAD détachée" -#: builtin/commit.c:1293 +#: builtin/commit.c:1392 msgid " (root-commit)" -msgstr "" +msgstr " (commit racine)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1486 msgid "suppress summary after successful commit" -msgstr "" +msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1361 +#: builtin/commit.c:1487 msgid "show diff in commit message template" -msgstr "" +msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1363 +#: builtin/commit.c:1489 msgid "Commit message options" -msgstr "" +msgstr "Options du message de validation" -#: builtin/commit.c:1364 builtin/tag.c:457 +#: builtin/commit.c:1490 builtin/tag.c:512 msgid "read message from file" -msgstr "" +msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1365 +#: builtin/commit.c:1491 msgid "author" -msgstr "" +msgstr "auteur" -#: builtin/commit.c:1365 +#: builtin/commit.c:1491 msgid "override author for commit" -msgstr "" +msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1366 builtin/gc.c:178 +#: builtin/commit.c:1492 builtin/gc.c:272 msgid "date" -msgstr "" +msgstr "date" -#: builtin/commit.c:1366 +#: builtin/commit.c:1492 msgid "override date for commit" -msgstr "" +msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 -#: builtin/notes.c:690 builtin/tag.c:455 +#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409 +#: builtin/notes.c:566 builtin/tag.c:510 msgid "message" -msgstr "" +msgstr "message" -#: builtin/commit.c:1367 +#: builtin/commit.c:1493 msgid "commit message" -msgstr "" +msgstr "message de validation" -#: builtin/commit.c:1368 +#: builtin/commit.c:1494 msgid "reuse and edit message from specified commit" -msgstr "" +msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1369 +#: builtin/commit.c:1495 msgid "reuse message from specified commit" -msgstr "" +msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1370 +#: builtin/commit.c:1496 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:1371 +#: builtin/commit.c:1497 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:1372 +#: builtin/commit.c:1498 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:1373 builtin/log.c:1113 builtin/revert.c:109 +#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86 msgid "add Signed-off-by:" -msgstr "" +msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1374 +#: builtin/commit.c:1500 msgid "use specified template file" -msgstr "" +msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1375 +#: builtin/commit.c:1501 msgid "force edit of commit" -msgstr "" +msgstr "forcer l'édition du commit" -#: builtin/commit.c:1376 +#: builtin/commit.c:1502 msgid "default" -msgstr "" +msgstr "défaut" -#: builtin/commit.c:1376 builtin/tag.c:460 +#: builtin/commit.c:1502 builtin/tag.c:515 msgid "how to strip spaces and #comments from message" -msgstr "" +msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1377 +#: builtin/commit.c:1503 msgid "include status in commit message template" -msgstr "" +msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 -msgid "key id" -msgstr "" +#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92 +#: builtin/tag.c:516 +msgid "key-id" +msgstr "id de clé" -#: builtin/commit.c:1379 builtin/merge.c:216 +#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93 msgid "GPG sign commit" -msgstr "" +msgstr "signer la validation avec GPG" -#. end commit message options -#: builtin/commit.c:1382 +#: builtin/commit.c:1508 msgid "Commit contents options" -msgstr "" +msgstr "Valider les options des contenus" -#: builtin/commit.c:1383 +#: builtin/commit.c:1509 msgid "commit all changed files" -msgstr "" +msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1384 +#: builtin/commit.c:1510 msgid "add specified files to index for commit" -msgstr "" +msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1385 +#: builtin/commit.c:1511 msgid "interactively add files" -msgstr "" +msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1386 +#: builtin/commit.c:1512 msgid "interactively add changes" -msgstr "" +msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1387 +#: builtin/commit.c:1513 msgid "commit only specified files" -msgstr "" +msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1388 +#: builtin/commit.c:1514 msgid "bypass pre-commit hook" -msgstr "" +msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1389 +#: builtin/commit.c:1515 msgid "show what would be committed" -msgstr "" +msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1400 +#: builtin/commit.c:1526 msgid "amend previous commit" -msgstr "" +msgstr "corriger la validation précédente" -#: builtin/commit.c:1401 +#: builtin/commit.c:1527 msgid "bypass post-rewrite hook" -msgstr "" +msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1406 +#: builtin/commit.c:1532 msgid "ok to record an empty change" -msgstr "" +msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1409 +#: builtin/commit.c:1534 msgid "ok to record a change with an empty message" -msgstr "" +msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1441 +#: builtin/commit.c:1562 msgid "could not parse HEAD commit" -msgstr "" +msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1479 builtin/merge.c:510 +#: builtin/commit.c:1601 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" -msgstr "" +msgstr "impossible d'ouvrir '%s' en lecture" -#: builtin/commit.c:1486 +#: builtin/commit.c:1608 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "" +msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1493 +#: builtin/commit.c:1615 msgid "could not read MERGE_MODE" -msgstr "" +msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1512 +#: builtin/commit.c:1634 #, c-format msgid "could not read commit message: %s" -msgstr "" +msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1526 +#: builtin/commit.c:1645 #, c-format msgid "Aborting commit; you did not edit the message.\n" -msgstr "" +msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1531 +#: builtin/commit.c:1650 #, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "" +msgstr "Abandon de la validation du à un message de validation vide\n" -#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 +#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882 msgid "failed to write commit object" -msgstr "" +msgstr "échec de l'écriture de l'objet commit" -#: builtin/commit.c:1567 +#: builtin/commit.c:1686 msgid "cannot lock HEAD ref" -msgstr "" +msgstr "impossible de verrouiller la référence HEAD" -#: builtin/commit.c:1571 +#: builtin/commit.c:1690 msgid "cannot update HEAD ref" -msgstr "" +msgstr "impossible de mettre à jour la référence HEAD" -#: builtin/commit.c:1582 +#: builtin/commit.c:1701 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" +"Le dépôt a été mis à jour, mais impossible d'écrire le fichier\n" +"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 "" +msgstr "git config [options]" -#: builtin/config.c:51 +#: builtin/config.c:53 msgid "Config file location" -msgstr "" +msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:52 +#: builtin/config.c:54 msgid "use global config file" -msgstr "" +msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:53 +#: builtin/config.c:55 msgid "use system config file" -msgstr "" +msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:54 +#: builtin/config.c:56 msgid "use repository config file" -msgstr "" +msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:55 +#: builtin/config.c:57 msgid "use given config file" -msgstr "" +msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:56 +#: builtin/config.c:58 +msgid "blob-id" +msgstr "blob-id" + +#: builtin/config.c:58 +msgid "read config from given blob object" +msgstr "lire la configuration depuis l'objet blob fourni" + +#: builtin/config.c:59 msgid "Action" -msgstr "" +msgstr "Action" -#: builtin/config.c:57 +#: builtin/config.c:60 msgid "get value: name [value-regex]" -msgstr "" +msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:58 +#: builtin/config.c:61 msgid "get all values: key [value-regex]" -msgstr "" +msgstr "obtenir toutes le valeurs : clé [regex-de-valeur]" -#: builtin/config.c:59 +#: builtin/config.c:62 msgid "get values for regexp: name-regex [value-regex]" -msgstr "" +msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" -#: builtin/config.c:60 +#: builtin/config.c:63 +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:64 msgid "replace all matching variables: name value [value_regex]" msgstr "" +"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:61 +#: builtin/config.c:65 msgid "add a new variable: name value" -msgstr "" +msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:62 +#: builtin/config.c:66 msgid "remove a variable: name [value-regex]" -msgstr "" +msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:63 +#: builtin/config.c:67 msgid "remove all matches: name [value-regex]" -msgstr "" +msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:64 +#: builtin/config.c:68 msgid "rename section: old-name new-name" -msgstr "" +msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:65 +#: builtin/config.c:69 msgid "remove a section: name" -msgstr "" +msgstr "supprimer une section : nom" -#: builtin/config.c:66 +#: builtin/config.c:70 msgid "list all" -msgstr "" +msgstr "afficher tout" -#: builtin/config.c:67 +#: builtin/config.c:71 msgid "open an editor" -msgstr "" +msgstr "ouvrir un éditeur" -#: builtin/config.c:68 builtin/config.c:69 +#: builtin/config.c:72 builtin/config.c:73 msgid "slot" -msgstr "" +msgstr "emplacement" -#: builtin/config.c:68 +#: builtin/config.c:72 msgid "find the color configured: [default]" -msgstr "" +msgstr "trouver la couleur configurée : [par défaut]" -#: builtin/config.c:69 +#: builtin/config.c:73 msgid "find the color setting: [stdout-is-tty]" -msgstr "" +msgstr "trouver le réglage de la couleur : [stdout-est-tty]" -#: builtin/config.c:70 +#: builtin/config.c:74 msgid "Type" -msgstr "" +msgstr "Type" -#: builtin/config.c:71 +#: builtin/config.c:75 msgid "value is \"true\" or \"false\"" -msgstr "" +msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:72 +#: builtin/config.c:76 msgid "value is decimal number" -msgstr "" +msgstr "la valeur est un nombre décimal" -#: builtin/config.c:73 +#: builtin/config.c:77 msgid "value is --bool or --int" -msgstr "" +msgstr "la valeur est --bool ou --int" -#: builtin/config.c:74 +#: builtin/config.c:78 msgid "value is a path (file or directory name)" -msgstr "" +msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" -#: builtin/config.c:75 +#: builtin/config.c:79 msgid "Other" -msgstr "" +msgstr "Autre" -#: builtin/config.c:76 +#: builtin/config.c:80 msgid "terminate values with NUL byte" -msgstr "" +msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:77 +#: builtin/config.c:81 msgid "respect include directives on lookup" -msgstr "" +msgstr "respecter les directives d'inclusion lors de la recherche" #: builtin/count-objects.c:82 msgid "git count-objects [-v] [-H | --human-readable]" -msgstr "" +msgstr "git count-objects [-v] [-H | --human-readable]" #: builtin/count-objects.c:97 msgid "print sizes in human readable format" -msgstr "" +msgstr "affiche les tailles dans un format humainement lisible" -#: builtin/describe.c:15 +#: builtin/describe.c:16 msgid "git describe [options] <commit-ish>*" -msgstr "" +msgstr "git describe [options] <commit ou apparenté>*" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] --dirty" -msgstr "" +msgstr "git describe [options] --dirty" -#: builtin/describe.c:233 +#: builtin/describe.c:225 #, c-format msgid "annotated tag %s not available" -msgstr "" +msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:237 +#: builtin/describe.c:229 #, c-format msgid "annotated tag %s has no embedded name" -msgstr "" +msgstr "l'étiquette annotée %s n'a pas de nom embarqué" -#: builtin/describe.c:239 +#: builtin/describe.c:231 #, c-format msgid "tag '%s' is really '%s' here" -msgstr "" +msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:266 +#: builtin/describe.c:258 #, c-format msgid "Not a valid object name %s" -msgstr "" +msgstr "%s n'est pas un nom d'objet valide" -#: builtin/describe.c:269 +#: builtin/describe.c:261 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: builtin/describe.c:286 +#: builtin/describe.c:278 #, c-format msgid "no tag exactly matches '%s'" -msgstr "" +msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:288 +#: builtin/describe.c:280 #, c-format msgid "searching to describe %s\n" -msgstr "" +msgstr "recherche de la description de %s\n" -#: builtin/describe.c:328 +#: builtin/describe.c:327 #, c-format msgid "finished search at %s\n" -msgstr "" +msgstr "recherche terminée à %s\n" -#: builtin/describe.c:352 +#: builtin/describe.c:354 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" +"Aucune étiquette annotée ne peut décrire '%s'.\n" +"Cependant, il existe des étiquettes non-annotées : essayez avec --tags." -#: builtin/describe.c:356 +#: builtin/describe.c:358 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" +"Aucune étiquette ne peut décrire '%s'.\n" +"Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:377 +#: builtin/describe.c:379 #, c-format msgid "traversed %lu commits\n" -msgstr "" +msgstr "%lu commits parcourus\n" -#: builtin/describe.c:380 +#: builtin/describe.c:382 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" +"plus de %i étiquettes ont été trouvées; seules les %i plus récentes sont " +"affichées\n" +"abandon de la recherche à %s\n" -#: builtin/describe.c:402 +#: builtin/describe.c:404 msgid "find the tag that comes after the commit" -msgstr "" +msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:403 +#: builtin/describe.c:405 msgid "debug search strategy on stderr" -msgstr "" +msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:404 +#: builtin/describe.c:406 msgid "use any ref" -msgstr "" +msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:405 +#: builtin/describe.c:407 msgid "use any tag, even unannotated" -msgstr "" +msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:406 +#: builtin/describe.c:408 msgid "always use long format" -msgstr "" +msgstr "toujours utiliser le format long" #: builtin/describe.c:409 +msgid "only follow first parent" +msgstr "ne suivre que le premier parent" + +#: builtin/describe.c:412 msgid "only output exact matches" -msgstr "" +msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:411 +#: builtin/describe.c:414 msgid "consider <n> most recent tags (default: 10)" msgstr "" +"considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" -#: builtin/describe.c:413 +#: builtin/describe.c:416 msgid "only consider tags matching <pattern>" -msgstr "" +msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:415 builtin/name-rev.c:238 +#: builtin/describe.c:418 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" -msgstr "" +msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:416 +#: builtin/describe.c:419 msgid "mark" -msgstr "" +msgstr "marque" -#: builtin/describe.c:417 +#: builtin/describe.c:420 msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "" +msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" -#: builtin/describe.c:435 +#: builtin/describe.c:438 msgid "--long is incompatible with --abbrev=0" -msgstr "" +msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:461 +#: builtin/describe.c:464 msgid "No names found, cannot describe anything." -msgstr "" +msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:481 +#: builtin/describe.c:484 msgid "--dirty is incompatible with commit-ishes" -msgstr "" +msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/diff.c:79 +#: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" -msgstr "" +msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" -#: builtin/diff.c:228 +#: builtin/diff.c:236 #, c-format msgid "invalid option: %s" -msgstr "" +msgstr "option invalide : %s" -#: builtin/diff.c:305 +#: builtin/diff.c:357 msgid "Not a git repository" -msgstr "" +msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:348 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." -msgstr "" - -#: builtin/diff.c:353 -#, c-format -msgid "more than %d trees given: '%s'" -msgstr "" +msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:363 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" -msgstr "" +msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:371 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." -msgstr "" +msgstr "objet non géré '%s' spécifié." #: builtin/fast-export.c:22 msgid "git fast-export [rev-list-opts]" -msgstr "" +msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:658 +#: builtin/fast-export.c:673 msgid "show progress after <n> objects" -msgstr "" +msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:660 +#: builtin/fast-export.c:675 msgid "select handling of signed tags" -msgstr "" +msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:663 +#: 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:666 +#: builtin/fast-export.c:681 msgid "Dump marks to this file" -msgstr "" +msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:668 +#: builtin/fast-export.c:683 msgid "Import marks from this file" -msgstr "" +msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:670 +#: builtin/fast-export.c:685 msgid "Fake a tagger when tags lack one" -msgstr "" +msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:672 +#: builtin/fast-export.c:687 msgid "Output full tree for each commit" -msgstr "" +msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:674 +#: builtin/fast-export.c:689 msgid "Use the done feature to terminate the stream" -msgstr "" +msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:675 +#: builtin/fast-export.c:690 msgid "Skip output of blob data" -msgstr "" +msgstr "Sauter l'affichage de données de blob" #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "" +msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" -msgstr "" +msgstr "git fetch [<options>] <groupe>" #: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "" +msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" #: builtin/fetch.c:23 msgid "git fetch --all [<options>]" -msgstr "" +msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:60 +#: builtin/fetch.c:75 msgid "fetch from all remotes" -msgstr "" +msgstr "récupérer depuis tous le dépôts distants" -#: builtin/fetch.c:62 +#: builtin/fetch.c:77 msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "" +msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:64 +#: builtin/fetch.c:79 msgid "path to upload pack on remote end" -msgstr "" +msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:65 +#: builtin/fetch.c:80 msgid "force overwrite of local branch" -msgstr "" +msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:67 +#: builtin/fetch.c:82 msgid "fetch from multiple remotes" -msgstr "" +msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:69 +#: builtin/fetch.c:84 msgid "fetch all tags and associated objects" -msgstr "" +msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:71 +#: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" -msgstr "" +msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:73 +#: builtin/fetch.c:88 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:89 msgid "on-demand" -msgstr "" +msgstr "à la demande" -#: builtin/fetch.c:75 +#: builtin/fetch.c:90 msgid "control recursive fetching of submodules" -msgstr "" +msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:79 +#: builtin/fetch.c:94 msgid "keep downloaded pack" -msgstr "" +msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:81 +#: builtin/fetch.c:96 msgid "allow updating of HEAD ref" -msgstr "" +msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:84 +#: builtin/fetch.c:99 msgid "deepen history of shallow clone" -msgstr "" +msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:86 +#: builtin/fetch.c:101 msgid "convert to a complete repository" -msgstr "" +msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:88 builtin/log.c:1130 +#: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" -msgstr "" +msgstr "dir" -#: builtin/fetch.c:89 +#: builtin/fetch.c:104 msgid "prepend this to submodule path output" -msgstr "" +msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:92 +#: builtin/fetch.c:107 msgid "default mode for recursion" -msgstr "" +msgstr "mode par défaut pour la récursion" + +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:204 +#: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" -msgstr "" +msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:257 +#: builtin/fetch.c:411 #, c-format msgid "object %s not found" -msgstr "" +msgstr "objet %s non trouvé" -#: builtin/fetch.c:262 +#: builtin/fetch.c:416 msgid "[up to date]" -msgstr "" +msgstr "[à jour]" -#: builtin/fetch.c:276 +#: builtin/fetch.c:430 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "" +msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)" -#: builtin/fetch.c:277 builtin/fetch.c:363 +#: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" -msgstr "" +msgstr "[rejeté]" -#: builtin/fetch.c:288 +#: builtin/fetch.c:442 msgid "[tag update]" -msgstr "" +msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" -msgstr "" +msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:308 +#: builtin/fetch.c:462 msgid "[new tag]" -msgstr "" +msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:465 msgid "[new branch]" -msgstr "" +msgstr "[nouvelle branche]" -#: builtin/fetch.c:314 +#: builtin/fetch.c:468 msgid "[new ref]" -msgstr "" +msgstr "[nouvelle référence]" -#: builtin/fetch.c:359 +#: builtin/fetch.c:513 msgid "unable to update local ref" -msgstr "" +msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:359 +#: builtin/fetch.c:513 msgid "forced update" -msgstr "" +msgstr "mise à jour forcée" -#: builtin/fetch.c:365 +#: builtin/fetch.c:519 msgid "(non-fast-forward)" -msgstr "" +msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:396 builtin/fetch.c:688 +#: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" -#: builtin/fetch.c:405 +#: builtin/fetch.c:561 #, 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:491 +#: builtin/fetch.c:579 #, c-format -msgid "From %.*s\n" +msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" +"%s rejeté parce que les racines superficielles ne sont pas mises à jour" + +#: builtin/fetch.c:667 builtin/fetch.c:750 +#, c-format +msgid "From %.*s\n" +msgstr "Depuis %.*s\n" -#: builtin/fetch.c:502 +#: builtin/fetch.c:678 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" 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:552 +#: builtin/fetch.c:730 #, c-format msgid " (%s will become dangling)" -msgstr "" +msgstr " (%s sera en suspens)" -#: builtin/fetch.c:553 +#: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" -msgstr "" +msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:560 +#: builtin/fetch.c:755 msgid "[deleted]" -msgstr "" +msgstr "[supprimé]" -#: builtin/fetch.c:561 builtin/remote.c:1055 +#: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" -msgstr "" +msgstr "(aucun(e))" -#: builtin/fetch.c:678 +#: builtin/fetch.c:775 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "" +msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:712 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "" - -#: builtin/fetch.c:789 +#: builtin/fetch.c:794 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "" +msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:792 +#: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" -msgstr "" +msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:894 +#: builtin/fetch.c:853 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Je ne sais pas récupérer depuis %s" + +#: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" -msgstr "" +msgstr "Récupération de %s\n" -#: builtin/fetch.c:896 builtin/remote.c:100 +#: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" -msgstr "" +msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:915 +#: builtin/fetch.c:1035 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." 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:935 +#: builtin/fetch.c:1059 msgid "You need to specify a tag name." -msgstr "" +msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:981 +#: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" -msgstr "" +msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:983 +#: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" -msgstr "" +msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" -msgstr "" +msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1004 +#: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" -msgstr "" +msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" -msgstr "" +msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1023 +#: builtin/fetch.c:1153 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" +"La récupération d'un groupe et les spécifications de référence n'ont pas de " +"sens" #: builtin/fmt-merge-msg.c:13 msgid "git fmt-merge-msg [-m <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:701 -#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700 +#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501 +#: parse-options.h:132 parse-options.h:239 msgid "n" -msgstr "" +msgstr "n" #: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" -msgstr "" +msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" #: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" -msgstr "" +msgstr "alias pour --log (obsolète)" #: builtin/fmt-merge-msg.c:670 msgid "text" -msgstr "" +msgstr "texte" #: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" -msgstr "" +msgstr "utiliser <texte> comme début de message" #: builtin/fmt-merge-msg.c:672 msgid "file to read from" -msgstr "" +msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:979 +#: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] [<pattern>]" -msgstr "" +msgstr "git for-each-ref [options] [<motif>]" -#: builtin/for-each-ref.c:994 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" -msgstr "" +msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:996 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" -msgstr "" +msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:998 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" -msgstr "" +msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:1000 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for tcl" -msgstr "" +msgstr "échapper les champs réservés pour tcl" -#: builtin/for-each-ref.c:1003 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" -msgstr "" +msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:1004 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 msgid "format" -msgstr "" +msgstr "format" -#: builtin/for-each-ref.c:1004 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" -msgstr "" +msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1005 +#: builtin/for-each-ref.c:1089 msgid "key" -msgstr "" +msgstr "clé" -#: builtin/for-each-ref.c:1006 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" -msgstr "" +msgstr "nom du champ servant à trier" + +#: builtin/fsck.c:147 builtin/prune.c:172 +msgid "Checking connectivity" +msgstr "Vérification de la connectivité" -#: builtin/fsck.c:608 +#: builtin/fsck.c:544 +msgid "Checking object directories" +msgstr "Vérification des répertoires d'objet" + +#: builtin/fsck.c:607 msgid "git fsck [options] [<object>...]" -msgstr "" +msgstr "git fsck [options] [<objet>...]" -#: builtin/fsck.c:614 +#: builtin/fsck.c:613 msgid "show unreachable objects" -msgstr "" +msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:615 +#: builtin/fsck.c:614 msgid "show dangling objects" -msgstr "" +msgstr "afficher les objets en suspens" -#: builtin/fsck.c:616 +#: builtin/fsck.c:615 msgid "report tags" -msgstr "" +msgstr "afficher les étiquettes" -#: builtin/fsck.c:617 +#: builtin/fsck.c:616 msgid "report root nodes" -msgstr "" +msgstr "signaler les nœuds racines" -#: builtin/fsck.c:618 +#: builtin/fsck.c:617 msgid "make index objects head nodes" -msgstr "" +msgstr "considérer les objets de l'index comme nœuds tête" -#: builtin/fsck.c:619 +# translated from man page +#: builtin/fsck.c:618 msgid "make reflogs head nodes (default)" -msgstr "" +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 "" +msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:621 +#: builtin/fsck.c:620 msgid "enable more strict checking" -msgstr "" +msgstr "activer une vérification plus strict" -#: builtin/fsck.c:623 +#: builtin/fsck.c:622 msgid "write dangling objects in .git/lost-found" -msgstr "" +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:144 msgid "show progress" -msgstr "" +msgstr "afficher la progression" -#: builtin/gc.c:22 +#: builtin/fsck.c:673 +msgid "Checking objects" +msgstr "Vérification des objets" + +#: builtin/gc.c:24 msgid "git gc [options]" -msgstr "" +msgstr "git gc [options]" -#: builtin/gc.c:63 +#: builtin/gc.c:90 #, c-format msgid "Invalid %s: '%s'" -msgstr "" +msgstr "%s invalide : '%s'" -#: builtin/gc.c:90 +#: builtin/gc.c:117 #, c-format msgid "insanely long object directory %.*s" -msgstr "" +msgstr "objet répertoire démentiellement long %.*s" -#: builtin/gc.c:179 +#: builtin/gc.c:273 msgid "prune unreferenced objects" -msgstr "" +msgstr "éliminer les objets non référencés" -#: builtin/gc.c:181 +#: builtin/gc.c:275 msgid "be more thorough (increased runtime)" -msgstr "" +msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:182 +#: builtin/gc.c:276 msgid "enable auto-gc mode" +msgstr "activer le mode auto-gc" + +#: builtin/gc.c:277 +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:222 +#: builtin/gc.c:318 +#, c-format +msgid "Auto packing the repository in background for optimum performance.\n" +msgstr "Compression automatique du dépôt en tâche de fond pour optimiser les performances.\n" + +#: builtin/gc.c:320 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "Compression du dépôt pour optimiser les performances.\n" + +#: builtin/gc.c:321 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" + +#: builtin/gc.c:336 #, c-format msgid "" -"Auto packing the repository for optimum performance. You may also\n" -"run \"git gc\" manually. See \"git help gc\" for more information.\n" +"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:249 +#: builtin/gc.c:361 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 "" +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 "" +msgstr "grep : échec de création du fil: %s" #: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" -msgstr "" +msgstr "Échec de chdir: %s" #: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" -msgstr "" +msgstr "impossible de lire l'arbre (%s)" #: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" -msgstr "" +msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:551 +#: builtin/grep.c:549 #, c-format msgid "switch `%c' expects a numerical value" -msgstr "" +msgstr "l'option '%c' attend un valeur numérique" -#: builtin/grep.c:568 +#: builtin/grep.c:566 #, c-format msgid "cannot open '%s'" -msgstr "" +msgstr "impossible d'ouvrir '%s'" -#: builtin/grep.c:643 +#: builtin/grep.c:640 msgid "search in index instead of in the work tree" -msgstr "" +msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:645 +#: builtin/grep.c:642 msgid "find in contents not managed by git" -msgstr "" +msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:647 +#: builtin/grep.c:644 msgid "search in both tracked and untracked files" -msgstr "" +msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:649 +#: builtin/grep.c:646 msgid "search also in ignored files" -msgstr "" +msgstr "rechercher aussi dans les fichiers ignorés" -#: builtin/grep.c:652 +#: builtin/grep.c:649 msgid "show non-matching lines" -msgstr "" +msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:654 +#: builtin/grep.c:651 msgid "case insensitive matching" -msgstr "" +msgstr "correspondance insensible à la casse" -#: builtin/grep.c:656 +#: builtin/grep.c:653 msgid "match patterns only at word boundaries" -msgstr "" +msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:658 +#: builtin/grep.c:655 msgid "process binary files as text" -msgstr "" +msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:660 +#: builtin/grep.c:657 msgid "don't match patterns in binary files" -msgstr "" +msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:663 +#: builtin/grep.c:660 +msgid "process binary files with textconv filters" +msgstr "traiter les fichiers binaires avec les filtres textconv" + +#: builtin/grep.c:662 msgid "descend at most <depth> levels" -msgstr "" +msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:667 +#: builtin/grep.c:666 msgid "use extended POSIX regular expressions" -msgstr "" +msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:670 +#: builtin/grep.c:669 msgid "use basic POSIX regular expressions (default)" -msgstr "" +msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:673 +#: builtin/grep.c:672 msgid "interpret patterns as fixed strings" -msgstr "" +msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:676 +#: builtin/grep.c:675 msgid "use Perl-compatible regular expressions" -msgstr "" +msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:679 +#: builtin/grep.c:678 msgid "show line numbers" -msgstr "" +msgstr "afficher les numéros de ligne" -#: builtin/grep.c:680 +#: builtin/grep.c:679 msgid "don't show filenames" -msgstr "" +msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:681 +#: builtin/grep.c:680 msgid "show filenames" -msgstr "" +msgstr "afficher les noms de fichier" -#: builtin/grep.c:683 +#: builtin/grep.c:682 msgid "show filenames relative to top directory" -msgstr "" +msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:685 +#: builtin/grep.c:684 msgid "show only filenames instead of matching lines" -msgstr "" +msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:687 +#: builtin/grep.c:686 msgid "synonym for --files-with-matches" -msgstr "" +msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:690 +#: builtin/grep.c:689 msgid "show only the names of files without match" -msgstr "" +msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:692 +#: builtin/grep.c:691 msgid "print NUL after filenames" -msgstr "" +msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:694 +#: builtin/grep.c:693 msgid "show the number of matches instead of matching lines" -msgstr "" +msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:695 +#: builtin/grep.c:694 msgid "highlight matches" -msgstr "" +msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:697 +#: builtin/grep.c:696 msgid "print empty line between matches from different files" msgstr "" +"imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:699 +#: builtin/grep.c:698 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:702 +#: builtin/grep.c:701 msgid "show <n> context lines before and after matches" -msgstr "" +msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:705 +#: builtin/grep.c:704 msgid "show <n> context lines before matches" -msgstr "" +msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:707 +#: builtin/grep.c:706 msgid "show <n> context lines after matches" -msgstr "" +msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:708 +#: builtin/grep.c:707 msgid "shortcut for -C NUM" -msgstr "" +msgstr "raccourci pour -C NUM" -#: builtin/grep.c:711 +#: builtin/grep.c:710 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:713 +#: builtin/grep.c:712 msgid "show the surrounding function" -msgstr "" +msgstr "afficher la fonction contenante" -#: builtin/grep.c:716 +#: builtin/grep.c:715 msgid "read patterns from file" -msgstr "" +msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:718 +#: builtin/grep.c:717 msgid "match <pattern>" -msgstr "" +msgstr "rechercher <motif>" -#: builtin/grep.c:720 +#: builtin/grep.c:719 msgid "combine patterns specified with -e" -msgstr "" +msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:732 +#: builtin/grep.c:731 msgid "indicate hit with exit status without output" msgstr "" +"indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:734 +#: builtin/grep.c:733 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:736 +#: builtin/grep.c:735 msgid "show parse tree for grep expression" -msgstr "" +msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:740 +#: builtin/grep.c:739 msgid "pager" -msgstr "" +msgstr "pagineur" -#: builtin/grep.c:740 +#: builtin/grep.c:739 msgid "show matching files in the pager" -msgstr "" +msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:743 +#: builtin/grep.c:742 msgid "allow calling of grep(1) (ignored by this build)" -msgstr "" +msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:744 builtin/show-ref.c:184 +#: builtin/grep.c:743 builtin/show-ref.c:187 msgid "show usage" -msgstr "" +msgstr "afficher l'usage" -#: builtin/grep.c:811 +#: builtin/grep.c:810 msgid "no pattern given." -msgstr "" +msgstr "aucun motif fourni." -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" -msgstr "" +msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." -msgstr "" +msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index." -#: builtin/grep.c:894 +#: builtin/grep.c:896 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:897 +#: builtin/grep.c:899 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:905 +#: builtin/grep.c:907 msgid "both --cached and trees are given." -msgstr "" +msgstr "--cached et des arbres sont fournis en même temps." #: builtin/hash-object.c:60 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." msgstr "" +"git hash-object [-t <type>] [-w] [--path=<fichier>|--no-filters] [--stdin] " +"[--] <fichier>..." #: builtin/hash-object.c:61 msgid "git hash-object --stdin-paths < <list-of-paths>" -msgstr "" +msgstr "git hash-object --stdin-paths < <liste-de-chemins>" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:72 builtin/tag.c:521 msgid "type" -msgstr "" +msgstr "type" #: builtin/hash-object.c:72 msgid "object type" -msgstr "" +msgstr "type d'objet" #: builtin/hash-object.c:73 msgid "write the object into the object database" -msgstr "" +msgstr "écrire l'objet dans la base de donnée d'objets" #: builtin/hash-object.c:74 msgid "read the object from stdin" -msgstr "" +msgstr "lire l'objet depuis l'entrée standard" #: builtin/hash-object.c:76 msgid "store file as is without filters" -msgstr "" +msgstr "stocker le fichier tel quel sans filtrage" #: builtin/hash-object.c:77 msgid "process file as it were from this path" -msgstr "" +msgstr "traiter le fichier comme s'il venait de ce chemin" -#: builtin/help.c:43 +#: builtin/help.c:41 msgid "print all available commands" -msgstr "" +msgstr "afficher toutes les commandes disponibles" -#: builtin/help.c:44 +#: builtin/help.c:42 msgid "print list of useful guides" -msgstr "" +msgstr "afficher une liste de guides utiles" -#: builtin/help.c:45 +#: builtin/help.c:43 msgid "show man page" -msgstr "" +msgstr "afficher la page de manuel" -#: builtin/help.c:46 +#: builtin/help.c:44 msgid "show manual in web browser" -msgstr "" +msgstr "afficher le manuel dans un navigateur web" -#: builtin/help.c:48 +#: builtin/help.c:46 msgid "show info page" -msgstr "" +msgstr "afficher la page info" -#: builtin/help.c:54 +#: builtin/help.c:52 msgid "git help [--all] [--guides] [--man|--web|--info] [command]" -msgstr "" +msgstr "git help [--all] [--guides] [--man|--web|--info] [commande]" -#: builtin/help.c:66 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" -msgstr "" +msgstr "format d'aide non reconnu '%s'" -#: builtin/help.c:94 +#: builtin/help.c:92 msgid "Failed to start emacsclient." -msgstr "" +msgstr "échec de démarrage d'emacsclient." -#: builtin/help.c:107 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." -msgstr "" +msgstr "échec d'analyse de la version d'emacsclient." -#: builtin/help.c:115 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "" +msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." -#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" -msgstr "" +msgstr "échec de l'exécution de '%s' : %s" -#: builtin/help.c:218 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" +"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n" +"Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:230 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" +"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" +"Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:351 +#: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." -msgstr "" +msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:368 +#: builtin/help.c:370 msgid "no man viewer handled the request" -msgstr "" +msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:376 +#: builtin/help.c:378 msgid "no info viewer handled the request" -msgstr "" +msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:422 +#: builtin/help.c:424 msgid "Defining attributes per path" -msgstr "" +msgstr "Définition des attributs par chemin" -#: builtin/help.c:423 +#: builtin/help.c:425 msgid "A Git glossary" -msgstr "" +msgstr "Un glossaire Git" -#: builtin/help.c:424 +#: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" -msgstr "" +msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" -#: builtin/help.c:425 +#: builtin/help.c:427 msgid "Defining submodule properties" -msgstr "" +msgstr "Définition des propriétés de sous-module" -#: builtin/help.c:426 +#: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" -msgstr "" +msgstr "Spécification des révisions et portées pour Git" -#: builtin/help.c:427 +#: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" +"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)" -#: builtin/help.c:428 +#: builtin/help.c:430 msgid "An overview of recommended workflows with Git" -msgstr "" +msgstr "Un aperçu des flux de travail recommandés avec Git" -#: builtin/help.c:440 +#: builtin/help.c:442 msgid "The common Git guides are:\n" -msgstr "" +msgstr "Les guides Git populaires sont : \n" -#: builtin/help.c:462 builtin/help.c:478 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" -msgstr "" +msgstr "usage : %s%s" -#: builtin/help.c:494 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" -msgstr "" +msgstr "`git %s\" est un alias de `%s'" -#: builtin/index-pack.c:182 +#: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" -msgstr "" +msgstr "type d'objet non correspondant à %s" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:204 msgid "object of unexpected type" -msgstr "" +msgstr "objet de type inattendu" -#: builtin/index-pack.c:239 +#: builtin/index-pack.c:244 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "impossible de remplir %d octet" +msgstr[1] "impossible de remplir %d octets" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:254 msgid "early EOF" -msgstr "" +msgstr "fin de fichier prématurée" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:255 msgid "read error on input" -msgstr "" +msgstr "erreur de lecture sur l'entrée" -#: builtin/index-pack.c:262 +#: builtin/index-pack.c:267 msgid "used more bytes than were available" -msgstr "" +msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:274 msgid "pack too large for current definition of off_t" -msgstr "" +msgstr "le paquet est trop grand pour la définition actuelle de off_t" -#: builtin/index-pack.c:285 +#: builtin/index-pack.c:290 #, c-format msgid "unable to create '%s'" -msgstr "" +msgstr "impossible de créer '%s'" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:295 #, c-format msgid "cannot open packfile '%s'" -msgstr "" +msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:309 msgid "pack signature mismatch" -msgstr "" +msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:306 +#: builtin/index-pack.c:311 #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "" +msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:329 #, c-format msgid "pack has bad object at offset %lu: %s" -msgstr "" +msgstr "le paquet a un mauvais objet à l'offset %lu: %s" -#: builtin/index-pack.c:446 +#: builtin/index-pack.c:451 #, c-format msgid "inflate returned %d" -msgstr "" +msgstr "la décompression (inflate) a retourné %d" -#: builtin/index-pack.c:495 +#: builtin/index-pack.c:500 msgid "offset value overflow for delta base object" -msgstr "" +msgstr "dépassement de la valeur d'offset pour l'objet delta de base" -#: builtin/index-pack.c:503 +#: builtin/index-pack.c:508 msgid "delta base offset is out of bound" -msgstr "" +msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:516 #, c-format msgid "unknown object type %d" -msgstr "" +msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:542 +#: builtin/index-pack.c:547 msgid "cannot pread pack file" -msgstr "" +msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:549 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "fin prématurée du fichier paquet, %lu octet lu" +msgstr[1] "fin prématurée du fichier paquet, %lu octets lus" -#: builtin/index-pack.c:570 +#: builtin/index-pack.c:575 msgid "serious inflate inconsistency" -msgstr "" +msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 -#: builtin/index-pack.c:724 builtin/index-pack.c:733 +#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 +#: builtin/index-pack.c:729 builtin/index-pack.c:738 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" -msgstr "" +msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:664 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:669 builtin/pack-objects.c:162 +#: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" -msgstr "" +msgstr "impossible de lire %s" -#: builtin/index-pack.c:730 +#: builtin/index-pack.c:735 #, c-format msgid "cannot read existing object %s" -msgstr "" +msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:744 +#: builtin/index-pack.c:749 #, c-format msgid "invalid blob object %s" -msgstr "" +msgstr "objet blob invalide %s" -#: builtin/index-pack.c:759 +#: builtin/index-pack.c:763 #, c-format msgid "invalid %s" -msgstr "" +msgstr "%s invalide" -#: builtin/index-pack.c:761 +#: builtin/index-pack.c:766 msgid "Error in object" -msgstr "" +msgstr "Erreur dans l'objet" -#: builtin/index-pack.c:763 +#: builtin/index-pack.c:768 #, c-format msgid "Not all child objects of %s are reachable" -msgstr "" +msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:833 builtin/index-pack.c:863 +#: builtin/index-pack.c:839 builtin/index-pack.c:869 msgid "failed to apply delta" -msgstr "" +msgstr "échec d'application du delta" -#: builtin/index-pack.c:1004 +#: builtin/index-pack.c:1010 msgid "Receiving objects" -msgstr "" +msgstr "Réception d'objets" -#: builtin/index-pack.c:1004 +#: builtin/index-pack.c:1010 msgid "Indexing objects" -msgstr "" +msgstr "Indexation d'objets" -#: builtin/index-pack.c:1030 +#: builtin/index-pack.c:1036 msgid "pack is corrupted (SHA1 mismatch)" -msgstr "" +msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1035 +#: builtin/index-pack.c:1041 msgid "cannot fstat packfile" -msgstr "" +msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1038 +#: builtin/index-pack.c:1044 msgid "pack has junk at the end" -msgstr "" +msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1049 +#: builtin/index-pack.c:1055 msgid "confusion beyond insanity in parse_pack_objects()" -msgstr "" +msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1072 +#: builtin/index-pack.c:1078 msgid "Resolving deltas" -msgstr "" +msgstr "Résolution des deltas" -#: builtin/index-pack.c:1082 +#: builtin/index-pack.c:1088 #, c-format msgid "unable to create thread: %s" -msgstr "" +msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1130 msgid "confusion beyond insanity" -msgstr "" +msgstr "confusion extrême" -#: builtin/index-pack.c:1132 +#: builtin/index-pack.c:1138 #, c-format msgid "completed with %d local objects" -msgstr "" +msgstr "complété avec %d objets locaux" -#: builtin/index-pack.c:1142 +#: 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:1146 +#: builtin/index-pack.c:1152 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "le paquet a %d delta non résolu" +msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1177 #, c-format msgid "unable to deflate appended object (%d)" -msgstr "" +msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1256 #, c-format msgid "local object %s is corrupt" -msgstr "" +msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1280 msgid "error while closing pack file" -msgstr "" +msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1293 #, c-format msgid "cannot write keep file '%s'" -msgstr "" +msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1301 #, c-format msgid "cannot close written keep file '%s'" -msgstr "" +msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1308 +#: builtin/index-pack.c:1314 msgid "cannot store pack file" -msgstr "" +msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1319 +#: builtin/index-pack.c:1325 msgid "cannot store index file" -msgstr "" +msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1352 +#: builtin/index-pack.c:1358 #, c-format msgid "bad pack.indexversion=%<PRIu32>" -msgstr "" +msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1358 +#: builtin/index-pack.c:1364 #, c-format msgid "invalid number of threads specified (%d)" -msgstr "" +msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/index-pack.c:1362 builtin/index-pack.c:1535 +#: builtin/index-pack.c:1368 builtin/index-pack.c:1546 #, c-format msgid "no threads support, ignoring %s" -msgstr "" +msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1426 #, c-format msgid "Cannot open existing pack file '%s'" -msgstr "" +msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1428 #, c-format msgid "Cannot open existing pack idx file for '%s'" -msgstr "" +msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1475 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pas un delta : %d objet" +msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1482 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "longueur chaînée = %d : %lu objet" +msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1510 msgid "Cannot come back to cwd" -msgstr "" +msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1547 builtin/index-pack.c:1550 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1566 +#: 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 "" +msgstr "mauvais %s" -#: builtin/index-pack.c:1580 +#: builtin/index-pack.c:1591 msgid "--fix-thin cannot be used without --stdin" -msgstr "" +msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1584 builtin/index-pack.c:1594 +#: builtin/index-pack.c:1595 builtin/index-pack.c:1605 #, c-format msgid "packfile name '%s' does not end with '.pack'" -msgstr "" +msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1614 msgid "--verify with no packfile name given" -msgstr "" +msgstr "--verify sans nom de fichier paquet donné" #: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" -msgstr "" +msgstr "Impossible de rendre %s inscriptible pour le groupe" #: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" -msgstr "" +msgstr "nom de modèle démentiellement long %s" #: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" -msgstr "" +msgstr "impossible de faire un stat de '%s'" #: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" -msgstr "" +msgstr "impossible de faire un stat du modèle '%s'" #: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" -msgstr "" +msgstr "impossible d'ouvrir (opendir) '%s'" #: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" -msgstr "" +msgstr "impossible de readlink '%s'" #: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" -msgstr "" +msgstr "lien symbolique démentiellement long %s" #: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "" +msgstr "impossible de créer un lien symbolique de '%s' '%s'" #: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" -msgstr "" +msgstr "impossible de copier '%s' vers '%s'" #: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" -msgstr "" +msgstr "modèle %s ignoré" #: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" -msgstr "" +msgstr "chemin de modèle %s démentiellement long" #: builtin/init-db.c:141 #, c-format msgid "templates not found %s" -msgstr "" +msgstr "modèles non trouvés %s" #: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" +"pas de copie des modèles étant dans une mauvaise version du format %d de '%s'" #: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" -msgstr "" +msgstr "répertoire git démentiel %s" #: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format @@ -5620,634 +6267,659 @@ msgstr "%s existe déjà" #: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" -msgstr "" +msgstr "impossible de traiter le fichier de type %d" #: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" -msgstr "" +msgstr "impossible de déplacer %s vers %s" -#: builtin/init-db.c:363 -#, c-format -msgid "Could not create git link %s" -msgstr "" - -#. -#. * TRANSLATORS: The first '%s' is either "Reinitialized -#. * existing" or "Initialized empty", the second " shared" or -#. * "", and the last '%s%s' is the verbatim directory name. -#. -#: builtin/init-db.c:420 +#. TRANSLATORS: The first '%s' is either "Reinitialized +#. existing" or "Initialized empty", the second " shared" or +#. "", and the last '%s%s' is the verbatim directory name. +#: builtin/init-db.c:418 #, c-format msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s Dépôt git dans %s%s\n" +msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n" -#: builtin/init-db.c:421 +#: builtin/init-db.c:419 msgid "Reinitialized existing" -msgstr "" +msgstr "existant réinitialisé" -#: builtin/init-db.c:421 +#: builtin/init-db.c:419 msgid "Initialized empty" -msgstr "" +msgstr "vide initialisé" -#: builtin/init-db.c:422 +#: builtin/init-db.c:420 msgid " shared" -msgstr "" +msgstr " partagé" -#: builtin/init-db.c:441 +#: builtin/init-db.c:439 msgid "cannot tell cwd" -msgstr "" +msgstr "impossible de déterminer le répertoire de travail courant" -#: builtin/init-db.c:467 +#: builtin/init-db.c:465 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" msgstr "" +"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" +"shared[=<permissions>]] [répertoire]" -#: builtin/init-db.c:490 +#: builtin/init-db.c:488 msgid "permissions" -msgstr "" +msgstr "permissions" -#: builtin/init-db.c:491 +#: builtin/init-db.c:489 msgid "specify that the git repository is to be shared amongst several users" -msgstr "" +msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:493 builtin/prune-packed.c:77 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168 msgid "be quiet" -msgstr "" +msgstr "être silencieux" -#: builtin/init-db.c:522 builtin/init-db.c:529 +#: builtin/init-db.c:523 builtin/init-db.c:528 #, c-format msgid "cannot mkdir %s" -msgstr "" +msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:533 +#: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" -msgstr "" +msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:555 +#: builtin/init-db.c:554 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" +"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" +"git-dir=<répertoire>)" -#: builtin/init-db.c:579 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" -msgstr "" +msgstr "Impossible d'accéder au répertoire de travail courant" -#: builtin/init-db.c:586 +#: builtin/init-db.c:585 #, c-format msgid "Cannot access work tree '%s'" -msgstr "" +msgstr "Impossible d'accéder à l'arbre de travail '%s'" -#: builtin/log.c:40 +#: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" -msgstr "" +msgstr "git log [<options>] [<page de révisions>] [[--] <chemin>...]\n" -#: builtin/log.c:41 +#: builtin/log.c:42 msgid " or: git show [options] <object>..." -msgstr "" +msgstr " ou : git show [options] <objet>..." -#: builtin/log.c:103 +#: builtin/log.c:125 msgid "suppress diff output" -msgstr "" +msgstr "supprimer la sortie des différences" -#: builtin/log.c:104 +#: builtin/log.c:126 msgid "show source" -msgstr "" +msgstr "afficher la source" -#: builtin/log.c:105 +#: builtin/log.c:127 msgid "Use mail map file" -msgstr "" +msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:106 +#: builtin/log.c:128 msgid "decorate options" -msgstr "" +msgstr "décorer les options" -#: builtin/log.c:199 +#: builtin/log.c:231 #, c-format msgid "Final output: %d %s\n" -msgstr "" +msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:422 builtin/log.c:514 +#: builtin/log.c:473 builtin/log.c:565 #, c-format msgid "Could not read object %s" -msgstr "" +msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:538 +#: builtin/log.c:589 #, c-format msgid "Unknown type: %d" -msgstr "" +msgstr "Type inconnu : %d" -#: builtin/log.c:638 +#: builtin/log.c:689 msgid "format.headers without value" -msgstr "" +msgstr "format.headers sans valeur" -#: builtin/log.c:720 +#: builtin/log.c:771 msgid "name of output directory is too long" -msgstr "" +msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:736 +#: builtin/log.c:787 #, c-format msgid "Cannot open patch file %s" -msgstr "" +msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:750 +#: builtin/log.c:801 msgid "Need exactly one range." -msgstr "" +msgstr "Exactement une plage nécessaire." -#: builtin/log.c:758 +#: builtin/log.c:809 msgid "Not a range." -msgstr "" +msgstr "Pas une plage." -#: builtin/log.c:860 +#: builtin/log.c:911 msgid "Cover letter needs email format" -msgstr "" +msgstr "La lettre de motivation doit être au format e-mail" -#: builtin/log.c:936 +#: builtin/log.c:987 #, c-format msgid "insane in-reply-to: %s" -msgstr "" +msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:964 +#: builtin/log.c:1015 msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "" +msgstr "git format-patch [options] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1009 +#: builtin/log.c:1060 msgid "Two output directories?" -msgstr "" +msgstr "Deux répertoires de sortie ?" -#: builtin/log.c:1108 +#: builtin/log.c:1175 msgid "use [PATCH n/m] even with a single patch" -msgstr "" +msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1111 +#: builtin/log.c:1178 msgid "use [PATCH] even with multiple patches" -msgstr "" +msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1115 +#: builtin/log.c:1182 msgid "print patches to standard out" -msgstr "" +msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1117 +#: builtin/log.c:1184 msgid "generate a cover letter" -msgstr "" +msgstr "générer une lettre de motivation" -#: builtin/log.c:1119 +#: 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:1120 +#: builtin/log.c:1187 msgid "sfx" -msgstr "" +msgstr "sfx" -#: builtin/log.c:1121 +#: builtin/log.c:1188 msgid "use <sfx> instead of '.patch'" -msgstr "" +msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1123 +#: builtin/log.c:1190 msgid "start numbering patches at <n> instead of 1" -msgstr "" +msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1125 +#: builtin/log.c:1192 msgid "mark the series as Nth re-roll" -msgstr "" +msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1127 +#: builtin/log.c:1194 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "" +msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1130 +#: builtin/log.c:1197 msgid "store resulting files in <dir>" -msgstr "" +msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1133 +#: builtin/log.c:1200 msgid "don't strip/add [PATCH]" -msgstr "" +msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1136 +#: builtin/log.c:1203 msgid "don't output binary diffs" -msgstr "" +msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1138 +#: builtin/log.c:1205 msgid "don't include a patch matching a commit upstream" -msgstr "" +msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1140 +#: builtin/log.c:1207 msgid "show patch format instead of default (patch + stat)" -msgstr "" +msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1142 +#: builtin/log.c:1209 msgid "Messaging" -msgstr "" +msgstr "Communication" -#: builtin/log.c:1143 +#: builtin/log.c:1210 msgid "header" -msgstr "" +msgstr "en-tête" -#: builtin/log.c:1144 +#: builtin/log.c:1211 msgid "add email header" -msgstr "" +msgstr "ajouter l'en-tête d'e-mail" -#: builtin/log.c:1145 builtin/log.c:1147 +#: builtin/log.c:1212 builtin/log.c:1214 msgid "email" -msgstr "" +msgstr "e-mail" -#: builtin/log.c:1145 +#: builtin/log.c:1212 msgid "add To: header" -msgstr "" +msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1147 +#: builtin/log.c:1214 msgid "add Cc: header" +msgstr "ajouter l'en-tête \"Cc:\"" + +#: builtin/log.c:1216 +msgid "ident" +msgstr "ident" + +#: 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)" -#: builtin/log.c:1149 +#: builtin/log.c:1219 msgid "message-id" -msgstr "" +msgstr "id-message" -#: builtin/log.c:1150 +#: builtin/log.c:1220 msgid "make first mail a reply to <message-id>" -msgstr "" +msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1151 builtin/log.c:1154 +#: builtin/log.c:1221 builtin/log.c:1224 msgid "boundary" -msgstr "" +msgstr "frontière" -#: builtin/log.c:1152 +#: builtin/log.c:1222 msgid "attach the patch" -msgstr "" +msgstr "attacher le patch" -#: builtin/log.c:1155 +#: builtin/log.c:1225 msgid "inline the patch" -msgstr "" +msgstr "patch à l'intérieur" -#: builtin/log.c:1159 +#: 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:1161 +#: builtin/log.c:1231 msgid "signature" -msgstr "" +msgstr "signature" -#: builtin/log.c:1162 +#: builtin/log.c:1232 msgid "add a signature" -msgstr "" +msgstr "ajouter une signature" -#: builtin/log.c:1164 +#: builtin/log.c:1233 msgid "don't print the patch filenames" -msgstr "" +msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1248 +#: builtin/log.c:1307 +#, c-format +msgid "invalid ident line: %s" +msgstr "ligne d'identification invalide : %s" + +#: builtin/log.c:1322 msgid "-n and -k are mutually exclusive." -msgstr "" +msgstr "-n et -k sont mutuellement exclusifs." -#: builtin/log.c:1250 +#: builtin/log.c:1324 msgid "--subject-prefix and -k are mutually exclusive." -msgstr "" +msgstr "--subject-prefix et -k sont mutuellement exclusifs." -#: builtin/log.c:1258 +#: builtin/log.c:1332 msgid "--name-only does not make sense" -msgstr "" +msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1260 +#: builtin/log.c:1334 msgid "--name-status does not make sense" -msgstr "" +msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1262 +#: builtin/log.c:1336 msgid "--check does not make sense" -msgstr "" +msgstr "--check n'a pas de sens" -#: builtin/log.c:1285 +#: builtin/log.c:1359 msgid "standard output, or directory, which one?" -msgstr "" +msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1287 +#: builtin/log.c:1361 #, c-format msgid "Could not create directory '%s'" -msgstr "" +msgstr "Impossible de créer le répertoire '%s'" -#: builtin/log.c:1435 +#: builtin/log.c:1509 msgid "Failed to create output files" -msgstr "" +msgstr "Échec de création des fichiers en sortie" -#: builtin/log.c:1484 +#: builtin/log.c:1558 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" -msgstr "" +msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1539 +#: builtin/log.c:1613 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" +"Impossible de trouver une branche distante suivie, merci de spécifier " +"<branche_amont> manuellement.\n" -#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 +#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 #, c-format msgid "Unknown commit %s" -msgstr "" +msgstr "Commit inconnu %s" -#: builtin/ls-files.c:402 +#: builtin/ls-files.c:401 msgid "git ls-files [options] [<file>...]" -msgstr "" +msgstr "git ls-files [options] [<fichier>...]" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:458 msgid "identify the file status with tags" -msgstr "" +msgstr "identifier le statut de fichier avec les étiquettes" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:460 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "" +msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:462 msgid "show cached files in the output (default)" -msgstr "" +msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:464 msgid "show deleted files in the output" -msgstr "" +msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:466 msgid "show modified files in the output" -msgstr "" +msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:468 msgid "show other files in the output" -msgstr "" +msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:470 msgid "show ignored files in the output" -msgstr "" +msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:473 msgid "show staged contents' object name in the output" -msgstr "" +msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:475 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:478 +#: builtin/ls-files.c:477 msgid "show 'other' directories' name only" -msgstr "" +msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:481 +#: builtin/ls-files.c:480 msgid "don't show empty directories" -msgstr "" +msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:484 +#: builtin/ls-files.c:483 msgid "show unmerged files in the output" -msgstr "" +msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:485 msgid "show resolve-undo information" -msgstr "" +msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:487 msgid "skip files matching pattern" -msgstr "" +msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:491 +#: builtin/ls-files.c:490 msgid "exclude patterns are read from <file>" -msgstr "" +msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:494 +#: builtin/ls-files.c:493 msgid "read additional per-directory exclude patterns in <file>" -msgstr "" +msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:496 +#: builtin/ls-files.c:495 msgid "add the standard git exclusions" -msgstr "" +msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:499 +#: builtin/ls-files.c:498 msgid "make the output relative to the project top directory" -msgstr "" +msgstr "afficher en relatif par rapport au répertoire racine du projet" -#: builtin/ls-files.c:502 +#: builtin/ls-files.c:501 msgid "if any <file> is not in the index, treat this as an error" -msgstr "" +msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:502 msgid "tree-ish" -msgstr "" +msgstr "arbre ou apparenté" -#: builtin/ls-files.c:504 +#: builtin/ls-files.c:503 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:506 +#: builtin/ls-files.c:505 msgid "show debugging data" -msgstr "" +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 "" +msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]" -#: builtin/ls-tree.c:125 +#: builtin/ls-tree.c:126 msgid "only show trees" -msgstr "" +msgstr "afficher seulement les arbres" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" -msgstr "" +msgstr "parcourir les sous-arbres" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" -msgstr "" +msgstr "afficher les arbres en les parcourant" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" -msgstr "" +msgstr "terminer les éléments avec un octet NUL" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "include object size" -msgstr "" +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 "" +msgstr "afficher seulement les noms de fichiers" -#: builtin/ls-tree.c:140 +#: builtin/ls-tree.c:141 msgid "use full path names" -msgstr "" +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 --" +"full-name)" #: builtin/merge.c:43 msgid "git merge [options] [<commit>...]" -msgstr "" +msgstr "git merge [options] [<commit>...]" #: builtin/merge.c:44 msgid "git merge [options] <msg> HEAD <commit>" -msgstr "" +msgstr "git merge [options] <message> HEAD <commit>" #: builtin/merge.c:45 msgid "git merge --abort" -msgstr "" +msgstr "git merge --abort" -#: builtin/merge.c:90 +#: builtin/merge.c:98 msgid "switch `m' requires a value" -msgstr "" +msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:127 +#: builtin/merge.c:135 #, c-format msgid "Could not find merge strategy '%s'.\n" -msgstr "" +msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:128 +#: builtin/merge.c:136 #, c-format msgid "Available strategies are:" -msgstr "" +msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:133 +#: builtin/merge.c:141 #, c-format msgid "Available custom strategies are:" -msgstr "" +msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:183 +#: builtin/merge.c:191 msgid "do not show a diffstat at the end of the merge" -msgstr "" +msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:186 +#: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" -msgstr "" +msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:187 +#: builtin/merge.c:195 msgid "(synonym to --stat)" -msgstr "" +msgstr "(synonyme de --stat)" -#: builtin/merge.c:189 +#: builtin/merge.c:197 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" +"ajouter (au plus <n>) éléments du journal court au message de validation de " +"la fusion" -#: builtin/merge.c:192 +#: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" -msgstr "" +msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:194 +#: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" -msgstr "" +msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:196 +#: builtin/merge.c:204 msgid "edit message before committing" -msgstr "" +msgstr "éditer le message avant la validation" -#: builtin/merge.c:198 +#: builtin/merge.c:205 msgid "allow fast-forward (default)" -msgstr "" +msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:200 +#: builtin/merge.c:207 msgid "abort if fast-forward is not possible" -msgstr "" +msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:203 +#: builtin/merge.c:211 msgid "Verify that the named commit has a valid GPG signature" -msgstr "" +msgstr "Vérifier que la validation a une signature GPG valide" -#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 +#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 msgid "strategy" -msgstr "" +msgstr "stratégie" -#: builtin/merge.c:205 +#: builtin/merge.c:213 msgid "merge strategy to use" -msgstr "" +msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:206 +#: builtin/merge.c:214 msgid "option=value" -msgstr "" +msgstr "option=valeur" -#: builtin/merge.c:207 +#: builtin/merge.c:215 msgid "option for selected merge strategy" -msgstr "" +msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:209 +#: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" +"message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:213 +#: builtin/merge.c:221 msgid "abort the current in-progress merge" -msgstr "" +msgstr "abandonner la fusion en cours" -#: builtin/merge.c:242 +#: builtin/merge.c:250 msgid "could not run stash." -msgstr "" +msgstr "impossible de lancer le remisage." -#: builtin/merge.c:247 +#: builtin/merge.c:255 msgid "stash failed" -msgstr "" +msgstr "échec du remisage" -#: builtin/merge.c:252 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" -msgstr "" +msgstr "pas un objet valide : %s" -#: builtin/merge.c:271 builtin/merge.c:288 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" -msgstr "" +msgstr "read-tree a échoué" -#: builtin/merge.c:318 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:331 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" -msgstr "" +msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:363 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" -msgstr "" +msgstr "Écriture de SQUASH_MSG" -#: builtin/merge.c:365 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" -msgstr "" +msgstr "Finition de SQUASH_MSG" -#: builtin/merge.c:388 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" -msgstr "" +msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:438 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" -msgstr "" +msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:550 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "" +msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:643 +#: builtin/merge.c:653 msgid "git write-tree failed to write a tree" -msgstr "" +msgstr "git write-tree a échoué à écrire un arbre" -#: builtin/merge.c:671 +#: builtin/merge.c:681 msgid "Not handling anything other than two heads merge." -msgstr "" +msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:685 +#: builtin/merge.c:695 #, c-format msgid "Unknown option for merge-recursive: -X%s" -msgstr "" +msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:699 +#: builtin/merge.c:709 #, c-format msgid "unable to write %s" -msgstr "" +msgstr "impossible d'écrire %s" -#: builtin/merge.c:788 +#: builtin/merge.c:798 #, c-format msgid "Could not read from '%s'" -msgstr "" +msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:797 +#: builtin/merge.c:807 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" +"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " +"fusion.\n" -#: builtin/merge.c:803 +#: builtin/merge.c:813 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6256,897 +6928,979 @@ msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" +"Veuillez entrer un message de validation pour expliquer en quoi cette fusion " +"est\n" +"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une " +"branche de sujet.\n" +"\n" +"Les lignes commençant par '%c' seront ignorées, et un message vide\n" +"abandonne la validation.\n" -#: builtin/merge.c:827 +#: builtin/merge.c:837 msgid "Empty commit message." -msgstr "" +msgstr "Message de validation vide." -#: builtin/merge.c:839 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" -msgstr "" +msgstr "Merveilleux.\n" -#: builtin/merge.c:904 +#: builtin/merge.c:914 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" +"La fusion automatique a échoué ; réglez les conflits et validez le " +"résultat.\n" -#: builtin/merge.c:920 +#: builtin/merge.c:930 #, c-format msgid "'%s' is not a commit" -msgstr "" +msgstr "'%s' n'est pas une validation" -#: builtin/merge.c:961 +#: builtin/merge.c:971 msgid "No current branch." -msgstr "" +msgstr "Pas de branche courante." -#: builtin/merge.c:963 +#: builtin/merge.c:973 msgid "No remote for the current branch." -msgstr "" +msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:965 +#: builtin/merge.c:975 msgid "No default upstream defined for the current branch." -msgstr "" +msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:970 +#: builtin/merge.c:980 #, c-format -msgid "No remote tracking branch for %s from %s" -msgstr "" +msgid "No remote-tracking branch for %s from %s" +msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1057 builtin/merge.c:1214 -#, c-format -msgid "%s - not something we can merge" -msgstr "" - -#: builtin/merge.c:1125 +#: builtin/merge.c:1136 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "" +msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1141 git-pull.sh:31 +#: builtin/merge.c:1152 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" +"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" +"Veuillez valider vos changements avant de pouvoir fusionner." -#: builtin/merge.c:1144 git-pull.sh:34 +#: builtin/merge.c:1155 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "" +msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: builtin/merge.c:1148 +#: builtin/merge.c:1159 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" +"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" +"Veuillez valider vos changements avant de pouvoir fusionner." -#: builtin/merge.c:1151 +#: builtin/merge.c:1162 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "" +msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1160 +#: builtin/merge.c:1171 msgid "You cannot combine --squash with --no-ff." -msgstr "" - -#: builtin/merge.c:1165 -msgid "You cannot combine --no-ff with --ff-only." -msgstr "" +msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1172 +#: builtin/merge.c:1180 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" +"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1204 +#: builtin/merge.c:1212 msgid "Can merge only exactly one commit into empty head" msgstr "" +"Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1207 +#: builtin/merge.c:1215 msgid "Squash commit into empty head not supported yet" -msgstr "" +msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1209 +#: builtin/merge.c:1217 msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "" +msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1265 +#: builtin/merge.c:1222 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - pas possible de fusionner ceci" + +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "" +msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: builtin/merge.c:1268 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "" +msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#. 'N' -#: builtin/merge.c:1271 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s does not have a GPG signature." -msgstr "" +msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1274 +#: builtin/merge.c:1282 #, c-format msgid "Commit %s has a good GPG signature by %s\n" -msgstr "" +msgstr "La validation %s a une signature GPG correcte par %s\n" -#: builtin/merge.c:1358 +#: builtin/merge.c:1366 #, c-format msgid "Updating %s..%s\n" -msgstr "" +msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1397 +#: builtin/merge.c:1405 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "" +msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1404 +#: builtin/merge.c:1412 #, c-format msgid "Nope.\n" -msgstr "" +msgstr "Non.\n" -#: builtin/merge.c:1436 +#: builtin/merge.c:1444 msgid "Not possible to fast-forward, aborting." -msgstr "" +msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1459 builtin/merge.c:1538 +#: builtin/merge.c:1467 builtin/merge.c:1546 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "" +msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1463 +#: builtin/merge.c:1471 #, c-format msgid "Trying merge strategy %s...\n" -msgstr "" +msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1529 +#: builtin/merge.c:1537 #, c-format msgid "No merge strategy handled the merge.\n" -msgstr "" +msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1539 #, c-format msgid "Merge with strategy %s failed.\n" -msgstr "" +msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1540 +#: builtin/merge.c:1548 #, c-format msgid "Using the %s to prepare resolving by hand.\n" -msgstr "" +msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1560 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" +"La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "" +msgstr "git merge-base [-a|--all] <validation> <validation>..." -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "" +msgstr "git merge-base [-a|--all] --octopus <validation>..." -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." -msgstr "" +msgstr "git merge-base --independent <validation>..." -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "" +msgstr "git merge-base --is-ancestor <validation> <validation>" + +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <référence> [<validation>]" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:214 msgid "output all common ancestors" -msgstr "" +msgstr "afficher tous les ancêtres communs" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" -msgstr "" +msgstr "trouver les ancêtres pour une fusion simple à n points" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" -msgstr "" +msgstr "afficher les révisions inaccessibles depuis les autres" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" -msgstr "" +msgstr "est le premier ancêtre de l'autre ?" + +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "trouver où <validation> a divergé du reflog de <référence>" #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " "file2" msgstr "" +"git merge-file [options] [-L nom1 [-L orig [-L nom2]]] fichier1 orig_file " +"fichier2" #: builtin/merge-file.c:33 msgid "send results to standard output" -msgstr "" +msgstr "envoyer les résultats sur la sortie standard" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "" +msgstr "utiliser une fusion basée sur diff3" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" -msgstr "" +msgstr "pour les conflits, utiliser notre version (our)" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" -msgstr "" +msgstr "pour les conflits, utiliser leur version (their)" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" -msgstr "" +msgstr "pour les conflits, utiliser l'ensemble des versions" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" -msgstr "" +msgstr "pour les conflits, utiliser cette taille de marqueur" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" -msgstr "" +msgstr "ne pas avertir à propos des conflits" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" -msgstr "" +msgstr "définir les labels pour fichier1/orig_file/fichier2" -#: builtin/mktree.c:67 +#: builtin/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" -msgstr "" +msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:153 +#: builtin/mktree.c:150 msgid "input is NUL terminated" -msgstr "" +msgstr "l'entrée se termine par NUL" -#: builtin/mktree.c:154 builtin/write-tree.c:24 +#: builtin/mktree.c:151 builtin/write-tree.c:24 msgid "allow missing objects" -msgstr "" +msgstr "autoriser les objets manquants" -#: builtin/mktree.c:155 +#: builtin/mktree.c:152 msgid "allow creation of more than one tree" -msgstr "" +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 "" +msgstr "git mv [options] <source>... <destination>" -#: builtin/mv.c:64 +#: builtin/mv.c:71 msgid "force move/rename even if target exists" -msgstr "" +msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:65 +#: builtin/mv.c:72 msgid "skip move/rename errors" -msgstr "" +msgstr "sauter les erreurs de déplacement/renommage" -#: builtin/mv.c:108 +#: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" -msgstr "" +msgstr "Vérification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:112 +#: builtin/mv.c:126 msgid "bad source" -msgstr "" +msgstr "mauvaise source" -#: builtin/mv.c:115 +#: builtin/mv.c:129 msgid "can not move directory into itself" -msgstr "" +msgstr "impossible de déplacer un répertoire dans lui-même" -#: builtin/mv.c:118 +#: builtin/mv.c:132 msgid "cannot move directory over file" +msgstr "impossible de déplacer un répertoire sur un fichier" + +#: builtin/mv.c:138 +#, 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:140 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:128 +#: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" -msgstr "" +msgstr "Hein ? %.*s est dans l'index ?" -#: builtin/mv.c:140 +#: builtin/mv.c:169 msgid "source directory is empty" -msgstr "" +msgstr "le répertoire source est vide" -#: builtin/mv.c:171 +#: builtin/mv.c:205 msgid "not under version control" -msgstr "" +msgstr "pas sous le contrôle de version" -#: builtin/mv.c:173 +#: builtin/mv.c:207 msgid "destination exists" -msgstr "" +msgstr "la destination existe" -#: builtin/mv.c:181 +#: builtin/mv.c:215 #, c-format msgid "overwriting '%s'" -msgstr "" +msgstr "écrasement de '%s'" -#: builtin/mv.c:184 +#: builtin/mv.c:218 msgid "Cannot overwrite" -msgstr "" +msgstr "Impossible d'écraser" -#: builtin/mv.c:187 +#: builtin/mv.c:221 msgid "multiple sources for the same target" -msgstr "" +msgstr "multiples sources pour la même destination" + +#: builtin/mv.c:223 +msgid "destination directory does not exist" +msgstr "le répertoire de destination n'existe pas" -#: builtin/mv.c:202 +#: builtin/mv.c:243 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:212 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" -msgstr "" +msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:215 builtin/remote.c:731 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355 #, c-format msgid "renaming '%s' failed" -msgstr "" +msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:175 +#: builtin/name-rev.c:258 msgid "git name-rev [options] <commit>..." -msgstr "" +msgstr "git name-rev [options] <validation>..." -#: builtin/name-rev.c:176 +#: builtin/name-rev.c:259 msgid "git name-rev [options] --all" -msgstr "" +msgstr "git name-rev [options] --all" -#: builtin/name-rev.c:177 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" -msgstr "" +msgstr "git name-rev [options] --stdin" -#: builtin/name-rev.c:229 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" -msgstr "" +msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:230 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" -msgstr "" +msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:232 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" -msgstr "" +msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:234 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" +"afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:235 +#: builtin/name-rev.c:318 msgid "read from stdin" -msgstr "" +msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:236 -msgid "allow to print `undefined` names" -msgstr "" +#: builtin/name-rev.c:319 +msgid "allow to print `undefined` names (default)" +msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/notes.c:26 +#: builtin/name-rev.c:325 +msgid "dereference tags in the input (internal use)" +msgstr "déréférencer les étiquettes en entrée (usage interne)" + +#: builtin/notes.c:24 msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "" +msgstr "git notes [--ref <références_notes>] [list [<object>]]" -#: builtin/notes.c:27 +#: builtin/notes.c:25 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" +"git notes [--ref <références_notes>] add [-f] [-m <message> | -F <fichier> | " +"(-c | -C) <objet>] [<objet>]" -#: builtin/notes.c:28 +#: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" msgstr "" +"git notes [--ref <références_notes>] copy [-f] <depuis-objet> <vers-objet>" -#: builtin/notes.c:29 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" +"git notes [--ref <références_notes>] append [-m <message> | -F <fichier> | (-" +"c | -C) <objet>] [<objet>]" -#: builtin/notes.c:30 +#: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] edit [<object>]" -msgstr "" +msgstr "git notes [--ref <références_notes>] edit [<objet>]" -#: builtin/notes.c:31 +#: builtin/notes.c:29 msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "" +msgstr "git notes [--ref <références_notes>] show [<objet>]" -#: builtin/notes.c:32 +#: builtin/notes.c:30 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" msgstr "" +"git notes [--ref <références_notes>] merge [-v | -q] [-s <stratégie> ] " +"<références_notes>" -#: builtin/notes.c:33 +#: builtin/notes.c:31 msgid "git notes merge --commit [-v | -q]" -msgstr "" +msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:32 msgid "git notes merge --abort [-v | -q]" -msgstr "" +msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:35 +#: builtin/notes.c:33 msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "" +msgstr "git notes [--ref <références_notes>] remove [<objet>...]" -#: builtin/notes.c:36 +#: builtin/notes.c:34 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "" +msgstr "git notes [--ref <références_notes>] prune [-n | -v]" -#: builtin/notes.c:37 +#: builtin/notes.c:35 msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "" +msgstr "git notes [--ref <références_notes>] get-ref" -#: builtin/notes.c:42 +#: builtin/notes.c:40 msgid "git notes [list [<object>]]" -msgstr "" +msgstr "git notes [list [<objet>]]" -#: builtin/notes.c:47 +#: builtin/notes.c:45 msgid "git notes add [<options>] [<object>]" -msgstr "" +msgstr "git notes add [<options>] [<objet>]" -#: builtin/notes.c:52 +#: builtin/notes.c:50 msgid "git notes copy [<options>] <from-object> <to-object>" -msgstr "" +msgstr "git notes copy [<options>] <depuis-objet> <vers-objet>" -#: builtin/notes.c:53 +#: builtin/notes.c:51 msgid "git notes copy --stdin [<from-object> <to-object>]..." -msgstr "" +msgstr "git notes copy --stdin [<depuis-objet> <vers-objet>]..." -#: builtin/notes.c:58 +#: builtin/notes.c:56 msgid "git notes append [<options>] [<object>]" -msgstr "" +msgstr "git notes append [<options>] [<objet>]" -#: builtin/notes.c:63 +#: builtin/notes.c:61 msgid "git notes edit [<object>]" -msgstr "" +msgstr "git notes edit [<objet>]" -#: builtin/notes.c:68 +#: builtin/notes.c:66 msgid "git notes show [<object>]" -msgstr "" +msgstr "git notes show [<objet>]" -#: builtin/notes.c:73 +#: builtin/notes.c:71 msgid "git notes merge [<options>] <notes_ref>" -msgstr "" +msgstr "git notes merge [<options>] <références_notes>" -#: builtin/notes.c:74 +#: builtin/notes.c:72 msgid "git notes merge --commit [<options>]" -msgstr "" +msgstr "git notes merge --commit [<options>]" -#: builtin/notes.c:75 +#: builtin/notes.c:73 msgid "git notes merge --abort [<options>]" -msgstr "" +msgstr "git notes merge --abort [<options>]" -#: builtin/notes.c:80 +#: builtin/notes.c:78 msgid "git notes remove [<object>]" -msgstr "" +msgstr "git notes remove [<objet>]" -#: builtin/notes.c:85 +#: builtin/notes.c:83 msgid "git notes prune [<options>]" -msgstr "" +msgstr "git notes prune [<options>]" -#: builtin/notes.c:90 +#: builtin/notes.c:88 msgid "git notes get-ref" -msgstr "" +msgstr "git notes get-ref" -#: builtin/notes.c:139 +#: builtin/notes.c:137 #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "" +msgstr "impossible de démarrer 'show' pour l'objet '%s'" -#: builtin/notes.c:143 +#: builtin/notes.c:141 msgid "could not read 'show' output" -msgstr "" +msgstr "impossible de lire la sortie de 'show'" -#: builtin/notes.c:151 +#: builtin/notes.c:149 #, c-format msgid "failed to finish 'show' for object '%s'" -msgstr "" +msgstr "impossible de finir 'show' pour l'objet '%s'" -#: builtin/notes.c:169 builtin/tag.c:341 +#: builtin/notes.c:167 builtin/tag.c:373 #, c-format msgid "could not create file '%s'" -msgstr "" +msgstr "impossible de créer le fichier '%s'" -#: builtin/notes.c:188 +#: builtin/notes.c:186 msgid "Please supply the note contents using either -m or -F option" -msgstr "" +msgstr "Veuillez fournir le contenu de la note en utilisant l'option -m ou -F" -#: builtin/notes.c:209 builtin/notes.c:972 +#: builtin/notes.c:207 builtin/notes.c:848 #, c-format msgid "Removing note for object %s\n" -msgstr "" +msgstr "Suppression de la note pour l'objet %s\n" -#: builtin/notes.c:214 +#: builtin/notes.c:212 msgid "unable to write note object" -msgstr "" +msgstr "impossible d'écrire l'objet note" -#: builtin/notes.c:216 +#: builtin/notes.c:214 #, c-format msgid "The note contents has been left in %s" -msgstr "" +msgstr "Le contenu de la note a été laissé dans %s" -#: builtin/notes.c:250 builtin/tag.c:540 +#: builtin/notes.c:248 builtin/tag.c:604 #, c-format msgid "cannot read '%s'" -msgstr "" +msgstr "impossible de lire '%s'" -#: builtin/notes.c:252 builtin/tag.c:543 +#: builtin/notes.c:250 builtin/tag.c:607 #, c-format msgid "could not open or read '%s'" -msgstr "" +msgstr "impossible d'ouvrir ou lire '%s'" -#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 -#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 -#: builtin/notes.c:967 builtin/tag.c:556 +#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 +#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 +#: builtin/notes.c:843 builtin/tag.c:620 #, c-format msgid "Failed to resolve '%s' as a valid ref." -msgstr "" +msgstr "Impossible de résoudre '%s' comme une référence valide." -#: builtin/notes.c:274 +#: builtin/notes.c:272 #, c-format msgid "Failed to read object '%s'." -msgstr "" +msgstr "Impossible de lire l'objet '%s'." -#: builtin/notes.c:298 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "" - -#: builtin/notes.c:339 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "" - -#: builtin/notes.c:349 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "" - -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: builtin/notes.c:376 +#: builtin/notes.c:276 #, c-format -msgid "Bad %s value: '%s'" -msgstr "" +msgid "Cannot read note data from non-blob object '%s'." +msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'." -#: builtin/notes.c:440 +#: builtin/notes.c:316 #, c-format msgid "Malformed input line: '%s'." -msgstr "" +msgstr "Ligne en entrée malformée : '%s'." -#: builtin/notes.c:455 +#: builtin/notes.c:331 #, c-format msgid "Failed to copy notes from '%s' to '%s'" -msgstr "" +msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 -#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 -#: builtin/notes.c:1032 +#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 +#: builtin/notes.c:908 msgid "too many parameters" -msgstr "" +msgstr "trop de paramètres" -#: builtin/notes.c:512 builtin/notes.c:771 +#: builtin/notes.c:388 builtin/notes.c:647 #, c-format msgid "No note found for object %s." -msgstr "" +msgstr "Pas de note trouvée pour l'objet %s." -#: builtin/notes.c:534 builtin/notes.c:691 +#: builtin/notes.c:410 builtin/notes.c:567 msgid "note contents as a string" -msgstr "" +msgstr "contenu de la note sous forme de chaîne" -#: builtin/notes.c:537 builtin/notes.c:694 +#: builtin/notes.c:413 builtin/notes.c:570 msgid "note contents in a file" -msgstr "" +msgstr "contenu de la note dans un fichier" -#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 -#: builtin/notes.c:699 builtin/tag.c:474 +#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 +#: builtin/notes.c:575 builtin/tag.c:539 msgid "object" -msgstr "" +msgstr "objet" -#: builtin/notes.c:540 builtin/notes.c:697 +#: builtin/notes.c:416 builtin/notes.c:573 msgid "reuse and edit specified note object" -msgstr "" +msgstr "réutiliser et éditer l'objet de note spécifié" -#: builtin/notes.c:543 builtin/notes.c:700 +#: builtin/notes.c:419 builtin/notes.c:576 msgid "reuse specified note object" -msgstr "" +msgstr "réutiliser l'objet de note spécifié" -#: builtin/notes.c:545 builtin/notes.c:613 +#: builtin/notes.c:421 builtin/notes.c:489 msgid "replace existing notes" -msgstr "" +msgstr "remplacer les notes existantes" -#: builtin/notes.c:579 +#: builtin/notes.c:455 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" +"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. " +"Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:584 builtin/notes.c:661 +#: builtin/notes.c:460 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" -msgstr "" +msgstr "Écrasement des notes existantes pour l'objet %s\n" -#: builtin/notes.c:614 +#: builtin/notes.c:490 msgid "read objects from stdin" -msgstr "" +msgstr "lire les objets depuis l'entrée standard" -#: builtin/notes.c:616 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" +"charger la configuration de réécriture pour <commande> (implique --stdin)" -#: builtin/notes.c:634 +#: builtin/notes.c:510 msgid "too few parameters" -msgstr "" +msgstr "pas assez de paramètres" -#: builtin/notes.c:655 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" +"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. " +"Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:667 +#: builtin/notes.c:543 #, c-format msgid "Missing notes on source object %s. Cannot copy." -msgstr "" +msgstr "Notes manquantes sur l'objet source %s. Impossible de copier." -#: builtin/notes.c:716 +#: builtin/notes.c:592 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" +"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n" +"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n" -#: builtin/notes.c:863 +#: builtin/notes.c:739 msgid "General options" -msgstr "" +msgstr "Options générales" -#: builtin/notes.c:865 +#: builtin/notes.c:741 msgid "Merge options" -msgstr "" +msgstr "Options de fusion" -#: builtin/notes.c:867 +#: builtin/notes.c:743 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" +"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/" +"theirs/union/cat_sort_uniq)" -#: builtin/notes.c:869 +#: builtin/notes.c:745 msgid "Committing unmerged notes" -msgstr "" +msgstr "Validation des notes non fusionnées" -#: builtin/notes.c:871 +#: builtin/notes.c:747 msgid "finalize notes merge by committing unmerged notes" -msgstr "" +msgstr "finaliser la fusion de notes en validant les notes non fusionnées" -#: builtin/notes.c:873 +#: builtin/notes.c:749 msgid "Aborting notes merge resolution" -msgstr "" +msgstr "Abandon de la résolution de fusion des notes" -#: builtin/notes.c:875 +#: builtin/notes.c:751 msgid "abort notes merge" -msgstr "" +msgstr "abandonner la fusion de notes" -#: builtin/notes.c:970 +#: builtin/notes.c:846 #, c-format msgid "Object %s has no note\n" -msgstr "" +msgstr "L'objet %s n'a pas de note\n" -#: builtin/notes.c:982 +#: builtin/notes.c:858 msgid "attempt to remove non-existent note is not an error" msgstr "" +"la tentative de suppression d'une note non existante n'est pas une erreur" -#: builtin/notes.c:985 +#: builtin/notes.c:861 msgid "read object names from the standard input" -msgstr "" +msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:1066 -msgid "notes_ref" -msgstr "" +#: builtin/notes.c:942 +msgid "notes-ref" +msgstr "références-notes" -#: builtin/notes.c:1067 +#: builtin/notes.c:943 msgid "use notes from <notes_ref>" -msgstr "" +msgstr "utiliser les notes depuis <références_notes>" -#: builtin/notes.c:1102 builtin/remote.c:1598 +#: builtin/notes.c:978 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" -msgstr "" +msgstr "Sous-commande inconnue : %s" -#: builtin/pack-objects.c:23 +#: builtin/pack-objects.c:25 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" +"git pack-objects --stdout [options...] [< liste-références | < liste-objets]" -#: builtin/pack-objects.c:24 +#: builtin/pack-objects.c:26 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:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" -msgstr "" +msgstr "erreur de compression (%d)" + +#: builtin/pack-objects.c:771 +msgid "Writing objects" +msgstr "Écriture des objets" + +#: builtin/pack-objects.c:1012 +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "désactivation de l'écriture en bitmap car certains objets ne sont pas compressés" -#: builtin/pack-objects.c:2397 +#: builtin/pack-objects.c:2174 +msgid "Compressing objects" +msgstr "Compression des objets" + +#: builtin/pack-objects.c:2530 #, c-format msgid "unsupported index version %s" -msgstr "" +msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2401 +#: builtin/pack-objects.c:2534 #, c-format msgid "bad index version '%s'" -msgstr "" +msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2424 +#: builtin/pack-objects.c:2557 #, c-format msgid "option %s does not accept negative form" -msgstr "" +msgstr "l'option %s n'accepte pas de valeur négative" -#: builtin/pack-objects.c:2428 +#: builtin/pack-objects.c:2561 #, c-format msgid "unable to parse value '%s' for option %s" -msgstr "" +msgstr "impossible d'analyser la valeur '%s' pour l'option %s" -#: builtin/pack-objects.c:2447 +#: builtin/pack-objects.c:2580 msgid "do not show progress meter" -msgstr "" +msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2449 +#: builtin/pack-objects.c:2582 msgid "show progress meter" -msgstr "" +msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2451 +#: builtin/pack-objects.c:2584 msgid "show progress meter during object writing phase" -msgstr "" +msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:2454 +#: builtin/pack-objects.c:2587 msgid "similar to --all-progress when progress meter is shown" -msgstr "" +msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2588 msgid "version[,offset]" -msgstr "" +msgstr "version[,offset]" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2589 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:2592 msgid "maximum size of each output pack file" -msgstr "" +msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2461 +#: builtin/pack-objects.c:2594 msgid "ignore borrowed objects from alternate object store" -msgstr "" +msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2463 +#: builtin/pack-objects.c:2596 msgid "ignore packed objects" -msgstr "" +msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2465 +#: builtin/pack-objects.c:2598 msgid "limit pack window by objects" -msgstr "" +msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2467 +#: builtin/pack-objects.c:2600 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:2602 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:2604 msgid "reuse existing deltas" -msgstr "" +msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2473 +#: builtin/pack-objects.c:2606 msgid "reuse existing objects" -msgstr "" +msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2475 +#: builtin/pack-objects.c:2608 msgid "use OFS_DELTA objects" -msgstr "" +msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2477 +#: builtin/pack-objects.c:2610 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:2612 msgid "do not create an empty pack output" -msgstr "" +msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2481 +#: builtin/pack-objects.c:2614 msgid "read revision arguments from standard input" -msgstr "" +msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2483 +#: builtin/pack-objects.c:2616 msgid "limit the objects to those that are not yet packed" -msgstr "" +msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:2486 +#: builtin/pack-objects.c:2619 msgid "include objects reachable from any reference" -msgstr "" +msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2489 +#: builtin/pack-objects.c:2622 msgid "include objects referred by reflog entries" -msgstr "" +msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:2492 +#: builtin/pack-objects.c:2625 msgid "output pack to stdout" -msgstr "" +msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2494 +#: builtin/pack-objects.c:2627 msgid "include tag objects that refer to objects to be packed" -msgstr "" +msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:2496 +#: builtin/pack-objects.c:2629 msgid "keep unreachable objects" -msgstr "" +msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2497 parse-options.h:141 +#: builtin/pack-objects.c:2630 parse-options.h:140 msgid "time" -msgstr "" +msgstr "heure" -#: builtin/pack-objects.c:2498 +#: builtin/pack-objects.c:2631 msgid "unpack unreachable objects newer than <time>" -msgstr "" +msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2501 +#: builtin/pack-objects.c:2634 msgid "create thin packs" -msgstr "" +msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2503 +#: builtin/pack-objects.c:2636 msgid "ignore packs that have companion .keep file" -msgstr "" +msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2505 +#: builtin/pack-objects.c:2638 msgid "pack compression level" -msgstr "" +msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2507 +#: builtin/pack-objects.c:2640 msgid "do not hide commits by grafts" -msgstr "" +msgstr "ne pas cacher les validations par greffes" + +#: builtin/pack-objects.c:2642 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "utiliser un index en bitmap si disponible pour accélerer le décompte des objets" + +#: builtin/pack-objects.c:2644 +msgid "write a bitmap index together with the pack index" +msgstr "écrire un index en bitmap associé à l'index de paquet" + +#: builtin/pack-objects.c:2723 +msgid "Counting objects" +msgstr "Décompte des objets" #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" -msgstr "" +msgstr "git pack-refs [options]" #: builtin/pack-refs.c:14 msgid "pack everything" -msgstr "" +msgstr "empaqueter tout" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" -msgstr "" +msgstr "éliminer les références perdues (défaut)" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" + +#: builtin/prune-packed.c:49 +msgid "Removing duplicate objects" +msgstr "Suppression des objets dupliqués" #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "" +msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]" -#: builtin/prune.c:132 +#: builtin/prune.c:142 msgid "do not remove, show only" -msgstr "" +msgstr "ne pas supprimer, afficher seulement" -#: builtin/prune.c:133 +#: builtin/prune.c:143 msgid "report pruned objects" -msgstr "" +msgstr "afficher les objets éliminés" -#: builtin/prune.c:136 +#: builtin/prune.c:146 msgid "expire objects older than <time>" -msgstr "" +msgstr "faire expirer les objets plus vieux que <heure>" #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "" +msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:45 +#: builtin/push.c:85 msgid "tag shorthand without <tag>" -msgstr "" +msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:64 +#: builtin/push.c:95 msgid "--delete only accepts plain target ref names" -msgstr "" +msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:99 +#: builtin/push.c:140 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" +"\n" +"Pour choisir l'option de manière permanente, voir push.default dans 'git " +"help config'." -#: builtin/push.c:102 +#: builtin/push.c:143 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7160,8 +7914,18 @@ msgid "" " git push %s %s\n" "%s" msgstr "" +"La branche amont de votre branche courante ne correspond pas\n" +"au nom de votre branche courante. Pour pousser vers la branche amont\n" +"sur le serveur distant, utilisez\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"Pour pousser vers la branche du même nom sur le serveur distant, utilisez\n" +"\n" +" git push %s %s\n" +"%s" -#: builtin/push.c:121 +#: builtin/push.c:158 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7170,8 +7934,13 @@ msgid "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" +"Vous n'êtes actuellement sur aucune branche.\n" +"Pour pousser l'historique menant à l'état actuel (HEAD détachée),\n" +"utilisez\n" +"\n" +" git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:128 +#: builtin/push.c:172 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7179,25 +7948,34 @@ msgid "" "\n" " git push --set-upstream %s %s\n" msgstr "" +"La branche courante %s n'a pas de branche amont.\n" +"Pour pousser la branche courante et définir la distante comme amont, " +"utilisez\n" +"\n" +" git push --set-upstream %s %s\n" -#: builtin/push.c:136 +#: builtin/push.c:180 #, 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:139 +#: builtin/push.c:183 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" +"Vous êtes en train de pousser vers la branche distante '%s', qui n'est\n" +"pas une branche amont de votre branche courante '%s', sans me dire\n" +"quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:151 +#: builtin/push.c:206 msgid "" -"push.default is unset; its implicit value is changing in\n" +"push.default is unset; its implicit value has changed in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -"and maintain the current behavior after the default changes, use:\n" +"and maintain the traditional behavior, use:\n" "\n" " git config --global push.default matching\n" "\n" @@ -7205,77 +7983,128 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"Since Git 2.0, Git defaults to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" +"push.default n'est pas défini ; sa valeur implicite a changé dans Git 2.0\n" +"de 'matching' vers 'simple'. Pour supprimer ce message et maintenir\n" +"le comportement actuel après la modification de la valeur de défaut, utilisez :\n" +"\n" +" git config --global push.default matching\n" +"\n" +"Pour supprimer ce message et adopter le nouveau comportement maintenant, utilisez :\n" +"\n" +" git config --global push.default simple\n" +"\n" +"Quand push.default vaudra 'matching', git poussera les branches locales\n" +"sur les branches distantes qui existent déjà avec le même nom.\n" +"\n" +"Depuis Git 2.0, Git utilise par défaut le comportement plus conservatif 'simple'\n" +"qui ne pousse la branche courante que vers la branche distante correspondante\n" +"que 'git pull' utilise pour mettre à jour la branche courante.\n" +" \n" +"Voir 'git help config' et chercher 'push.default' pour plus d'information.\n" +"(le mode 'simple' a été introduit dans Git 1.7.11. Utilisez le mode similaire\n" +"'current' au lieu de 'simple' si vous utilisez de temps en temps d'anciennes versions de Git)" -#: builtin/push.c:199 +#: builtin/push.c:273 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:206 +#: builtin/push.c:280 msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" -"before pushing again.\n" +"its remote counterpart. Integrate the remote changes (e.g.\n" +"'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" +"Les mises à jour ont été rejetées car la pointe de la branche courante est " +"derrière\n" +"son homologue distant. Intégrez les changements distants (par exemple 'git " +"pull ...')\n" +"avant de pousser à nouveau.\n" +"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " +"d'information." -#: builtin/push.c:212 -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" -"specify branches to push or set the 'push.default' configuration variable\n" -"to 'simple', 'current' or 'upstream' to push only the current branch." -msgstr "" - -#: builtin/push.c:218 +#: builtin/push.c:286 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and merge the remote changes\n" -"(e.g. 'git pull') before pushing again.\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" +"Les mises à jour ont été rejetées car la pointe de la branche courante est " +"derrière\n" +"son homologue distant. Extrayez cette branche et Intégrez les changements " +"distants\n" +"(par exemple 'git pull ...') avant de pousser à nouveau.\n" +"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " +"d'information." -#: builtin/push.c:224 +#: builtin/push.c:292 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" -"to the same ref. You may want to first merge the remote changes (e.g.,\n" -"'git pull') before pushing again.\n" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" - -#: builtin/push.c:231 +"Les mises à jour ont été rejetées car la branche distante contient du " +"travail que\n" +"vous n'avez pas en local. Ceci est généralement causé par un autre dépôt " +"poussé\n" +"vers la même référence. Vous pourriez intégrer d'abord les changements " +"distants\n" +"(par exemple 'git pull ...') avant de pousser à nouveau.\n" +"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " +"d'information." + +#: builtin/push.c:299 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:234 +#: builtin/push.c:302 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" "without using the '--force' option.\n" msgstr "" +"Vous ne pouvez pas mettre à jour une référence distante qui pointe sur un " +"objet qui\n" +"n'est pas un commit, ou mettre à jour une référence distante pour la faire " +"pointer\n" +"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:294 +#: builtin/push.c:361 #, c-format msgid "Pushing to %s\n" -msgstr "" +msgstr "Poussage vers %s\n" -#: builtin/push.c:298 +#: builtin/push.c:365 #, c-format msgid "failed to push some refs to '%s'" -msgstr "" +msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:331 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" -msgstr "" +msgstr "mauvais dépôt '%s'" -#: builtin/push.c:332 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7287,90 +8116,108 @@ msgid "" "\n" " git push <name>\n" msgstr "" +"Pas de destination pour pousser.\n" +"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " +"en utilisant\n" +"\n" +" git remote add <nom> <url>\n" +"\n" +"et poussez alors en utilisant le dépôt distant\n" +"\n" +" git push <nom>\n" -#: builtin/push.c:347 +#: builtin/push.c:411 msgid "--all and --tags are incompatible" -msgstr "" +msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:348 +#: builtin/push.c:412 msgid "--all can't be combined with refspecs" -msgstr "" +msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:353 +#: builtin/push.c:417 msgid "--mirror and --tags are incompatible" -msgstr "" +msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:354 +#: builtin/push.c:418 msgid "--mirror can't be combined with refspecs" -msgstr "" +msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:359 +#: builtin/push.c:423 msgid "--all and --mirror are incompatible" -msgstr "" +msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:419 +#: builtin/push.c:483 msgid "repository" -msgstr "" +msgstr "dépôt" -#: builtin/push.c:420 +#: builtin/push.c:484 msgid "push all refs" -msgstr "" +msgstr "pousser toutes les références" -#: builtin/push.c:421 +#: builtin/push.c:485 msgid "mirror all refs" -msgstr "" +msgstr "refléter toutes les références" -#: builtin/push.c:423 +#: builtin/push.c:487 msgid "delete refs" -msgstr "" +msgstr "supprimer les références" -#: builtin/push.c:424 +#: builtin/push.c:488 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:427 +#: builtin/push.c:491 msgid "force updates" -msgstr "" +msgstr "forcer les mises à jour" -#: builtin/push.c:428 +#: builtin/push.c:493 +msgid "refname>:<expect" +msgstr "nom de référence>:<attendu" + +#: builtin/push.c:494 +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:496 msgid "check" -msgstr "" +msgstr "check" -#: builtin/push.c:429 +#: builtin/push.c:497 msgid "control recursive pushing of submodules" -msgstr "" +msgstr "contrôler le poussage récursif des sous-modules" -#: builtin/push.c:431 +#: builtin/push.c:499 msgid "use thin pack" -msgstr "" +msgstr "utiliser un empaquetage léger" -#: builtin/push.c:432 builtin/push.c:433 +#: builtin/push.c:500 builtin/push.c:501 msgid "receive pack program" -msgstr "" +msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:434 +#: builtin/push.c:502 msgid "set upstream for git pull/status" -msgstr "" +msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:437 +#: builtin/push.c:505 msgid "prune locally removed refs" -msgstr "" +msgstr "éliminer les références locales supprimées" -#: builtin/push.c:439 +#: builtin/push.c:507 msgid "bypass pre-push hook" -msgstr "" +msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:440 +#: builtin/push.c:508 msgid "push missing but relevant tags" -msgstr "" +msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:450 +#: builtin/push.c:518 msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "" +msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:452 +#: builtin/push.c:520 msgid "--delete doesn't make sense without any refs" -msgstr "" +msgstr "--delete n'a pas de sens sans aucune référence" #: builtin/read-tree.c:36 msgid "" @@ -7378,152 +8225,174 @@ msgid "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --" +"prefix=<préfixe>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" +"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté " +"1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])" -#: builtin/read-tree.c:108 +#: builtin/read-tree.c:109 msgid "write resulting index to <file>" -msgstr "" +msgstr "écrire l'index résultant dans <fichier>" -#: builtin/read-tree.c:111 +#: builtin/read-tree.c:112 msgid "only empty the index" -msgstr "" +msgstr "juste vider l'index" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:114 msgid "Merging" -msgstr "" +msgstr "Fusion" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:116 msgid "perform a merge in addition to a read" -msgstr "" +msgstr "effectuer une fusion en plus d'une lecture" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:118 msgid "3-way merge if no file level merging required" -msgstr "" +msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:120 msgid "3-way merge in presence of adds and removes" -msgstr "" +msgstr "fusion à 3 points en présence d'ajouts et suppressions" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:122 msgid "same as -m, but discard unmerged entries" -msgstr "" +msgstr "comme -m, mais annule les éléments non fusionnés" -#: builtin/read-tree.c:122 +#: builtin/read-tree.c:123 msgid "<subdirectory>/" -msgstr "" +msgstr "<sous-répertoire>/" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "read the tree into the index under <subdirectory>/" -msgstr "" +msgstr "lire l'arbre dans l'index dans <sous-répertoire>/" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:127 msgid "update working tree with merge result" -msgstr "" +msgstr "mettre à jour la copie de travail avec le résultat de la fusion" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:129 msgid "gitignore" -msgstr "" +msgstr "gitignore" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "allow explicitly ignored files to be overwritten" -msgstr "" +msgstr "autoriser explicitement les fichiers ignorés à être écrasés" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:133 msgid "don't check the working tree after merging" -msgstr "" +msgstr "ne pas vérifier la copie de travail après la fusion" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't update the index or the work tree" -msgstr "" +msgstr "ne pas mettre à jour l'index ou la copie de travail" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:136 msgid "skip applying sparse checkout filter" -msgstr "" +msgstr "sauter l'application du filtre d'extraction creuse" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:138 msgid "debug unpack-trees" -msgstr "" +msgstr "déboguer unpack-trees" -#: builtin/remote.c:11 +#: 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:615 builtin/reflog.c:620 +#, c-format +msgid "'%s' is not a valid timestamp" +msgstr "'%s' n'est pas un horodatage valide" + +#: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" -msgstr "git remote add [-t <branche>] [-m <maîtresse>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <nom> <URL>" +msgstr "" +"git remote add [-t <branche>] [-m <maîtresse>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <nom> <URL>" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "git remote rename <ancienne> <nouvelle>" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 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:16 +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:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" -msgstr "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | <distante>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<groupe> | " +"<distante>)...]" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branche>..." -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <nouvelle-URL>" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <URL>" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:47 +#: builtin/remote.c:43 +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:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branche>..." -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <nom>" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <nom>" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<groupe> | <distante>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "Mise à jour de %s" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -7531,101 +8400,107 @@ msgstr "" "--mirror est dangereux et obsolète ; merci\n" "\t d'utiliser --mirror=fetch ou --mirror=push à la place" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "argument miroir inconnu : %s" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" -msgstr "importer toutes les étiquettes et les objets associés lors du rapatriement" +msgstr "" +"importer toutes les étiquettes et les objets associés lors du rapatriement" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou ne rapatrier aucune étiquette (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" msgstr "branche(s) à suivre" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "branche maîtresse" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" -msgstr "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" +msgstr "" +"paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "spécifier les branches à suivre n'a de sens qu'avec des miroirs de rapatriement" +msgstr "" +"spécifier les branches à suivre n'a de sens qu'avec des miroirs de " +"rapatriement" -#: builtin/remote.c:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:299 +#: builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: builtin/remote.c:339 +#: builtin/remote.c:334 #, 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" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:435 builtin/remote.c:443 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:452 +#: builtin/remote.c:447 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Impossible d'ajouter '%s' à '%s'" -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 #, c-format msgid "No such remote: %s" msgstr "Distante inconnue : %s" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Impossible de renommer la section de configuration '%s' en '%s'" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:794 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -7634,34 +8509,34 @@ msgid "" msgstr "" "Pas de mise à jour du refspec de rapatriement qui n'est pas par défaut\n" "\t%s\n" -"\tMerci de mettre à jour la configuration si nécessaire." +"\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Impossible d'ajouter '%s'" -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Impossible de définir '%s'" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:764 +#: builtin/remote.c:759 #, c-format msgid "Could not remove branch %s" msgstr "Impossible de supprimer la branche %s" -#: builtin/remote.c:834 +#: builtin/remote.c:829 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -7672,268 +8547,347 @@ msgstr[0] "" "Note : Une branche en dehors de refs/remotes/ n'a pas été supprimée ;\n" "pour la supprimer, utilisez :" msgstr[1] "" -"Note : Plusieurs branches en dehors de refs/remotes/ n'ont pas été supprimées ;\n" +"Note : Plusieurs branches en dehors de refs/remotes/ n'ont pas été " +"supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:943 +#: builtin/remote.c:938 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:946 +#: builtin/remote.c:941 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:948 +#: builtin/remote.c:943 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:950 +#: builtin/remote.c:945 msgid " ???" msgstr " ???" -#: builtin/remote.c:991 +#: builtin/remote.c:986 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche" -#: builtin/remote.c:998 +#: builtin/remote.c:993 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:1001 +#: builtin/remote.c:996 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:1002 +#: builtin/remote.c:997 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1004 +#: builtin/remote.c:999 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1000 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 msgid "create" msgstr "créer" -#: builtin/remote.c:1054 +#: builtin/remote.c:1049 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1058 +#: builtin/remote.c:1053 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1061 +#: builtin/remote.c:1056 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1064 +#: builtin/remote.c:1059 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1071 +#: builtin/remote.c:1066 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1074 +#: builtin/remote.c:1069 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1081 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1091 +#: builtin/remote.c:1144 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1118 +#: builtin/remote.c:1171 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1172 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1173 builtin/remote.c:1318 msgid "(no URL)" msgstr "(pas d'URL)" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1182 builtin/remote.c:1184 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1192 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" -msgstr " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des suivantes) :\n" +msgstr "" +" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " +"suivantes) :\n" -#: builtin/remote.c:1151 +#: builtin/remote.c:1204 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1207 builtin/remote.c:1234 msgid " (status not queried)" msgstr " (statut non demandé)" -#: builtin/remote.c:1163 +#: builtin/remote.c:1216 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branche locale configurée pour 'git pull' :" msgstr[1] " Branches locales configurées pour 'git pull' :" -#: builtin/remote.c:1171 +#: builtin/remote.c:1224 msgid " Local refs will be mirrored by 'git push'" msgstr " Les références locales seront reflétées par 'git push'" -#: builtin/remote.c:1178 +#: builtin/remote.c:1231 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Référence locale configurée pour 'git push'%s :" msgstr[1] " Références locales configurées pour 'git push'%s :" -#: builtin/remote.c:1199 +#: builtin/remote.c:1252 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1201 +#: builtin/remote.c:1254 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1216 +#: builtin/remote.c:1269 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1218 +#: builtin/remote.c:1271 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" -msgstr "Il y a de multiples branches HEAD distantes. Merci d'en choisir une explicitement avec :" +msgstr "" +"Il y a de multiples branches HEAD distantes. Veuillez en choisir une " +"explicitement avec :" -#: builtin/remote.c:1228 +#: builtin/remote.c:1281 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1236 +#: builtin/remote.c:1289 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1238 +#: builtin/remote.c:1291 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1274 +#: builtin/remote.c:1307 #, c-format msgid " %s will become dangling!" msgstr " %s deviendra en suspens !" -#: builtin/remote.c:1275 +#: builtin/remote.c:1308 #, c-format msgid " %s has become dangling!" msgstr " %s est devenu en suspens !" -#: builtin/remote.c:1281 +#: builtin/remote.c:1314 #, c-format msgid "Pruning %s" -msgstr "Élagage de %s" +msgstr "Élimination de %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1315 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1295 +#: builtin/remote.c:1328 #, c-format msgid " * [would prune] %s" -msgstr " * [serait élagué] %s" +msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1331 #, c-format msgid " * [pruned] %s" -msgstr " * [élagué] %s" +msgstr " * [éliminé] %s" -#: builtin/remote.c:1321 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" -msgstr "élaguer les distants après le rapatriement" +msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1440 builtin/remote.c:1514 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1407 +#: builtin/remote.c:1460 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1414 +#: builtin/remote.c:1467 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1436 +#: builtin/remote.c:1489 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1438 +#: builtin/remote.c:1491 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1440 +#: builtin/remote.c:1493 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1447 +#: builtin/remote.c:1500 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1487 +#: builtin/remote.c:1540 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1495 +#: builtin/remote.c:1548 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1497 +#: builtin/remote.c:1550 msgid "Will not delete all non-push URLs" -msgstr "" +msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1569 +#: builtin/remote.c:1564 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" +#: builtin/repack.c:16 +msgid "git repack [options]" +msgstr "git repack [options]" + +#: builtin/repack.c:156 +msgid "pack everything in a single pack" +msgstr "empaqueter tout dans un seul paquet" + +#: builtin/repack.c:158 +msgid "same as -a, and turn unreachable objects loose" +msgstr "identique à -a et transformer les objets inaccessibles en suspens" + +#: builtin/repack.c:161 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "supprimer les paquets redondants et lancer git-prune-packed" + +#: builtin/repack.c:163 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "passer --no-reuse-delta à git-pack-objects" + +#: builtin/repack.c:165 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "passer --no-reuse-object à git-pack-objects" + +#: builtin/repack.c:167 +msgid "do not run git-update-server-info" +msgstr "ne pas lancer git update-server-info" + +#: builtin/repack.c:170 +msgid "pass --local to git-pack-objects" +msgstr "passer --local à git-pack-objects" + +#: builtin/repack.c:172 +msgid "write bitmap index" +msgstr "écrire un index en bitmap" + +#: builtin/repack.c:173 +msgid "approxidate" +msgstr "date approximative" + +#: builtin/repack.c:174 +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:176 +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:177 builtin/repack.c:181 +msgid "bytes" +msgstr "octets" + +#: builtin/repack.c:178 +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:180 +msgid "limits the maximum delta depth" +msgstr "limite la profondeur maximale des deltas" + +#: builtin/repack.c:182 +msgid "maximum size of each packfile" +msgstr "taille maximum de chaque fichier paquet" + +#: builtin/repack.c:184 +msgid "repack objects in packs marked with .keep" +msgstr "réempaqueter les objets dans des paquets marqués avec .keep" + +#: builtin/repack.c:371 +#, 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>" @@ -7943,41 +8897,46 @@ msgid "git replace -d <object>..." msgstr "git replace -d <objet>..." #: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" -msgstr "git replace -l [<motif>]" +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<format>] [-l [<motif>]]" -#: builtin/replace.c:121 +#: builtin/replace.c:174 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:122 +#: builtin/replace.c:175 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:123 +#: builtin/replace.c:176 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/rerere.c:11 +#: builtin/replace.c:177 +msgid "use this format" +msgstr "utiliser ce format" + +#: 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" #: builtin/reset.c:25 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:26 msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <arbre> [--] <chemins>..." +msgstr "git reset [-q] <arbre ou apparenté> [--] <chemins>..." #: builtin/reset.c:27 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<arbre>] [--] [<chemins>...]" +msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]" #: builtin/reset.c:33 msgid "mixed" @@ -8012,95 +8971,109 @@ msgstr "Impossible de trouver l'arbre pour HEAD." msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." -#: builtin/reset.c:98 +#: builtin/reset.c:99 #, c-format msgid "HEAD is now at %s" msgstr "HEAD est maintenant à %s" -#: builtin/reset.c:169 +#: builtin/reset.c:182 #, c-format 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:248 +#: builtin/reset.c:273 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" -#: builtin/reset.c:250 +#: builtin/reset.c:275 msgid "reset HEAD and index" msgstr "réinitialiser HEAD et l'index" -#: builtin/reset.c:251 +#: builtin/reset.c:276 msgid "reset only HEAD" msgstr "réinitialiser seulement HEAD" -#: builtin/reset.c:253 builtin/reset.c:255 +#: builtin/reset.c:278 builtin/reset.c:280 msgid "reset HEAD, index and working tree" msgstr "réinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:257 +#: builtin/reset.c:282 msgid "reset HEAD but keep local changes" msgstr "réinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:275 +#: builtin/reset.c:285 +msgid "record only the fact that removed paths will be added later" +msgstr "enregistrer seulement le fait que les chemins effacés seront ajoutés plus tard" + +#: builtin/reset.c:302 #, 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:278 builtin/reset.c:286 +#: builtin/reset.c:305 builtin/reset.c:313 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/reset.c:283 +#: builtin/reset.c:310 #, 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:292 +#: builtin/reset.c:319 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch est incompatible avec --{hard,mixed,soft}" -#: builtin/reset.c:301 +#: builtin/reset.c:328 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." +msgstr "" +"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " +"place." -#: builtin/reset.c:303 +#: builtin/reset.c:330 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:313 +#: builtin/reset.c:340 #, 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:333 -#, 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:344 +msgid "-N can only be used with --mixed" +msgstr "-N ne peut être utilisé qu'avec --mixed" -#: builtin/reset.c:339 +#: builtin/reset.c:361 msgid "Unstaged changes after reset:" msgstr "Modifications non indexées après reset :" -#: builtin/reset.c:344 +#: builtin/reset.c:367 +#, 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:372 msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-parse.c:339 +#: builtin/rev-parse.c:359 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<arguments>...]" -#: builtin/rev-parse.c:344 +#: builtin/rev-parse.c:364 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passé en argument" -#: builtin/rev-parse.c:346 +#: builtin/rev-parse.c:366 msgid "stop parsing after the first non-option argument" msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:464 +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "sortie en forme longue fixée" + +#: builtin/rev-parse.c:497 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -8112,11 +9085,12 @@ msgstr "" " ou : git rev-parse --sq-quote [<argument>...]\n" " ou : git rev-parse [options] [<argument>...]\n" "\n" -"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur l'utilisation principale." +"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur " +"l'utilisation principale." #: builtin/revert.c:22 msgid "git revert [options] <commit-ish>..." -msgstr "git revert [options] <commit>..." +msgstr "git revert [options] <commit ou apparenté>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" @@ -8124,151 +9098,180 @@ msgstr "git revert <sous-commande>" #: builtin/revert.c:28 msgid "git cherry-pick [options] <commit-ish>..." -msgstr "git cherry-pick [options] <commit>..." +msgstr "git cherry-pick [options] <commit ou apparenté>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <sous-commande>" -#: builtin/revert.c:70 builtin/revert.c:92 +#: 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:103 +#: builtin/revert.c:80 msgid "end revert or cherry-pick sequence" msgstr "mettre fin au retour ou picorage" -#: builtin/revert.c:104 +#: builtin/revert.c:81 msgid "resume revert or cherry-pick sequence" msgstr "reprendre le retour ou picorage" -#: builtin/revert.c:105 +#: builtin/revert.c:82 msgid "cancel revert or cherry-pick sequence" msgstr "annuler le retour ou picorage" -#: builtin/revert.c:106 +#: builtin/revert.c:83 msgid "don't automatically commit" msgstr "ne pas valider automatiquement" -#: builtin/revert.c:107 +#: builtin/revert.c:84 msgid "edit the commit message" msgstr "éditer le message de validation" -#: builtin/revert.c:110 +#: builtin/revert.c:87 msgid "parent number" msgstr "numéro de parent" -#: builtin/revert.c:112 +#: builtin/revert.c:89 msgid "merge strategy" msgstr "stratégie de fusion" -#: builtin/revert.c:113 +#: builtin/revert.c:90 msgid "option" msgstr "option" -#: builtin/revert.c:114 +#: builtin/revert.c:91 msgid "option for merge strategy" msgstr "option pour la stratégie de fusion" -#: builtin/revert.c:125 +#: builtin/revert.c:104 msgid "append commit name" msgstr "ajouter le nom de validation" -#: builtin/revert.c:126 +#: builtin/revert.c:105 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/revert.c:127 +#: builtin/revert.c:106 msgid "preserve initially empty commits" msgstr "préserver les validations vides initialement" -#: builtin/revert.c:128 +#: builtin/revert.c:107 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/revert.c:129 +#: builtin/revert.c:108 msgid "keep redundant, empty commits" msgstr "garder les validations redondantes, vides" -#: builtin/revert.c:133 +#: builtin/revert.c:112 msgid "program error" msgstr "erreur du programme" -#: builtin/revert.c:223 +#: builtin/revert.c:197 msgid "revert failed" msgstr "revert a échoué" -#: builtin/revert.c:238 +#: builtin/revert.c:212 msgid "cherry-pick failed" msgstr "le picorage a échoué" -#: builtin/rm.c:15 +#: builtin/rm.c:17 msgid "git rm [options] [--] <file>..." msgstr "git rm [options] [--] <fichier>..." -#: builtin/rm.c:64 builtin/rm.c:186 -#, c-format +#: builtin/rm.c:65 msgid "" -"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"the following submodule (or one of its nested submodules)\n" +"uses a .git directory:" +msgid_plural "" +"the following submodules (or one of its nested submodules)\n" +"use a .git directory:" +msgstr[0] "" +"le sous-module suivant (ou un de ses sous-modules imbriqués)\n" +"utilise un répertoire .git :" +msgstr[1] "" +"les sous-modules suivants (ou un de ses sous-modules imbriqués)\n" +"utilisent un répertoire .git :" + +#: builtin/rm.c:71 +msgid "" +"\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -"le sous-module '%s' (ou un des sous-modules imbriqués) utilise un répertoire .git\n" -"(utilisez 'rm -rf' si vous souhaitez vraiment le supprimer avec tout son historique)" +"\n" +"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " +"historique)" -#: builtin/rm.c:174 -#, c-format +#: builtin/rm.c:231 +msgid "" +"the following file has staged content different from both the\n" +"file and the HEAD:" +msgid_plural "" +"the following files have staged content different from both the\n" +"file and the HEAD:" +msgstr[0] "" +"le fichier suivant a du contenu indexé différent\n" +"du fichier et de HEAD :" +msgstr[1] "" +"les fichiers suivants ont du contenu indexé différent\n" +"du fichier et de HEAD :" + +#: builtin/rm.c:236 msgid "" -"'%s' has staged content different from both the file and the HEAD\n" +"\n" "(use -f to force removal)" msgstr "" -"'%s' a du contenu indexé différent du fichier et de HEAD\n" +"\n" "(utilisez -f pour forcer la suppression)" -#: builtin/rm.c:180 -#, c-format -msgid "" -"'%s' has changes staged in the index\n" -"(use --cached to keep the file, or -f to force removal)" -msgstr "" -"'%s' a des changements dans l'index\n" -"(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)" +#: 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:191 -#, c-format +#: builtin/rm.c:244 builtin/rm.c:255 msgid "" -"'%s' has local modifications\n" +"\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -"'%s' a des modifications locales\n" +"\n" "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)" -#: builtin/rm.c:207 +#: 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:270 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimés" -#: builtin/rm.c:208 +#: builtin/rm.c:271 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:209 +#: builtin/rm.c:272 msgid "override the up-to-date check" msgstr "outrepasser la vérification des fichiers à jour" -#: builtin/rm.c:210 +#: builtin/rm.c:273 msgid "allow recursive removal" msgstr "autoriser la suppression récursive" -#: builtin/rm.c:212 +#: 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:283 +#: 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:322 +#: builtin/rm.c:375 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" @@ -8282,23 +9285,25 @@ msgstr "git shortlog [<options>] [<intervalle révisions>] [[--] [<chemin>...]]" msgid "Missing author: %s" msgstr "Auteur manquant : %s" -#: builtin/shortlog.c:227 +#: 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:229 +#: builtin/shortlog.c:232 msgid "Suppress commit descriptions, only provides commit count" -msgstr "Supprimer les descriptions de validation, fournit seulement le nombre de validations" +msgstr "" +"Supprimer les descriptions de validation, fournit seulement le nombre de " +"validations" -#: builtin/shortlog.c:231 +#: builtin/shortlog.c:234 msgid "Show the email address of each author" msgstr "Afficher l'adresse e-mail de chaque auteur" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:235 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:233 +#: builtin/shortlog.c:236 msgid "Linewrap output" msgstr "Couper les lignes" @@ -8308,117 +9313,130 @@ msgid "" "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " "<glob>)...]" -msgstr "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=<quand>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<révision> | <glob>)...]" +msgstr "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<quand>] | --no-color] [--sparse] [--more=<n> | --list | " +"--independent | --merge-base] [--no-name | --sha1-name] [--topics] " +"[(<révision> | <glob>)...]" #: builtin/show-branch.c:10 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<référence>]" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "afficher les branches de suivi distantes et les branches locales" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "afficher les branches de suivi distantes" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "couleur '*!+-' correspondant à la branche" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "afficher <n> validations de plus après l'ancêtre commun" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "synonyme de more=-1" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "suppress naming strings" -msgstr "" +msgstr "supprimer les chaînes de nommage" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "inclure la branche courante" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "nommer les validations avec leurs noms d'objet" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "afficher les bases possibles de fusion" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" -msgstr "afficher les références non accessibles depuis toute autre référence" +msgstr "afficher les références inaccessibles depuis toute autre référence" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "afficher les validations dans l'ordre topologique" #: builtin/show-branch.c:671 msgid "show only commits not on the first branch" -msgstr "afficher seulement les validations qui ne sont pas sur la première branche" +msgstr "" +"afficher seulement les validations qui ne sont pas sur la première branche" #: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "afficher les fusions accessibles depuis une seule pointe" #: builtin/show-branch.c:675 -msgid "show commits where no parent comes before its children" -msgstr "afficher les validations où aucun parent ne vient avant ses enfants" +msgid "topologically sort, maintaining date order where possible" +msgstr "tri topologique, maintenant l'ordre par date si possible" -#: builtin/show-branch.c:677 +#: builtin/show-branch.c:678 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" -msgstr "afficher les <n> plus récentes entrées de ref-log en commençant à la base" +msgstr "" +"afficher les <n> plus récents éléments de ref-log en commençant à la base" #: builtin/show-ref.c:10 msgid "" "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " -msgstr "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [motif*] " +msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [motif*] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=motif] < liste-références" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:168 msgid "only show tags (can be combined with heads)" msgstr "afficher seulement les étiquettes (peut être combiné avec des têtes)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:169 msgid "only show heads (can be combined with tags)" msgstr "afficher seulement les têtes (peut être combiné avec des étiquettes)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:170 msgid "stricter reference checking, requires exact ref path" -msgstr "vérification de référence plus stricte, requiert un chemin de référence exact" +msgstr "" +"vérification de référence plus stricte, nécessite un chemin de référence " +"exact" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 -msgid "show the HEAD reference" -msgstr "afficher la référence HEAD" +#: 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:174 +#: 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:176 +#: 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:180 +#: 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)" +msgstr "" +"ne pas afficher les résultats sur la sortie standard (pratique avec --verify)" -#: builtin/show-ref.c:182 +#: 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 local" +msgstr "" +"afficher les références de l'entrée standard qui ne sont pas dans le dépôt " +"local" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [options] name [ref]" @@ -8430,7 +9448,8 @@ msgstr "git symbolic-ref -d [-q] nom" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" -msgstr "supprimer le message d'erreur pour une référence non symbolique (détachée)" +msgstr "" +"supprimer le message d'erreur pour une référence non symbolique (détachée)" #: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" @@ -8440,18 +9459,20 @@ 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:255 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255 msgid "reason of the update" msgstr "raison de la mise à jour" #: builtin/tag.c:22 msgid "" "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" -msgstr "git tag [-a|-s|-u <id-clé>] [-f] [-m <msg>|-F <file>] <nométiquette> [<head>]" +msgstr "" +"git tag [-a|-s|-u <id-clé>] [-f] [-m <message>|-F <file>] <nométiquette> " +"[<head>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." @@ -8469,32 +9490,32 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <nométiquette>..." -#: builtin/tag.c:60 +#: builtin/tag.c:67 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: builtin/tag.c:207 +#: builtin/tag.c:239 #, c-format msgid "tag name too long: %.*s..." msgstr "nom d'étiquette trop long : %.*s..." -#: builtin/tag.c:212 +#: builtin/tag.c:244 #, c-format msgid "tag '%s' not found." msgstr "étiquette '%s' non trouvée." -#: builtin/tag.c:227 +#: builtin/tag.c:259 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était %s)\n" -#: builtin/tag.c:239 +#: builtin/tag.c:271 #, c-format msgid "could not verify the tag '%s'" msgstr "impossible de vérifier l'étiquette '%s'" -#: builtin/tag.c:249 +#: builtin/tag.c:281 #, c-format msgid "" "\n" @@ -8505,7 +9526,7 @@ msgstr "" "Écrire un message pour l'étiquette\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:253 +#: builtin/tag.c:285 #, c-format msgid "" "\n" @@ -8515,274 +9536,310 @@ msgid "" msgstr "" "\n" "Écrire un message pour l'étiquette\n" -"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-même si vous le souhaitez.\n" +"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" +"même si vous le souhaitez.\n" -#: builtin/tag.c:292 +#: builtin/tag.c:324 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:294 +#: builtin/tag.c:326 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" -#: builtin/tag.c:319 +#: builtin/tag.c:351 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:332 +#: builtin/tag.c:364 msgid "tag header too big." msgstr "en-tête d'étiquette trop gros." -#: builtin/tag.c:368 +#: builtin/tag.c:400 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:374 +#: builtin/tag.c:406 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" -#: builtin/tag.c:423 +#: builtin/tag.c:455 msgid "switch 'points-at' requires an object" -msgstr "le commutateur 'points-at' requiert un objet" +msgstr "le commutateur 'points-at' a besoin d'un objet" -#: builtin/tag.c:425 +#: builtin/tag.c:457 #, c-format msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: builtin/tag.c:445 +#: builtin/tag.c:480 +#, c-format +msgid "unsupported sort specification %s" +msgstr "spécification de tri non supportée %s" + +#: builtin/tag.c:500 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:447 +#: builtin/tag.c:502 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:449 +#: builtin/tag.c:504 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:450 +#: builtin/tag.c:505 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:452 +#: builtin/tag.c:507 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:454 +#: builtin/tag.c:509 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:456 +#: builtin/tag.c:511 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:458 +#: builtin/tag.c:513 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:462 +#: builtin/tag.c:517 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:463 +#: builtin/tag.c:518 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:464 +#: builtin/tag.c:519 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:466 +#: builtin/tag.c:521 +msgid "sort tags" +msgstr "trier les étiquettes" + +#: builtin/tag.c:525 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:469 +#: builtin/tag.c:528 builtin/tag.c:534 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:475 +#: builtin/tag.c:540 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:504 +#: builtin/tag.c:566 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:521 +#: builtin/tag.c:578 +msgid "--sort and -n are incompatible" +msgstr "--sort et -n sont incompatibles" + +#: builtin/tag.c:585 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:587 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:589 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:597 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:617 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:559 +#: builtin/tag.c:623 #, 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:628 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:582 +#: builtin/tag.c:646 #, c-format msgid "%s: cannot lock the ref" msgstr "%s : impossible de verrouiller la référence" -#: builtin/tag.c:584 +#: builtin/tag.c:648 #, 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:650 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était %s)\n" -#: builtin/update-index.c:401 +#: builtin/unpack-objects.c:483 +msgid "Unpacking objects" +msgstr "Dépaquetage des objets" + +#: builtin/update-index.c:399 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [options] [--] [<fichier>...]" -#: builtin/update-index.c:718 +#: builtin/update-index.c:748 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:751 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:724 +#: builtin/update-index.c:754 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:726 +#: builtin/update-index.c:756 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:758 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:760 msgid "refresh even if index contains unmerged entries" -msgstr "rafraîchir même si l'index contient des entrées non fusionnées" +msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:733 +#: builtin/update-index.c:763 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:737 +#: builtin/update-index.c:767 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:741 -msgid "<mode> <object> <path>" -msgstr "<mode> <objet> <chemin>" +#: builtin/update-index.c:771 +msgid "<mode>,<object>,<path>" +msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:742 +#: builtin/update-index.c:772 msgid "add the specified entry to the index" -msgstr "ajouter l'entrée spécifiée dans l'index" +msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:746 +#: builtin/update-index.c:776 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:747 +#: builtin/update-index.c:777 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:781 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:754 +#: builtin/update-index.c:784 msgid "clear assumed-unchanged bit" -msgstr "" +msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:757 +#: builtin/update-index.c:787 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:760 +#: builtin/update-index.c:790 msgid "clear skip-worktree bit" -msgstr "" +msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:763 +#: builtin/update-index.c:793 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" +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:795 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" +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:797 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:799 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:803 msgid "add entries from standard input to the index" -msgstr "ajouter les entrées depuis l'entrée standard à l'index" +msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:777 +#: builtin/update-index.c:807 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:811 msgid "only update entries that differ from HEAD" -msgstr "mettre à jour seulement les entrées qui diffèrent de HEAD" +msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:785 +#: builtin/update-index.c:815 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:818 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:790 +#: builtin/update-index.c:820 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:824 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>]" +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:256 msgid "delete the reference" msgstr "supprimer la référence" -#: builtin/update-ref.c:21 +#: builtin/update-ref.c:258 msgid "update <refname> not the one it points to" -msgstr "" +msgstr "mettre à jour <nomréférence> et non la référence pointée par lui" + +#: builtin/update-ref.c:259 +msgid "stdin has NUL-terminated arguments" +msgstr "l'entrée standard a des arguments qui se terminent par NUL" + +#: builtin/update-ref.c:260 +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]" @@ -8828,7 +9885,7 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: git.c:16 +#: git.c:17 msgid "" "'git help -a' and 'git help -g' lists available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -8838,7 +9895,11 @@ 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:156 +#: parse-options.h:143 +msgid "expiry-date" +msgstr "date-d'expiration" + +#: parse-options.h:158 msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" @@ -8856,11 +9917,11 @@ 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" @@ -8876,11 +9937,13 @@ 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" -msgstr "Afficher les changements entre les validations, entre validation et copie de travail, etc" +msgstr "" +"Afficher les changements entre les validations, entre validation et copie de " +"travail, etc" #: common-cmds.h:15 msgid "Download objects and refs from another repository" @@ -8900,15 +9963,15 @@ 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" msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique" #: common-cmds.h:21 -msgid "Fetch from and merge with another repository or a local branch" -msgstr "Rapatrier et fusionner avec un autre dépôt ou une branche locale" +msgid "Fetch from and integrate with another repository or a local branch" +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" @@ -8916,7 +9979,8 @@ 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" +msgstr "" +"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" @@ -8924,11 +9988,11 @@ 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" -msgstr "Afficher différents types d'objects" +msgstr "Afficher différents types d'objets" #: common-cmds.h:27 msgid "Show the working tree status" @@ -8936,13 +10000,14 @@ msgstr "Afficher le statut de la copie de travail" #: common-cmds.h:28 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" +msgstr "" +"Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" -#: git-am.sh:50 +#: git-am.sh:52 msgid "You need to set your committer info first" msgstr "Vous devez d'abord définir vos informations de validateur" -#: git-am.sh:95 +#: git-am.sh:97 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8950,30 +10015,34 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: git-am.sh:105 +#: git-am.sh:107 #, sh-format msgid "" -"When you have resolved this problem, run \"$cmdline --resolved\".\n" +"When you have resolved this problem, run \"$cmdline --continue\".\n" "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" -"Lorsque vous aurez résolu ce problème, lancez \"$cmdline --resolved\".\n" +"Lorsque vous aurez résolu ce problème, lancez \"$cmdline --continue\".\n" "Si vous préférez sauter ce patch, lancez \"$cmdline --skip\" à la place.\n" -"Pour restaurer la branche d'origine et stopper le patchage, lancez \"$cmdline --abort\"." +"Pour restaurer la branche d'origine et stopper le patchage, lancez " +"\"$cmdline --abort\"." -#: git-am.sh:121 +#: git-am.sh:123 msgid "Cannot fall back to three-way merge." -msgstr "Impossible de retourner à une fusion 3-way." +msgstr "Impossible de retourner à une fusion à 3 points." -#: git-am.sh:137 +#: git-am.sh:139 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion 3-way." +msgstr "" +"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " +"points." -#: git-am.sh:139 +#: git-am.sh:141 msgid "Using index info to reconstruct a base tree..." -msgstr "Utilisation de l'information de l'index pour reconstruire un arbre de base..." +msgstr "" +"Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: git-am.sh:154 +#: git-am.sh:156 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8981,54 +10050,66 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: git-am.sh:163 +#: git-am.sh:165 msgid "Falling back to patching base and 3-way merge..." -msgstr "Retour à un patch de la base et fusion 3-way..." +msgstr "Retour à un patch de la base et fusion à 3 points..." -#: git-am.sh:179 +#: git-am.sh:181 msgid "Failed to merge in the changes." -msgstr "Échec de fusion dans les changements." +msgstr "Échec d'intégration des modifications." -#: git-am.sh:274 +#: git-am.sh:276 msgid "Only one StGIT patch series can be applied at once" -msgstr "Seulement une série de patches StGIT peut être appliquée à la fois" +msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" -#: git-am.sh:361 +#: git-am.sh:363 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Le format de patch $patch_format n'est pas supporté." -#: git-am.sh:363 +#: git-am.sh:365 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: git-am.sh:389 +#: git-am.sh:392 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" -"et elle sera supprimée. Merci de ne plus l'utiliser." +"et elle sera supprimée. Veuillez ne plus l'utiliser." -#: git-am.sh:477 +#: git-am.sh:486 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "le répertoire précédent de rebasage $dotest existe toujours mais mbox donnée." +msgstr "" +"le répertoire précédent de rebasage $dotest existe toujours mais mbox donnée." -#: git-am.sh:482 +#: git-am.sh:491 msgid "Please make up your mind. --skip or --abort?" msgstr "Décidez-vous. --skip ou --abort ?" -#: git-am.sh:509 +#: git-am.sh:527 +#, sh-format +msgid "" +"Stray $dotest directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"Répertoire abandonné $dotest trouvé.\n" +"Utilisez \"git am --abort\" pour le supprimer." + +#: git-am.sh:535 msgid "Resolve operation not in progress, we are not resuming." -msgstr "Pas de résolution de l'opération en cours, nous ne sommes pas dans une reprise." +msgstr "" +"Pas de résolution de l'opération en cours, nous ne sommes pas dans une " +"reprise." -#: git-am.sh:575 +#: git-am.sh:601 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" -msgstr "Index sale : impossible d'appliquer des patches (sales : $files)" +msgstr "Index sale : impossible d'appliquer des patchs (sales : $files)" -#: git-am.sh:679 +#: git-am.sh:705 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -9037,40 +10118,46 @@ msgid "" msgstr "" "Le patch est vide. Était-il mal découpé ?\n" "Si vous préférez sauter ce patch, lancez plutôt \"$cmdline --skip\".\n" -"Pour restaurer la branche d'origine et stopper le patchage, lancez \"$cmdline --abort\"." +"Pour restaurer la branche d'origine et stopper le patchage, lancez " +"\"$cmdline --abort\"." -#: git-am.sh:706 +#: git-am.sh:732 msgid "Patch does not have a valid e-mail address." msgstr "Le patch n'a pas d'adresse e-mail valide." -#: git-am.sh:753 +#: git-am.sh:779 msgid "cannot be interactive without stdin connected to a terminal." -msgstr "impossible d'être interactif sans entrée standard connectée à un terminal." +msgstr "" +"impossible d'être interactif sans entrée standard connectée à un terminal." -#: git-am.sh:757 +#: git-am.sh:783 msgid "Commit Body is:" msgstr "Le corps de la validation est :" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:764 +#: git-am.sh:790 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -#: git-am.sh:800 +#: git-am.sh:826 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Application : $FIRSTLINE" -#: git-am.sh:821 +#: git-am.sh:847 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" +"Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n" +"S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n" +"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " +"patch." -#: git-am.sh:829 +#: git-am.sh:855 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -9078,16 +10165,16 @@ msgstr "" "Vous avez toujours des chemins non fusionnés dans votre index\n" "auriez-vous oublié de faire 'git add' ?" -#: git-am.sh:845 +#: git-am.sh:871 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: git-am.sh:855 +#: git-am.sh:881 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Le patch a échoué à $msgnum $FIRSTLINE" -#: git-am.sh:858 +#: git-am.sh:884 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" @@ -9096,7 +10183,7 @@ msgstr "" "La copie du patch qui a échoué se trouve dans :\n" " $dotest/patch" -#: git-am.sh:876 +#: git-am.sh:902 msgid "applying to an empty history" msgstr "application à un historique vide" @@ -9129,11 +10216,13 @@ msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD" #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." -msgstr "L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branchevalide>'." +msgstr "" +"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset " +"<branchevalide>'." #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "" +msgid "won't bisect on cg-seek'ed tree" +msgstr "refus de bissecter sur un arbre 'cg-seeked'" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" @@ -9151,7 +10240,7 @@ msgstr "Mauvaise révision en entrée : $arg" #: git-bisect.sh:232 msgid "Please call 'bisect_state' with at least one argument." -msgstr "Merci d'appeler 'bisect_state' avec au moins un argument." +msgstr "Veuillez appeler 'bisect_state' avec au moins un argument." #: git-bisect.sh:244 #, sh-format @@ -9162,8 +10251,6 @@ msgstr "Mauvaise révision en entrée : $rev" msgid "'git bisect bad' can take only one argument." msgstr "'git bisect bad' n'accepte qu'un seul argument." -#. have bad but not good. we could bisect although -#. this is less optimum. #: git-bisect.sh:273 msgid "Warning: bisecting only with a bad commit." msgstr "Attention : bissection avec seulement une mauvaise validation." @@ -9262,22 +10349,21 @@ msgid "" "as appropriate to mark resolution, or use 'git commit -a'." msgstr "" "Le pull n'est pas possible car vous avez des fichiers non fusionnés.\n" -"Merci de corriger dans votre copie de travail, et utilisez alors 'git add/rm <file>'\n" +"Veuillez les corriger dans votre copie de travail, et utilisez alors 'git " +"add/rm <file>'\n" "si nécessaire pour marquer comme résolu, ou utilisez 'git commit -a'." #: git-pull.sh:25 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:247 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 l'index" +msgstr "" +"mise à jour d'une branche non encore créée avec les changements ajoutés dans " +"l'index" -#. The fetch involved updating the current branch. -#. 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:271 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -9288,15 +10374,15 @@ 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:296 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:300 msgid "Cannot rebase onto multiple branches" msgstr "Impossible de rebaser sur de multiples branches" -#: git-rebase.sh:53 +#: git-rebase.sh:57 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -9305,33 +10391,55 @@ msgid "" msgstr "" "Lorsque vous aurez résolu ce problème, lancez \"git rebase --continue\".\n" "Si vous préférez sauter ce patch, lancez \"git rebase --skip\" à la place.\n" -"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git rebase --abort\"." +"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git " +"rebase --abort\"." -#: git-rebase.sh:160 +#: git-rebase.sh:164 +msgid "Applied autostash." +msgstr "Autoremisage appliqué." + +#: git-rebase.sh:167 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "Impossible de stocker $stash_sha1" + +#: git-rebase.sh:168 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"L'application de l'autoremisage a provoqué des conflits\n" +"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:207 msgid "The pre-rebase hook refused to rebase." -msgstr "Le hook pre-rebase a refusé de rebaser." +msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:165 +#: git-rebase.sh:212 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:296 +#: git-rebase.sh:350 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:301 +#: git-rebase.sh:355 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:312 +#: git-rebase.sh:366 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." +msgstr "" +"L'action --edit-todo peut seulement être utilisée lors d'un rebasage " +"interactif." -#: git-rebase.sh:319 +#: git-rebase.sh:373 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:322 +#: git-rebase.sh:376 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -9339,12 +10447,12 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:340 +#: git-rebase.sh:394 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" -#: git-rebase.sh:359 +#: git-rebase.sh:413 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9357,64 +10465,74 @@ 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" -"et relancer à nouveau. Je m'arrête au cas où vous auriez quelque chose\n" +"puis relancez-moi à nouveau. Je m'arrête au cas où vous auriez quelque " +"chose\n" "d'important ici." -#: git-rebase.sh:404 +#: git-rebase.sh:464 #, sh-format msgid "invalid upstream $upstream_name" msgstr "invalide $upstream_name en amont" -#: git-rebase.sh:428 +#: git-rebase.sh:488 #, 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:431 git-rebase.sh:435 +#: git-rebase.sh:491 git-rebase.sh:495 #, 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:440 +#: git-rebase.sh:500 #, 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:463 +#: git-rebase.sh:523 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal : pas de branche : $branch_name" -#: git-rebase.sh:483 +#: git-rebase.sh:556 +msgid "Cannot autostash" +msgstr "Autoremisage impossible" + +#: git-rebase.sh:561 +#, sh-format +msgid "Created autostash: $stash_abbrev" +msgstr "Autoremisage créé : $stash_abbrev" + +#: git-rebase.sh:565 msgid "Please commit or stash them." -msgstr "Merci de les valider ou de les remiser." +msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:501 +#: git-rebase.sh:585 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:504 +#: git-rebase.sh:589 #, 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:515 +#: git-rebase.sh:600 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#. Detach HEAD and reset the tree -#: git-rebase.sh:524 +#: git-rebase.sh:609 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:532 +#: git-rebase.sh:619 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -9447,6 +10565,11 @@ msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)" msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" +#: git-stash.sh:190 +#, sh-format +msgid "Cannot update $ref_stash with $w_commit" +msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" + #. TRANSLATORS: $option is an invalid option, like #. `--blah-blah'. The 7 spaces at the beginning of the #. second line correspond to "error: ". So you should line @@ -9457,7 +10580,7 @@ msgstr "Impossible d'enregistrer l'état de la copie de travail" #. $ 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:202 +#: git-stash.sh:237 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -9466,119 +10589,129 @@ msgstr "" "erreur: option inconnue pour 'stash save': $option\n" " Pour fournir un message, utilisez git stash save -- '$option'" -#: git-stash.sh:223 +#: git-stash.sh:258 msgid "No local changes to save" -msgstr "Pas de changements en local à sauver" +msgstr "Pas de modifications locales à sauver" -#: git-stash.sh:227 +#: git-stash.sh:262 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: git-stash.sh:235 +#: git-stash.sh:266 msgid "Cannot save the current status" msgstr "Impossible de sauver le statut courant" -#: git-stash.sh:253 +#: git-stash.sh:284 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: git-stash.sh:352 +#: git-stash.sh:383 msgid "No stash found." msgstr "Pas de remisage trouvé." -#: git-stash.sh:359 +#: git-stash.sh:390 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-stash.sh:365 +#: 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:393 +#: 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:404 +#: 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:412 +#: git-stash.sh:443 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-stash.sh:416 +#: 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:424 +#: git-stash.sh:455 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-stash.sh:426 +#: git-stash.sh:457 msgid "Could not save index tree" msgstr "Impossible de sauver l'arbre d'index" -#: git-stash.sh:460 +#: git-stash.sh:491 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-stash.sh:475 +#: git-stash.sh:506 msgid "Index was not unstashed." -msgstr "" +msgstr "L'index n'a pas été sorti de remise." -#: git-stash.sh:492 +#: git-stash.sh:529 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-stash.sh:493 +#: git-stash.sh:530 #, sh-format msgid "${REV}: Could not drop stash entry" -msgstr "${REV}: Impossible de supprimer l'entrée de stash" +msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:500 +#: git-stash.sh:537 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:571 +#: git-stash.sh:609 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" -#: git-submodule.sh:91 +#: git-submodule.sh:95 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "impossible de supprimer un composant de l'URL '$remoteurl'" -#: git-submodule.sh:196 +#: git-submodule.sh:237 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" -msgstr "Pas de mappage du sous-module trouvé dans .gitmodules pour le chemin '$sm_path'" +msgstr "" +"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " +"chemin '$sm_path'" -#: git-submodule.sh:239 +#: git-submodule.sh:287 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "Le clonage de '$url' dans le chemin de sous-module '$sm_path' a échoué" -#: git-submodule.sh:251 +#: git-submodule.sh:299 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-versa" +msgstr "" +"Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-" +"versa" + +#: git-submodule.sh:409 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" +"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de " +"travail" -#: git-submodule.sh:349 +#: git-submodule.sh:419 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../" -#: git-submodule.sh:366 +#: git-submodule.sh:436 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:370 +#: git-submodule.sh:440 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9589,235 +10722,413 @@ msgstr "" "$sm_path\n" "Utilisez -f si vous voulez vraiment l'ajouter." -#: git-submodule.sh:388 +#: git-submodule.sh:458 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Ajout du dépôt existant à '$sm_path' dans l'index" -#: git-submodule.sh:390 +#: git-submodule.sh:460 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide" -#: git-submodule.sh:398 +#: git-submodule.sh:468 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) distant(s) :" +msgstr "" +"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) " +"distant(s) :" -#: git-submodule.sh:400 +#: git-submodule.sh:470 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" -msgstr "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à nouveau depuis" +msgstr "" +"Si vous voulez réutiliser ce répertoire git local au lieu de cloner à " +"nouveau depuis" -#: git-submodule.sh:402 +#: git-submodule.sh:472 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" -msgstr "utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt correct" +msgstr "" +"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt " +"correct" -#: git-submodule.sh:403 +#: git-submodule.sh:473 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." -msgstr "ou vous ne savez pas ce que cela signifie de choisir un autre nom avec l'option '--name'." +msgstr "" +"ou vous ne savez pas ce que cela signifie de choisir un autre nom avec " +"l'option '--name'." -#: git-submodule.sh:405 +#: git-submodule.sh:475 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'." -#: git-submodule.sh:417 +#: git-submodule.sh:487 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:422 +#: git-submodule.sh:492 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:431 +#: git-submodule.sh:501 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:474 +#: git-submodule.sh:545 #, sh-format -msgid "Entering '$prefix$sm_path'" -msgstr "Entrée dans '$prefix$sm_path'" +msgid "Entering '$prefix$displaypath'" +msgstr "Entrée dans '$prefix$displaypath'" -#: git-submodule.sh:488 +#: git-submodule.sh:565 #, sh-format -msgid "Stopping at '$sm_path'; script returned non-zero status." -msgstr "Arrêt sur '$sm_path' ; le script a retourné un statut non nul." +msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgstr "" +"Arrêt sur '$prefix$displaypath' ; le script a retourné un statut non nul." -#: git-submodule.sh:532 +#: git-submodule.sh:611 #, sh-format -msgid "No url found for submodule path '$sm_path' in .gitmodules" -msgstr "URL non trouvé pour le chemin de sous-module '$sm_path' dans .gitmodules" +msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgstr "" +"URL non trouvé pour le chemin de sous-module '$displaypath' dans .gitmodules" -#: git-submodule.sh:541 +#: git-submodule.sh:620 #, sh-format -msgid "Failed to register url for submodule path '$sm_path'" -msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '$sm_path'" +msgid "Failed to register url for submodule path '$displaypath'" +msgstr "" +"Échec d'enregistrement de l'URL pour le chemin de sous-module '$displaypath'" -#: git-submodule.sh:543 +#: git-submodule.sh:622 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$sm_path'" -msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$sm_path'" +msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$displaypath'" -#: git-submodule.sh:551 +#: git-submodule.sh:639 #, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" -msgstr "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module '$sm_path'" +msgid "Failed to register update mode for submodule path '$displaypath'" +msgstr "" +"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " +"'$displaypath'" -#: git-submodule.sh:588 +#: git-submodule.sh:677 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules" +msgstr "" +"Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules" -#: git-submodule.sh:603 +#: git-submodule.sh:694 #, sh-format -msgid "Submodule work tree '$sm_path' contains a .git directory" -msgstr "La copie de travail du sous-module '$sm_path' contient un répertoire .git" +msgid "Submodule work tree '$displaypath' contains a .git directory" +msgstr "" +"La copie de travail du sous-module '$displaypath' contient un répertoire .git" -#: git-submodule.sh:604 +#: git-submodule.sh:695 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son historique)" +msgstr "" +"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " +"historique)" -#: git-submodule.sh:610 +#: git-submodule.sh:701 #, sh-format msgid "" -"Submodule work tree '$sm_path' contains local modifications; use '-f' to " +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" -msgstr "La copie de travail du sous-module '$sm_path' contient des modifications locales; utilisez '-f' pour les annuler" +msgstr "" +"La copie de travail du sous-module '$displaypath' contient des modifications " +"locales ; utilisez '-f' pour les annuler" -#: git-submodule.sh:613 +#: git-submodule.sh:704 #, sh-format -msgid "Cleared directory '$sm_path'" -msgstr "Répertoire '$sm_path' nettoyé" +msgid "Cleared directory '$displaypath'" +msgstr "Répertoire '$displaypath' nettoyé" -#: git-submodule.sh:614 +#: git-submodule.sh:705 #, sh-format -msgid "Could not remove submodule work tree '$sm_path'" -msgstr "Impossible de supprimer la copie de travail du sous-module '$sm_path'" +msgid "Could not remove submodule work tree '$displaypath'" +msgstr "" +"Impossible de supprimer la copie de travail du sous-module '$displaypath'" -#: git-submodule.sh:617 +#: git-submodule.sh:708 #, sh-format -msgid "Could not create empty submodule directory '$sm_path'" -msgstr "Impossible de créer le répertoire vide du sous-module '$sm_path'" +msgid "Could not create empty submodule directory '$displaypath'" +msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'" -#: git-submodule.sh:626 +#: git-submodule.sh:717 #, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" -msgstr "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin '$sm_path'" +msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +msgstr "" +"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin " +"'$displaypath'" -#: git-submodule.sh:731 +#: git-submodule.sh:833 #, sh-format msgid "" -"Submodule path '$prefix$sm_path' not initialized\n" +"Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -"Chemin de sous-module '$prefix$sm_path' non initialisé\n" +"Chemin de sous-module '$displaypath' non initialisé\n" "Peut-être souhaitez-vous utiliser 'update --init' ?" -#: git-submodule.sh:744 +#: git-submodule.sh:846 #, sh-format -msgid "Unable to find current revision in submodule path '$prefix$sm_path'" -msgstr "Impossible de trouver la révision courante dans le chemin de sous-module '$prefix$sm_path'" +msgid "Unable to find current revision in submodule path '$displaypath'" +msgstr "" +"Impossible de trouver la révision courante dans le chemin de sous-module " +"'$displaypath'" -#: git-submodule.sh:753 +#: git-submodule.sh:855 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:777 +#: git-submodule.sh:879 #, sh-format -msgid "Unable to fetch in submodule path '$prefix$sm_path'" -msgstr "Impossible de rapatrier dans le chemin de sous-module '$prefix$sm_path'" +msgid "Unable to fetch in submodule path '$displaypath'" +msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:791 +#: git-submodule.sh:893 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" -msgstr "Impossible de rebaser '$sha1' dans le chemin de sous-module '$prefix$sm_path'" +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "" +"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:792 +#: git-submodule.sh:894 #, sh-format -msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" -msgstr "Chemin de sous-module '$prefix$sm_path' : rebasé dans '$sha1'" +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:797 +#: git-submodule.sh:898 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" -msgstr "Impossible de fusionner '$sha1' dans le chemin de sous-module '$prefix$sm_path'" +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "" +"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:798 +#: git-submodule.sh:899 #, sh-format -msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" -msgstr "Chemin de sous-module '$prefix$sm_path' : fusionné dans '$sha1'" +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:803 +#: git-submodule.sh:904 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" -msgstr "Impossible d'extraire '$sha1' dans le chemin de sous-module '$prefix$sm_path'" +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "" +"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:804 +#: git-submodule.sh:905 #, sh-format -msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" -msgstr "Chemin de sous-module '$prefix$sm_path' : '$sha1' extrait" +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:831 +#: git-submodule.sh:910 #, sh-format -msgid "Failed to recurse into submodule path '$prefix$sm_path'" -msgstr "Échec de parcours dans le chemin du sous-module '$prefix$sm_path'" +msgid "" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgstr "" +"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " +"'$prefix$sm_path'" + +#: git-submodule.sh:911 +#, sh-format +msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'" -#: git-submodule.sh:939 +#: git-submodule.sh:941 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" + +#: git-submodule.sh:1049 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:979 +#: git-submodule.sh:1097 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:997 +#: git-submodule.sh:1117 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_src" -msgstr " Attention : $name ne contient pas la validation $sha1_src" +msgid " Warn: $display_name doesn't contain commit $sha1_src" +msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:1000 +#: git-submodule.sh:1120 #, sh-format -msgid " Warn: $name doesn't contain commit $sha1_dst" -msgstr " Attention : $name ne contient pas la validation $sha1_dst" +msgid " Warn: $display_name doesn't contain commit $sha1_dst" +msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:1003 +#: git-submodule.sh:1123 #, sh-format -msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" -msgstr " Attention : $name ne contient pas les validations $sha1_src et $sha1_dst" +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:1028 +#: git-submodule.sh:1148 msgid "blob" msgstr "blob" -#: git-submodule.sh:1066 -msgid "Submodules changed but not updated:" -msgstr "Sous-modules modifiés mais non mis à jour :" - -#: git-submodule.sh:1068 -msgid "Submodule changes to be committed:" -msgstr "Changements du sous-module à valider :" - -#: git-submodule.sh:1153 +#: git-submodule.sh:1262 #, 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:1216 +#: git-submodule.sh:1326 #, sh-format -msgid "Synchronizing submodule url for '$prefix$sm_path'" -msgstr "Synchronisation de l'URL sous-module pour '$prefix$sm_path'" +msgid "Synchronizing submodule url for '$displaypath'" +msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" + +#~ msgid "Tracking not set up: name too long: %s" +#~ msgstr "Suivi de branche non paramétré : le nom est trop long : %s" + +#~ msgid "could not find .gitmodules in index" +#~ msgstr "impossible de trouver .gitmodules dans l'index" + +#~ msgid "reading updated .gitmodules failed" +#~ msgstr "échec de la lecture du .gitmodules mis à jour" + +#~ msgid "unable to stat updated .gitmodules" +#~ msgstr "échec de stat du .gitmodules mis à jour" + +#~ msgid "unable to remove .gitmodules from index" +#~ msgstr "suppression du .gitmodules dans l'index impossible" + +#~ msgid "adding updated .gitmodules failed" +#~ msgstr "échec de l'ajout du .gitmodules mis à jour" + +#~ msgid "bug" +#~ msgstr "bogue" + +#~ msgid "ahead " +#~ msgstr "devant " + +#~ msgid ", behind " +#~ msgstr ", derrière " + +#~ msgid "" +#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n" +#~ "subdirectory of the tree will change in Git 2.0 and should not be used " +#~ "anymore.\n" +#~ "To add content for the whole tree, run:\n" +#~ "\n" +#~ " git add %s :/\n" +#~ " (or git add %s :/)\n" +#~ "\n" +#~ "To restrict the command to the current directory, run:\n" +#~ "\n" +#~ " git add %s .\n" +#~ " (or git add %s .)\n" +#~ "\n" +#~ "With the current Git version, the command is restricted to the current " +#~ "directory.\n" +#~ msgstr "" +#~ "Le comportement de 'git add %s (ou %s)' sans argument de chemin depuis " +#~ "un\n" +#~ "sous-répertoire du projet va changer dans Git 2.0 et ne doit plus être " +#~ "utilisé.\n" +#~ "Pour ajouter le contenu de toute l'arborescence, lancez :\n" +#~ "\n" +#~ " git add %s :/\n" +#~ " (ou git add %s :/)\n" +#~ "\n" +#~ "Pour restreindre la commande au répertoire courant, lancez :\n" +#~ "\n" +#~ " git add %s .\n" +#~ " (ou git add %s .)\n" +#~ "\n" +#~ "Avec la version actuelle de Git, la commande est restreinte au répertoire " +#~ "courant.\n" + +#~ msgid "" +#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" +#~ "whose behaviour will change in Git 2.0 with respect to paths you " +#~ "removed.\n" +#~ "Paths like '%s' that are\n" +#~ "removed from your working tree are ignored with this version of Git.\n" +#~ "\n" +#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n" +#~ " ignores paths you removed from your working tree.\n" +#~ "\n" +#~ "* 'git add --all <pathspec>' will let you also record the removals.\n" +#~ "\n" +#~ "Run 'git status' to check the paths you removed from your working tree.\n" +#~ msgstr "" +#~ "Vous avez lancé 'git add' sans '-A (--all)' ni '--ignore-removal',\n" +#~ "dont le comportement va changer dans Git 2.0 avec le respect des chemins " +#~ "que vous supprimez.\n" +#~ "Les chemins tels que '%s' qui ont été\n" +#~ "retirés de votre copie de travail sont ignorés avec cette version de " +#~ "Git.\n" +#~ "\n" +#~ "* 'git add --ignore-removal <chemin>', qui est l'option par défaut " +#~ "actuelle,\n" +#~ " ignore les chemins que vous avez supprimés de votre copie de travail.\n" +#~ "\n" +#~ "* 'git add --all <chemin>' permet d'enregistrer aussi les suppressions.\n" +#~ "\n" +#~ "Lancez 'git status' pour vérifier les chemins que vous avez supprimés de " +#~ "votre copie de travail.\n" + +#~ msgid "key id" +#~ msgstr "identifiant de clé" + +#~ msgid "" +#~ "Auto packing the repository for optimum performance. You may also\n" +#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n" +#~ msgstr "" +#~ "Compression automatique du dépôt pour une performance optimum. Vous " +#~ "pouvez aussi\n" +#~ "lancer \"git gc\" manuellement. Voir \"git help gc\" pour plus " +#~ "d'information.\n" + +#~ 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" +#~ "specify branches to push or set the 'push.default' configuration " +#~ "variable\n" +#~ "to 'simple', 'current' or 'upstream' to push only the current branch." +#~ msgstr "" +#~ "Les mises à jour ont été rejetées car la pointe de la branche poussée est " +#~ "derrière\n" +#~ "son homologue distant. Si vous ne vouliez pas pousser cette branche, vous " +#~ "pourriez\n" +#~ "vouloir spécifier les branches à pousser ou définir la variable de " +#~ "configuration\n" +#~ "'push.default' à 'simple', 'current' ou 'upstream' pour pousser seulement " +#~ "la branche courante." + +#~ msgid "deleted: %s" +#~ msgstr "supprimé : %s" + +#~ msgid "modified: %s" +#~ msgstr "modifié : %s" + +#~ msgid "renamed: %s -> %s" +#~ msgstr "renommé : %s -> %s" + +#~ msgid "unmerged: %s" +#~ msgstr "non fus. : %s" + +#~ msgid "input paths are terminated by a null character" +#~ msgstr "les chemins en entrée sont terminés par le caractère nul" + +#~ 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." |