# French translations for Git. # Copyright (C) 2013 Jean-Noël Avila # This file is distributed under the same license as the Git package. # Jean-Noël Avila , 2013. # Sébastien Helleu , 2013. # # French translations of common Git words used in this file: # # English | French # -----------------+--------------------------------- # 3-way merge | fusion à 3 points # #NN | n°NN # a commit | un commit # backward | # compatibility | rétrocompatibilité # bare repository | dépôt nu # bisect | bissection # blob | blob # bug | bogue # bundle | colis # bypass | éviter d'utiliser # to checkout | extraire # cherry-pick | picorer # to commit | valider # commit-ish | commit ou apparenté # config file | fichier de configuration # dangling | en suspens # to debug | déboguer # debugging | débogage # to deflate | compresser # email | e-mail # entry | élément # fast-forward | avance rapide # fast-forwarded | mis à jour en avance rapide # to fetch | rapatrier # fix conflicts | réglez les conflits # to format | formater # glob | glob # hash | hachage # HEAD | HEAD (genre féminin) # hook | crochet # hunk | section # to inflate | décompresser # to list | afficher # mapping | mise en correspondance # merge | fusion # pack | paquet # patches | patchs # pattern | motif # to prune | éliminer # to push | pousser # to rebase | rebaser # repository | dépôt # remote | distante (ou serveur distant) # revision | révision # shell | interpréteur de commandes # stash | remisage # to stash | remiser # tag | étiquette # template | modèle # thread | fil # to track | suivre # tree | arbre # tree-ish | arbre ou apparenté # to unstage | désindexer # upstream | amont # viewer | visualiseur # worktree / | # work(ing) tree | copie de travail # msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2013-11-02 08:06+0800\n" "PO-Revision-Date: 2013-11-07 21:41+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: Jean-Noël Avila \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" "X-Generator: Poedit 1.5.4\n" #: advice.c:57 #, c-format msgid "hint: %.*s\n" msgstr "astuce: %.*s\n" #. #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. #: advice.c:87 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm ' as\n" "appropriate to mark resolution and make a commit,\n" "or use 'git commit -a'." msgstr "" "Corrigez-les dans la copie de travail,\n" "et utilisez 'git add/rm ' si\n" "nécessaire pour marquer la résolution et valider,\n" "ou utilisez 'git commit -a'." #: archive.c:10 msgid "git archive [options] [...]" msgstr "git archive [options] [...]" #: archive.c:11 msgid "git archive --list" msgstr "git archive --list" #: archive.c:12 msgid "" "git archive --remote [--exec ] [options] [...]" msgstr "" "git archive --remote [--exec ] [options] [...]" #: archive.c:13 msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" #: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" #: archive.c:327 msgid "fmt" msgstr "fmt" #: archive.c:327 msgid "archive format" msgstr "format d'archive" #: archive.c:328 builtin/log.c:1193 msgid "prefix" msgstr "préfixe" #: archive.c:329 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" #: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 #: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 msgid "file" msgstr "fichier" #: archive.c:331 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" #: archive.c:333 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" #: archive.c:334 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" #: archive.c:335 msgid "store only" msgstr "stockage seulement" #: archive.c:336 msgid "compress faster" msgstr "compression rapide" #: archive.c:344 msgid "compress better" msgstr "compression efficace" #: archive.c:347 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" #: archive.c:349 builtin/archive.c:90 builtin/clone.c:84 msgid "repo" msgstr "dépôt" #: archive.c:350 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "récupérer l'archive depuis le dépôt distant " #: archive.c:351 builtin/archive.c:92 builtin/notes.c:487 msgid "command" msgstr "commande" #: archive.c:352 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" #: attr.c:259 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." #: branch.c:60 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "La branche %s ne peut pas être sa propre branche amont." #: branch.c:82 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" "La branche %s est paramétrée pour suivre la branche distante %s de %s en " "rebasant." #: branch.c:83 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "" "La branche %s est paramétrée pour suivre la branche distante %s depuis %s." #: branch.c:87 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" "La branche %s est paramétrée pour suivre la branche locale %s en rebasant." #: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "La branche %s est paramétrée pour suivre la branche locale %s." #: branch.c:92 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" "La branche %s est paramétrée pour suivre la référence distante %s en " "rebasant." #: branch.c:93 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "La branche %s est paramétrée pour suivre la référence distante %s." #: branch.c:97 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" "La branche %s est paramétrée pour suivre la référence locale %s en rebasant." #: branch.c:98 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "La branche %s est paramétrée pour suivre la référence locale %s." #: branch.c:118 #, c-format msgid "Tracking not set up: name too long: %s" msgstr "Suivi de branche non paramétré : le nom est trop long : %s" #: branch.c:137 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Pas de suivi : information ambiguë pour la référence %s" #: branch.c:182 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' n'est pas un nom de branche valide." #: branch.c:187 #, c-format msgid "A branch named '%s' already exists." msgstr "Une branche nommée '%s' existe déjà." #: branch.c:195 msgid "Cannot force update the current branch." msgstr "Impossible de forcer la mise à jour de la branche courante." #: branch.c:215 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " "pas une branche." #: branch.c:217 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" #: branch.c:219 msgid "" "\n" "If you are planning on basing your work on an upstream\n" "branch that already exists at the remote, you may need to\n" "run \"git fetch\" to retrieve it.\n" "\n" "If you are planning to push out a new local branch that\n" "will track its remote counterpart, you may want to use\n" "\"git push -u\" to set the upstream config as you push." msgstr "" "\n" "Si vous comptez baser votre travail sur une branche\n" "amont qui existe déjà sur le serveur distant, vous pourriez\n" "devoir lancer \"git fetch\" pour la récupérer.\n" "\n" "Si vous comptez pousser une nouvelle branche locale qui suivra\n" "sa jumelle distante, vous souhaiterez utiliser \"git push -u\"\n" "pour paramétrer le suivi distant en même temps que vous poussez." #: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'." #: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'." #: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." #: branch.c:295 msgid "Failed to lock ref for update" msgstr "Échec du verrouillage de la référence pour mise à jour" #: branch.c:313 msgid "Failed to write ref" msgstr "Échec de l'écriture de la référence" #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ne semble pas être un fichier bundle v2" #: bundle.c:63 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" #: bundle.c:89 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" #: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis :" #: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" #: bundle.c:186 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" #: bundle.c:193 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." #: bundle.c:195 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" #: bundle.c:294 msgid "rev-list died" msgstr "rev-list a disparu" #: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" #: bundle.c:335 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" #: bundle.c:380 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." #: bundle.c:398 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" #: bundle.c:416 msgid "pack-objects died" msgstr "les objets groupés ont disparu" #: bundle.c:419 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" #: bundle.c:441 msgid "index-pack died" msgstr "l'index de groupe a disparu" #: commit.c:53 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" #: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "plus de mémoire" #: connected.c:60 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" #: connected.c:80 #, c-format msgid "failed write to rev-list: %s" msgstr "impossible d'écrire dans la rev-list : %s" #: connected.c:88 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "impossible de fermer l'entrée standard du rev-list : %s" #: date.c:95 msgid "in the future" msgstr "dans le futur" #: date.c:101 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "il y a %lu seconde" msgstr[1] "il y a %lu secondes" #: date.c:108 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "il y a %lu minute" msgstr[1] "il y a %lu minutes" #: date.c:115 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "il y a %lu heure" msgstr[1] "il y a %lu heures" #: date.c:122 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "il y a %lu jour" msgstr[1] "il y a %lu jours" #: date.c:128 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "il y a %lu semaine" msgstr[1] "il y a %lu semaines" #: date.c:135 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "il y a %lu mois" msgstr[1] "il y a %lu mois" #: date.c:146 #, c-format msgid "%lu year" msgid_plural "%lu years" msgstr[0] "%lu an" msgstr[1] "%lu ans" #: date.c:149 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "il y a %s et %lu mois" msgstr[1] "il y a %s et %lu mois" #: date.c:154 date.c:159 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" msgstr[0] "il y a %lu an" msgstr[1] "il y a %lu ans" #: diff.c:112 #, 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:117 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" #: diff.c:210 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" #: diff.c:260 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" #: diff.c:3490 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" #: diff.c:3504 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" #: gpg-interface.c:59 gpg-interface.c:131 msgid "could not run gpg." msgstr "impossible de lancer gpg." #: gpg-interface.c:71 msgid "gpg did not accept the data" msgstr "gpg n'a pas accepté les données" #: gpg-interface.c:82 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" #: gpg-interface.c:115 #, c-format msgid "could not create temporary file '%s': %s" msgstr "impossible de créer un fichier temporaire '%s' : %s" #: gpg-interface.c:118 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "impossible d'écrire la signature détachée dans '%s' : %s" #: grep.c:1695 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" #: grep.c:1712 #, c-format msgid "'%s': %s" msgstr "'%s' : %s" #: grep.c:1723 #, c-format msgid "'%s': short read %s" msgstr "'%s' : lecture tronquée %s" #: help.c:210 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" #: help.c:217 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" #: help.c:233 msgid "The most commonly used git commands are:" msgstr "Les commandes git les plus utilisées sont :" #: help.c:290 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" #: help.c:347 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." #: help.c:369 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe " "pas.\n" "Poursuite en supposant que vous avez voulu dire '%s'" #: help.c:374 #, c-format msgid "in %0.1f seconds automatically..." msgstr "dans %0.1f secondes automatiquement..." #: help.c:381 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." #: help.c:385 help.c:444 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "Vouliez-vous dire cela ?" msgstr[1] "" "\n" "Vouliez-vous dire un de ceux-là ?" #: help.c:440 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" #: merge.c:56 msgid "failed to read the cache" msgstr "impossible de lire le cache" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 #: builtin/clone.c:655 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" msgstr "(mauvais commit)\n" #: merge-recursive.c:206 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "échec de addinfo_cache pour le chemin '%s'" #: merge-recursive.c:269 msgid "error building trees" msgstr "erreur de construction des arbres" #: merge-recursive.c:673 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" #: merge-recursive.c:684 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" #. something else exists #. .. but not some other error (who really cares what?) #: merge-recursive.c:698 merge-recursive.c:719 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" #: merge-recursive.c:709 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" #: merge-recursive.c:749 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" #: merge-recursive.c:751 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" #: merge-recursive.c:774 builtin/clone.c:311 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" #: merge-recursive.c:782 #, c-format msgid "failed to symlink '%s'" msgstr "échec à la création du lien symbolique '%s'" #: merge-recursive.c:785 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" #: merge-recursive.c:923 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" #: merge-recursive.c:927 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" #: merge-recursive.c:943 msgid "unsupported object type in the tree" msgstr "type d'objet non supporté dans l'arbre" #: merge-recursive.c:1022 merge-recursive.c:1036 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." #: merge-recursive.c:1028 merge-recursive.c:1041 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." #: merge-recursive.c:1082 msgid "rename" msgstr "renommage" #: merge-recursive.c:1082 msgid "renamed" msgstr "renommé" #: merge-recursive.c:1138 #, 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:1160 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" #: merge-recursive.c:1165 msgid " (left unresolved)" msgstr " (laissé non résolu)" #: merge-recursive.c:1219 #, 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:1249 #, 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:1448 #, 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:1458 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" #: merge-recursive.c:1463 merge-recursive.c:1661 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" #: merge-recursive.c:1514 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" #: merge-recursive.c:1517 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" #: merge-recursive.c:1565 msgid "modify" msgstr "modification" #: merge-recursive.c:1565 msgid "modified" msgstr "modifié" #: merge-recursive.c:1575 msgid "content" msgstr "contenu" #: merge-recursive.c:1582 msgid "add/add" msgstr "ajout/ajout" #: merge-recursive.c:1616 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" #: merge-recursive.c:1630 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" #: merge-recursive.c:1634 git-submodule.sh:1125 msgid "submodule" msgstr "sous-module" #: merge-recursive.c:1635 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" #: merge-recursive.c:1725 #, c-format msgid "Removing %s" msgstr "Suppression de %s" #: merge-recursive.c:1750 msgid "file/directory" msgstr "fichier/répertoire" #: merge-recursive.c:1756 msgid "directory/file" msgstr "répertoire/fichier" #: merge-recursive.c:1761 #, 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:1771 #, c-format msgid "Adding %s" msgstr "Ajout de %s" #: merge-recursive.c:1788 msgid "Fatal merge failure, shouldn't happen." msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." #: merge-recursive.c:1807 msgid "Already up-to-date!" msgstr "Déjà à jour !" #: merge-recursive.c:1816 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" #: merge-recursive.c:1846 #, c-format msgid "Unprocessed path??? %s" msgstr "Chemin non traité ??? %s" #: merge-recursive.c:1891 msgid "Merging:" msgstr "Fusion :" #: merge-recursive.c:1904 #, 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:1941 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" #: merge-recursive.c:1998 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" #: merge-recursive.c:2010 builtin/merge.c:672 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." #: notes-utils.c:40 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Impossible de valider un arbre de notes non initialisé/référencé" #: notes-utils.c:81 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Mauvaise valeur de notes.rewriteMode : '%s'" #: notes-utils.c:91 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value #: notes-utils.c:118 #, c-format msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" #: object.c:202 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" #: parse-options.c:537 msgid "..." msgstr "..." #: parse-options.c:555 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:559 #, c-format msgid " or: %s" msgstr " ou : %s" #: parse-options.c:562 #, c-format msgid " %s" msgstr " %s" #: parse-options.c:596 msgid "-NUM" msgstr "-NUM" #: pathspec.c:118 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont incompatibles" #: pathspec.c:128 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "le réglage global de spécificateur de chemin 'literal' est incompatible avec tous les autres réglages globaux de spécificateur de chemin" #: pathspec.c:158 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'" #: pathspec.c:164 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'" #: pathspec.c:168 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'" #: pathspec.c:186 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Spécificateur magique '%c' non implémenté dans '%s'" #: pathspec.c:211 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s : 'literal' et 'glob' sont incompatibles" #: pathspec.c:222 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s : '%s' est hors du dépôt" #: pathspec.c:278 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Le chemin '%s' est dans le sous-module '%.*s'" #. #. * We may want to substitute "this command" with a command #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. #: pathspec.c:340 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s : le spécificateur magique de chemin n'est pas supporté par cette commande : %s" #: pathspec.c:415 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" #: remote.c:1833 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" #: remote.c:1837 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch -unset-upstream\" pour corriger)\n" #: remote.c:1840 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" #: remote.c:1844 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" #: remote.c:1850 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" #: remote.c:1853 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" "Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour " "en avance rapide.\n" msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" #: remote.c:1861 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" #: remote.c:1864 #, c-format msgid "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commit each, respectively.\n" msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commit différent chacune respectivement.\n" msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" #: remote.c:1874 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" #: run-command.c:80 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" #: run-command.c:82 #, c-format msgid "dup2(%d,%d) failed" msgstr "échec de dup2(%d,%d)" #: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 #: builtin/merge.c:1013 builtin/merge.c:1023 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" #: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 #: builtin/merge.c:1015 builtin/merge.c:1028 #, c-format msgid "Could not write to '%s'" msgstr "Impossible d'écrire dans '%s'" #: sequencer.c:229 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add ' ou 'git rm '" #: sequencer.c:232 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add ' ou 'git rm '\n" "puis validez le résultat avec 'git commit'" #: sequencer.c:245 sequencer.c:870 sequencer.c:953 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" #: sequencer.c:248 #, c-format msgid "Error wrapping up %s" msgstr "Erreur à l'emballage de %s" #: sequencer.c:263 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Vos modifications locales seraient écrasées par cherry-pick." #: sequencer.c:265 msgid "Your local changes would be overwritten by revert." msgstr "Vos modifications locales seraient écrasées par revert." #: sequencer.c:268 msgid "Commit your changes or stash them to proceed." msgstr "Validez vos modifications ou les remiser pour continuer." #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:325 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" #: sequencer.c:356 msgid "Could not resolve HEAD commit\n" msgstr "Impossible de résoudre le commit HEAD\n" #: sequencer.c:378 msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" #: sequencer.c:423 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" #: sequencer.c:428 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" #: sequencer.c:494 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." #: sequencer.c:513 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée." #: sequencer.c:521 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas le parent %d" #: sequencer.c:525 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" "Une branche principale a été spécifiée mais le commit %s n'est pas une " "fusion." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 #: sequencer.c:538 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" #: sequencer.c:542 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" #: sequencer.c:628 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" #: sequencer.c:629 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" #: sequencer.c:665 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" #: sequencer.c:673 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" #: sequencer.c:678 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" #: sequencer.c:736 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" #: sequencer.c:758 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." #: sequencer.c:763 msgid "No commits parsed." msgstr "Aucun commit analysé." #: sequencer.c:776 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" #: sequencer.c:780 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." #: sequencer.c:787 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" #: sequencer.c:815 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" #: sequencer.c:818 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" #: sequencer.c:830 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" #: sequencer.c:851 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" #: sequencer.c:852 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" #: sequencer.c:856 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" #: sequencer.c:872 sequencer.c:957 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." #: sequencer.c:891 sequencer.c:1025 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" #: sequencer.c:893 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" #: sequencer.c:895 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" #: sequencer.c:917 builtin/apply.c:4061 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" #: sequencer.c:920 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" #: sequencer.c:921 msgid "unexpected end of file" msgstr "fin de fichier inattendue" #: sequencer.c:927 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" #: sequencer.c:950 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." #: sequencer.c:1093 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" #: sequencer.c:1096 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" #: sequencer.c:1130 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" #: sequencer.c:1131 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" #: sha1_name.c:440 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" "Git ne créé normalement jamais de référence qui se termine par 40 caractères " "hexa\n" "car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n" "peuvent être créées par erreur. Par exemple,\n" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" "où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa " "est créée.\n" "Veuillez examiner ces références et peut-être les supprimer. Désactivez ce " "message\n" "en lançant \"git config advice.objectNameWarning false\"" #: sha1_name.c:1112 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" #: sha1_name.c:1115 #, c-format msgid "No such branch: '%s'" msgstr "Branche inconnue : '%s'" #: sha1_name.c:1117 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Aucune branche amont configurée pour la branche '%s'" #: sha1_name.c:1121 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "La branche amont '%s' n'est pas stockée comme branche de suivi" #: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "Modification impossible de .gitmodules non fusionné, résolvez les conflits d'abord" #: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Impossible de trouver une section où path=%s dans .gitmodules" #. Maybe the user already did that, don't error out here #: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" # ici %s est un chemin #. Maybe the user already did that, don't error out here #: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" #: submodule.c:127 msgid "could not find .gitmodules in index" msgstr "impossible de trouver .gitmodules dans l'index" #: submodule.c:133 msgid "reading updated .gitmodules failed" msgstr "échec de la lecture du .gitmodules mis à jour" #: submodule.c:135 msgid "unable to stat updated .gitmodules" msgstr "échec de stat du .gitmodules mis à jour" #: submodule.c:139 msgid "unable to remove .gitmodules from index" msgstr "suppression du .gitmodules dans l'index impossible" #: submodule.c:141 msgid "adding updated .gitmodules failed" msgstr "échec de l'ajout du .gitmodules mis à jour" #: submodule.c:143 msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" #: submodule.c:1144 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Impossible de créer le lien git %s" #: submodule.c:1155 #, c-format msgid "Could not set core.worktree in %s" msgstr "Impossible de paramétrer core.worktree dans %s" #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant" #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 #, c-format msgid "invalid %XX escape sequence" msgstr "séquence d'échappement %XX invalide" #: urlmatch.c:172 msgid "missing host and scheme is not 'file:'" msgstr "hôte manquant et le schéma n'est pas 'file:'" #: urlmatch.c:189 msgid "a 'file:' URL may not have a port number" msgstr "une URL 'file:' ne peut pas contenir de numéro de port" #: urlmatch.c:199 msgid "invalid characters in host name" msgstr "caractères invalides dans le nom d'hôte" #: urlmatch.c:244 urlmatch.c:255 msgid "invalid port number" msgstr "numéro de port invalide" #: urlmatch.c:322 msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" #: wrapper.c:422 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" #: wrapper.c:443 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" #: wrapper.c:454 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" "impossible de rechercher l'utilisateur actuel dans le fichier de mots de " "passe : %s" #: wrapper.c:455 msgid "no such user" msgstr "utilisateur inconnu" #: wt-status.c:146 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" #: wt-status.c:173 wt-status.c:200 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr " (utilisez \"git reset %s ...\" pour désindexer)" #: wt-status.c:175 wt-status.c:202 msgid " (use \"git rm --cached ...\" to unstage)" msgstr " (utilisez \"git rm --cached ...\" pour désindexer)" #: wt-status.c:179 msgid " (use \"git add ...\" to mark resolution)" msgstr " (utilisez \"git add ...\" pour marquer comme résolu)" #: wt-status.c:181 wt-status.c:185 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm ...\" si nécessaire pour marquer comme " "résolu)" #: wt-status.c:183 msgid " (use \"git rm ...\" to mark resolution)" msgstr " (utilisez \"git rm ...\" pour marquer comme résolu)" #: wt-status.c:194 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" #: wt-status.c:212 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" #: wt-status.c:216 msgid " (use \"git add ...\" to update what will be committed)" msgstr "" " (utilisez \"git add ...\" pour mettre à jour ce qui sera validé)" #: wt-status.c:218 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm ...\" pour mettre à jour ce qui sera " "validé)" #: wt-status.c:219 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" " (utilisez \"git checkout -- ...\" pour annuler les modifications " "dans la copie de travail)" #: wt-status.c:221 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" #: wt-status.c:233 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s ...\" pour inclure dans ce qui sera validé)" #: wt-status.c:250 msgid "bug" msgstr "bogue" #: wt-status.c:255 msgid "both deleted:" msgstr "supprimé des deux côtés :" #: wt-status.c:256 msgid "added by us:" msgstr "ajouté par nous :" #: wt-status.c:257 msgid "deleted by them:" msgstr "supprimé par eux :" #: wt-status.c:258 msgid "added by them:" msgstr "ajouté par eux :" #: wt-status.c:259 msgid "deleted by us:" msgstr "supprimé par nous :" #: wt-status.c:260 msgid "both added:" msgstr "ajouté de deux côtés :" #: wt-status.c:261 msgid "both modified:" msgstr "modifié des deux côtés :" #: wt-status.c:291 msgid "new commits, " msgstr "nouveaux commits, " #: wt-status.c:293 msgid "modified content, " msgstr "contenu modifié, " #: wt-status.c:295 msgid "untracked content, " msgstr "contenu non suivi, " #: wt-status.c:312 #, c-format msgid "new file: %s" msgstr "nouveau : %s" #: wt-status.c:315 #, c-format msgid "copied: %s -> %s" msgstr "copié : %s -> %s" #: wt-status.c:318 #, c-format msgid "deleted: %s" msgstr "supprimé : %s" #: wt-status.c:321 #, c-format msgid "modified: %s" msgstr "modifié : %s" #: wt-status.c:324 #, c-format msgid "renamed: %s -> %s" msgstr "renommé : %s -> %s" #: wt-status.c:327 #, c-format msgid "typechange: %s" msgstr "nv type : %s" #: wt-status.c:330 #, c-format msgid "unknown: %s" msgstr "inconnu : %s" #: wt-status.c:333 #, c-format msgid "unmerged: %s" msgstr "non fus. : %s" #: wt-status.c:336 #, c-format msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" #: wt-status.c:703 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" #: wt-status.c:705 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" #: wt-status.c:848 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." #: wt-status.c:851 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" #: wt-status.c:854 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." #: wt-status.c:857 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" #: wt-status.c:867 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." #: wt-status.c:870 msgid "The current patch is empty." msgstr "Le patch actuel est vide." #: wt-status.c:874 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" #: wt-status.c:876 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" #: wt-status.c:878 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" #: wt-status.c:938 wt-status.c:955 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." #: wt-status.c:943 wt-status.c:960 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." #: wt-status.c:946 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" #: wt-status.c:948 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" #: wt-status.c:950 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" #: wt-status.c:963 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" #: wt-status.c:967 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." #: wt-status.c:972 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." #: wt-status.c:975 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" #: wt-status.c:979 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." #: wt-status.c:984 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." #: wt-status.c:987 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" #: wt-status.c:989 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos " "modifications)" #: wt-status.c:999 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." #: wt-status.c:1004 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" #: wt-status.c:1007 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" #: wt-status.c:1009 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" #: wt-status.c:1018 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." #: wt-status.c:1023 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" #: wt-status.c:1026 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" #: wt-status.c:1028 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" #: wt-status.c:1039 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." #: wt-status.c:1043 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." #: wt-status.c:1046 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" #: wt-status.c:1221 msgid "On branch " msgstr "Sur la branche " #: wt-status.c:1228 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " #: wt-status.c:1235 msgid "HEAD detached at " msgstr "HEAD détachée sur " #: wt-status.c:1237 msgid "HEAD detached from " msgstr "HEAD détachée depuis " #: wt-status.c:1240 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." #: wt-status.c:1257 msgid "Initial commit" msgstr "Validation initiale" #: wt-status.c:1271 msgid "Untracked files" msgstr "Fichiers non suivis" #: wt-status.c:1273 msgid "Ignored files" msgstr "Fichiers ignorés" #: wt-status.c:1277 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" "may speed it up, but you have to be careful not to forget to add\n" "new files yourself (see 'git help status')." msgstr "" "L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n" "peut l'accélérer, mais vous devez alors faire attention à ne pas\n" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." #: wt-status.c:1283 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" #: wt-status.c:1285 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" #: wt-status.c:1291 msgid "No changes" msgstr "Aucune modification" #: wt-status.c:1296 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" #: wt-status.c:1299 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" #: wt-status.c:1302 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" #: wt-status.c:1305 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" #: wt-status.c:1308 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" #: wt-status.c:1311 wt-status.c:1316 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" #: wt-status.c:1314 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" #: wt-status.c:1318 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" #: wt-status.c:1427 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" #: wt-status.c:1433 msgid "Initial commit on " msgstr "Validation initiale sur " # à priori on parle d'une branche ici #: wt-status.c:1463 msgid "gone" msgstr "disparue" #: wt-status.c:1465 msgid "behind " msgstr "derrière " #: wt-status.c:1468 wt-status.c:1471 msgid "ahead " msgstr "devant " #: wt-status.c:1473 msgid ", behind " msgstr ", derrière " #: compat/precompose_utf8.c:55 builtin/clone.c:350 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" #: builtin/add.c:20 msgid "git add [options] [--] ..." msgstr "git add [options] [--] ..." #. #. * To be consistent with "git add -p" and most Git #. * commands, we should default to being tree-wide, but #. * this is not the original behavior and can't be #. * changed until users trained themselves not to type #. * "git add -u" or "git add -A". For now, we warn and #. * keep the old behavior. Later, the behavior can be changed #. * to tree-wide, keeping the warning for a while, and #. * eventually we can drop the warning. #. #: builtin/add.c:58 #, c-format msgid "" "The behavior of 'git add %s (or %s)' with no path argument from a\n" "subdirectory of the tree will change in Git 2.0 and should not be used " "anymore.\n" "To add content for the whole tree, run:\n" "\n" " git add %s :/\n" " (or git add %s :/)\n" "\n" "To restrict the command to the current directory, run:\n" "\n" " git add %s .\n" " (or git add %s .)\n" "\n" "With the current Git version, the command is restricted to the current " "directory.\n" msgstr "" "Le comportement de 'git add %s (ou %s)' sans argument de chemin depuis un\n" "sous-répertoire du projet va changer dans Git 2.0 et ne doit plus être " "utilisé.\n" "Pour ajouter le contenu de toute l'arborescence, lancez :\n" "\n" " git add %s :/\n" " (ou git add %s :/)\n" "\n" "Pour restreindre la commande au répertoire courant, lancez :\n" "\n" " git add %s .\n" " (ou git add %s .)\n" "\n" "Avec la version actuelle de Git, la commande est restreinte au répertoire " "courant.\n" #: builtin/add.c:100 #, c-format msgid "" "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" "whose behaviour will change in Git 2.0 with respect to paths you removed.\n" "Paths like '%s' that are\n" "removed from your working tree are ignored with this version of Git.\n" "\n" "* 'git add --ignore-removal ', which is the current default,\n" " ignores paths you removed from your working tree.\n" "\n" "* 'git add --all ' will let you also record the removals.\n" "\n" "Run 'git status' to check the paths you removed from your working tree.\n" msgstr "" "Vous avez lancé 'git add' sans '-A (--all)' ni '--ignore-removal',\n" "dont le comportement va changer dans Git 2.0 avec le respect des chemins que " "vous supprimez.\n" "Les chemins tels que '%s' qui ont été\n" "retirés de votre copie de travail sont ignorés avec cette version de Git.\n" "\n" "* 'git add --ignore-removal ', qui est l'option par défaut " "actuelle,\n" " ignore les chemins que vous avez supprimés de votre copie de travail.\n" "\n" "* 'git add --all ' permet d'enregistrer aussi les suppressions.\n" "\n" "Lancez 'git status' pour vérifier les chemins que vous avez supprimés de " "votre copie de travail.\n" #: builtin/add.c:144 #, c-format msgid "unexpected diff status %c" msgstr "status de diff inattendu %c" #: builtin/add.c:149 builtin/commit.c:260 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" #: builtin/add.c:163 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" #: builtin/add.c:237 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" #: builtin/add.c:299 msgid "Could not read the index" msgstr "Impossible de lire l'index" #: builtin/add.c:310 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." #: builtin/add.c:314 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" #: builtin/add.c:319 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" #: builtin/add.c:321 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." #: builtin/add.c:327 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" #: builtin/add.c:337 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" #: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 #: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 #: builtin/rm.c:269 msgid "dry run" msgstr "simuler l'action" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 #: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 msgid "be verbose" msgstr "mode verbeux" #: builtin/add.c:357 msgid "interactive picking" msgstr "sélection interactive" #: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 msgid "select hunks interactively" msgstr "sélection interactive des sections" #: builtin/add.c:359 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" #: builtin/add.c:360 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" #: builtin/add.c:361 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" #: builtin/add.c:362 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" #: builtin/add.c:363 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" #. takes no arguments #: builtin/add.c:366 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" #: builtin/add.c:368 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" #: builtin/add.c:369 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" #: builtin/add.c:370 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" #: builtin/add.c:392 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" #: builtin/add.c:393 msgid "no files added" msgstr "aucun fichier ajouté" #: builtin/add.c:399 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" #: builtin/add.c:438 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" #: builtin/add.c:456 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" #: builtin/add.c:486 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" #: builtin/add.c:487 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 #: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "fichier d'index corrompu" #: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" #: builtin/apply.c:57 msgid "git apply [options] [...]" msgstr "git apply [options] [...]" #: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" #: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" #: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" #: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" #: builtin/apply.c:913 #, 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 #, 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 #, 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 #, 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 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" #: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" #: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" #: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " "component (line %d)" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composant de préfixe de chemin (ligne %d)" msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" #: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" #: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" #: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" #: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" #: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" #: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" #: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" #. there has to be one hunk (forward hunk) #: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" #: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" #: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" #: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" #: builtin/apply.c:2688 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" #: builtin/apply.c:2806 #, c-format msgid "Hunk #%d succeeded at %d (offset %d li