diff options
Diffstat (limited to 'po/fr.po')
| -rw-r--r-- | po/fr.po | 801 |
1 files changed, 419 insertions, 382 deletions
@@ -76,8 +76,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-12-15 16:27+0800\n" -"PO-Revision-Date: 2020-12-16 22:15+0100\n" +"POT-Creation-Date: 2020-12-21 07:10+0800\n" +"PO-Revision-Date: 2020-12-21 18:52+0100\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -138,7 +138,7 @@ msgstr[1] "%d chemins mis à jour\n" msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -281,7 +281,7 @@ msgstr "indexé" msgid "unstaged" msgstr "non-indexé" -#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 #: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 #: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 @@ -1202,7 +1202,7 @@ msgstr "le chemin %s a été renommé/supprimé" msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3537 apply.c:3708 apply.c:3953 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" @@ -1263,311 +1263,311 @@ msgstr "chemin invalide '%s'" msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3956 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3976 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: apply.c:3981 +#: apply.c:3979 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: apply.c:4001 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: apply.c:4005 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:4020 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4112 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "l'information sha1 est manquante ou inutilisable pour le sous-module %s" -#: apply.c:4119 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle" -#: apply.c:4122 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4131 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4141 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4279 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4313 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4319 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4327 +#: apply.c:4325 #, 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" -#: apply.c:4333 apply.c:4478 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4376 builtin/bisect--helper.c:524 +#: apply.c:4374 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4380 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4450 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4548 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4556 +#: apply.c:4554 msgid "internal error" msgstr "erreur interne" -#: apply.c:4559 +#: apply.c:4557 #, 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..." -#: apply.c:4570 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4592 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4596 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4720 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4728 +#: apply.c:4726 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4748 +#: apply.c:4746 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4905 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4932 +#: apply.c:4930 #, 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" -#: apply.c:4938 apply.c:4953 +#: apply.c:4936 apply.c:4951 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne a ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." -#: apply.c:4946 +#: apply.c:4944 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4990 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4993 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4995 builtin/am.c:2266 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4996 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4999 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:5001 +#: apply.c:4999 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" -#: apply.c:5005 +#: apply.c:5003 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" -#: apply.c:5007 +#: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée" -#: apply.c:5009 +#: apply.c:5007 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" -#: apply.c:5011 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: apply.c:5013 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:5015 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:5017 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:5020 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" -#: apply.c:5022 +#: apply.c:5020 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" -#: apply.c:5024 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:5029 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 #: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "action" -#: apply.c:5031 +#: apply.c:5029 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" -#: apply.c:5034 apply.c:5037 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:5040 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:5042 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:5044 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5046 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22 +#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 #: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5049 +#: apply.c:5047 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" -#: apply.c:5052 +#: apply.c:5050 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" -#: apply.c:5054 builtin/am.c:2254 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "racine" -#: apply.c:5055 +#: apply.c:5053 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -1698,8 +1698,8 @@ msgstr "préfixer chaque chemin de fichier dans l'archive" #: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 #: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" @@ -2275,187 +2275,179 @@ msgstr "" msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:1042 builtin/am.c:1292 +#: commit-graph.c:1036 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: commit-graph.c:1265 builtin/pack-objects.c:2864 +#: commit-graph.c:1252 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1301 +#: commit-graph.c:1283 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1318 +#: commit-graph.c:1300 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1338 +#: commit-graph.c:1320 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1357 +#: commit-graph.c:1339 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:1424 +#: commit-graph.c:1406 msgid "Computing commit changed paths Bloom filters" msgstr "Calcul des filtres Bloom des chemins modifiés du commit" -#: commit-graph.c:1501 +#: commit-graph.c:1483 msgid "Collecting referenced commits" msgstr "Collecte des commits référencés" -#: commit-graph.c:1526 +#: commit-graph.c:1508 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet" msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets" -#: commit-graph.c:1539 +#: commit-graph.c:1521 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:1543 +#: commit-graph.c:1525 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:1582 +#: commit-graph.c:1562 msgid "Finding commits for commit graph among packed objects" msgstr "" "Recherche de commits pour un graphe de commits parmi les objets empaquetés" -#: commit-graph.c:1597 -msgid "Counting distinct commits in commit graph" -msgstr "Comptage des commits distincts dans un graphe de commit" - -#: commit-graph.c:1629 +#: commit-graph.c:1580 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1678 +#: commit-graph.c:1628 msgid "failed to write correct number of base graph ids" msgstr "échec à l'écriture le nombre correct d'id de base de fusion" -#: commit-graph.c:1720 midx.c:819 +#: commit-graph.c:1670 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "impossible de créer les répertoires de premier niveau de %s" -#: commit-graph.c:1733 +#: commit-graph.c:1683 msgid "unable to create temporary graph layer" msgstr "impossible de créer une couche de graphe temporaire" -#: commit-graph.c:1738 +#: commit-graph.c:1688 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "impossible de régler les droits partagés pour '%s'" -#: commit-graph.c:1808 +#: commit-graph.c:1758 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Écriture le graphe de commits en %d passe" msgstr[1] "Écriture le graphe de commits en %d passes" -#: commit-graph.c:1853 +#: commit-graph.c:1803 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1869 +#: commit-graph.c:1819 msgid "failed to rename base commit-graph file" msgstr "échec du renommage du fichier de graphe de commits" -#: commit-graph.c:1889 +#: commit-graph.c:1839 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:2015 +#: commit-graph.c:1965 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:2059 +#: commit-graph.c:2009 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" -#: commit-graph.c:2165 +#: commit-graph.c:2115 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé" - -#: commit-graph.c:2274 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "le graphe de commits ne peut pas écrire %d commits" +msgstr "" +"essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé" -#: commit-graph.c:2285 +#: commit-graph.c:2214 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:2378 +#: commit-graph.c:2307 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "le graphe de commit a une somme de contrôle incorrecte et est " "vraisemblablement corrompu" -#: commit-graph.c:2388 +#: commit-graph.c:2317 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s" -#: commit-graph.c:2398 commit-graph.c:2413 +#: commit-graph.c:2327 commit-graph.c:2342 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = " "%u != %u" -#: commit-graph.c:2405 +#: commit-graph.c:2334 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" -#: commit-graph.c:2423 +#: commit-graph.c:2352 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2438 +#: commit-graph.c:2367 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "échec de l'analyse du commit %s depuis la base de données d'objets pour le " "graphe de commit" -#: commit-graph.c:2445 +#: commit-graph.c:2374 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != " "%s" -#: commit-graph.c:2455 +#: commit-graph.c:2384 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "la liste des parents du graphe de commit pour le commit %s est trop longue" -#: commit-graph.c:2464 +#: commit-graph.c:2393 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "le parent du graphe de commit pour %s est %s != %s" -#: commit-graph.c:2478 +#: commit-graph.c:2407 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "la liste de parents du graphe de commit pour le commit %s se termine trop tôt" -#: commit-graph.c:2483 +#: commit-graph.c:2412 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2463,7 +2455,7 @@ msgstr "" "le graphe de commit a un numéro de génération nul pour le commit %s, mais " "non-nul ailleurs" -#: commit-graph.c:2487 +#: commit-graph.c:2416 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2471,12 +2463,12 @@ msgstr "" "le graphe de commit a un numéro de génération non-nul pour le commit %s, " "mais nul ailleurs" -#: commit-graph.c:2503 +#: commit-graph.c:2432 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "la génération du graphe de commit pour le commit %s est %u != %u" -#: commit-graph.c:2509 +#: commit-graph.c:2438 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -3407,22 +3399,22 @@ msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4706 +#: diff.c:4707 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4754 +#: diff.c:4755 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302 +#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4791 +#: diff.c:4792 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3431,42 +3423,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4876 +#: diff.c:4877 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4900 +#: diff.c:4901 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4914 +#: diff.c:4915 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4964 diff.c:4970 +#: diff.c:4965 diff.c:4971 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4982 +#: diff.c:4983 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:5003 +#: diff.c:5004 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:5022 +#: diff.c:5023 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:5062 +#: diff.c:5063 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3474,160 +3466,160 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5098 diff.c:5118 +#: diff.c:5099 diff.c:5119 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5222 +#: diff.c:5223 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex invalide fournie à -I : '%s'" -#: diff.c:5271 +#: diff.c:5272 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" -#: diff.c:5327 +#: diff.c:5328 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5350 +#: diff.c:5351 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5352 diff.c:5358 +#: diff.c:5353 diff.c:5359 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5355 builtin/log.c:178 +#: diff.c:5356 builtin/log.c:178 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5360 diff.c:5474 diff.c:5481 +#: diff.c:5361 diff.c:5475 diff.c:5482 msgid "<n>" msgstr "<n>" -#: diff.c:5361 diff.c:5364 +#: diff.c:5362 diff.c:5365 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5366 +#: diff.c:5367 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5369 +#: diff.c:5370 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5373 +#: diff.c:5374 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5377 +#: diff.c:5378 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5380 +#: diff.c:5381 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5382 diff.c:5390 +#: diff.c:5383 diff.c:5391 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5383 +#: diff.c:5384 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "afficher la distribution des quantités de modifications relatives pour " "chaque sous-répertoire" -#: diff.c:5387 +#: diff.c:5388 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5391 +#: diff.c:5392 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5395 +#: diff.c:5396 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avertir si les modifications introduisent des marqueurs de conflit ou des " "erreurs d'espace" -#: diff.c:5398 +#: diff.c:5399 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "résumé succinct tel que les créations, les renommages et les modifications " "de mode" -#: diff.c:5401 +#: diff.c:5402 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5404 +#: diff.c:5405 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5406 +#: diff.c:5407 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5407 +#: diff.c:5408 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5409 diff.c:5412 diff.c:5415 +#: diff.c:5410 diff.c:5413 diff.c:5416 msgid "<width>" msgstr "<largeur>" -#: diff.c:5410 +#: diff.c:5411 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5413 +#: diff.c:5414 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5416 +#: diff.c:5417 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5418 +#: diff.c:5419 msgid "<count>" msgstr "<compte>" -#: diff.c:5419 +#: diff.c:5420 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5422 +#: diff.c:5423 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5425 +#: diff.c:5426 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5428 +#: diff.c:5429 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "afficher les noms complets des objets pre- et post-image sur les lignes " "\"index\"" -#: diff.c:5430 +#: diff.c:5431 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5431 +#: diff.c:5432 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5432 +#: diff.c:5433 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3635,7 +3627,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5435 +#: diff.c:5436 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3643,93 +3635,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553 +#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5439 +#: diff.c:5440 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5442 +#: diff.c:5443 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5445 +#: diff.c:5446 msgid "prepend an additional prefix to every line of output" msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" -#: diff.c:5448 +#: diff.c:5449 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5451 +#: diff.c:5452 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "afficher le contexte entre les sections à concurrence du nombre de ligne " "indiqué" -#: diff.c:5455 diff.c:5460 diff.c:5465 +#: diff.c:5456 diff.c:5461 diff.c:5466 msgid "<char>" msgstr "<caractère>" -#: diff.c:5456 +#: diff.c:5457 msgid "specify the character to indicate a new line instead of '+'" msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'" -#: diff.c:5461 +#: diff.c:5462 msgid "specify the character to indicate an old line instead of '-'" msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'" -#: diff.c:5466 +#: diff.c:5467 msgid "specify the character to indicate a context instead of ' '" msgstr "" "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" -#: diff.c:5469 +#: diff.c:5470 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5470 +#: diff.c:5471 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5471 +#: diff.c:5472 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "casser les modifications d'une réécrire complète en paires de suppression et " "création" -#: diff.c:5475 +#: diff.c:5476 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5479 +#: diff.c:5480 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5482 +#: diff.c:5483 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5486 +#: diff.c:5487 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5488 +#: diff.c:5489 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5491 +#: diff.c:5492 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5493 +#: diff.c:5494 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5496 +#: diff.c:5497 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3737,165 +3729,165 @@ msgstr "" "empêcher la détection de renommage/copie si le nombre de cibles de renommage/" "copie excède la limite indiquée" -#: diff.c:5498 +#: diff.c:5499 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5500 +#: diff.c:5501 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5503 +#: diff.c:5504 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5506 +#: diff.c:5507 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5509 +#: diff.c:5510 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5512 +#: diff.c:5513 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5515 +#: diff.c:5516 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587 +#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 msgid "<regex>" msgstr "<regex>" -#: diff.c:5518 +#: diff.c:5519 msgid "ignore changes whose all lines match <regex>" msgstr "ignorer les modifications dont les lignes correspondent à <regex>" -#: diff.c:5521 +#: diff.c:5522 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heuristique qui déplace les limites de sections de diff pour faciliter la " "lecture" -#: diff.c:5524 +#: diff.c:5525 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5528 +#: diff.c:5529 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5530 +#: diff.c:5531 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5531 +#: diff.c:5532 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5533 +#: diff.c:5534 msgid "<text>" msgstr "<texte>" -#: diff.c:5534 +#: diff.c:5535 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5536 diff.c:5545 diff.c:5548 +#: diff.c:5537 diff.c:5546 diff.c:5549 msgid "<mode>" msgstr "<mode>" -#: diff.c:5537 +#: diff.c:5538 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "afficher des différences par mot, en utilisant <mode> pour délimiter les " "mots modifiés" -#: diff.c:5540 +#: diff.c:5541 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5543 +#: diff.c:5544 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5546 +#: diff.c:5547 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5549 +#: diff.c:5550 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5552 +#: diff.c:5553 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5554 +#: diff.c:5555 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "lancé depuis un sous-répertoire, exclure les modifications en dehors et " "afficher les chemins relatifs" -#: diff.c:5558 +#: diff.c:5559 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5560 +#: diff.c:5561 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5562 +#: diff.c:5563 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon" -#: diff.c:5564 +#: diff.c:5565 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5566 +#: diff.c:5567 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5568 +#: diff.c:5569 msgid "run external text conversion filters when comparing binary files" msgstr "" "lancer les filtres externes de conversion en texte lors de la comparaison de " "fichiers binaires" -#: diff.c:5570 +#: diff.c:5571 msgid "<when>" msgstr "<quand>" -#: diff.c:5571 +#: diff.c:5572 msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorer les modifications dans les sous-modules lors de la génération de diff" -#: diff.c:5574 +#: diff.c:5575 msgid "<format>" msgstr "<format>" -#: diff.c:5575 +#: diff.c:5576 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5579 +#: diff.c:5580 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5582 +#: diff.c:5583 msgid "treat 'git add -N' entries as real in the index" msgstr "traiter les entrées 'git add -N' comme réelles dans l'index" -#: diff.c:5584 +#: diff.c:5585 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5585 +#: diff.c:5586 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3903,7 +3895,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5588 +#: diff.c:5589 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3911,26 +3903,26 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5591 +#: diff.c:5592 msgid "show all changes in the changeset with -S or -G" msgstr "" "afficher toutes les modifications dans l'ensemble de modifications avec -S " "ou -G" -#: diff.c:5594 +#: diff.c:5595 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5597 +#: diff.c:5598 msgid "control the order in which files appear in the output" msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie" -#: diff.c:5598 +#: diff.c:5599 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5599 +#: diff.c:5600 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3938,35 +3930,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5601 +#: diff.c:5602 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5602 +#: diff.c:5603 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5604 +#: diff.c:5605 msgid "<file>" msgstr "<fichier>" -#: diff.c:5605 +#: diff.c:5606 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6262 +#: diff.c:6263 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:6265 +#: diff.c:6266 msgid "only found copies from modified paths due to too many files." msgstr "" "recherche uniquement des copies par modification de chemin à cause d'un trop " "grand nombre de fichiers." -#: diff.c:6268 +#: diff.c:6269 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -6303,7 +6295,7 @@ msgstr "objet malformé à '%s'" msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2156 refs.c:660 +#: ref-filter.c:2156 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" @@ -6328,65 +6320,90 @@ msgstr "l'option '%s' doit pointer sur un commit" msgid "%s does not point to a valid object!" msgstr "%s ne pointe pas sur un objet valide!" -#: refs.c:575 +#: refs.c:566 +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" +"Utilisation de '%s' comme nom de la branche initiale. Le nom de la branche\n" +"par défaut peut changer. Pour configurer le nom de la branche initiale\n" +"pour tous les nouveaux dépôts, et supprimer cet avertissement, lancez :\n" +"\n" +"\tgit config --global init.defaultBranch <nom>\n" +"\n" +"Les noms les plus utilisés à la place de 'master' sont 'main', 'trunk' et\n" +"'development'. La branche nouvellement créée peut être rénommée avec :\n" +"\n" +"\tgit branch -m <nom>\n" + +#: refs.c:588 #, c-format msgid "could not retrieve `%s`" msgstr "impossible de récupérer `%s`" -#: refs.c:582 +#: refs.c:598 #, c-format msgid "invalid branch name: %s = %s" msgstr "Nom de branche invalide : %s = %s" -#: refs.c:658 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:895 +#: refs.c:911 #, c-format msgid "log for ref %s has gap after %s" msgstr "le journal pour la réf %s contient un trou après %s" -#: refs.c:901 +#: refs.c:917 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s" -#: refs.c:960 +#: refs.c:976 #, c-format msgid "log for %s is empty" msgstr "le journal pour la réf %s est vide" -#: refs.c:1052 +#: refs.c:1068 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" -#: refs.c:1123 +#: refs.c:1139 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:1947 +#: refs.c:1963 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:2027 +#: refs.c:2043 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs.c:2038 +#: refs.c:2054 msgid "ref updates aborted by hook" msgstr "mises à jour des références annulées par le crochet" -#: refs.c:2138 refs.c:2168 +#: refs.c:2154 refs.c:2184 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2144 refs.c:2179 +#: refs.c:2160 refs.c:2195 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" @@ -6683,7 +6700,7 @@ 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" -#: remote.c:2348 +#: remote.c:2349 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -8483,7 +8500,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "le processus pour le sous-module '%s' a échoué" -#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." @@ -10364,7 +10381,7 @@ msgstr "option historique -- no-op" msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 #: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "être silencieux" @@ -10418,7 +10435,7 @@ msgstr "le passer jusqu'à git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136 +#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136 #: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 #: builtin/verify-tag.c:38 msgid "format" @@ -11028,7 +11045,9 @@ msgstr "plage" #: builtin/blame.c:895 msgid "Process only line range <start>,<end> or function :<funcname>" -msgstr "Traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-de-fonction>" +msgstr "" +"Traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-" +"de-fonction>" #: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" @@ -11204,42 +11223,42 @@ msgstr "impossible de renommer la branche actuelle, il n'y en a pas." msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:542 +#: builtin/branch.c:544 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:544 +#: builtin/branch.c:546 msgid "Branch copy failed" msgstr "Échec de copie de la branche" -#: builtin/branch.c:548 +#: builtin/branch.c:550 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Création d'une copie d'une branche mal nommée '%s'" -#: builtin/branch.c:551 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'une branche mal nommée '%s'" -#: builtin/branch.c:557 +#: builtin/branch.c:559 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:566 +#: builtin/branch.c:568 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:568 +#: builtin/branch.c:570 msgid "Branch is copied, but update of config-file failed" msgstr "" "La branche est copiée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:584 +#: builtin/branch.c:586 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11250,180 +11269,180 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:618 +#: builtin/branch.c:620 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:620 +#: builtin/branch.c:622 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:621 +#: builtin/branch.c:623 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:622 +#: builtin/branch.c:624 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:624 +#: builtin/branch.c:626 msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:626 builtin/rebase.c:532 +#: builtin/branch.c:628 builtin/rebase.c:532 msgid "upstream" msgstr "amont" -#: builtin/branch.c:626 +#: builtin/branch.c:628 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:627 +#: builtin/branch.c:629 msgid "unset the upstream info" msgstr "désactiver l'information amont" -#: builtin/branch.c:628 +#: builtin/branch.c:630 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:633 builtin/branch.c:635 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:634 builtin/branch.c:636 msgid "print only branches that don't contain the commit" msgstr "afficher seulement les branches qui ne contiennent pas le commit" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:641 +#: builtin/branch.c:643 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:642 +#: builtin/branch.c:644 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:643 +#: builtin/branch.c:645 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:644 +#: builtin/branch.c:646 msgid "copy a branch and its reflog" msgstr "copier une branche et son reflog" -#: builtin/branch.c:645 +#: builtin/branch.c:647 msgid "copy a branch, even if target exists" msgstr "copier une branche, même si la cible existe" -#: builtin/branch.c:646 +#: builtin/branch.c:648 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:647 +#: builtin/branch.c:649 msgid "show current branch name" msgstr "afficher le nom de la branche courante" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:650 +#: builtin/branch.c:652 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 #: builtin/tag.c:434 msgid "object" msgstr "objet" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:682 builtin/clone.c:790 +#: builtin/branch.c:684 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:706 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:751 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:756 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:763 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:766 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:781 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" -#: builtin/branch.c:790 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opération de renommage" -#: builtin/branch.c:795 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spécifier une branche amont" -#: builtin/branch.c:799 +#: builtin/branch.c:801 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11431,32 +11450,32 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:802 builtin/branch.c:825 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:806 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:819 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour désactiver un amont" -#: builtin/branch.c:823 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:829 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:839 +#: builtin/branch.c:841 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11465,7 +11484,7 @@ msgstr "" "branche.\n" "Vouliez-vous plutôt dire -a|-r --list <motif> ?" -#: builtin/branch.c:843 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -12593,7 +12612,7 @@ msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 msgid "create a bare repository" msgstr "créer un dépôt nu" @@ -12625,11 +12644,11 @@ msgstr "initialiser les sous-modules dans le clone" msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:112 builtin/init-db.c:550 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:113 builtin/init-db.c:551 +#: builtin/clone.c:113 builtin/init-db.c:553 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" @@ -12643,7 +12662,7 @@ msgstr "dépôt de référence" msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 #: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 msgid "name" msgstr "nom" @@ -12703,11 +12722,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:138 builtin/init-db.c:559 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:139 builtin/init-db.c:560 +#: builtin/clone.c:139 builtin/init-db.c:562 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" @@ -12945,12 +12964,12 @@ msgstr "le dépôt source est superficiel, option --local ignorée" msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1308 builtin/clone.c:1316 +#: builtin/clone.c:1311 builtin/clone.c:1319 #, 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:1319 +#: builtin/clone.c:1322 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -13508,8 +13527,8 @@ msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "mode" @@ -13784,7 +13803,8 @@ msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" #: builtin/config.c:142 msgid "replace all matching variables: name value [value-pattern]" -msgstr "remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]" +msgstr "" +"remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]" #: builtin/config.c:143 msgid "add a new variable: name value" @@ -13812,7 +13832,8 @@ msgstr "afficher tout" #: builtin/config.c:149 msgid "use string equality when comparing values to 'value-pattern'" -msgstr "utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'" +msgstr "" +"utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'" #: builtin/config.c:150 msgid "open an editor" @@ -14457,96 +14478,96 @@ msgstr "" "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-" "tags ne soit spécifié." -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "le jeton --anonymize-map ne peut pas être vide" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 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:1206 +#: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" msgstr "" "sélectionner la gestion des messages de validation dans un encodage " "alternatif" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1208 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1210 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1214 msgid "Import marks from this file if it exists" msgstr "importer les marques depuis ce fichier s'il existe" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1216 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:1219 +#: builtin/fast-export.c:1218 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1220 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1221 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1223 builtin/log.c:1816 +#: builtin/fast-export.c:1222 builtin/log.c:1816 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1223 msgid "Apply refspec to exported refs" msgstr "Appliquer le spécificateur de référence aux références exportées" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "depuis:vers" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert <from> to <to> in anonymized output" msgstr "convertit <depuis> en <vers> dans la sortie anonymisée" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1229 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "les parents références qui ne sont pas dans le flux d'export rapide par id " "d'objet" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1231 msgid "Show original object ids of blobs/commits" msgstr "Afficher les ids d'objet originaux des blobs/commits" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1233 msgid "Label tags with mark ids" msgstr "Marquer les étiquettes avec des ids de marque" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "--anonymize-map n'a aucune signification sans --anonymize" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists" @@ -15424,7 +15445,8 @@ msgstr "" #: builtin/gc.c:708 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" -msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]" +msgstr "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]" #: builtin/gc.c:738 msgid "--no-schedule is not allowed" @@ -15466,7 +15488,8 @@ msgstr "échec de 'git multi-pack-index repack'" #: builtin/gc.c:1181 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" -msgstr "tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé" +msgstr "" +"tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé" #: builtin/gc.c:1279 #, c-format @@ -15522,15 +15545,21 @@ msgstr "échec du lancement de 'git config'" #: builtin/gc.c:1512 msgid "another process is scheduling background maintenance" -msgstr "un autre processus est en train de programmer une maintenance en tâche de fond" +msgstr "" +"un autre processus est en train de programmer une maintenance en tâche de " +"fond" #: builtin/gc.c:1525 msgid "failed to run 'crontab -l'; your system might not support 'cron'" -msgstr "echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir 'cron'" +msgstr "" +"echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir " +"'cron'" #: builtin/gc.c:1544 msgid "failed to run 'crontab'; your system might not support 'cron'" -msgstr "echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir 'cron'" +msgstr "" +"echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir " +"'cron'" #: builtin/gc.c:1550 msgid "failed to open stdin of 'crontab'" @@ -16254,7 +16283,7 @@ msgstr "Impossible de revenir au répertoire de travail courant" msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algorithme d'empreinte inconnu '%s'" @@ -16319,56 +16348,56 @@ msgstr "modèles non trouvés dans %s" msgid "not copying templates from '%s': %s" msgstr "pas de copie des modèles depuis '%s' : %s" -#: builtin/init-db.c:274 +#: builtin/init-db.c:275 #, c-format msgid "invalid initial branch name: '%s'" msgstr "Nom de branche initiale invalide : '%s'" -#: builtin/init-db.c:366 +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:369 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" -#: builtin/init-db.c:385 +#: builtin/init-db.c:386 msgid "attempt to reinitialize repository with different hash" msgstr "essai de réinitialisation du dépôt avec une empreinte différente" -#: builtin/init-db.c:409 builtin/init-db.c:412 +#: builtin/init-db.c:410 builtin/init-db.c:413 #, c-format msgid "%s already exists" msgstr "%s existe déjà" -#: builtin/init-db.c:443 +#: builtin/init-db.c:445 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-initialisation : --initial-branch=%s ignoré" -#: builtin/init-db.c:474 +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n" -#: builtin/init-db.c:475 +#: builtin/init-db.c:477 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Dépôt Git existant réinitialisé dans %s%s\n" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Dépôt Git vide partagé initialisé dans %s%s\n" -#: builtin/init-db.c:480 +#: builtin/init-db.c:482 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Dépôt Git vide initialisé dans %s%s\n" -#: builtin/init-db.c:529 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16376,41 +16405,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:555 +#: builtin/init-db.c:557 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:556 +#: builtin/init-db.c:558 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:562 +#: builtin/init-db.c:564 msgid "override the name of the initial branch" msgstr "outrepasser le nom de la branche initiale" -#: builtin/init-db.c:563 builtin/verify-pack.c:74 +#: builtin/init-db.c:565 builtin/verify-pack.c:74 msgid "hash" msgstr "empreinte" -#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "spécifier l'algorithme d'empreinte à utiliser" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir et --bare sont mutuellement exclusifs" -#: builtin/init-db.c:600 builtin/init-db.c:605 +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:609 builtin/init-db.c:664 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:636 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16419,12 +16448,12 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:688 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" -#: builtin/init-db.c:693 +#: builtin/init-db.c:695 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir est incompatible avec un dépôt nu" @@ -16529,11 +16558,14 @@ msgstr "décorer les options" msgid "" "Trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" -msgstr "tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-fonction> dans <fichier>" +msgstr "" +"tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-" +"fonction> dans <fichier>" #: builtin/log.c:212 msgid "-L<range>:<file> cannot be used with pathspec" -msgstr "-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin" +msgstr "" +"-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin" #: builtin/log.c:302 #, c-format @@ -25981,3 +26013,8 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#~ msgid "Counting distinct commits in commit graph" +#~ msgstr "Comptage des commits distincts dans un graphe de commit" + +#~ msgid "the commit graph format cannot write %d commits" +#~ msgstr "le graphe de commits ne peut pas écrire %d commits" |