msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2014-04-19 12:50+0800\n"
-"PO-Revision-Date: 2014-04-22 21:28+0200\n"
+"POT-Creation-Date: 2014-08-04 14:48+0800\n"
+"PO-Revision-Date: 2014-08-05 19:23+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"
msgid "hint: %.*s\n"
msgstr "astuce: %.*s\n"
-#: advice.c:85
+#: advice.c:88
msgid ""
-"Fix them up in the work tree,\n"
-"and then use 'git add/rm <file>' as\n"
-"appropriate to mark resolution and make a commit,\n"
-"or use 'git commit -a'."
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit, or use\n"
+"'git commit -a'."
msgstr ""
"Corrigez-les dans la copie de travail,\n"
-"et utilisez 'git add/rm <fichier>' si\n"
+"puis utilisez 'git add/rm <fichier>' si\n"
"nécessaire pour marquer la résolution et valider,\n"
"ou utilisez 'git commit -a'."
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328
+#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:329 builtin/log.c:1193
+#: archive.c:329 builtin/log.c:1201
msgid "prefix"
msgstr "préfixe"
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: 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
+#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
+#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
+#: builtin/fast-export.c:711 builtin/grep.c:712 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"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:86 builtin/commit.c:706
+#: bundle.c:86 builtin/commit.c:755
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c: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
+#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330
+#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
msgstr[0] "Le colis exige cette référence :"
msgstr[1] "Le colis exige ces %d références :"
-#: bundle.c:293
+#: bundle.c:289
msgid "rev-list died"
msgstr "rev-list a disparu"
-#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261
+#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:334
+#: bundle.c:330
#, 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:379
+#: bundle.c:375
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:395
+#: bundle.c:390
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
-#: bundle.c:413
+#: bundle.c:408
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
-#: bundle.c:416
+#: bundle.c:411
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:438
+#: bundle.c:433
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
-#: commit.c:54
+#: commit.c:40
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
-#: commit.c:56
+#: commit.c:42
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
msgid "failed to read orderfile '%s'"
msgstr "impossible de lire le fichier de commande '%s'"
-#: diffcore-rename.c:517
+#: diffcore-rename.c:514
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
-#: diff.c:113
+#: diff.c:114
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: diff.c:118
+#: diff.c:119
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:213
+#: diff.c:214
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:263
+#: diff.c:267
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:3495
+#: diff.c:2934
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "l'application de diff externe a disparu, arrêt à %s"
+
+#: diff.c:3329
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow a besoin d'une spécification de chemin unique"
+
+#: diff.c:3492
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3509
+#: diff.c:3506
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: gpg-interface.c:59 gpg-interface.c:131
+#: gpg-interface.c:73 gpg-interface.c:145
msgid "could not run gpg."
msgstr "impossible de lancer gpg."
-#: gpg-interface.c:71
+#: gpg-interface.c:85
msgid "gpg did not accept the data"
msgstr "gpg n'a pas accepté les données"
-#: gpg-interface.c:82
+#: gpg-interface.c:96
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
-#: gpg-interface.c:115
+#: gpg-interface.c:129
#, c-format
msgid "could not create temporary file '%s': %s"
msgstr "impossible de créer un fichier temporaire '%s' : %s"
-#: gpg-interface.c:118
+#: gpg-interface.c:132
#, c-format
msgid "failed writing detached signature to '%s': %s"
msgstr "impossible d'écrire la signature détachée dans '%s' : %s"
-#: grep.c:1698
+#: grep.c:1703
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1715
+#: grep.c:1720
#, c-format
msgid "'%s': %s"
msgstr "'%s' : %s"
-#: grep.c:1726
+#: grep.c:1731
#, c-format
msgid "'%s': short read %s"
msgstr "'%s' : lecture tronquée %s"
-#: help.c:209
+#: help.c:207
#, c-format
msgid "available git commands in '%s'"
msgstr "commandes git disponibles dans '%s'"
-#: help.c:216
+#: help.c:214
msgid "git commands available from elsewhere on your $PATH"
msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
-#: help.c:232
+#: help.c:230
msgid "The most commonly used git commands are:"
msgstr "Les commandes git les plus utilisées sont :"
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:384 help.c:443
+#: help.c:384 help.c:444
msgid ""
"\n"
"Did you mean this?"
"\n"
"Vouliez-vous dire un de ceux-là ?"
-#: help.c:439
+#: help.c:440
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: merge.c:56
+#: merge.c:40
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558
+#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
#: builtin/clone.c:661
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
msgid "(bad commit)\n"
msgstr "(mauvais commit)\n"
-#: merge-recursive.c:208
+#: merge-recursive.c:210
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "échec de addinfo_cache pour le chemin '%s'"
msgid "error building trees"
msgstr "erreur de construction des arbres"
-#: merge-recursive.c:675
+#: merge-recursive.c:692
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:686
+#: merge-recursive.c:703
#, 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"
-#: merge-recursive.c:700 merge-recursive.c:721
+#: merge-recursive.c:717 merge-recursive.c:738
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:711
+#: merge-recursive.c:728
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:751
+#: merge-recursive.c:768
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:753
+#: merge-recursive.c:770
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:776 builtin/clone.c:317
+#: merge-recursive.c:793 builtin/clone.c:317
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: merge-recursive.c:784
+#: merge-recursive.c:801
#, c-format
msgid "failed to symlink '%s'"
msgstr "échec à la création du lien symbolique '%s'"
-#: merge-recursive.c:787
+#: merge-recursive.c:804
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:925
+#: merge-recursive.c:942
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-recursive.c:929
+#: merge-recursive.c:946
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:945
+#: merge-recursive.c:962
msgid "unsupported object type in the tree"
msgstr "type d'objet non supporté dans l'arbre"
-#: merge-recursive.c:1024 merge-recursive.c:1038
+#: merge-recursive.c:1037 merge-recursive.c:1051
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1030 merge-recursive.c:1043
+#: merge-recursive.c:1043 merge-recursive.c:1056
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"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:1084
+#: merge-recursive.c:1097
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1084
+#: merge-recursive.c:1097
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1140
+#: merge-recursive.c:1153
#, 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:1162
+#: merge-recursive.c:1175
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1167
+#: merge-recursive.c:1180
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1221
+#: merge-recursive.c:1234
#, 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"
-#: merge-recursive.c:1251
+#: merge-recursive.c:1264
#, 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:1450
+#: merge-recursive.c:1463
#, 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"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1473
#, c-format
msgid "Adding merged %s"
msgstr "Ajout de %s fusionné"
-#: merge-recursive.c:1465 merge-recursive.c:1663
+#: merge-recursive.c:1478 merge-recursive.c:1676
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:1516
+#: merge-recursive.c:1529
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:1519
+#: merge-recursive.c:1532
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:1567
+#: merge-recursive.c:1580
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:1567
+#: merge-recursive.c:1580
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:1577
+#: merge-recursive.c:1590
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:1584
+#: merge-recursive.c:1597
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:1618
+#: merge-recursive.c:1631
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1645
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1636 git-submodule.sh:1149
+#: merge-recursive.c:1649 git-submodule.sh:1150
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:1637
+#: merge-recursive.c:1650
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:1727
+#: merge-recursive.c:1740
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1765
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:1758
+#: merge-recursive.c:1771
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:1763
+#: merge-recursive.c:1776
#, 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"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1786
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:1790
+#: merge-recursive.c:1803
msgid "Fatal merge failure, shouldn't happen."
msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
-#: merge-recursive.c:1809
+#: merge-recursive.c:1822
msgid "Already up-to-date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:1818
+#: merge-recursive.c:1831
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:1848
+#: merge-recursive.c:1861
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Chemin non traité ??? %s"
-#: merge-recursive.c:1893
+#: merge-recursive.c:1906
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1919
#, 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:1943
+#: merge-recursive.c:1956
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:2000
+#: merge-recursive.c:2013
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:2012 builtin/merge.c:668
+#: merge-recursive.c:2024 builtin/merge.c:666
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
-#: notes-utils.c:40
+#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
-#: notes-utils.c:81
+#: notes-utils.c:83
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
-#: notes-utils.c:91
+#: notes-utils.c:93
#, 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
+#: notes-utils.c:120
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
-#: object.c:229
+#: object.c:234
#, c-format
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
-#: parse-options.c:532
+#: parse-options.c:534
msgid "..."
msgstr "..."
-#: parse-options.c:550
+#: parse-options.c:552
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:554
+#: parse-options.c:556
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:557
+#: parse-options.c:559
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:591
+#: parse-options.c:593
msgid "-NUM"
msgstr "-NUM"
"%s : le spécificateur magique de chemin n'est pas supporté par cette "
"commande : %s"
-#: pathspec.c:433
+#: pathspec.c:432
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pathspec.c:442
+#: pathspec.c:441
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
"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
+#: progress.c:225
msgid "done"
msgstr "fait"
-#: read-cache.c:1238
+#: read-cache.c:1260
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1248
+#: read-cache.c:1270
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: remote.c:758
+#: remote.c:753
#, 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
+#: remote.c:757
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:766
+#: remote.c:761
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:774
+#: remote.c:769
msgid "Internal error"
msgstr "Erreur interne"
-#: remote.c:1948
+#: remote.c:1943
#, 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
+#: remote.c:1947
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:1955
+#: remote.c:1950
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:1959
+#: remote.c:1954
#, 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:1965
+#: remote.c:1960
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:1968
+#: remote.c:1963
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:1976
+#: remote.c:1971
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:1979
+#: remote.c:1974
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:1989
+#: remote.c:1984
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"
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
+#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
+#: builtin/merge.c:1003 builtin/merge.c:1013
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789
-#: builtin/merge.c:1011 builtin/merge.c:1024
+#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
+#: builtin/merge.c:1005 builtin/merge.c:1018
#, c-format
msgid "Could not write to '%s'"
msgstr "Impossible d'écrire dans '%s'"
-#: sequencer.c:229
+#: sequencer.c:194
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:232
+#: sequencer.c:197
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:245 sequencer.c:879 sequencer.c:962
+#: sequencer.c:210 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "Impossible d'écrire dans %s"
-#: sequencer.c:248
+#: sequencer.c:213
#, c-format
msgid "Error wrapping up %s"
msgstr "Erreur à l'emballage de %s"
-#: sequencer.c:263
+#: sequencer.c:228
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "Vos modifications locales seraient écrasées par cherry-pick."
-#: sequencer.c:265
+#: sequencer.c:230
msgid "Your local changes would be overwritten by revert."
msgstr "Vos modifications locales seraient écrasées par revert."
-#: sequencer.c:268
+#: sequencer.c:233
msgid "Commit your changes or stash them to proceed."
msgstr "Validez vos modifications ou les remiser pour continuer."
+#: sequencer.c:250
+msgid "Failed to lock HEAD during fast_forward_to"
+msgstr "Échec du verrouillage de HEAD pendant l'avance rapide"
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:325
+#: sequencer.c:293
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:356
+#: sequencer.c:324
msgid "Could not resolve HEAD commit\n"
msgstr "Impossible de résoudre le commit HEAD\n"
-#: sequencer.c:378
+#: sequencer.c:344
msgid "Unable to update cache tree\n"
msgstr "Impossible de mettre à jour l'arbre de cache\n"
-#: sequencer.c:430
+#: sequencer.c:391
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Impossible d'analyser le commit %s\n"
-#: sequencer.c:435
+#: sequencer.c:396
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Impossible d'analyser le commit parent %s\n"
-#: sequencer.c:501
+#: sequencer.c:462
msgid "Your index file is unmerged."
msgstr "Votre fichier d'index n'est pas fusionné."
-#: sequencer.c:520
+#: sequencer.c:481
#, 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:528
+#: sequencer.c:489
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Le commit %s n'a pas le parent %d"
-#: sequencer.c:532
+#: sequencer.c:493
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:545
+#: sequencer.c:506
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:549
+#: sequencer.c:510
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Impossible d'obtenir un message de validation pour %s"
-#: sequencer.c:635
+#: sequencer.c:596
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:636
+#: sequencer.c:597
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:672
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:680
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:685
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:743
+#: sequencer.c:705
#, c-format
msgid "Cannot %s during a %s"
msgstr "Impossible de %s pendant un %s"
-#: sequencer.c:765
+#: sequencer.c:727
#, c-format
msgid "Could not parse line %d."
msgstr "Impossible d'analyser la ligne %d."
-#: sequencer.c:770
+#: sequencer.c:732
msgid "No commits parsed."
msgstr "Aucun commit analysé."
-#: sequencer.c:783
+#: sequencer.c:745
#, c-format
msgid "Could not open %s"
msgstr "Impossible d'ouvrir %s"
-#: sequencer.c:787
+#: sequencer.c:749
#, c-format
msgid "Could not read %s."
msgstr "Impossible de lire %s."
-#: sequencer.c:794
+#: sequencer.c:756
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Feuille d'instruction inutilisable : %s"
-#: sequencer.c:824
+#: sequencer.c:786
#, c-format
msgid "Invalid key: %s"
msgstr "Clé invalide: %s"
-#: sequencer.c:827
+#: sequencer.c:789
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valeur invalide pour %s : %s"
-#: sequencer.c:839
+#: sequencer.c:801
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Feuille d'options malformée : %s"
-#: sequencer.c:860
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:861
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:865
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Impossible de créer le répertoire de séquenceur %s"
-#: sequencer.c:881 sequencer.c:966
+#: sequencer.c:843 sequencer.c:928
#, c-format
msgid "Error wrapping up %s."
msgstr "Erreur lors de l'emballage de %s."
-#: sequencer.c:900 sequencer.c:1036
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:902
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:904
+#: sequencer.c:866
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:926 builtin/apply.c:4061
+#: sequencer.c:888 builtin/apply.c:4062
#, c-format
msgid "cannot open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
-#: sequencer.c:929
+#: sequencer.c:891
#, c-format
msgid "cannot read %s: %s"
msgstr "impossible de lire %s : %s"
-#: sequencer.c:930
+#: sequencer.c:892
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:936
+#: sequencer.c:898
#, 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:959
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "Impossible de formater %s."
-#: sequencer.c:1104
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:1107
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:1141
+#: sequencer.c:1103
msgid "Can't revert as initial commit"
msgstr "Impossible d'annuler en tant que commit initial"
-#: sequencer.c:1142
+#: sequencer.c:1104
msgid "Can't cherry-pick into empty head"
msgstr "Impossible de picorer vers une HEAD vide"
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: sha1_name.c:1072
+#: sha1_name.c:1060
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: sha1_name.c:1075
+#: sha1_name.c:1063
#, c-format
msgid "No such branch: '%s'"
msgstr "Branche inconnue : '%s'"
-#: sha1_name.c:1077
+#: sha1_name.c:1065
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "Aucune branche amont configurée pour la branche '%s'"
-#: sha1_name.c:1081
+#: sha1_name.c:1069
#, 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"
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:1121 builtin/init-db.c:363
+#: submodule.c:1118 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
+#: submodule.c:1129
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Impossible de paramétrer core.worktree dans %s"
-#: unpack-trees.c:206
+#: unpack-trees.c:202
msgid "Checking out files"
msgstr "Extraction des fichiers"
msgid "invalid '..' path segment"
msgstr "segment de chemin '..' invalide"
-#: wrapper.c:422
+#: wrapper.c:460
#, c-format
msgid "unable to access '%s': %s"
msgstr "impossible d'accéder à '%s' : %s"
-#: wrapper.c:443
+#: wrapper.c:481
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:454
+#: wrapper.c:492
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr ""
"impossible de rechercher l'utilisateur actuel dans le fichier de mots de "
"passe : %s"
-#: wrapper.c:455
+#: wrapper.c:493
msgid "no such user"
msgstr "utilisateur inconnu"
msgid "bug: unhandled diff status %c"
msgstr "bogue : état de diff non géré %c"
-#: wt-status.c:765
+#: wt-status.c:764
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:767
+#: wt-status.c:766
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:846
+#: wt-status.c:845
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
"Ne touchez pas à la ligne ci-dessus\n"
"Tout se qui suit sera éliminé."
-#: wt-status.c:937
+#: wt-status.c:936
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:940
+#: wt-status.c:939
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:943
+#: wt-status.c:942
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:946
+#: wt-status.c:945
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:956
+#: wt-status.c:955
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:959
+#: wt-status.c:958
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:963
+#: wt-status.c:962
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:965
+#: wt-status.c:964
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:967
+#: wt-status.c:966
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1027 wt-status.c:1044
+#: wt-status.c:1026 wt-status.c:1043
#, 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:1032 wt-status.c:1049
+#: wt-status.c:1031 wt-status.c:1048
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1035
+#: wt-status.c:1034
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1037
+#: wt-status.c:1036
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1039
+#: wt-status.c:1038
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:1052
+#: wt-status.c:1051
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1056
+#: wt-status.c:1055
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1061
+#: wt-status.c:1060
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-#: wt-status.c:1064
+#: wt-status.c:1063
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-#: wt-status.c:1068
+#: wt-status.c:1067
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
"branche '%s' sur '%s'."
-#: wt-status.c:1073
+#: wt-status.c:1072
msgid "You are currently editing a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-#: wt-status.c:1076
+#: wt-status.c:1075
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1078
+#: wt-status.c:1077
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "
"modifications)"
-#: wt-status.c:1088
+#: wt-status.c:1087
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1093
+#: wt-status.c:1092
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1096
+#: wt-status.c:1095
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
+#: wt-status.c:1097
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
+#: wt-status.c:1106
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1112
+#: wt-status.c:1111
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1115
+#: wt-status.c:1114
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1117
+#: wt-status.c:1116
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1128
+#: wt-status.c:1127
#, 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:1132
+#: wt-status.c:1131
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1135
+#: wt-status.c:1134
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:1310
+#: wt-status.c:1309
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1317
+#: wt-status.c:1316
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1324
+#: wt-status.c:1323
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1326
+#: wt-status.c:1325
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1329
+#: wt-status.c:1328
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1346
+#: wt-status.c:1345
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1360
+#: wt-status.c:1359
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1362
+#: wt-status.c:1361
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1366
+#: wt-status.c:1365
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1372
+#: wt-status.c:1371
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1374
+#: wt-status.c:1373
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1380
+#: wt-status.c:1379
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1385
+#: wt-status.c:1384
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
"\"git commit -a\")\n"
-#: wt-status.c:1388
+#: wt-status.c:1387
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1391
+#: wt-status.c:1390
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1394
+#: wt-status.c:1393
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents\n"
-#: wt-status.c:1397
+#: wt-status.c:1396
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
"suivre)\n"
-#: wt-status.c:1400 wt-status.c:1405
+#: wt-status.c:1399 wt-status.c:1404
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1403
+#: wt-status.c:1402
#, 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:1407
+#: wt-status.c:1406
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1516
+#: wt-status.c:1515
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:1522
+#: wt-status.c:1521
msgid "Initial commit on "
msgstr "Validation initiale sur "
# à priori on parle d'une branche ici
-#: wt-status.c:1554
+#: wt-status.c:1553
msgid "gone"
msgstr "disparue"
-#: wt-status.c:1556 wt-status.c:1564
+#: wt-status.c:1555 wt-status.c:1563
msgid "behind "
msgstr "derrière "
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:193
+#: builtin/add.c:193 builtin/rev-parse.c:781
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: 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/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
+#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
#: builtin/rm.c:269
msgid "dry run"
msgstr "simuler l'action"
-#: 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
+#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
+#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
+#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113
msgid "be verbose"
msgstr "mode verbeux"
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283
+#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:330
+#: builtin/add.c:329
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:337
+#: builtin/add.c:336
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-#: builtin/add.c:358
+#: builtin/add.c:357
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:359
+#: builtin/add.c:358
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: 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
+#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432
+#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: builtin/apply.c:823
+#: builtin/apply.c:825
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: builtin/apply.c:832
+#: builtin/apply.c:834
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: builtin/apply.c:913
+#: builtin/apply.c:915
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: builtin/apply.c:945
+#: builtin/apply.c:947
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
"ligne %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:951
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
"à la ligne %d"
-#: builtin/apply.c:950
+#: builtin/apply.c:952
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
"à la ligne %d"
-#: builtin/apply.c:957
+#: builtin/apply.c:959
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: builtin/apply.c:2946
+#: builtin/apply.c:2944
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: builtin/apply.c:2952
+#: builtin/apply.c:2950
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
-#: builtin/apply.c:2973
+#: builtin/apply.c:2971
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: builtin/apply.c:3851
+#: builtin/apply.c:3852
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: builtin/apply.c:3855
+#: builtin/apply.c:3856
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: builtin/apply.c:3860
+#: builtin/apply.c:3861
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: builtin/apply.c:3863 builtin/apply.c:3971
+#: builtin/apply.c:3864 builtin/apply.c:3972
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: builtin/apply.c:3896
+#: builtin/apply.c:3897
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: builtin/apply.c:3945
+#: builtin/apply.c:3946
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: builtin/apply.c:4032
+#: builtin/apply.c:4033
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: builtin/apply.c:4040
+#: builtin/apply.c:4041
msgid "internal error"
msgstr "erreur interne"
-#: builtin/apply.c:4043
+#: builtin/apply.c:4044
#, 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:4053
+#: builtin/apply.c:4054
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: builtin/apply.c:4074
+#: builtin/apply.c:4075
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: builtin/apply.c:4077
+#: builtin/apply.c:4078
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: builtin/apply.c:4227
+#: builtin/apply.c:4228
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: builtin/apply.c:4238
+#: builtin/apply.c:4239
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
-#: builtin/fetch.c:78
+#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
+#: builtin/fetch.c:93
msgid "path"
msgstr "chemin"
-#: builtin/apply.c:4358
+#: builtin/apply.c:4359
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:4361
+#: builtin/apply.c:4362
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:4363
+#: builtin/apply.c:4364
msgid "num"
msgstr "num"
-#: builtin/apply.c:4364
+#: builtin/apply.c:4365
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: builtin/apply.c:4367
+#: builtin/apply.c:4368
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: builtin/apply.c:4369
+#: builtin/apply.c:4370
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:4373
+#: builtin/apply.c:4374
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: builtin/apply.c:4375
+#: builtin/apply.c:4376
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:4377
+#: builtin/apply.c:4378
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:4379
+#: builtin/apply.c:4380
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:4381
+#: builtin/apply.c:4382
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: builtin/apply.c:4383
+#: builtin/apply.c:4384
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-#: builtin/apply.c:4385
+#: builtin/apply.c:4386
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:4387
+#: builtin/apply.c:4388
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455
+#: builtin/apply.c:4390 builtin/checkout-index.c:198 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:4392
+#: builtin/apply.c:4393
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: builtin/apply.c:4393
+#: builtin/apply.c:4394
msgid "action"
msgstr "action"
-#: builtin/apply.c:4394
+#: builtin/apply.c:4395
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: builtin/apply.c:4397 builtin/apply.c:4400
+#: builtin/apply.c:4398 builtin/apply.c:4401
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: builtin/apply.c:4403
+#: builtin/apply.c:4404
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: builtin/apply.c:4405
+#: builtin/apply.c:4406
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: builtin/apply.c:4407
+#: builtin/apply.c:4408
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: builtin/apply.c:4409
+#: builtin/apply.c:4410
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: builtin/apply.c:4412
+#: builtin/apply.c:4413
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: builtin/apply.c:4415
+#: builtin/apply.c:4416
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:4417
+#: builtin/apply.c:4418
msgid "root"
msgstr "racine"
-#: builtin/apply.c:4418
+#: builtin/apply.c:4419
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
-#: builtin/apply.c:4440
+#: builtin/apply.c:4441
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: builtin/apply.c:4448
+#: builtin/apply.c:4449
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: builtin/apply.c:4451
+#: builtin/apply.c:4452
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: builtin/apply.c:4467
+#: builtin/apply.c:4468
#, c-format
msgid "can't open patch '%s'"
msgstr "ouverture impossible du patch '%s'"
-#: builtin/apply.c:4481
+#: builtin/apply.c:4482
#, 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:4487 builtin/apply.c:4497
+#: builtin/apply.c:4488 builtin/apply.c:4498
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
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:27
+#: builtin/blame.c:30
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr "git blame [options] [options-de-révision] [rev] [--] fichier"
-#: builtin/blame.c:32
+#: builtin/blame.c:35
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[options-de-révision] sont documentés dans git-rev-list(1)"
-#: builtin/blame.c:2242
+#: builtin/blame.c:2501
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
"manière incrémentale"
-#: builtin/blame.c:2243
+#: builtin/blame.c:2502
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:2244
+#: builtin/blame.c:2503
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
-#: builtin/blame.c:2245
+#: builtin/blame.c:2504
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2246
+#: builtin/blame.c:2505
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2247
+#: builtin/blame.c:2506
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2248
+#: builtin/blame.c:2507
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2249
+#: builtin/blame.c:2508
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2250
+#: builtin/blame.c:2509
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2251
+#: builtin/blame.c:2510
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:2252
+#: builtin/blame.c:2511
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2253
+#: builtin/blame.c:2512
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2254
+#: builtin/blame.c:2513
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:2255
+#: builtin/blame.c:2514
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:2256
+#: builtin/blame.c:2515
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2257
+#: builtin/blame.c:2516
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2258
+#: builtin/blame.c:2517
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
-#: builtin/blame.c:2259
+#: builtin/blame.c:2518
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2260 builtin/blame.c:2261
+#: builtin/blame.c:2519 builtin/blame.c:2520
msgid "score"
msgstr "score"
-#: builtin/blame.c:2260
+#: builtin/blame.c:2519
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2261
+#: builtin/blame.c:2520
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2262
+#: builtin/blame.c:2521
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2262
+#: builtin/blame.c:2521
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"
+#. TRANSLATORS: This string is used to tell us the maximum
+#. display width for a relative timestamp in "git blame"
+#. output. For C locale, "4 years, 11 months ago", which
+#. takes 22 places, is the longest among various forms of
+#. relative timestamps, but your language may need more or
+#. fewer display columns.
+#: builtin/blame.c:2599
+msgid "4 years, 11 months ago"
+msgstr "il y a 10 ans et 11 mois"
+
#: builtin/branch.c:24
msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [options] [-r | -a] [--merged | --no-merged]"
msgstr "agir sur les branches de suivi distantes"
#: 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
+#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
+#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
+#: builtin/tag.c:621
msgid "commit"
msgstr "commit"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: builtin/branch.c:872 builtin/clone.c:635
+#: builtin/branch.c:872 builtin/clone.c:636
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271
+#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
msgid "git checkout-index [options] [--] [<file>...]"
msgstr "git checkout-index [options] [--] [<fichier>...]"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:188
msgid "check out all files in the index"
msgstr "extraire tous les fichiers présents dans l'index"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:189
msgid "force overwrite of existing files"
msgstr "forcer l'écrasement des fichiers existants"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:191
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"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:193
msgid "don't checkout new files"
msgstr "ne pas extraire les nouveaux fichiers"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:195
msgid "update stat information in the index file"
msgstr "mettre à jour l'information de stat dans le fichier d'index"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:201
msgid "read list of paths from the standard input"
msgstr "lire la liste des chemins depuis l'entrée standard"
-#: builtin/checkout-index.c:202
+#: builtin/checkout-index.c:203
msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
-#: builtin/checkout-index.c:203 builtin/column.c:30
+#: builtin/checkout-index.c:204 builtin/column.c:30
msgid "string"
msgstr "chaîne"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:205
msgid "when creating files, prepend <string>"
msgstr "lors de la création de fichiers, préfixer par <chaîne>"
-#: builtin/checkout-index.c:207
+#: builtin/checkout-index.c:208
msgid "copy out the files from named stage"
msgstr "copier les fichiers depuis l'index nommé"
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
-#: builtin/checkout.c:241
+#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
+#: builtin/checkout.c:240
#, 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:244 builtin/checkout.c:247
+#: builtin/checkout.c:243 builtin/checkout.c:246
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:250
+#: builtin/checkout.c:249
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
"même temps."
-#: builtin/checkout.c:261 builtin/checkout.c:450
+#: builtin/checkout.c:260 builtin/checkout.c:449
msgid "corrupt index file"
msgstr "fichier d'index corrompu"
-#: builtin/checkout.c:321 builtin/checkout.c:328
+#: builtin/checkout.c:320 builtin/checkout.c:327
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:472
+#: builtin/checkout.c:471
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:593
+#: builtin/checkout.c:591
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "Impossible de faire un reflog pour '%s'\n"
-#: builtin/checkout.c:631
+#: builtin/checkout.c:629
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:638
+#: builtin/checkout.c:636
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:641
+#: builtin/checkout.c:639
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:645
+#: builtin/checkout.c:643
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:647 builtin/checkout.c:1032
+#: builtin/checkout.c:645 builtin/checkout.c:1026
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:649
+#: builtin/checkout.c:647
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:705
+#: builtin/checkout.c:699
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:711
+#: builtin/checkout.c:705
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:729
+#: builtin/checkout.c:723
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"git branch nouvelle_branche %s\n"
"\n"
-#: builtin/checkout.c:759
+#: builtin/checkout.c:753
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:763
+#: builtin/checkout.c:757
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était"
-#: builtin/checkout.c:790 builtin/checkout.c:1027
+#: builtin/checkout.c:784 builtin/checkout.c:1021
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:928
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:973
+#: builtin/checkout.c:967
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1002
+#: builtin/checkout.c:996
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1041
+#: builtin/checkout.c:1035
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1044 builtin/checkout.c:1048
+#: builtin/checkout.c:1038 builtin/checkout.c:1042
#, 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:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
+#: builtin/checkout.c:1057
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1062
#, 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:1090 builtin/checkout.c:1092 builtin/clone.c:88
+#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88
#: builtin/remote.c:159 builtin/remote.c:161
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1091
+#: builtin/checkout.c:1085
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1093
+#: builtin/checkout.c:1087
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1094
+#: builtin/checkout.c:1088
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1095
+#: builtin/checkout.c:1089
msgid "detach the HEAD at named commit"
msgstr "détacher la HEAD à la validation nommée"
-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1090
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1092
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1092
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1093
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1095
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1097
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1098
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1105 builtin/merge.c:225
+#: builtin/checkout.c:1099 builtin/merge.c:225
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245
+#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1107
+#: builtin/checkout.c:1101
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (fusion ou diff3)"
-#: builtin/checkout.c:1110
+#: builtin/checkout.c:1104
msgid "do not limit pathspecs to sparse entries only"
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
-#: builtin/checkout.c:1112
+#: builtin/checkout.c:1106
msgid "second guess 'git checkout no-such-branch'"
msgstr "deuxième chance 'git checkout branche-inexistante'"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1129
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1146
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1153
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1190
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1197
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"en même temps.\n"
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-#: builtin/checkout.c:1208
+#: builtin/checkout.c:1202
#, 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:1212
+#: builtin/checkout.c:1206
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "Huh (%s)?"
msgstr "Hein (%s) ?"
-#: builtin/clean.c:660
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
-#: builtin/clean.c:758
+#: builtin/clean.c:757
#, c-format
msgid "remove %s? "
msgstr "supprimer %s ? "
-#: builtin/clean.c:783
+#: builtin/clean.c:782
msgid "Bye."
msgstr "Au revoir."
-#: builtin/clean.c:791
+#: builtin/clean.c:790
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:818
+#: builtin/clean.c:817
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:819
+#: builtin/clean.c:818
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:827
+#: builtin/clean.c:826
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:844
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:875
+#: builtin/clean.c:874
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:877
+#: builtin/clean.c:876
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:878
+#: builtin/clean.c:877
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:880
+#: builtin/clean.c:879
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: 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
+#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
+#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:882
+#: builtin/clean.c:881
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:883
+#: builtin/clean.c:882
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:885
+#: builtin/clean.c:884
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:903
+#: builtin/clean.c:902
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clean.c:907
+#: builtin/clean.c:906
msgid ""
"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"
+msgstr ""
+"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
+"nettoyer"
-#: builtin/clean.c:910
+#: builtin/clean.c:909
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [options] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
-#: builtin/push.c:504
+#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
+#: builtin/push.c:503
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659
msgid "depth"
msgstr "profondeur"
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:626
+#: builtin/clone.c:627
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD distante réfère à une référence non existante, impossible de "
"l'extraire.\n"
-#: builtin/clone.c:657
+#: builtin/clone.c:658
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:765
+#: builtin/clone.c:768
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:769
+#: builtin/clone.c:772
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:780
+#: builtin/clone.c:783
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:783
+#: builtin/clone.c:786
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:796
+#: builtin/clone.c:799
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: 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://\"."
-
-#: 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:814 builtin/fetch.c:1119
+#: builtin/clone.c:805 builtin/fetch.c:1143
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:824
+#: builtin/clone.c:815
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:834
+#: builtin/clone.c:825
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:847 builtin/clone.c:859
+#: builtin/clone.c:838 builtin/clone.c:850
#, 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:850
+#: builtin/clone.c:841
#, 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:869
+#: builtin/clone.c:860
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:871
+#: builtin/clone.c:862
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
+#: builtin/clone.c:898
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
+
+#: builtin/clone.c:901
+msgid "source repository is shallow, ignoring --local"
+msgstr "le dépôt source est superficiel, option --local ignorée"
+
#: builtin/clone.c:906
+msgid "--local is ignored"
+msgstr "--local est ignoré"
+
+#: builtin/clone.c:910
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:957 builtin/clone.c:965
+#: builtin/clone.c:961 builtin/clone.c:969
#, 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:968
+#: builtin/clone.c:972
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:330
+#: builtin/commit.c:328
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:336
+#: builtin/commit.c:334
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440
+#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:421
+#: builtin/commit.c:418
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:423
+#: builtin/commit.c:420
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:433
+#: builtin/commit.c:429
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:453
+#: builtin/commit.c:447
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:544 builtin/commit.c:550
+#: builtin/commit.c:557 builtin/commit.c:563
#, c-format
msgid "invalid commit: %s"
msgstr "commit invalide : %s"
-#: builtin/commit.c:572
+#: builtin/commit.c:585
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
#: builtin/commit.c:592
#, c-format
+msgid "invalid date format: %s"
+msgstr "format de date invalide : %s"
+
+#: builtin/commit.c:609
+#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Chaîne ident mal formée : '%s'"
-#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014
+#: builtin/commit.c:642
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"impossible de sélectionner un caractère de commentaire\n"
+"qui n'est pas utilisé dans le message de validation actuel"
+
+#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:641 builtin/shortlog.c:273
+#: builtin/commit.c:691 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:643
+#: builtin/commit.c:693
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:647
+#: builtin/commit.c:697
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:654
-msgid "commit has empty message"
-msgstr "le commit a un message vide"
-
-#: builtin/commit.c:670
+#: builtin/commit.c:719
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:674
+#: builtin/commit.c:723
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:678
+#: builtin/commit.c:727
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/commit.c:749
+#: builtin/commit.c:798
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:764
+#: builtin/commit.c:816
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:769
+#: builtin/commit.c:821
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:782
+#: builtin/commit.c:834
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:789
+#: builtin/commit.c:841
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"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:802
+#: builtin/commit.c:855
#, c-format
-msgid "%sAuthor: %s"
-msgstr "%sAuteur : %s"
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:809
+#: builtin/commit.c:863
#, c-format
-msgid "%sCommitter: %s"
-msgstr "%sValidateur : %s"
+msgid "%sDate: %s"
+msgstr "%sDate : %s"
-#: builtin/commit.c:829
+#: builtin/commit.c:870
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sValidateur : %.*s <%.*s>"
+
+#: builtin/commit.c:888
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:872
+#: builtin/commit.c:945
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:887 builtin/tag.c:391
+#: builtin/commit.c:960 builtin/tag.c:495
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:989
+#: builtin/commit.c:1061
#, c-format
msgid "No existing author found with '%s'"
msgstr "Aucun auteur existant trouvé avec '%s'"
-#: builtin/commit.c:1004 builtin/commit.c:1244
+#: builtin/commit.c:1076 builtin/commit.c:1316
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1041
+#: builtin/commit.c:1113
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1071
+#: builtin/commit.c:1143
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:1080
+#: builtin/commit.c:1152
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1083
+#: builtin/commit.c:1155
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1085
+#: builtin/commit.c:1157
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:1088
+#: builtin/commit.c:1160
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:1098
+#: builtin/commit.c:1170
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:1100
+#: builtin/commit.c:1172
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:1108
+#: builtin/commit.c:1180
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:1125
+#: builtin/commit.c:1197
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1199
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:1129
+#: builtin/commit.c:1201
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
-#: builtin/commit.c:1131
+#: builtin/commit.c:1203
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:1143 builtin/tag.c:639
+#: builtin/commit.c:1215 builtin/tag.c:727
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1220
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:1258 builtin/commit.c:1516
+#: builtin/commit.c:1330 builtin/commit.c:1595
msgid "show status concisely"
msgstr "afficher le statut avec concision"
-#: builtin/commit.c:1260 builtin/commit.c:1518
+#: builtin/commit.c:1332 builtin/commit.c:1597
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490
+#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1265 builtin/commit.c:1522
+#: builtin/commit.c:1337 builtin/commit.c:1601
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
-#: builtin/commit.c:1268 builtin/commit.c:1525
+#: builtin/commit.c:1340 builtin/commit.c:1604
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674
-#: builtin/fast-export.c:677 builtin/tag.c:514
+#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
+#: builtin/fast-export.c:706 builtin/tag.c:602
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1271 builtin/commit.c:1528
+#: builtin/commit.c:1343 builtin/commit.c:1607
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:1274
+#: builtin/commit.c:1346
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1275 parse-options.h:153
+#: builtin/commit.c:1347 parse-options.h:153
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1276
+#: builtin/commit.c:1348
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1278
+#: builtin/commit.c:1350
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1347
+#: builtin/commit.c:1419
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1349
+#: builtin/commit.c:1421
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1390
+#: builtin/commit.c:1469
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1392
+#: builtin/commit.c:1471
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1486
+#: builtin/commit.c:1565
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1566
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1568
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1490 builtin/tag.c:512
+#: builtin/commit.c:1569 builtin/tag.c:600
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1570
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1570
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1492 builtin/gc.c:272
+#: builtin/commit.c:1571 builtin/gc.c:286
msgid "date"
msgstr "date"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1571
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409
-#: builtin/notes.c:566 builtin/tag.c:510
+#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
+#: builtin/notes.c:566 builtin/tag.c:598
msgid "message"
msgstr "message"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1572
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1573
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1574
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1575
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1576
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message au format autosquash pour compresser le commit spécifié"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1577
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:1499 builtin/log.c:1180 builtin/revert.c:86
+#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1579
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1580
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1581
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1502 builtin/tag.c:515
+#: builtin/commit.c:1581 builtin/tag.c:603
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1582
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92
-#: builtin/tag.c:516
+#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
+#: builtin/tag.c:604
msgid "key-id"
msgstr "id de clé"
-#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93
+#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1587
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1588
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1589
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1590
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1591
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1592
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1593
msgid "bypass pre-commit hook"
msgstr "éviter d'utiliser le crochet pre-commit"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1594
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1526
+#: builtin/commit.c:1605
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1527
+#: builtin/commit.c:1606
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1532
+#: builtin/commit.c:1611
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1534
+#: builtin/commit.c:1613
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1562
+#: builtin/commit.c:1641
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1601 builtin/merge.c:518
+#: builtin/commit.c:1680 builtin/merge.c:518
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1687
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1694
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1713
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1724
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1729
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation du à un message de validation vide\n"
-#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882
+#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/commit.c:1686
+#: builtin/commit.c:1756
msgid "cannot lock HEAD ref"
msgstr "impossible de verrouiller la référence HEAD"
-#: builtin/commit.c:1690
+#: builtin/commit.c:1769
msgid "cannot update HEAD ref"
msgstr "impossible de mettre à jour la référence HEAD"
-#: builtin/commit.c:1701
+#: builtin/commit.c:1780
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
msgid "git describe [options] --dirty"
msgstr "git describe [options] --dirty"
-#: builtin/describe.c:225
+#: builtin/describe.c:216
#, c-format
msgid "annotated tag %s not available"
msgstr "l'étiquette annotée %s n'est pas disponible"
-#: builtin/describe.c:229
+#: builtin/describe.c:220
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
-#: builtin/describe.c:231
+#: builtin/describe.c:222
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'étiquette '%s' est en fait '%s'"
-#: builtin/describe.c:258
+#: builtin/describe.c:249
#, c-format
msgid "Not a valid object name %s"
msgstr "%s n'est pas un nom d'objet valide"
-#: builtin/describe.c:261
+#: builtin/describe.c:252
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: builtin/describe.c:278
+#: builtin/describe.c:269
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "aucune étiquette ne correspond parfaitement à '%s'"
-#: builtin/describe.c:280
+#: builtin/describe.c:271
#, c-format
msgid "searching to describe %s\n"
msgstr "recherche de la description de %s\n"
-#: builtin/describe.c:327
+#: builtin/describe.c:318
#, c-format
msgid "finished search at %s\n"
msgstr "recherche terminée à %s\n"
-#: builtin/describe.c:354
+#: builtin/describe.c:345
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"Aucune étiquette annotée ne peut décrire '%s'.\n"
"Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
-#: builtin/describe.c:358
+#: builtin/describe.c:349
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Aucune étiquette ne peut décrire '%s'.\n"
"Essayez --always, ou créez des étiquettes."
-#: builtin/describe.c:379
+#: builtin/describe.c:370
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits parcourus\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:373
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"affichées\n"
"abandon de la recherche à %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:395
msgid "find the tag that comes after the commit"
msgstr "rechercher l'étiquette qui suit le commit"
-#: builtin/describe.c:405
+#: builtin/describe.c:396
msgid "debug search strategy on stderr"
msgstr "déboguer la stratégie de recherche sur stderr"
-#: builtin/describe.c:406
+#: builtin/describe.c:397
msgid "use any ref"
msgstr "utiliser n'importe quelle référence"
-#: builtin/describe.c:407
+#: builtin/describe.c:398
msgid "use any tag, even unannotated"
msgstr "utiliser n'importe quelle étiquette, même non-annotée"
-#: builtin/describe.c:408
+#: builtin/describe.c:399
msgid "always use long format"
msgstr "toujours utiliser le format long"
-#: builtin/describe.c:409
+#: builtin/describe.c:400
msgid "only follow first parent"
msgstr "ne suivre que le premier parent"
-#: builtin/describe.c:412
+#: builtin/describe.c:403
msgid "only output exact matches"
msgstr "n'afficher que les correspondances exactes"
-#: builtin/describe.c:414
+#: builtin/describe.c:405
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:416
+#: builtin/describe.c:407
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:418 builtin/name-rev.c:321
+#: builtin/describe.c:409 builtin/name-rev.c:318
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
-#: builtin/describe.c:419
+#: builtin/describe.c:410
msgid "mark"
msgstr "marque"
-#: builtin/describe.c:420
+#: builtin/describe.c:411
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
-#: builtin/describe.c:438
+#: builtin/describe.c:429
msgid "--long is incompatible with --abbrev=0"
msgstr "--long et --abbrev=0 sont incompatibles"
-#: builtin/describe.c:464
+#: builtin/describe.c:455
msgid "No names found, cannot describe anything."
msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
-#: builtin/describe.c:484
+#: builtin/describe.c:475
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
-#: builtin/fast-export.c:22
+#: builtin/fast-export.c:23
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:673
+#: builtin/fast-export.c:702
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:675
+#: builtin/fast-export.c:704
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:707
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:681
+#: builtin/fast-export.c:710
msgid "Dump marks to this file"
msgstr "Enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:712
msgid "Import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:685
+#: builtin/fast-export.c:714
msgid "Fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:687
+#: builtin/fast-export.c:716
msgid "Output full tree for each commit"
msgstr "Afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:689
+#: builtin/fast-export.c:718
msgid "Use the done feature to terminate the stream"
msgstr "Utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:690
+#: builtin/fast-export.c:719
msgid "Skip output of blob data"
msgstr "Sauter l'affichage de données de blob"
+#: builtin/fast-export.c:720
+msgid "refspec"
+msgstr "spécificateur de référence"
+
+#: builtin/fast-export.c:721
+msgid "Apply refspec to exported refs"
+msgstr "Appliquer le spécificateur de référence aux références exportées"
+
#: builtin/fetch.c:20
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:75
+#: builtin/fetch.c:90
msgid "fetch from all remotes"
msgstr "récupérer depuis tous le dépôts distants"
-#: builtin/fetch.c:77
+#: builtin/fetch.c:92
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:79
+#: builtin/fetch.c:94
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:80
+#: builtin/fetch.c:95
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:82
+#: builtin/fetch.c:97
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:84
+#: builtin/fetch.c:99
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:86
+#: builtin/fetch.c:101
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:88
+#: builtin/fetch.c:103
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:89
+#: builtin/fetch.c:104
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:90
+#: builtin/fetch.c:105
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:94
+#: builtin/fetch.c:109
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:96
+#: builtin/fetch.c:111
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:114
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:116
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:103 builtin/log.c:1197
+#: builtin/fetch.c:118 builtin/log.c:1205
msgid "dir"
msgstr "dir"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:119
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:122
msgid "default mode for recursion"
msgstr "mode par défaut pour la récursion"
-#: builtin/fetch.c:109
+#: builtin/fetch.c:124
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:347
+#: builtin/fetch.c:125
+msgid "refmap"
+msgstr "correspondance de référence"
+
+#: builtin/fetch.c:126
+msgid "specify fetch refmap"
+msgstr "spécifier une correspondance de référence pour la récupération"
+
+#: builtin/fetch.c:376
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:411
+#: builtin/fetch.c:440
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:416
+#: builtin/fetch.c:445
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:430
+#: builtin/fetch.c:459
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"
-#: builtin/fetch.c:431 builtin/fetch.c:517
+#: builtin/fetch.c:460 builtin/fetch.c:546
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:442
+#: builtin/fetch.c:471
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
+#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526
msgid " (unable to update local ref)"
msgstr " (impossible de mettre à jour la référence locale)"
-#: builtin/fetch.c:462
+#: builtin/fetch.c:491
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:465
+#: builtin/fetch.c:494
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:468
+#: builtin/fetch.c:497
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:542
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:542
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:519
+#: builtin/fetch.c:548
msgid "(non-fast-forward)"
msgstr "(pas d'avance rapide)"
-#: builtin/fetch.c:552 builtin/fetch.c:785
+#: builtin/fetch.c:581 builtin/fetch.c:814
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir %s : %s\n"
-#: builtin/fetch.c:561
+#: builtin/fetch.c:590
#, 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:579
+#: builtin/fetch.c:608
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:667 builtin/fetch.c:750
+#: builtin/fetch.c:696 builtin/fetch.c:779
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:678
+#: builtin/fetch.c:707
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"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:730
+#: builtin/fetch.c:759
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:731
+#: builtin/fetch.c:760
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:784
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:756 builtin/remote.c:1050
+#: builtin/fetch.c:785 builtin/remote.c:1059
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:775
+#: builtin/fetch.c:804
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:794
+#: builtin/fetch.c:823
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:797
+#: builtin/fetch.c:826
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:882
#, 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
+#: builtin/fetch.c:1044
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1017 builtin/remote.c:90
+#: builtin/fetch.c:1046 builtin/remote.c:90
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1035
+#: builtin/fetch.c:1064
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"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:1059
+#: builtin/fetch.c:1087
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1107
+#: builtin/fetch.c:1131
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1109
+#: builtin/fetch.c:1133
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
-#: builtin/fetch.c:1132
+#: builtin/fetch.c:1156
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1158
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
-#: builtin/fetch.c:1145
+#: builtin/fetch.c:1169
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1153
+#: builtin/fetch.c:1177
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 "
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179
-#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
+#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183
+#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589
#: parse-options.h:132 parse-options.h:239
msgid "n"
msgstr "n"
msgid "file to read from"
msgstr "fichier d'où lire"
-#: builtin/for-each-ref.c:1063
+#: builtin/for-each-ref.c:1051
msgid "git for-each-ref [options] [<pattern>]"
msgstr "git for-each-ref [options] [<motif>]"
-#: builtin/for-each-ref.c:1078
+#: builtin/for-each-ref.c:1066
msgid "quote placeholders suitably for shells"
msgstr "échapper les champs réservés pour les interpréteurs de commandes"
-#: builtin/for-each-ref.c:1080
+#: builtin/for-each-ref.c:1068
msgid "quote placeholders suitably for perl"
msgstr "échapper les champs réservés pour perl"
-#: builtin/for-each-ref.c:1082
+#: builtin/for-each-ref.c:1070
msgid "quote placeholders suitably for python"
msgstr "échapper les champs réservés pour python"
-#: builtin/for-each-ref.c:1084
+#: builtin/for-each-ref.c:1072
msgid "quote placeholders suitably for tcl"
msgstr "échapper les champs réservés pour tcl"
-#: builtin/for-each-ref.c:1087
+#: builtin/for-each-ref.c:1075
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:1088 builtin/replace.c:177
+#: builtin/for-each-ref.c:1076 builtin/replace.c:435
msgid "format"
msgstr "format"
-#: builtin/for-each-ref.c:1088
+#: builtin/for-each-ref.c:1076
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/for-each-ref.c:1089
+#: builtin/for-each-ref.c:1077
msgid "key"
msgstr "clé"
-#: builtin/for-each-ref.c:1090
+#: builtin/for-each-ref.c:1078
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: builtin/fsck.c:544
+#: builtin/fsck.c:538
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:607
+#: builtin/fsck.c:601
msgid "git fsck [options] [<object>...]"
msgstr "git fsck [options] [<objet>...]"
-#: builtin/fsck.c:613
+#: builtin/fsck.c:607
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:614
+#: builtin/fsck.c:608
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:615
+#: builtin/fsck.c:609
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:616
+#: builtin/fsck.c:610
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:617
+#: builtin/fsck.c:611
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:618
+#: builtin/fsck.c:612
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:613
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:614
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:622
+#: builtin/fsck.c:616
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:623 builtin/prune.c:144
+#: builtin/fsck.c:617 builtin/prune.c:144
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:673
+#: builtin/fsck.c:667
msgid "Checking objects"
msgstr "Vérification des objets"
msgid "git gc [options]"
msgstr "git gc [options]"
-#: builtin/gc.c:90
+#: builtin/gc.c:91
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: builtin/gc.c:117
+#: builtin/gc.c:118
#, c-format
msgid "insanely long object directory %.*s"
msgstr "objet répertoire démentiellement long %.*s"
-#: builtin/gc.c:273
+#: builtin/gc.c:287
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:275
+#: builtin/gc.c:289
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:276
+#: builtin/gc.c:290
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:277
+#: builtin/gc.c:291
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:318
+#: builtin/gc.c:332
#, 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"
+msgstr ""
+"Compression automatique du dépôt en tâche de fond pour optimiser les "
+"performances.\n"
-#: builtin/gc.c:320
+#: builtin/gc.c:334
#, 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
+#: builtin/gc.c:335
#, 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
+#: builtin/gc.c:353
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"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:361
+#: builtin/gc.c:375
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:365
-#, c-format
-msgid "Failed to chdir: %s"
-msgstr "Échec de chdir: %s"
-
-#: builtin/grep.c:443 builtin/grep.c:478
+#: builtin/grep.c:441 builtin/grep.c:476
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:493
+#: builtin/grep.c:491
#, c-format
msgid "unable to grep from object of type %s"
msgstr "impossible de faire un grep sur un objet de type %s"
-#: builtin/grep.c:549
+#: builtin/grep.c:547
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:566
+#: builtin/grep.c:564
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: builtin/grep.c:640
+#: builtin/grep.c:638
msgid "search in index instead of in the work tree"
msgstr "rechercher dans l'index plutôt que dans la copie de travail"
-#: builtin/grep.c:642
+#: builtin/grep.c:640
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:644
+#: builtin/grep.c:642
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:646
+#: builtin/grep.c:644
msgid "search also in ignored files"
msgstr "rechercher aussi dans les fichiers ignorés"
-#: builtin/grep.c:649
+#: builtin/grep.c:647
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:651
+#: builtin/grep.c:649
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:653
+#: builtin/grep.c:651
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:655
+#: builtin/grep.c:653
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:657
+#: builtin/grep.c:655
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:660
+#: builtin/grep.c:658
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:662
+#: builtin/grep.c:660
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:666
+#: builtin/grep.c:664
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:669
+#: builtin/grep.c:667
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:672
+#: builtin/grep.c:670
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:675
+#: builtin/grep.c:673
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:678
+#: builtin/grep.c:676
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:679
+#: builtin/grep.c:677
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:680
+#: builtin/grep.c:678
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:682
+#: builtin/grep.c:680
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:684
+#: builtin/grep.c:682
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:686
+#: builtin/grep.c:684
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:689
+#: builtin/grep.c:687
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:691
+#: builtin/grep.c:689
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:693
+#: builtin/grep.c:691
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:694
+#: builtin/grep.c:692
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:696
+#: builtin/grep.c:694
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:698
+#: builtin/grep.c:696
msgid "show filename only once above matches from same file"
msgstr ""
"afficher le nom de fichier une fois au dessus des correspondances du même "
"fichier"
-#: builtin/grep.c:701
+#: builtin/grep.c:699
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:704
+#: builtin/grep.c:702
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:706
+#: builtin/grep.c:704
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:707
+#: builtin/grep.c:705
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:710
+#: builtin/grep.c:708
msgid "show a line with the function name before matches"
msgstr ""
"afficher une ligne avec le nom de la fonction avant les correspondances"
-#: builtin/grep.c:712
+#: builtin/grep.c:710
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:715
+#: builtin/grep.c:713
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:717
+#: builtin/grep.c:715
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:719
+#: builtin/grep.c:717
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:731
+#: builtin/grep.c:729
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:733
+#: builtin/grep.c:731
msgid "show only matches from files that match all patterns"
msgstr ""
"n'afficher que les correspondances de fichiers qui correspondent à tous les "
"motifs"
-#: builtin/grep.c:735
+#: builtin/grep.c:733
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:739
+#: builtin/grep.c:737
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:739
+#: builtin/grep.c:737
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:742
+#: builtin/grep.c:740
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:743 builtin/show-ref.c:187
+#: builtin/grep.c:741 builtin/show-ref.c:187
msgid "show usage"
msgstr "afficher l'usage"
-#: builtin/grep.c:810
+#: builtin/grep.c:808
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:868
+#: builtin/grep.c:866
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
-#: builtin/grep.c:891
+#: builtin/grep.c:892
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
-#: builtin/grep.c:896
+#: builtin/grep.c:897
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:899
+#: builtin/grep.c:900
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:907
+#: builtin/grep.c:908
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
msgid "git hash-object --stdin-paths < <list-of-paths>"
msgstr "git hash-object --stdin-paths < <liste-de-chemins>"
-#: builtin/hash-object.c:72 builtin/tag.c:521
+#: builtin/hash-object.c:72 builtin/tag.c:609
msgid "type"
msgstr "type"
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s\" est un alias de `%s'"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:145
+#, c-format
+msgid "unable to open %s"
+msgstr "impossible d'ouvrir %s"
+
+#: builtin/index-pack.c:191
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:204
-msgid "object of unexpected type"
-msgstr "objet de type inattendu"
+#: builtin/index-pack.c:211
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "objet attendu non reçu %s"
+
+#: builtin/index-pack.c:214
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:244
+#: builtin/index-pack.c:256
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossible de remplir %d octet"
msgstr[1] "impossible de remplir %d octets"
-#: builtin/index-pack.c:254
+#: builtin/index-pack.c:266
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:255
+#: builtin/index-pack.c:267
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:279
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:274
+#: builtin/index-pack.c:286
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:302
#, c-format
msgid "unable to create '%s'"
msgstr "impossible de créer '%s'"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:307
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:309
+#: builtin/index-pack.c:321
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:323
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:329
+#: builtin/index-pack.c:341
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr "le paquet a un mauvais objet à l'offset %lu: %s"
-#: builtin/index-pack.c:451
+#: builtin/index-pack.c:462
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:500
+#: builtin/index-pack.c:511
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:508
+#: builtin/index-pack.c:519
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:516
+#: builtin/index-pack.c:527
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:547
+#: builtin/index-pack.c:558
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:549
+#: builtin/index-pack.c:560
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
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:575
+#: builtin/index-pack.c:586
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: 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
+#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706
+#: builtin/index-pack.c:740 builtin/index-pack.c:749
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:669 builtin/pack-objects.c:162
+#: builtin/index-pack.c:680 builtin/pack-objects.c:162
#: builtin/pack-objects.c:254
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:735
+#: builtin/index-pack.c:746
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:749
+#: builtin/index-pack.c:760
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:763
+#: builtin/index-pack.c:774
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/index-pack.c:766
+#: builtin/index-pack.c:777
msgid "Error in object"
msgstr "Erreur dans l'objet"
-#: builtin/index-pack.c:768
+#: builtin/index-pack.c:779
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
-#: builtin/index-pack.c:839 builtin/index-pack.c:869
+#: builtin/index-pack.c:851 builtin/index-pack.c:881
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1010
+#: builtin/index-pack.c:1022
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1010
+#: builtin/index-pack.c:1022
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1036
+#: builtin/index-pack.c:1048
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1041
+#: builtin/index-pack.c:1053
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1044
+#: builtin/index-pack.c:1056
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1055
+#: builtin/index-pack.c:1067
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1078
+#: builtin/index-pack.c:1090
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1088
+#: builtin/index-pack.c:1100
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1142
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1138
+#: builtin/index-pack.c:1150
#, c-format
msgid "completed with %d local objects"
msgstr "complété avec %d objets locaux"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1160
#, 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:1152
+#: builtin/index-pack.c:1164
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "le paquet a %d delta non résolu"
msgstr[1] "le paquet a %d deltas non résolus"
-#: builtin/index-pack.c:1177
+#: builtin/index-pack.c:1189
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1256
+#: builtin/index-pack.c:1268
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1280
+#: builtin/index-pack.c:1292
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1305
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1313
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1314
+#: builtin/index-pack.c:1326
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1325
+#: builtin/index-pack.c:1337
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1358
+#: builtin/index-pack.c:1370
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1364
+#: builtin/index-pack.c:1376
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
+#: builtin/index-pack.c:1380 builtin/index-pack.c:1559
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/index-pack.c:1426
+#: builtin/index-pack.c:1438
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1440
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
-#: builtin/index-pack.c:1475
+#: builtin/index-pack.c:1487
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "pas un delta : %d objet"
msgstr[1] "pas un delta : %d objets"
-#: builtin/index-pack.c:1482
+#: builtin/index-pack.c:1494
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1510
+#: builtin/index-pack.c:1523
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
-#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
+#: builtin/index-pack.c:1571 builtin/index-pack.c:1574
+#: builtin/index-pack.c:1586 builtin/index-pack.c:1590
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1591
+#: builtin/index-pack.c:1604
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
+#: builtin/index-pack.c:1608 builtin/index-pack.c:1617
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-#: builtin/index-pack.c:1614
+#: builtin/index-pack.c:1625
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
msgid "specify that the git repository is to be shared amongst several users"
msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
-#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168
+#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172
msgid "be quiet"
msgstr "être silencieux"
msgid " or: git show [options] <object>..."
msgstr " ou : git show [options] <objet>..."
-#: builtin/log.c:125
+#: builtin/log.c:127
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: builtin/log.c:126
+#: builtin/log.c:128
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:127
+#: builtin/log.c:129
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:128
+#: builtin/log.c:130
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:231
+#: builtin/log.c:229
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:473 builtin/log.c:565
+#: builtin/log.c:470 builtin/log.c:562
#, c-format
msgid "Could not read object %s"
msgstr "Impossible de lire l'objet %s"
-#: builtin/log.c:589
+#: builtin/log.c:586
#, c-format
msgid "Unknown type: %d"
msgstr "Type inconnu : %d"
-#: builtin/log.c:689
+#: builtin/log.c:687
msgid "format.headers without value"
msgstr "format.headers sans valeur"
msgid "Not a range."
msgstr "Ceci n'est pas une plage."
-#: builtin/log.c:911
+#: builtin/log.c:916
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format e-mail"
-#: builtin/log.c:987
+#: builtin/log.c:995
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1015
+#: builtin/log.c:1023
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr "git format-patch [options] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1060
+#: builtin/log.c:1068
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1175
+#: builtin/log.c:1183
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1178
+#: builtin/log.c:1186
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1182
+#: builtin/log.c:1190
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1184
+#: builtin/log.c:1192
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1186
+#: builtin/log.c:1194
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:1187
+#: builtin/log.c:1195
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1188
+#: builtin/log.c:1196
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1190
+#: builtin/log.c:1198
msgid "start numbering patches at <n> instead of 1"
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
-#: builtin/log.c:1192
+#: builtin/log.c:1200
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1194
+#: builtin/log.c:1202
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1197
+#: builtin/log.c:1205
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1200
+#: builtin/log.c:1208
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1203
+#: builtin/log.c:1211
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1205
+#: builtin/log.c:1213
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1207
+#: builtin/log.c:1215
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1209
+#: builtin/log.c:1217
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1210
+#: builtin/log.c:1218
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1211
+#: builtin/log.c:1219
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1212 builtin/log.c:1214
+#: builtin/log.c:1220 builtin/log.c:1222
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1212
+#: builtin/log.c:1220
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1214
+#: builtin/log.c:1222
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1216
+#: builtin/log.c:1224
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1217
+#: builtin/log.c:1225
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:1219
+#: builtin/log.c:1227
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1220
+#: builtin/log.c:1228
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1221 builtin/log.c:1224
+#: builtin/log.c:1229 builtin/log.c:1232
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1222
+#: builtin/log.c:1230
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1225
+#: builtin/log.c:1233
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1229
+#: builtin/log.c:1237
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1231
+#: builtin/log.c:1239
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1232
+#: builtin/log.c:1240
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1233
+#: builtin/log.c:1242
+msgid "add a signature from a file"
+msgstr "ajouter une signature depuis un fichier"
+
+#: builtin/log.c:1243
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1307
+#: builtin/log.c:1317
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1322
+#: builtin/log.c:1332
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1324
+#: builtin/log.c:1334
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix et -k sont mutuellement exclusifs."
-#: builtin/log.c:1332
+#: builtin/log.c:1342
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1334
+#: builtin/log.c:1344
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1336
+#: builtin/log.c:1346
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1359
+#: builtin/log.c:1369
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1361
+#: builtin/log.c:1371
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1509
+#: builtin/log.c:1468
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "lecture du fichier de signature '%s' impossible"
+
+#: builtin/log.c:1531
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1558
+#: builtin/log.c:1579
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1613
+#: builtin/log.c:1634
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
+#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/merge.c:681
+#: builtin/merge.c:678
msgid "Not handling anything other than two heads merge."
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
-#: builtin/merge.c:695
+#: builtin/merge.c:692
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Options inconnue pour merge-recursive : -X%s"
-#: builtin/merge.c:709
+#: builtin/merge.c:705
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:798
+#: builtin/merge.c:794
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:807
+#: builtin/merge.c:803
#, 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:813
+#: builtin/merge.c:809
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:837
+#: builtin/merge.c:833
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:849
+#: builtin/merge.c:845
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:914
+#: builtin/merge.c:908
#, 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:930
+#: builtin/merge.c:924
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' n'est pas une validation"
-#: builtin/merge.c:971
+#: builtin/merge.c:965
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:973
+#: builtin/merge.c:967
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:975
+#: builtin/merge.c:969
msgid "No default upstream defined for the current branch."
msgstr "Pas de branche amont par défaut définie pour la branche courante."
-#: builtin/merge.c:980
+#: builtin/merge.c:974
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1136
+#: builtin/merge.c:1130
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
-#: builtin/merge.c:1152 git-pull.sh:31
+#: builtin/merge.c:1146 git-pull.sh:31
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos changements avant de pouvoir fusionner."
-#: builtin/merge.c:1155 git-pull.sh:34
+#: builtin/merge.c:1149 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: builtin/merge.c:1159
+#: builtin/merge.c:1153
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos changements avant de pouvoir fusionner."
-#: builtin/merge.c:1162
+#: builtin/merge.c:1156
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
-#: builtin/merge.c:1171
+#: builtin/merge.c:1165
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1180
+#: builtin/merge.c:1174
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:1212
+#: builtin/merge.c:1206
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:1215
+#: builtin/merge.c:1209
msgid "Squash commit into empty head not supported yet"
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
-#: builtin/merge.c:1217
+#: builtin/merge.c:1211
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
-#: builtin/merge.c:1222
+#: builtin/merge.c:1216
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1273
+#: builtin/merge.c:1267
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
-#: builtin/merge.c:1276
+#: builtin/merge.c:1270
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
-#: builtin/merge.c:1279
+#: builtin/merge.c:1273
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: builtin/merge.c:1282
+#: builtin/merge.c:1276
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La validation %s a une signature GPG correcte par %s\n"
-#: builtin/merge.c:1366
+#: builtin/merge.c:1357
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1405
+#: builtin/merge.c:1396
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1412
+#: builtin/merge.c:1403
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1444
+#: builtin/merge.c:1435
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1467 builtin/merge.c:1546
+#: builtin/merge.c:1458 builtin/merge.c:1537
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1471
+#: builtin/merge.c:1462
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1537
+#: builtin/merge.c:1528
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
-#: builtin/merge.c:1539
+#: builtin/merge.c:1530
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1548
+#: builtin/merge.c:1539
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1560
+#: builtin/merge.c:1551
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:207
+#: builtin/mv.c:208
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:215
+#: builtin/mv.c:216
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:218
+#: builtin/mv.c:219
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:221
+#: builtin/mv.c:222
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "destination directory does not exist"
msgstr "le répertoire de destination n'existe pas"
-#: builtin/mv.c:243
+#: builtin/mv.c:244
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:253
+#: builtin/mv.c:254
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355
+#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:255
msgid "git name-rev [options] <commit>..."
msgstr "git name-rev [options] <validation>..."
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:256
msgid "git name-rev [options] --all"
msgstr "git name-rev [options] --all"
-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:257
msgid "git name-rev [options] --stdin"
msgstr "git name-rev [options] --stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:309
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:310
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:312
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:314
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:315
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:316
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:322
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
msgid "failed to finish 'show' for object '%s'"
msgstr "impossible de finir 'show' pour l'objet '%s'"
-#: builtin/notes.c:167 builtin/tag.c:373
+#: builtin/notes.c:167 builtin/tag.c:477
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
msgid "The note contents has been left in %s"
msgstr "Le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:248 builtin/tag.c:604
+#: builtin/notes.c:248 builtin/tag.c:692
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:250 builtin/tag.c:607
+#: builtin/notes.c:250 builtin/tag.c:695
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
#: 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
+#: builtin/notes.c:843 builtin/tag.c:708
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
msgstr "contenu de la note dans un fichier"
#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
-#: builtin/notes.c:575 builtin/tag.c:539
+#: builtin/notes.c:575 builtin/tag.c:627
msgid "object"
msgstr "objet"
msgid "use notes from <notes_ref>"
msgstr "utiliser les notes depuis <références_notes>"
-#: builtin/notes.c:978 builtin/remote.c:1593
+#: builtin/notes.c:978 builtin/remote.c:1616
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
#: 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"
+msgstr ""
+"désactivation de l'écriture en bitmap car certains objets ne sont pas "
+"compressés"
#: builtin/pack-objects.c:2174
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2530
+#: builtin/pack-objects.c:2526
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2534
+#: builtin/pack-objects.c:2530
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2557
+#: builtin/pack-objects.c:2553
#, c-format
msgid "option %s does not accept negative form"
msgstr "l'option %s n'accepte pas de valeur négative"
-#: builtin/pack-objects.c:2561
+#: builtin/pack-objects.c:2557
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "impossible d'analyser la valeur '%s' pour l'option %s"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2576
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2582
+#: builtin/pack-objects.c:2578
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2584
+#: builtin/pack-objects.c:2580
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/pack-objects.c:2587
+#: builtin/pack-objects.c:2583
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2584
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2589
+#: builtin/pack-objects.c:2585
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:2592
+#: builtin/pack-objects.c:2588
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2590
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2592
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2598
+#: builtin/pack-objects.c:2594
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2596
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:2602
+#: builtin/pack-objects.c:2598
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:2604
+#: builtin/pack-objects.c:2600
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2602
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2604
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2606
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:2612
+#: builtin/pack-objects.c:2608
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2610
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2612
msgid "limit the objects to those that are not yet packed"
msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2615
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2618
msgid "include objects referred by reflog entries"
msgstr "inclure les objets référencés par les éléments de reflog"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2621
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2623
msgid "include tag objects that refer to objects to be packed"
msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2625
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2630 parse-options.h:140
+#: builtin/pack-objects.c:2626 parse-options.h:140
msgid "time"
msgstr "heure"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2627
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2630
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2632
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2638
+#: builtin/pack-objects.c:2634
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2636
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2638
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"
+msgstr ""
+"utiliser un index en bitmap si disponible pour accélerer le décompte des "
+"objets"
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2640
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
+#: builtin/pack-objects.c:2719
msgid "Counting objects"
msgstr "Décompte des objets"
msgid "--delete only accepts plain target ref names"
msgstr "--delete accepte seulement des noms entiers de références cibles"
-#: builtin/push.c:140
+#: builtin/push.c:139
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
"help config'."
-#: builtin/push.c:143
+#: builtin/push.c:142
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
" git push %s %s\n"
"%s"
-#: builtin/push.c:158
+#: builtin/push.c:157
#, c-format
msgid ""
"You are not currently on a branch.\n"
"\n"
" git push %s HEAD:<nom-de-la-branche-amont>\n"
-#: builtin/push.c:172
+#: builtin/push.c:171
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:180
+#: builtin/push.c:179
#, 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:183
+#: builtin/push.c:182
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\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:206
+#: builtin/push.c:205
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
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"
+"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"
+"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"
+"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)"
+"(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:273
+#: builtin/push.c:272
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:280
+#: builtin/push.c:279
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:286
+#: builtin/push.c:285
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:292
+#: builtin/push.c:291
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"
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:299
+#: builtin/push.c:298
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:302
+#: builtin/push.c:301
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"
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:361
+#: builtin/push.c:360
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussée vers %s\n"
-#: builtin/push.c:365
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:394
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:395
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"\n"
" git push <nom>\n"
-#: builtin/push.c:411
+#: builtin/push.c:410
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:412
+#: builtin/push.c:411
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:417
+#: builtin/push.c:416
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:418
+#: builtin/push.c:417
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:423
+#: builtin/push.c:422
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:483
+#: builtin/push.c:482
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:484
+#: builtin/push.c:483
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:485
+#: builtin/push.c:484
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:487
+#: builtin/push.c:486
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:488
+#: builtin/push.c:487
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:491
+#: builtin/push.c:490
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:493
+#: builtin/push.c:492
msgid "refname>:<expect"
msgstr "nom de référence>:<attendu"
-#: builtin/push.c:494
+#: builtin/push.c:493
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
+#: builtin/push.c:495
msgid "check"
msgstr "check"
-#: builtin/push.c:497
+#: builtin/push.c:496
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:499
+#: builtin/push.c:498
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:500 builtin/push.c:501
+#: builtin/push.c:499 builtin/push.c:500
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:502
+#: builtin/push.c:501
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:505
+#: builtin/push.c:504
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:507
+#: builtin/push.c:506
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:508
+#: builtin/push.c:507
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:518
+#: builtin/push.c:517
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:520
+#: builtin/push.c:519
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:185 builtin/remote.c:641
+#: builtin/remote.c:185 builtin/remote.c:640
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
-#: builtin/remote.c:189 builtin/remote.c:645
+#: builtin/remote.c:189 builtin/remote.c:644
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' n'est pas un nom valide de distante"
msgid "Could not setup master '%s'"
msgstr "Impossible de paramétrer la maîtresse '%s'"
-#: builtin/remote.c:289
+#: builtin/remote.c:288
#, c-format
msgid "more than one %s"
msgstr "plus d'un %s"
-#: builtin/remote.c:334
+#: builtin/remote.c:333
#, 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:435 builtin/remote.c:443
+#: builtin/remote.c:434 builtin/remote.c:442
msgid "(matching)"
msgstr "(correspond)"
-#: builtin/remote.c:447
+#: builtin/remote.c:446
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
+#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "Impossible d'ajouter '%s' à '%s'"
-#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
+#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894
#, c-format
msgid "No such remote: %s"
msgstr "Distante inconnue : %s"
-#: builtin/remote.c:651
+#: builtin/remote.c:650
#, 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:657 builtin/remote.c:794
+#: builtin/remote.c:656 builtin/remote.c:846
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:672
+#: builtin/remote.c:671
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:678
+#: builtin/remote.c:677
#, c-format
msgid "Could not append '%s'"
msgstr "Impossible d'ajouter '%s'"
-#: builtin/remote.c:689
+#: builtin/remote.c:688
#, c-format
msgid "Could not set '%s'"
msgstr "Impossible de définir '%s'"
-#: builtin/remote.c:711
+#: builtin/remote.c:710
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:745
+#: builtin/remote.c:744
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:759
+#: builtin/remote.c:765
#, c-format
msgid "Could not remove branch %s"
msgstr "Impossible de supprimer la branche %s"
-#: builtin/remote.c:829
+#: builtin/remote.c:832
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:938
+#: builtin/remote.c:947
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:941
+#: builtin/remote.c:950
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:943
+#: builtin/remote.c:952
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:945
+#: builtin/remote.c:954
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:986
+#: builtin/remote.c:995
#, 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:993
+#: builtin/remote.c:1002
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:996
+#: builtin/remote.c:1005
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:997
+#: builtin/remote.c:1006
msgid " and with remote"
msgstr " et avec la distante"
-#: builtin/remote.c:999
+#: builtin/remote.c:1008
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1009
msgid " and with remote"
msgstr " et avec la distante"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1055
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1058
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1062
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1065
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1068
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1066
+#: builtin/remote.c:1075
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1069
+#: builtin/remote.c:1078
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1073
+#: builtin/remote.c:1082
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1076
+#: builtin/remote.c:1085
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1153
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1171
+#: builtin/remote.c:1180
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1172
+#: builtin/remote.c:1181
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1173 builtin/remote.c:1318
+#: builtin/remote.c:1182 builtin/remote.c:1329
msgid "(no URL)"
msgstr "(pas d'URL)"
-#: builtin/remote.c:1182 builtin/remote.c:1184
+#: builtin/remote.c:1191 builtin/remote.c:1193
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
+#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1192
+#: builtin/remote.c:1201
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1204
+#: builtin/remote.c:1213
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1207 builtin/remote.c:1234
+#: builtin/remote.c:1216 builtin/remote.c:1243
msgid " (status not queried)"
msgstr " (statut non demandé)"
-#: builtin/remote.c:1216
+#: builtin/remote.c:1225
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:1224
+#: builtin/remote.c:1233
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:1231
+#: builtin/remote.c:1240
#, 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:1252
+#: builtin/remote.c:1261
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1254
+#: builtin/remote.c:1263
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1269
+#: builtin/remote.c:1278
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1280
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
"explicitement avec :"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1290
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1298
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1300
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1307
+#: builtin/remote.c:1318
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1319
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1325
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1326
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1328
+#: builtin/remote.c:1349
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1331
+#: builtin/remote.c:1352
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1374
+#: builtin/remote.c:1397
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1440 builtin/remote.c:1514
+#: builtin/remote.c:1463 builtin/remote.c:1537
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1483
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1490
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1512
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1491
+#: builtin/remote.c:1514
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1516
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1500
+#: builtin/remote.c:1523
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1540
+#: builtin/remote.c:1563
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1548
+#: builtin/remote.c:1571
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1550
+#: builtin/remote.c:1573
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1564
+#: builtin/remote.c:1587
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
-#: builtin/repack.c:16
+#: builtin/repack.c:17
msgid "git repack [options]"
msgstr "git repack [options]"
-#: builtin/repack.c:156
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:158
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:161
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:163
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:165
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:167
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git update-server-info"
-#: builtin/repack.c:170
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:172
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:173
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:174
+#: builtin/repack.c:178
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
+#: builtin/repack.c:180
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
+#: builtin/repack.c:181 builtin/repack.c:185
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:178
+#: builtin/repack.c:182
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
+#: builtin/repack.c:184
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:182
+#: builtin/repack.c:186
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:184
+#: builtin/repack.c:188
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:371
+#: builtin/repack.c:374
#, c-format
msgid "removing '%s' failed"
msgstr "la suppression de '%s' a échoué"
-#: builtin/replace.c:17
+#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <objet> <remplacement>"
-#: builtin/replace.c:18
+#: builtin/replace.c:20
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <objet>"
+
+#: builtin/replace.c:21
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <commit> [<parent>...]"
+
+#: builtin/replace.c:22
msgid "git replace -d <object>..."
msgstr "git replace -d <objet>..."
-#: builtin/replace.c:19
+#: builtin/replace.c:23
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<motif>]]"
-#: builtin/replace.c:174
+#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388
+#, c-format
+msgid "Not a valid object name: '%s'"
+msgstr "Nom d'objet invalide : '%s'"
+
+#: builtin/replace.c:352
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "mauvaise étiquette de fusion dans le commit '%s'"
+
+#: builtin/replace.c:354
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "étiquette de fusion malformée dans le commit '%s'"
+
+#: builtin/replace.c:365
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; utilisez --edit au lieu de --graft"
+
+#: builtin/replace.c:398
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr "le commit original '%s' contient une signature GPG."
+
+#: builtin/replace.c:399
+msgid "the signature will be removed in the replacement commit!"
+msgstr "la signature sera éliminée dans la validation de remplacement !"
+
+#: builtin/replace.c:405
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "Impossible d'écrire le commit de remplacement pour '%s'"
+
+#: builtin/replace.c:429
msgid "list replace refs"
msgstr "afficher les références de remplacement"
-#: builtin/replace.c:175
+#: builtin/replace.c:430
msgid "delete replace refs"
msgstr "supprimer les références de remplacement"
-#: builtin/replace.c:176
+#: builtin/replace.c:431
+msgid "edit existing object"
+msgstr "éditer l'objet existant"
+
+#: builtin/replace.c:432
+msgid "change a commit's parents"
+msgstr "Modifier les parents d'un commit"
+
+#: builtin/replace.c:433
msgid "replace the ref if it exists"
msgstr "remplacer la référence si elle existe"
-#: builtin/replace.c:177
+#: builtin/replace.c:434
+msgid "do not pretty-print contents for --edit"
+msgstr "afficher sans mise en forme pour --edit"
+
+#: builtin/replace.c:435
msgid "use this format"
msgstr "utiliser ce 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:273
+#: builtin/reset.c:275
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:275
+#: builtin/reset.c:277
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:276
+#: builtin/reset.c:278
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:278 builtin/reset.c:280
+#: builtin/reset.c:280 builtin/reset.c:282
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:282
+#: builtin/reset.c:284
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:285
+#: builtin/reset.c:287
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"
+msgstr ""
+"enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
+"tard"
-#: builtin/reset.c:302
+#: builtin/reset.c:304
#, 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:305 builtin/reset.c:313
+#: builtin/reset.c:307 builtin/reset.c:315
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/reset.c:310
+#: builtin/reset.c:312
#, 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:319
+#: builtin/reset.c:321
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-#: builtin/reset.c:328
+#: builtin/reset.c:330
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
"place."
-#: builtin/reset.c:330
+#: builtin/reset.c:332
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:340
+#: builtin/reset.c:342
#, 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:344
+#: builtin/reset.c:346
msgid "-N can only be used with --mixed"
msgstr "-N ne peut être utilisé qu'avec --mixed"
-#: builtin/reset.c:361
+#: builtin/reset.c:363
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:367
+#: builtin/reset.c:369
#, 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
+#: builtin/reset.c:373
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-parse.c:359
+#: builtin/rev-parse.c:360
msgid "git rev-parse --parseopt [options] -- [<args>...]"
msgstr "git rev-parse --parseopt [options] -- [<arguments>...]"
-#: builtin/rev-parse.c:364
+#: builtin/rev-parse.c:365
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:367
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:369
+#: builtin/rev-parse.c:370
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:497
+#: builtin/rev-parse.c:498
msgid ""
"git rev-parse --parseopt [options] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "shorten ref output"
msgstr "raccourcir l'affichage de la référence"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
msgid "reason of the update"
msgstr "raison de la mise à jour"
msgid "git tag -v <tagname>..."
msgstr "git tag -v <nométiquette>..."
-#: builtin/tag.c:67
+#: builtin/tag.c:69
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: builtin/tag.c:239
+#: builtin/tag.c:301
#, c-format
msgid "tag name too long: %.*s..."
msgstr "nom d'étiquette trop long : %.*s..."
-#: builtin/tag.c:244
+#: builtin/tag.c:306
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:259
+#: builtin/tag.c:321
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était %s)\n"
-#: builtin/tag.c:271
+#: builtin/tag.c:333
#, c-format
msgid "could not verify the tag '%s'"
msgstr "impossible de vérifier l'étiquette '%s'"
-#: builtin/tag.c:281
+#: builtin/tag.c:343
#, c-format
msgid ""
"\n"
-"Write a tag message\n"
+"Write a message for tag:\n"
+" %s\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
"\n"
-"Écrire un message pour l'étiquette\n"
+"Écrivez un message pour l'étiquette :\n"
+" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:285
+#: builtin/tag.c:347
#, c-format
msgid ""
"\n"
-"Write a tag message\n"
+"Write a message for tag:\n"
+" %s\n"
"Lines starting with '%c' will be kept; you may remove them yourself if you "
"want to.\n"
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"
+"Écrivez un message pour l'étiquette :\n"
+" %s\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:371
+#, c-format
+msgid "unsupported sort specification '%s'"
+msgstr "spécification de tri non supportée '%s'"
-#: builtin/tag.c:324
+#: builtin/tag.c:373
+#, c-format
+msgid "unsupported sort specification '%s' in variable '%s'"
+msgstr "spécification de tri non supportée '%s' dans le variable '%s'"
+
+#: builtin/tag.c:428
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:326
+#: builtin/tag.c:430
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/tag.c:351
+#: builtin/tag.c:455
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:364
+#: builtin/tag.c:468
msgid "tag header too big."
msgstr "en-tête d'étiquette trop gros."
-#: builtin/tag.c:400
+#: builtin/tag.c:504
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:406
+#: builtin/tag.c:510
#, 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:455
+#: builtin/tag.c:559
msgid "switch 'points-at' requires an object"
msgstr "le commutateur 'points-at' a besoin d'un objet"
-#: builtin/tag.c:457
+#: builtin/tag.c:561
#, c-format
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: builtin/tag.c:480
-#, c-format
-msgid "unsupported sort specification %s"
-msgstr "spécification de tri non supportée %s"
-
-#: builtin/tag.c:500
+#: builtin/tag.c:588
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:502
+#: builtin/tag.c:590
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:504
+#: builtin/tag.c:592
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:505
+#: builtin/tag.c:593
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:507
+#: builtin/tag.c:595
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:509
+#: builtin/tag.c:597
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:511
+#: builtin/tag.c:599
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:513
+#: builtin/tag.c:601
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:517
+#: builtin/tag.c:605
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:518
+#: builtin/tag.c:606
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:519
+#: builtin/tag.c:607
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:521
+#: builtin/tag.c:609
msgid "sort tags"
msgstr "trier les étiquettes"
-#: builtin/tag.c:525
+#: builtin/tag.c:613
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:528 builtin/tag.c:534
+#: builtin/tag.c:616 builtin/tag.c:622
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:540
+#: builtin/tag.c:628
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:566
+#: builtin/tag.c:654
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:578
+#: builtin/tag.c:666
msgid "--sort and -n are incompatible"
msgstr "--sort et -n sont incompatibles"
-#: builtin/tag.c:585
+#: builtin/tag.c:673
msgid "-n option is only allowed with -l."
msgstr "l'option -n est autorisée seulement avec -l."
-#: builtin/tag.c:587
+#: builtin/tag.c:675
msgid "--contains option is only allowed with -l."
msgstr "l'option --contains est autorisée seulement avec -l."
-#: builtin/tag.c:589
+#: builtin/tag.c:677
msgid "--points-at option is only allowed with -l."
msgstr "l'option --points-at est autorisée seulement avec -l."
-#: builtin/tag.c:597
+#: builtin/tag.c:685
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:617
+#: builtin/tag.c:705
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:623
+#: builtin/tag.c:711
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:628
+#: builtin/tag.c:716
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:646
+#: builtin/tag.c:734
#, c-format
msgid "%s: cannot lock the ref"
msgstr "%s : impossible de verrouiller la référence"
-#: builtin/tag.c:648
+#: builtin/tag.c:736
#, c-format
msgid "%s: cannot update the ref"
msgstr "%s : impossible de mettre à jour la référence"
-#: builtin/tag.c:650
+#: builtin/tag.c:738
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était %s)\n"
msgid "Unpacking objects"
msgstr "Dépaquetage des objets"
-#: builtin/update-index.c:399
+#: builtin/update-index.c:402
msgid "git update-index [options] [--] [<file>...]"
msgstr "git update-index [options] [--] [<fichier>...]"
-#: builtin/update-index.c:748
+#: builtin/update-index.c:755
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:751
+#: builtin/update-index.c:758
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:754
+#: builtin/update-index.c:761
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:756
+#: builtin/update-index.c:763
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:758
+#: builtin/update-index.c:765
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:760
+#: builtin/update-index.c:767
msgid "refresh even if index contains unmerged entries"
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
-#: builtin/update-index.c:763
+#: builtin/update-index.c:770
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:767
+#: builtin/update-index.c:774
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:771
+#: builtin/update-index.c:778
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:772
+#: builtin/update-index.c:779
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:776
+#: builtin/update-index.c:783
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:777
+#: builtin/update-index.c:784
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/update-index.c:781
+#: builtin/update-index.c:788
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:784
+#: builtin/update-index.c:791
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:787
+#: builtin/update-index.c:794
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:790
+#: builtin/update-index.c:797
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:793
+#: builtin/update-index.c:800
msgid "add to index only; do not add content to object database"
msgstr ""
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
"données des objets"
-#: builtin/update-index.c:795
+#: builtin/update-index.c:802
msgid "remove named paths even if present in worktree"
msgstr ""
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
"travail"
-#: builtin/update-index.c:797
+#: builtin/update-index.c:804
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:799
+#: builtin/update-index.c:806
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:803
+#: builtin/update-index.c:810
msgid "add entries from standard input to the index"
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
-#: builtin/update-index.c:807
+#: builtin/update-index.c:814
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:811
+#: builtin/update-index.c:818
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:815
+#: builtin/update-index.c:822
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:818
+#: builtin/update-index.c:825
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:820
+#: builtin/update-index.c:827
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:824
+#: builtin/update-index.c:831
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
+#: builtin/update-index.c:833
+msgid "enable or disable split index"
+msgstr "activer ou désactiver l'index divisé"
+
#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
msgstr "git update-ref [options] -d <nomréférence> [<anciennevaleur>]"
msgid "git update-ref [options] --stdin [-z]"
msgstr "git update-ref [options] --stdin [-z]"
-#: builtin/update-ref.c:256
+#: builtin/update-ref.c:350
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:258
+#: builtin/update-ref.c:352
msgid "update <refname> not the one it points to"
msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
-#: builtin/update-ref.c:259
+#: builtin/update-ref.c:353
msgid "stdin has NUL-terminated arguments"
msgstr "l'entrée standard a des arguments qui se terminent par NUL"
-#: builtin/update-ref.c:260
+#: builtin/update-ref.c:354
msgid "read updates from stdin"
msgstr "lire les mises à jour depuis l'entrée standard"
msgid "update the info files from scratch"
msgstr "mettre à jour les fichiers d'information à partir de zéro"
-#: builtin/verify-pack.c:56
+#: builtin/verify-commit.c:17
+msgid "git verify-commit [-v|--verbose] <commit>..."
+msgstr "git verify-commit [-v|--verbose] <commit>..."
+
+#: builtin/verify-commit.c:75
+msgid "print commit contents"
+msgstr "afficher le contenu du commit"
+
+#: builtin/verify-pack.c:55
msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:65
msgid "verbose"
msgstr "verbeux"
-#: builtin/verify-pack.c:68
+#: builtin/verify-pack.c:67
msgid "show statistics only"
msgstr "afficher seulement les statistiques"
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:247
+#: git-pull.sh:245
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"
-#: git-pull.sh:271
+#: git-pull.sh:269
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
"Attention : mise à jour en avance rapide de votre copie de travail\n"
"Attention : depuis la validation $orig_head."
-#: git-pull.sh:296
+#: git-pull.sh:294
msgid "Cannot merge multiple branches into empty head"
msgstr "Impossible de fusionner de multiples branches sur une tête vide"
-#: git-pull.sh:300
+#: git-pull.sh:298
msgid "Cannot rebase onto multiple branches"
msgstr "Impossible de rebaser sur de multiples branches"
"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
"rebase --abort\"."
-#: git-rebase.sh:164
+#: git-rebase.sh:165
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
-#: git-rebase.sh:167
+#: git-rebase.sh:168
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Impossible de stocker $stash_sha1"
-#: git-rebase.sh:168
+#: git-rebase.sh:169
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\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
+#: git-rebase.sh:208
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:212
+#: git-rebase.sh:213
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:350
+#: git-rebase.sh:351
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:355
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:366
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: git-rebase.sh:373
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:376
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:394
+#: git-rebase.sh:395
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:413
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"chose\n"
"d'important ici."
-#: git-rebase.sh:464
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:488
+#: git-rebase.sh:489
#, 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:491 git-rebase.sh:495
+#: git-rebase.sh:492 git-rebase.sh:496
#, 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:500
+#: git-rebase.sh:501
#, 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:523
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:556
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:565
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:585
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:589
+#: git-rebase.sh:590
#, 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:600
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:609
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
-#: git-rebase.sh:619
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:124 git-stash.sh:137
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: git-stash.sh:140
+#: git-stash.sh:141
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: git-stash.sh:143
+#: git-stash.sh:144
msgid "Cannot remove temporary index (can't happen)"
msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-#: git-stash.sh:156
+#: git-stash.sh:157
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: git-stash.sh:190
+#: git-stash.sh:191
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:237
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
"erreur: option inconnue pour 'stash save': $option\n"
" Pour fournir un message, utilisez git stash save -- '$option'"
-#: git-stash.sh:258
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: git-stash.sh:262
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: git-stash.sh:266
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "Impossible de sauver le statut courant"
-#: git-stash.sh:284
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:383
+#: git-stash.sh:384
msgid "No stash found."
msgstr "Pas de remisage trouvé."
-#: git-stash.sh:390
+#: git-stash.sh:391
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:396
+#: git-stash.sh:397
#, sh-format
msgid "$reference is not valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:424
+#: git-stash.sh:425
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:435
+#: git-stash.sh:436
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:443
+#: git-stash.sh:444
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:447
+#: git-stash.sh:448
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:455
+#: git-stash.sh:456
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:457
+#: git-stash.sh:458
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:491
+#: git-stash.sh:492
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:506
+#: git-stash.sh:507
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:529
+#: git-stash.sh:530
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:530
+#: git-stash.sh:531
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:537
+#: git-stash.sh:538
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:609
+#: git-stash.sh:610
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
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:299
+#: git-submodule.sh:296
#, 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"
-#: git-submodule.sh:409
+#: git-submodule.sh:406
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:419
+#: git-submodule.sh:416
#, 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:436
+#: git-submodule.sh:433
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:440
+#: git-submodule.sh:437
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Utilisez -f si vous voulez vraiment l'ajouter."
-#: git-submodule.sh:458
+#: git-submodule.sh:455
#, 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:460
+#: git-submodule.sh:457
#, 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:468
+#: git-submodule.sh:465
#, 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) :"
-#: git-submodule.sh:470
+#: git-submodule.sh:467
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
"Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
"nouveau depuis"
-#: git-submodule.sh:472
+#: git-submodule.sh:469
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
"correct"
-#: git-submodule.sh:473
+#: git-submodule.sh:470
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"ou vous ne savez pas ce que cela signifie de choisir un autre nom avec "
"l'option '--name'."
-#: git-submodule.sh:475
+#: git-submodule.sh:472
#, 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:487
+#: git-submodule.sh:484
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:492
+#: git-submodule.sh:489
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:501
+#: git-submodule.sh:498
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:545
+#: git-submodule.sh:542
#, sh-format
msgid "Entering '$prefix$displaypath'"
msgstr "Entrée dans '$prefix$displaypath'"
-#: git-submodule.sh:565
+#: git-submodule.sh:562
#, sh-format
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:611
+#: git-submodule.sh:608
#, sh-format
msgid "No url found for submodule path '$displaypath' in .gitmodules"
msgstr ""
"URL non trouvée pour le chemin de sous-module '$displaypath' dans .gitmodules"
-#: git-submodule.sh:620
+#: git-submodule.sh:617
#, sh-format
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:622
+#: git-submodule.sh:619
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$displaypath'"
-#: git-submodule.sh:639
+#: git-submodule.sh:636
#, sh-format
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:677
+#: git-submodule.sh:674
#, sh-format
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: git-submodule.sh:694
+#: git-submodule.sh:691
#, sh-format
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:695
+#: git-submodule.sh:692
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: git-submodule.sh:701
+#: git-submodule.sh:698
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"La copie de travail du sous-module '$displaypath' contient des modifications "
"locales ; utilisez '-f' pour les annuler"
-#: git-submodule.sh:704
+#: git-submodule.sh:701
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Répertoire '$displaypath' nettoyé"
-#: git-submodule.sh:705
+#: git-submodule.sh:702
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
-#: git-submodule.sh:708
+#: git-submodule.sh:705
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
-#: git-submodule.sh:717
+#: git-submodule.sh:714
#, sh-format
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:833
+#: git-submodule.sh:830
#, sh-format
msgid ""
"Submodule path '$displaypath' not initialized\n"
"Chemin de sous-module '$displaypath' non initialisé\n"
"Peut-être souhaitez-vous utiliser 'update --init' ?"
-#: git-submodule.sh:846
+#: git-submodule.sh:843
#, sh-format
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:855
+#: git-submodule.sh:852
#, 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:879
+#: git-submodule.sh:876
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:893
+#: git-submodule.sh:890
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:894
+#: git-submodule.sh:891
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:898
+#: git-submodule.sh:895
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:899
+#: git-submodule.sh:896
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:904
+#: git-submodule.sh:901
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:905
+#: git-submodule.sh:902
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:910
+#: git-submodule.sh:907
#, sh-format
msgid ""
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
"'$prefix$sm_path'"
-#: git-submodule.sh:911
+#: git-submodule.sh:908
#, sh-format
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'"
-#: git-submodule.sh:941
+#: git-submodule.sh:938
#, 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
+#: git-submodule.sh:1046
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"
-#: git-submodule.sh:1097
+#: git-submodule.sh:1098
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:1117
+#: git-submodule.sh:1118
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:1120
+#: git-submodule.sh:1121
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:1123
+#: git-submodule.sh:1124
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Attention : $display_name ne contient pas les validations $sha1_src et "
"$sha1_dst"
-#: git-submodule.sh:1148
+#: git-submodule.sh:1149
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1262
+#: git-submodule.sh:1267
#, 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:1326
+#: git-submodule.sh:1331
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
+#~ msgid "commit has empty message"
+#~ msgstr "le commit a un message vide"
+
+#~ msgid "Failed to chdir: %s"
+#~ msgstr "Échec de chdir: %s"
+
#~ msgid "Tracking not set up: name too long: %s"
#~ msgstr "Suivi de branche non paramétré : le nom est trop long : %s"
OSDN Git Service
