# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2013-04-30 08:25+0800\n" "PO-Revision-Date: 2013-07-02 22:28+0100\n" "Last-Translator: Jean-Noël Avila \n" "Language-Team: Jean-Noël Avila \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" "X-Generator: Poedit 1.5.4\n" #: advice.c:53 #, c-format msgid "hint: %.*s\n" msgstr "astuce: %*s\n" #. #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. #: advice.c:83 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 l'espace de travail,\n" "et utilisez 'git add/rm ' comme\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:323 msgid "fmt" msgstr "fmt" #: archive.c:323 msgid "archive format" msgstr "format d'archive" #: archive.c:324 builtin/log.c:1126 msgid "prefix" msgstr "préfixe" #: archive.c:325 msgid "prepend prefix to each pathname in the archive" msgstr "Préfixer chaque chemin de fichier dans l'archive" #: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 #: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 #: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 #: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "fichier" #: archive.c:327 builtin/archive.c:89 msgid "write the archive to this file" msgstr "Écrire l'archive dans ce fichier" #: archive.c:329 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" #: archive.c:330 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" #: archive.c:331 msgid "store only" msgstr "stockage seulement" #: archive.c:332 msgid "compress faster" msgstr "compression rapide" #: archive.c:340 msgid "compress better" msgstr "compression efficace" #: archive.c:343 msgid "list supported archive formats" msgstr "lister les formats d'archive supportés" #: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 msgid "repo" msgstr "dépôt" #: archive.c:346 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:347 builtin/archive.c:92 builtin/notes.c:615 msgid "command" msgstr "commande" #: archive.c:348 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 patrons négatifs 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:201 #, 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:203 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" #: branch.c:205 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\n" "qui suivra sa jumelle distante, vous souhaiterez utiliser\n" "\"git push -u\" pour paramétrer le suivi distant en même\n" "temps que vous poussez." #: branch.c:250 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'" #: branch.c:270 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'" #: branch.c:275 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'" #: branch.c:281 msgid "Failed to lock ref for update" msgstr "Échec du verrouillage de la référence pour mise à jour" #: branch.c:299 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 "entête non reconnu : %s %s (%d)" #: bundle.c:89 builtin/commit.c:676 #, 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:651 sequencer.c:1101 builtin/log.c:300 #: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 #: builtin/shortlog.c:155 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 bundle 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:1255 builtin/shortlog.c:258 #, 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 "ref '%s' est exclus par les options de rev-list" #: bundle.c:380 msgid "Refusing to create empty bundle." msgstr "Refus de créer un bundle 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:50 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" #: commit.c:52 #, 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:39 msgid "Could not run 'git rev-list'" msgstr "impossible de lancer 'git rev-list'" #: connected.c:48 #, c-format msgid "failed write to rev-list: %s" msgstr "impossible d'écrire la rev-list : %s" #: connected.c:56 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "impossible de fermer le stdin 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:3481 #, 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:3495 #, 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:1623 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" #: grep.c:1640 #, c-format msgid "'%s': %s" msgstr "'%s' : %s" #: grep.c:1651 #, c-format msgid "'%s': short read %s" msgstr "'%s' : lecture tronquée %s" #: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" #: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" #: help.c:235 msgid "The most commonly used git commands are:" msgstr "Les commandes git les plus usitées sont :" #: help.c:292 #, 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 être éxecutée. Peut-être git-%s est-il cassé ?" #: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." #: help.c:371 #, 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 avec l'hypothèse que vous avez voulu dire '%s'" #: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "dans %01f secondes automatiquement..." #: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Référez-vous à 'git --help'" #: help.c:387 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 cela ?" #: merge.c:56 msgid "failed to read the cache" msgstr "impossible de lire le cache" #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 #: builtin/clone.c:645 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:268 msgid "error building trees" msgstr "Erreur à la construction des arbres" #: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" #: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" #. something else exists #. .. but not some other error (who really cares what?) #: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" #: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" #: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" #: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" #: merge-recursive.c:773 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "Échec à l'ouverture de '%s'" #: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "Échec à la création du lien symbolique '%s'" #: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" #: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" #: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" #: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "type d'objet non supporté dans l'arbre" #: merge-recursive.c:1021 merge-recursive.c:1035 #, 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:1027 merge-recursive.c:1040 #, 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:1081 msgid "rename" msgstr "renommage" #: merge-recursive.c:1081 msgid "renamed" msgstr "renommé" #: merge-recursive.c:1137 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" #: merge-recursive.c:1159 #, 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:1164 msgid " (left unresolved)" msgstr " (laissé non résolu)" #: merge-recursive.c:1218 #, 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:1248 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renommage préféré de %s en %s et de %s en %s" #: merge-recursive.c:1447 #, 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:1457 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" #: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" #: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" #: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" #: merge-recursive.c:1564 msgid "modify" msgstr "modification" #: merge-recursive.c:1564 msgid "modified" msgstr "modifié" #: merge-recursive.c:1574 msgid "content" msgstr "contenu" #: merge-recursive.c:1581 msgid "add/add" msgstr "ajout/ajout" #: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ignoré (fusion identique à l'existant)" #: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "fusion automatique de %s" #: merge-recursive.c:1633 git-submodule.sh:1029 msgid "submodule" msgstr "sous-module" #: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : conflit de fusion dans %s" #: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "Suppression de %s" #: merge-recursive.c:1749 msgid "file/directory" msgstr "fichier/répertoire" #: merge-recursive.c:1755 msgid "directory/file" msgstr "répertoire/fichier" #: merge-recursive.c:1760 #, 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:1770 #, c-format msgid "Adding %s" msgstr "Ajout de %s" #: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." #: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "Déjà à jour !" #: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "Échec de fusion des arbres %s et %s" #: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "Chemin non traité ??? %s" #: merge-recursive.c:1890 msgid "Merging:" msgstr "Fusion :" #: merge-recursive.c:1903 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" #: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" #: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" #: merge-recursive.c:2009 builtin/merge.c:658 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." #: object.c:195 #, c-format msgid "unable to parse object: %s" msgstr "Impossible d'analyser l'objet '%s'" #: parse-options.c:489 msgid "..." msgstr "..." #: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:511 #, c-format msgid " or: %s" msgstr " ou : %s" #: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" #: parse-options.c:548 msgid "-NUM" msgstr "-NUM" #: pathspec.c:83 #, c-format msgid "Path '%s' is in submodule '%.*s'" msgstr "Le chemin '%s' est dans le sous-module '%.*s'" #: pathspec.c:99 #, c-format msgid "'%s' is beyond a symbolic link" msgstr "'%s' est au delà d'un lien symbolique" #: remote.c:1781 #, 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' par %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' par %d commits.\n" #: remote.c:1787 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez 'git push' pour publier vos commits locaux)\n" #: remote.c:1790 #, 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' par %d commit, et peut être mise à jour en avance rapide.\n" msgstr[1] "Votre branche est en retard sur '%s' par %d commits, et peut être mise à jour en avance rapide.\n" #: remote.c:1798 msgid " (use \"git pull\" to update your local branch)\n" msgstr " ( utilisez 'git pull' pour mettre à jour votre branche locale)\n" #: remote.c:1801 #, 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:1811 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" #: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 #: builtin/merge.c:1009 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" #: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 #: builtin/merge.c:1001 builtin/merge.c:1014 #, 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:859 sequencer.c:942 #, 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 serait é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 remisez-les pour continuer." #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:319 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: impossiblde d'écrire le nouveau fichier index" #: sequencer.c:350 msgid "Could not resolve HEAD commit\n" msgstr "Impossible de résoudre le commit HEAD\n" #: sequencer.c:371 msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" #: sequencer.c:416 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" #: sequencer.c:421 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" #: sequencer.c:487 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." #: sequencer.c:506 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée." #: sequencer.c:514 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas %d pour parent" #: sequencer.c:518 #, 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:531 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" #: sequencer.c:535 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" #: sequencer.c:621 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" #: sequencer.c:622 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" #: sequencer.c:654 msgid "empty commit set passed" msgstr "l'ensemble de commits spéficifié est vide" #: sequencer.c:662 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" #: sequencer.c:667 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du raffraîchissement de l'index" #: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" #: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." #: sequencer.c:752 msgid "No commits parsed." msgstr "Aucun commit analysé." #: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" #: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." #: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" #: sequencer.c:804 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" #: sequencer.c:807 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" #: sequencer.c:819 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" #: sequencer.c:840 msgid "a cherry-pick or revert is already in progress" msgstr "Un picorage ou un retour est déjà en cours" #: sequencer.c:841 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" #: sequencer.c:845 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" #: sequencer.c:861 sequencer.c:946 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." #: sequencer.c:880 sequencer.c:1014 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" #: sequencer.c:882 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" #: sequencer.c:884 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" #: sequencer.c:906 builtin/apply.c:4060 #, c-format msgid "cannot open %s: %s" msgstr "impossible d'ouvrir %s : %s" #: sequencer.c:909 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" #: sequencer.c:910 msgid "unexpected end of file" msgstr "fin de fichier inattendue" #: sequencer.c:916 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "Le fichier HEAD de préparation de picorage '%s' est corrompu" #: sequencer.c:939 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." #: sequencer.c:1083 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" #: sequencer.c:1085 #, c-format msgid "%s: bad revision" msgstr "%s: mauvaise révision" #: sequencer.c:1119 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" #: sequencer.c:1120 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers un HEAD vide" #: sha1_name.c:1036 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" #: sha1_name.c:1039 #, c-format msgid "No such branch: '%s'" msgstr "Branche inconnue : '%s'" #: sha1_name.c:1041 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Aucune branche amont configurée pour la branche '%s'" #: sha1_name.c:1044 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "La branche amont '%s' n'est pas stockée comme branche de suivi" #: wrapper.c:408 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" #: wrapper.c:423 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" #: wrapper.c:434 #, 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:435 msgid "no such user" msgstr "utilisateur inconnu" #: wt-status.c:140 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" #: wt-status.c:167 wt-status.c:194 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr " (utilisez \"git reset %s ...\" pour désindexer)" #: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached ...\" to unstage)" msgstr " (utilisez \"git rm --cached ...\" pour désindexer)" #: wt-status.c:173 msgid " (use \"git add ...\" to mark resolution)" msgstr " (utilisez \"git add ...\" pour marquer résolu)" #: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr " (utilisez \"git add/rm ...\" selon le cas pour marquer résolu)" #: wt-status.c:177 msgid " (use \"git rm ...\" to mark resolution)" msgstr " (utilisez \"git rm ...\" pour marquer résolu)" #: wt-status.c:188 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" #: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" #: wt-status.c:210 msgid " (use \"git add ...\" to update what will be committed)" msgstr " (utilisez \"git add ...\" pour mettre à jour ce qui sera validé)" #: wt-status.c:212 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:213 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:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (valider out annuler le contenu non suivi our modifié dans les sous-modules)" #: wt-status.c:227 #, 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:244 msgid "bug" msgstr "bogue" #: wt-status.c:249 msgid "both deleted:" msgstr "effacé des deux côtés :" #: wt-status.c:250 msgid "added by us:" msgstr "ajouté par nous :" #: wt-status.c:251 msgid "deleted by them:" msgstr "effacé par eux :" #: wt-status.c:252 msgid "added by them:" msgstr "ajouté par eux :" #: wt-status.c:253 msgid "deleted by us:" msgstr "effacé par nous :" #: wt-status.c:254 msgid "both added:" msgstr "Ajouté de deux côtés :" #: wt-status.c:255 msgid "both modified:" msgstr "modifié des deux côtés :" #: wt-status.c:285 msgid "new commits, " msgstr "nouveaux commits, " #: wt-status.c:287 msgid "modified content, " msgstr "contenu modifié, " #: wt-status.c:289 msgid "untracked content, " msgstr "contenu non suivi, " #: wt-status.c:306 #, c-format msgid "new file: %s" msgstr "nouveau : %s" #: wt-status.c:309 #, c-format msgid "copied: %s -> %s" msgstr "copié : %s->%s" #: wt-status.c:312 #, c-format msgid "deleted: %s" msgstr "effacé : %s" #: wt-status.c:315 #, c-format msgid "modified: %s" msgstr "modifié : %s" #: wt-status.c:318 #, c-format msgid "renamed: %s -> %s" msgstr "renommé : %s -> %s" #: wt-status.c:321 #, c-format msgid "typechange: %s" msgstr "nv type : %s" #: wt-status.c:324 #, c-format msgid "unknown: %s" msgstr "inconnu : %s" #: wt-status.c:327 #, c-format msgid "unmerged: %s" msgstr "non fus : %s" #: wt-status.c:330 #, c-format msgid "bug: unhandled diff status %c" msgstr "bogue : état de diff non géré %c" #: wt-status.c:803 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." #: wt-status.c:806 wt-status.c:958 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits et lancez \"git commit\")" #: wt-status.c:809 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." #: wt-status.c:812 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" #: wt-status.c:822 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." #: wt-status.c:825 msgid "The current patch is empty." msgstr "Le patch actuel est vide." #: wt-status.c:829 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " (réglez les conflits puis lancez \"git am --resolved\")" #: wt-status.c:831 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" #: wt-status.c:833 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche originelle)" #: wt-status.c:893 wt-status.c:910 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." #: wt-status.c:898 wt-status.c:915 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." #: wt-status.c:901 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (résolvez les conflits puis lancez \"git rebase --continue\")" #: wt-status.c:903 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" #: wt-status.c:905 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" #: wt-status.c:918 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont résolus : lancez \"git rebase --continue\")" #: wt-status.c:922 #, 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:927 msgid "You are currently splitting a commit during a rebase." msgstr "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." #: wt-status.c:930 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" #: wt-status.c:934 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la branche '%s' sur '%s'." #: wt-status.c:939 msgid "You are currently editing a commit during a rebase." msgstr "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." #: wt-status.c:942 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" #: wt-status.c:944 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos modifications)" #: wt-status.c:954 msgid "You are currently cherry-picking." msgstr "Vous êtes actuellement en train de picorer." #: wt-status.c:961 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (tous les conflits sont résolus : lancez \"git commit\")" #: wt-status.c:970 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir un commit %s." #: wt-status.c:975 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (résolvez les conflits et lancez \"git revert --continue\")" #: wt-status.c:978 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont résolus : lancez \"git revert --continue\")" #: wt-status.c:980 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" #: wt-status.c:991 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." #: wt-status.c:995 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." #: wt-status.c:998 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche de départ)" #: wt-status.c:1173 msgid "On branch " msgstr "Sur la branche " #: wt-status.c:1184 msgid "HEAD detached at " msgstr "HEAD détaché sur " #: wt-status.c:1186 msgid "HEAD detached from " msgstr "HEAD détaché depuis " #: wt-status.c:1189 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." #: wt-status.c:1206 msgid "Initial commit" msgstr "Validation initiale." #: wt-status.c:1220 msgid "Untracked files" msgstr "Fichiers non suivis" #: wt-status.c:1222 msgid "Ignored files" msgstr "Fichiers ignorés" #: wt-status.c:1226 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" "may speed it up, but you have to be careful not to forget to add\n" "new files yourself (see 'git help status')." msgstr "L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n" "peut l'accélerer, mais vous devez alors faire attention à ne pas\n" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help status')." #: wt-status.c:1232 #, c-format msgid "Untracked files not listed%s" msgstr "Les fichiers non suivis ne sont pas listés %s" #: wt-status.c:1234 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" #: wt-status.c:1240 msgid "No changes" msgstr "Aucune modification" #: wt-status.c:1245 #, 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 au commit (utilisez \"git add\" ou \"git commit -a\")\n" #: wt-status.c:1248 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification indexée\n" #: wt-status.c:1251 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "Aucune modification indexée mais des fichiers non suivis sont présents (utilisez \"git add\" pour les suivre)\n" #: wt-status.c:1254 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "Aucune modification indexée mais des fichiers non-suivis sont présents\n" #: wt-status.c:1257 #, 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 le suivre)\n" #: wt-status.c:1260 wt-status.c:1265 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" #: wt-status.c:1263 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" #: wt-status.c:1267 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" #: wt-status.c:1375 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" #: wt-status.c:1381 msgid "Initial commit on " msgstr "Validation initiale sur " #: wt-status.c:1396 msgid "behind " msgstr "derrière " #: wt-status.c:1399 wt-status.c:1402 msgid "ahead " msgstr "devant " #: wt-status.c:1404 msgid ", behind " msgstr ", derrière " #: compat/precompose_utf8.c:58 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "echec 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\n" "depuis un sous-répertoire du projet va changer dans Git 2.0. Cet usage\n" "est déconseillé.\n" "Pour ajouter du contenu pour tout le projet, 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" "Le comportement vis à vis des fichiers supprimés va changer dans Git 2.0.\n" "Les chemins tels que '%s' qui ont été retirés de votre copie de travail sont\n" "actuellement ignorés.\n" "\n" " 'git add --ignore-removal ', est l'option par défaut actuelle qui\n" " ignore les chemins que vous avez supprimé de votre copie de travail.\n" "\n" "* 'git add --all ' permet d'enregistrer aussi les suppressions.\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:233 msgid "updating files failed" msgstr "echec de la mise à jour des fichiers" #: builtin/add.c:163 #, c-format msgid "remove '%s'\n" msgstr "retrait de '%s'\n" #: builtin/add.c:253 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index" #: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" #: builtin/add.c:339 msgid "Could not read the index" msgstr "Impossible de lire l'index" #: builtin/add.c:349 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." #: builtin/add.c:353 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" #: builtin/add.c:358 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" #: builtin/add.c:360 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." #: builtin/add.c:366 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" #: builtin/add.c:376 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:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 #: builtin/rm.c:206 msgid "dry run" msgstr "à vide" #: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 #: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "mode verbeux" #: builtin/add.c:396 msgid "interactive picking" msgstr "sélection interactive" #: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 msgid "select hunks interactively" msgstr "sélection interactive des sections" #: builtin/add.c:398 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" #: builtin/add.c:399 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" #: builtin/add.c:400 msgid "update tracked files" msgstr "mise à jour des fichiers suivis" #: builtin/add.c:401 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" #: builtin/add.c:402 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non-suivis" #. takes no arguments #: builtin/add.c:405 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:407 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" #: builtin/add.c:408 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:409 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier à vide si des fichiers, même manquants, sont ignorés" #: builtin/add.c:431 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" #: builtin/add.c:432 msgid "no files added" msgstr "aucun fichier ajouté" #: builtin/add.c:438 msgid "adding files failed" msgstr "echec de l'ajout de fichiers" #: builtin/add.c:477 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" #: builtin/add.c:495 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:525 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Spécification vide, riien à ajouter.\n" #: builtin/add.c:526 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous voulez sûrement dire 'git add .' ?\n" #: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "fichier d'index corrompu" #: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 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 [option] [...]" #: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espaces non reconnue '%s'" #: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'espaces ignorés 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 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é 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 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 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 ligne %d" #: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount : ligne inattendue : %.*s" #: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans entête 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'entête de git diff lors de la suppression de %d composant de préfix de chemin (ligne %d)" msgstr[1] "information de nom de fichier manquante dans l'entête de git diff lors de la suppression de %d composants de préfix 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 effacé" #: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu 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 ligne %d" #: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible ligne %d" #: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "lecture du symlink %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 line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section #%d a réussi à la ligne %d (offset %d ligne)" msgstr[1] "La section #%d a réussi à la ligne %d (offset %d lignes)" #: builtin/apply.c:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" #: builtin/apply.c:2824 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "pendant la recherche de :\n" "%.*s" #: builtin/apply.c:2843 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" #: builtin/apply.c:2946 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" #: builtin/apply.c:2952 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s trouvé)" #: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s : %ld" #: builtin/apply.c:3095 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 #, c-format msgid "read of %s failed" msgstr "echec de la lecture de %s" #: builtin/apply.c:3173 builtin/apply.c:3395 #, c-format msgid "path %s has been renamed/deleted" msgstr "le fichier %s a été renommé/supprimé" #: builtin/apply.c:3254 builtin/apply.c:3409 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" #: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 #, c-format msgid "%s: %s" msgstr "%s : %s" #: builtin/apply.c:3263 builtin/apply.c:3417 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" #: builtin/apply.c:3365 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" #: builtin/apply.c:3434 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" #: builtin/apply.c:3436 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" #: builtin/apply.c:3537 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" #: builtin/apply.c:3540 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" #: builtin/apply.c:3560 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" #: builtin/apply.c:3565 #, 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" #: builtin/apply.c:3573 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" #: builtin/apply.c:3586 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." #: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "echec de make_cache_entry pour le chemin '%s'" #: builtin/apply.c:3822 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" #: builtin/apply.c:3850 #, c-format msgid "corrupt patch for subproject %s" msgstr "patch corrompu pour le sous-projet %s" #: builtin/apply.c:3854 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" #: builtin/apply.c:3859 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "création du magasin de sauvegard pour le fichier nouvellement créé %s impossible" #: builtin/apply.c:3862 builtin/apply.c:3970 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'entrée de cache %s impossible" #: builtin/apply.c:3895 #, c-format msgid "closing file '%s'" msgstr "fermeture du ficheir '%s'" #: builtin/apply.c:3944 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" #: builtin/apply.c:4031 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." #: builtin/apply.c:4039 msgid "internal error" msgstr "erreur interne" #. Say this even without --verbose #: builtin/apply.c:4042 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." #: builtin/apply.c:4052 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" #: builtin/apply.c:4073 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section no %d appliqué proprement." #: builtin/apply.c:4076 #, c-format msgid "Rejected hunk #%d." msgstr "Section no %d rejetée." #: builtin/apply.c:4226 msgid "unrecognized input" msgstr "entrée non reconnue" #: builtin/apply.c:4237 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" #: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 #: builtin/fetch.c:63 msgid "path" msgstr "chemin" #: builtin/apply.c:4357 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" #: builtin/apply.c:4360 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" #: builtin/apply.c:4362 msgid "num" msgstr "num" #: builtin/apply.c:4363 msgid "remove leading slashes from traditional diff paths" msgstr "supprimer barres obliques des chemins traditionnels de diff" #: builtin/apply.c:4366 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" #: builtin/apply.c:4368 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" #: builtin/apply.c:4372 msgid "show number of added and deleted lines in decimal notation" msgstr "afficher le nombre de lignes ajoutées et supprimées en notation décimale" #: builtin/apply.c:4374 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" #: builtin/apply.c:4376 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" #: builtin/apply.c:4378 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" #: builtin/apply.c:4380 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" #: builtin/apply.c:4382 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" #: builtin/apply.c:4384 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" #: builtin/apply.c:4386 msgid "build a temporary index based on embedded index information" msgstr "construire une index temporaire fondé sur l'information de l'index embarqué" #: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" #: builtin/apply.c:4391 msgid "ensure at least lines of context match" msgstr "s'assurer d'au moins lignes de correspondance de contexte" #: builtin/apply.c:4392 msgid "action" msgstr "action" #: builtin/apply.c:4393 msgid "detect new or modified lines that have whitespace errors" msgstr "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs d'espace" #: builtin/apply.c:4396 builtin/apply.c:4399 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espaces lors de la recherche de contexte" #: builtin/apply.c:4402 msgid "apply the patch in reverse" msgstr "appliquer le patch en inverse" #: builtin/apply.c:4404 msgid "don't expect at least one line of context" msgstr "accepter moins d'une ligne de contexte" #: builtin/apply.c:4406 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" #: builtin/apply.c:4408 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" #: builtin/apply.c:4411 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolérer faux positifs de retours chariot manquant en fin de fichier" #: builtin/apply.c:4414 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au comptes de lignes dans les entêtes de section" #: builtin/apply.c:4416 msgid "root" msgstr "racine" #: builtin/apply.c:4417 msgid "prepend to all filenames" msgstr "préfixer tous les noms de fichier avec " #: builtin/apply.c:4439 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" #: builtin/apply.c:4447 msgid "--index outside a repository" msgstr "--index hors d'une dépôt" #: builtin/apply.c:4450 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" #: builtin/apply.c:4466 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" #: builtin/apply.c:4480 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" #: builtin/apply.c:4486 builtin/apply.c:4496 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne ont ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" msgstr "création impossible du fichier d'archive '%s'" #: builtin/archive.c:20 msgid "could not redirect output" msgstr "impossible de rediriger la sortie" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" msgstr "git archive : Dépôt distant sans URL" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" msgstr "git archive : ACK/NACK attendu, EOF reçu" #: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "git archive : NACK %s" #: builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "erreur distante : %s" #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive : erreur de protocole" #: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect --helper --next-all [--no-checkout]" #: builtin/bisect--helper.c:17 msgid "perform 'git bisect next'" msgstr "effectuer 'git bisect next'" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" #: builtin/blame.c:25 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "git blame [options] [option de révision] [rev] [--] file" #: builtin/blame.c:30 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-opts] sont documentés dans git-rev-list(1)" #: builtin/blame.c:2355 msgid "Show blame entries as we find them, incrementally" msgstr "Montrer les entrée de blame au fur et à mesure de leur découverte, incrémentalement" #: builtin/blame.c:2356 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (défaut : désactivé)" #: builtin/blame.c:2357 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Ne pas traiter les commits racine comme des limites (défaut : désactivé)" #: builtin/blame.c:2358 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" #: builtin/blame.c:2359 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les entrées de blâme" #: builtin/blame.c:2360 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (défaut : auto)" #: builtin/blame.c:2361 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (défaut : désactivé)" #: builtin/blame.c:2362 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" #: builtin/blame.c:2363 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" #: builtin/blame.c:2364 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (défaut : désactivé)" #: builtin/blame.c:2365 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (défaut: désactivé)" #: builtin/blame.c:2366 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les SHA1 longs (defaut : désactivé)" #: builtin/blame.c:2367 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (défaut : désactivé)" #: builtin/blame.c:2368 msgid "Show author email instead of name (Default: off)" msgstr "Afficher l'e-mail de l'auteur au lieu du nom (défaut : désactivé)" #: builtin/blame.c:2369 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" #: builtin/blame.c:2370 msgid "Spend extra cycles to find better match" msgstr "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" #: builtin/blame.c:2371 msgid "Use revisions from instead of calling git-rev-list" msgstr "Utiliser les révisions du fichier au lieu d'appeler git-rev-list" #: builtin/blame.c:2372 msgid "Use 's contents as the final image" msgstr "Utiliser le contenu de comme image finale" #: builtin/blame.c:2373 builtin/blame.c:2374 msgid "score" msgstr "score" #: builtin/blame.c:2373 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" #: builtin/blame.c:2374 msgid "Find line movements within and across files" msgstr "Trouver les mouvements dans et entre les fichiers" #: builtin/blame.c:2375 msgid "n,m" msgstr "n,m" #: builtin/blame.c:2375 msgid "Process only line range n,m, counting from 1" msgstr "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" #: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "git branch [options] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 msgid "git branch [options] [-l] [-f] []" msgstr "git branch [options] [-l] [-f] []" #: builtin/branch.c:26 msgid "git branch [options] [-r] (-d | -D) ..." msgstr "git branch [options] [-r] (-d | -D) ..." #: builtin/branch.c:27 msgid "git branch [options] (-m | -M) [] " msgstr "git branch [options] (-m | -M) [] " #: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." #: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n" " '%s', mais dans HEAD." #: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" #: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "La branche '%s' n'est pas totalement fusionnée.\n" "Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'" #: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "Echec de la mise à jour du fichier config" #: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" #: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" #: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "Impossible d'effacer la branche '%s' qui est actuellement extraite" #: builtin/branch.c:240 #, c-format msgid "remote branch '%s' not found." msgstr "branche distante %s' non trouvée." #: builtin/branch.c:241 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." #: builtin/branch.c:255 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Erreur lors de la suppression de la branche distante '%s'" #: builtin/branch.c:256 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" #: builtin/branch.c:263 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Branche distante %s supprimée (précédemment %s)\n" #: builtin/branch.c:264 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s)\n" #: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" msgstr "la branche '%s' ne pointe pas sur un commit" #: builtin/branch.c:453 #, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" #: builtin/branch.c:455 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" #: builtin/branch.c:459 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" #: builtin/branch.c:461 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" #: builtin/branch.c:464 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s : en avance de %d, en retard de %d]" #: builtin/branch.c:467 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" #: builtin/branch.c:490 msgid " **** invalid ref ****" msgstr " **** référence invalide ****" #: builtin/branch.c:582 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" #: builtin/branch.c:585 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" #: builtin/branch.c:588 #, c-format msgid "(detached from %s)" msgstr "(détaché de %s)" #: builtin/branch.c:591 msgid "(no branch)" msgstr "(aucune branche)" #: builtin/branch.c:637 #, c-format msgid "object '%s' does not point to a commit" msgstr "l'objet '%s' ne pointe pas sur un commit" #: builtin/branch.c:669 msgid "some refs could not be read" msgstr "des références n'ont pas pu être lues" #: builtin/branch.c:682 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." #: builtin/branch.c:692 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" #: builtin/branch.c:707 msgid "Branch rename failed" msgstr "Echec de renommage de la branche" #: builtin/branch.c:711 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" #: builtin/branch.c:715 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée '%s', mais HEAD n'est pas mis à jour !" #: builtin/branch.c:722 msgid "Branch is renamed, but update of config-file failed" msgstr "La branche est renommée, mais echec de la mise à jour du fichier de config" #: builtin/branch.c:737 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" #: builtin/branch.c:761 #, c-format msgid "could not write branch description template: %s" msgstr "impossible d'écrire le modèle de description de branche : %s" #: builtin/branch.c:791 msgid "Generic options" msgstr "Options génériques" #: builtin/branch.c:793 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le condensé et le sujet, doublé pour la branche amont" #: builtin/branch.c:794 msgid "suppress informational messages" msgstr "supprimer les messages d'information" #: builtin/branch.c:795 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" #: builtin/branch.c:797 msgid "change upstream info" msgstr "modifier l'information amont" #: builtin/branch.c:801 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" #: builtin/branch.c:802 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distant" #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 #: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 msgid "commit" msgstr "valider" #: builtin/branch.c:806 builtin/branch.c:812 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" #: builtin/branch.c:818 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" #: builtin/branch.c:819 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" #: builtin/branch.c:821 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" #: builtin/branch.c:822 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" #: builtin/branch.c:823 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" #: builtin/branch.c:824 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" #: builtin/branch.c:825 msgid "list branch names" msgstr "afficher les noms des branches" #: builtin/branch.c:826 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" #: builtin/branch.c:828 msgid "edit the description for the branch" msgstr "éditer la description de la branche" #: builtin/branch.c:829 msgid "force creation (when already exists)" msgstr "forcer la création (même si la cible existe)" #: builtin/branch.c:832 msgid "print only not merged branches" msgstr "afficher seulement les branches non fusionnées" #: builtin/branch.c:838 msgid "print only merged branches" msgstr "afficher seulement les branches fusionnées" #: builtin/branch.c:842 msgid "list branches in columns" msgstr "afficher les branches en colonnes" #: builtin/branch.c:855 msgid "Failed to resolve HEAD as a valid ref." msgstr "Echec de résolution de HEAD comme référence valide." #: builtin/branch.c:860 builtin/clone.c:619 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvé sous refs/heads !" #: builtin/branch.c:883 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" #: builtin/branch.c:889 builtin/branch.c:928 msgid "branch name required" msgstr "nom de branche exigé" #: builtin/branch.c:904 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire HEAD détaché" #: builtin/branch.c:909 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" #: builtin/branch.c:916 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'" #: builtin/branch.c:919 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." #: builtin/branch.c:934 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" #: builtin/branch.c:939 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" #: builtin/branch.c:943 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur aucune branche." #: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990 #, c-format msgid "no such branch '%s'" msgstr "branche inexistante '%s'" #: builtin/branch.c:950 #, c-format msgid "branch '%s' does not exist" msgstr "branche inexistante '%s'" #: builtin/branch.c:962 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" #: builtin/branch.c:966 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 qu'elle ne pointe sur aucune branche." #: builtin/branch.c:972 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" #: builtin/branch.c:987 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a aucun sens" #: builtin/branch.c:993 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" #: builtin/branch.c:996 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --track ou --set-upstream-to\n" #: builtin/branch.c:1013 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\n" msgstr "\n" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" #: builtin/branch.c:1014 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" #: builtin/branch.c:1015 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch -set-upstream-to %s\n" #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" msgstr "%s convient\n" #: builtin/bundle.c:56 msgid "Need a repository to create a bundle." msgstr "La création d'un bundle requiert un dépôt." #: builtin/bundle.c:60 msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un bundle requiert un dépôt." #: builtin/cat-file.c:176 msgid "git cat-file (-t|-s|-e|-p||--textconv) " msgstr "git cat-file (-t|-s|-e|-p||--textconv) " #: builtin/cat-file.c:177 msgid "git cat-file (--batch|--batch-check) < " msgstr "git cat-file (--batch|--batch-check) < " #: builtin/cat-file.c:195 msgid " can be one of: blob, tree, commit, tag" msgstr " peut être : blob, tree, commit ou tag" #: builtin/cat-file.c:196 msgid "show object type" msgstr "afficher le type de l'objet" #: builtin/cat-file.c:197 msgid "show object size" msgstr "affichier la taille de l'objet" #: builtin/cat-file.c:199 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" #: builtin/cat-file.c:200 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" #: builtin/cat-file.c:202 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" #: builtin/cat-file.c:204 msgid "show info and content of objects fed from the standard input" msgstr "afficher l'information et le contenu des objets passé en entrée standard" #: builtin/cat-file.c:207 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | attr...] [--] pathname..." msgstr "git check-attr [-a | --all | attr...] [--] chemin..." #: builtin/check-attr.c:12 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < " msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < " #: builtin/check-attr.c:19 msgid "report all attributes set on file" msgstr "afficher tous les attributs associés au fichier" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" msgstr "utiliser .gitattributes seulement depuis l'index" #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" msgstr "lire les noms de fichier depuis stdin" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" msgstr "les chemins en entrée sont terminés par le caractère nul" #: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 msgid "suppress progress reporting" msgstr "supprimer le rapport de progrès" #: builtin/check-ignore.c:146 msgid "cannot specify pathnames with --stdin" msgstr "l'option --stdin et la spécification de chemin sont incompatibles" #: builtin/check-ignore.c:149 msgid "-z only makes sense with --stdin" msgstr "-z n'a de sens qu'avec l'option --stdin" #: builtin/check-ignore.c:151 msgid "no path specified" msgstr "aucun chemin spécifié" #: builtin/check-ignore.c:155 msgid "--quiet is only valid with a single pathname" msgstr "--quiet n'est valide qu'avec un seul chemin" #: builtin/check-ignore.c:157 msgid "cannot have both --quiet and --verbose" msgstr "les options --quiet et --verbose sont incompatibles" #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [...]" msgstr "git checkout-index [options] [--] [...]" #: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "extraire tous les fichiers présents dans l'index" #: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "forcer l'écrasement des fichiers existant" #: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "éliminer les alertes pour les fichiers existant et les fichiers absents de l'index" #: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "ne pas extraire les nouveaux fichiers" #: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "mettre à jour l'information de stat dans le fichier d'index" #: builtin/checkout-index.c:200 msgid "read list of paths from the standard input" msgstr "lire la liste des chemins depuis l'entrée standard" #: builtin/checkout-index.c:202 msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:203 builtin/column.c:30 msgid "string" msgstr "chaîne" #: builtin/checkout-index.c:204 msgid "when creating files, prepend " msgstr "lors de la création de fichiers, préfixer " #: builtin/checkout-index.c:207 msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" #: builtin/checkout.c:25 msgid "git checkout [options] " msgstr "git checkout [options] " #: builtin/checkout.c:26 msgid "git checkout [options] [] -- ..." msgstr "git checkout [options] [] -- ..." #: builtin/checkout.c:117 builtin/checkout.c:150 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" #: builtin/checkout.c:119 builtin/checkout.c:152 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" #: builtin/checkout.c:135 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" #: builtin/checkout.c:179 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" #: builtin/checkout.c:196 #, c-format msgid "path '%s': cannot merge" msgstr "impossible de fusionner le chemin '%s'" #: builtin/checkout.c:213 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" #: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243 #: builtin/checkout.c:246 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" #: builtin/checkout.c:249 builtin/checkout.c:252 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" #: builtin/checkout.c:255 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en même temps." #: builtin/checkout.c:266 builtin/checkout.c:458 msgid "corrupt index file" msgstr "fichier d'index corrompu" #: builtin/checkout.c:329 builtin/checkout.c:336 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" #: builtin/checkout.c:480 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" #: builtin/checkout.c:601 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Impossible de faire un reflog pour '%s'\n" #: builtin/checkout.c:634 msgid "HEAD is now at" msgstr "HEAD est maintenant sur " #: builtin/checkout.c:641 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" #: builtin/checkout.c:644 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" #: builtin/checkout.c:648 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" #: builtin/checkout.c:650 builtin/checkout.c:987 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" #: builtin/checkout.c:652 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" #: builtin/checkout.c:708 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" #. The singular version #: builtin/checkout.c:714 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgid_plural "" "Warning: you are leaving %d commits behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgstr[0] "Attention : vous laissez %d commit en retard, connectés à aucune de vos\n" "branches :\n" "\n" "%s\n" msgstr[1] "Attention : vous laissez %d commits en retard, connectés à aucune de vos\n" "branches :\n" "\n" "%s\n" #: builtin/checkout.c:732 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch new_branch_name %s\n" "\n" msgstr "Si vous souhaitez les garder en créant une nouvelle branches, c'est le bon moment avec :\n" "\n" "git branche nouvelle_branche %s\n" "\n" #: builtin/checkout.c:762 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" #: builtin/checkout.c:766 msgid "Previous HEAD position was" msgstr "Lo position précédente de HEAD était " #: builtin/checkout.c:793 builtin/checkout.c:982 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" #. case (1) #: builtin/checkout.c:918 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" #. case (1): want a tree #: builtin/checkout.c:957 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" #: builtin/checkout.c:996 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" #: builtin/checkout.c:999 builtin/checkout.c:1003 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "impossible d'utiliser '%s' avec un basculement de branches " #: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 #: builtin/checkout.c:1018 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "impossible d'utiliser '%s' avec '%s'" #: builtin/checkout.c:1023 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" #: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "branche" #: builtin/checkout.c:1046 msgid "create and checkout a new branch" msgstr "créer et extrait une nouvelle branche" #: builtin/checkout.c:1048 msgid "create/reset and checkout a branch" msgstr "créer/reinitialise et extrait une branche" #: builtin/checkout.c:1049 msgid "create reflog for new branch" msgstr "créer un refog pour une nouvelle branche" #: builtin/checkout.c:1050 msgid "detach the HEAD at named commit" msgstr "détacher le HEAD au commit nommé" #: builtin/checkout.c:1051 msgid "set upstream info for new branch" msgstr "paramètrer l'information de branche amont pour une nouvelle branche" #: builtin/checkout.c:1053 msgid "new branch" msgstr "nouvelle branche" #: builtin/checkout.c:1053 msgid "new unparented branch" msgstr "nouvelle branche sans parent" #: builtin/checkout.c:1054 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" #: builtin/checkout.c:1056 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" #: builtin/checkout.c:1058 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (écraser les modifications locales)" #: builtin/checkout.c:1059 msgid "perform a 3-way merge with the new branch" msgstr "réaliser une fusion à 3 points avec la nouvelle branche" #: builtin/checkout.c:1060 builtin/merge.c:217 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" #: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 msgid "style" msgstr "style" #: builtin/checkout.c:1062 msgid "conflict style (merge or diff3)" msgstr "style de conflit (fusion ou diff3)" #: builtin/checkout.c:1065 msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seules entrées creuses" #: builtin/checkout.c:1067 msgid "second guess 'git checkout no-such-branch'" msgstr "deuxième chance 'git checkout branche-inexistante'" #: builtin/checkout.c:1091 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" #: builtin/checkout.c:1108 msgid "--track needs a branch name" msgstr "un nom de branche est nécessaire pour --track" #: builtin/checkout.c:1115 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez avec -b" #: builtin/checkout.c:1150 msgid "invalid path specification" msgstr "spécification de chemin invalide" #: builtin/checkout.c:1157 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "Impossible e mettre à jour les chemins et de basculer sur la branche '%s' en même temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" #: builtin/checkout.c:1162 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach d'accepte pas un argument de chemin '%s'" #: builtin/checkout.c:1166 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "git checkout: --ours/--theirs, --force et --merge sont incompatible lors\n" "de l'extraction de l'index." #: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "git clean [-d] [-f] [-n] [-q] [-e ] [-x | -X] [--] ..." #: builtin/clean.c:24 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" #: builtin/clean.c:25 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" #: builtin/clean.c:26 #, c-format msgid "Skipping repository %s\n" msgstr "Dépôt %s ignoré\n" #: builtin/clean.c:27 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dépôt %s\n" #: builtin/clean.c:28 #, c-format msgid "failed to remove %s" msgstr "echec de la suppression de %s" #: builtin/clean.c:160 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" #: builtin/clean.c:162 msgid "force" msgstr "forcer" #: builtin/clean.c:164 msgid "remove whole directories" msgstr "supprimer des répertoires entiers" #: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 #: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" msgstr "expression" #: builtin/clean.c:166 msgid "add to ignore rules" msgstr "ajouter aux règles ignore" #: builtin/clean.c:167 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" #: builtin/clean.c:169 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" #: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "-x et -X sont mutuellement exclusifs" #: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "clean.requireForce positionné à true et ni -n ni -f fourni ; refus de nettoyer" #: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "clean.requireForce à true par défaut et ni -n ni -f fourni ; refus de nettoyer" #: builtin/clone.c:37 msgid "git clone [options] [--] []" msgstr "git clone [options] [--] []" #: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 #: builtin/push.c:436 msgid "force progress reporting" msgstr "forcer l'affichage du progrès" #: builtin/clone.c:67 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" #: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "créer un dépôt nu" #: builtin/clone.c:73 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" #: builtin/clone.c:75 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" #: builtin/clone.c:77 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, mais toujours copier" #: builtin/clone.c:79 msgid "setup as shared repository" msgstr "régler comme dépôt partager" #: builtin/clone.c:81 builtin/clone.c:83 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" #: builtin/clone.c:84 builtin/init-db.c:485 msgid "template-directory" msgstr "répertoire-modèle" #: builtin/clone.c:85 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" #: builtin/clone.c:87 msgid "reference repository" msgstr "dépôt de référence" #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" #: builtin/clone.c:89 msgid "use instead of 'origin' to track upstream" msgstr "utiliser au lieu de 'origin' pour traquer la branche amont" #: builtin/clone.c:91 msgid "checkout instead of the remote's HEAD" msgstr "extraire au lieu du HEAD du répertoire distant" #: builtin/clone.c:93 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" #: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 msgid "depth" msgstr "profondeur" #: builtin/clone.c:95 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" #: builtin/clone.c:97 msgid "clone only one branch, HEAD or --branch" msgstr "clonez seulement une branche, HEAD ou --branch" #: builtin/clone.c:98 builtin/init-db.c:494 msgid "gitdir" msgstr "gitdir" #: builtin/clone.c:99 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" #: builtin/clone.c:100 msgid "key=value" msgstr "clé=valeur" #: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" #: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local" #: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "echec de la création du répertoire '%s'" #: builtin/clone.c:319 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "echec du stat de '%s'" #: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" #: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "echec du stat de %s\n" #: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "echec de la création du lien '%s'" #: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "echec de la copie vers '%s'" #: builtin/clone.c:384 #, c-format msgid "done.\n" msgstr "fait.\n" #: builtin/clone.c:397 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "Le clone a réussi, mais l'extraction a échoué.\n" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer l'extraction avec 'git checkout -f HEAD'\n" #: builtin/clone.c:476 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." #: builtin/clone.c:550 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" #: builtin/clone.c:610 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "le HEAD distant réfère à une référence non existante, impossible de l'extraire.\n" #: builtin/clone.c:641 msgid "unable to checkout working tree" msgstr "incapable d'extraire la copie de travail" #: builtin/clone.c:749 msgid "Too many arguments." msgstr "Trop d'arguments" #: builtin/clone.c:753 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." #: builtin/clone.c:764 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles" #: builtin/clone.c:767 msgid "--bare and --separate-git-dir are incompatible." msgstr "les option --bare --separate-git-dir sont incompatibles." #: builtin/clone.c:780 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" #: builtin/clone.c:785 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth est ignoré dans les clones locaux : utilisez plutôt file://" #: builtin/clone.c:795 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." #: builtin/clone.c:805 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." #: builtin/clone.c:818 builtin/clone.c:830 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" #: builtin/clone.c:821 #, c-format msgid "could not create work tree dir '%s'." msgstr "impossible de créer le répertoire de la copie de travail '%s'" #: builtin/clone.c:840 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" #: builtin/clone.c:842 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'\n" #: builtin/clone.c:877 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner '%s'" #: builtin/clone.c:926 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" #: builtin/clone.c:933 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." #: builtin/column.c:9 msgid "git column [options]" msgstr "git column [options]" #: builtin/column.c:26 msgid "lookup config vars" msgstr "rechercher les variables de configuration" #: builtin/column.c:27 builtin/column.c:28 msgid "layout to use" msgstr "mise en page à utiliser" #: builtin/column.c:29 msgid "Maximum width" msgstr "Largeur maximale" #: builtin/column.c:30 msgid "Padding space on left border" msgstr "Tabulation sur le côté gauche" #: builtin/column.c:31 msgid "Padding space on right border" msgstr "Tabulation sur le côté droit" #: builtin/column.c:32 msgid "Padding space between columns" msgstr "Tabulation entre colonnes" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command doit être le premier argument" #: builtin/commit.c:34 msgid "git commit [options] [--] ..." msgstr "git commit [options] [--] ..." #: builtin/commit.c:39 msgid "git status [options] [--] ..." msgstr "git status [options] [--] ..." #: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" "You can suppress this message by setting them explicitly:\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" "After doing this, you may fix the identity used for this commit with:\n" "\n" " git commit --amend --reset-author\n" msgstr "Votre nom et votre adresse e-mail ont été configurés automatiquement en se fondant\n" "sur votre nom d'utilisateur et votre nom d'ordinateur. Veuillez vérifier qu'ils sont corrects.\n" "Vous pouvez supprimer ce message en les paramétrant explicitement :\n" "\n" " git config --global user.name \"Votre Nom\"\n" " git config --global user.email \"vous@exemple.com\n" "\n" "Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n" "\n" " git commit --amend --reset-author\n" #: builtin/commit.c:56 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "Vous avez demandé de corriger le commit le plus récent, mais le faire le rendrait\n" "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n" "supprimer complètement le commit avec \"git reset HEAD^\".\n" #: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" "\n" " git commit --allow-empty\n" "\n" "Otherwise, please use 'git reset'\n" msgstr "Le picorage précédent est à présent vide, vraisemblablement du à une résolution de conflit.\n" "Si vous souhaitez tout de même le valider, utilisez :\n" "\n" " git commit --allow-empty\n" "\n" "Sinon, utilisez 'git reset'\n" #: builtin/commit.c:260 msgid "failed to unpack HEAD tree object" msgstr "echec du dépaquetage de l'objet arbre HEAD" #: builtin/commit.c:302 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" #: builtin/commit.c:308 msgid "interactive add failed" msgstr "echec de l'ajout interactif" #: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" #: builtin/commit.c:393 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." #: builtin/commit.c:395 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." #: builtin/commit.c:405 msgid "cannot read the index" msgstr "impossible de lire l'index" #: builtin/commit.c:425 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" #: builtin/commit.c:513 builtin/commit.c:519 #, c-format msgid "invalid commit: %s" msgstr "commit invalide : %s" #: builtin/commit.c:542 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" #: builtin/commit.c:562 #, c-format msgid "Malformed ident string: '%s'" msgstr "chaîne ident mal formée : '%s'" #: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" #: builtin/commit.c:612 builtin/shortlog.c:270 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" #: builtin/commit.c:614 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" #: builtin/commit.c:618 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" #: builtin/commit.c:624 msgid "commit has empty message" msgstr "le commit a un message vide" #: builtin/commit.c:640 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" #: builtin/commit.c:644 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" #: builtin/commit.c:648 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" #: builtin/commit.c:709 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" #: builtin/commit.c:720 #, c-format msgid "" "\n" "It looks like you may be committing a merge.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "\n" "Il semble que vous validiez une fusion.\n" "Si ce n'est pas le cas, veuillez supprimer le fichier\n" "\t%s\n" "et essayez à nouveau.\n" #: builtin/commit.c:725 #, c-format msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "\n" "Il semble que vous validiez un picorage.\n" "Si ce n'est pas le cas, veuillez supprimer le fichier\n" "\t%s\n" "et essayez à nouveau.\n" #: builtin/commit.c:737 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "Veuillez saisir le message de validation pour vos modifications. Les lignes\n" "commençant par '%c' seront ignorées, et un message vide abandonne la\n" "validation.\n" #: builtin/commit.c:742 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "Veuillez saisir le message de validation pour vos modifications. Les lignes\n" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-\n" "même si vous le souhaitez. Un message vide abandonne la validation.\n" #: builtin/commit.c:755 #, c-format msgid "%sAuthor: %s" msgstr "%sAuteur : %s" #: builtin/commit.c:762 #, c-format msgid "%sCommitter: %s" msgstr "%s Validateur: %s" #: builtin/commit.c:782 msgid "Cannot read index" msgstr "Impossible de lire l'index" #: builtin/commit.c:819 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" #: builtin/commit.c:834 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" #: builtin/commit.c:931 #, c-format msgid "No existing author found with '%s'" msgstr "Aucun auteur existant trouvé avec '%s'" #: builtin/commit.c:946 builtin/commit.c:1140 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" #: builtin/commit.c:976 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation concurrente de --reset-author et --author n'a pas de sens" #: builtin/commit.c:987 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." #: builtin/commit.c:990 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." #: builtin/commit.c:992 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." #: builtin/commit.c:995 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup sont incompatibles" #: builtin/commit.c:1005 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." #: builtin/commit.c:1007 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." #: builtin/commit.c:1015 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." #: builtin/commit.c:1032 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Une seule option parmi --include/--only/--all/--interactive/--patch peut être utilisée." #: builtin/commit.c:1034 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." #: builtin/commit.c:1036 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier commit avec un index sale." #: builtin/commit.c:1038 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" #: builtin/commit.c:1048 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "" #: builtin/commit.c:1053 msgid "Paths with -a does not make sense." msgstr "" #: builtin/commit.c:1059 builtin/commit.c:1194 msgid "--long and -z are incompatible" msgstr "" #: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show status concisely" msgstr "" #: builtin/commit.c:1156 builtin/commit.c:1392 msgid "show branch information" msgstr "" #: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 msgid "machine-readable output" msgstr "" #: builtin/commit.c:1161 builtin/commit.c:1396 msgid "show status in long format (default)" msgstr "" #: builtin/commit.c:1164 builtin/commit.c:1399 msgid "terminate entries with NUL" msgstr "" #: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 #: builtin/fast-export.c:662 builtin/tag.c:459 msgid "mode" msgstr "" #: builtin/commit.c:1167 builtin/commit.c:1402 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" #: builtin/commit.c:1170 msgid "show ignored files" msgstr "" #: builtin/commit.c:1171 parse-options.h:151 msgid "when" msgstr "" #: builtin/commit.c:1172 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" #: builtin/commit.c:1174 msgid "list untracked files in columns" msgstr "" #: builtin/commit.c:1248 msgid "couldn't look up newly created commit" msgstr "" #: builtin/commit.c:1250 msgid "could not parse newly created commit" msgstr "" #: builtin/commit.c:1291 msgid "detached HEAD" msgstr "" #: builtin/commit.c:1293 msgid " (root-commit)" msgstr "" #: builtin/commit.c:1360 msgid "suppress summary after successful commit" msgstr "" #: builtin/commit.c:1361 msgid "show diff in commit message template" msgstr "" #: builtin/commit.c:1363 msgid "Commit message options" msgstr "" #: builtin/commit.c:1364 builtin/tag.c:457 msgid "read message from file" msgstr "" #: builtin/commit.c:1365 msgid "author" msgstr "" #: builtin/commit.c:1365 msgid "override author for commit" msgstr "" #: builtin/commit.c:1366 builtin/gc.c:178 msgid "date" msgstr "" #: builtin/commit.c:1366 msgid "override date for commit" msgstr "" #: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 #: builtin/notes.c:690 builtin/tag.c:455 msgid "message" msgstr "" #: builtin/commit.c:1367 msgid "commit message" msgstr "" #: builtin/commit.c:1368 msgid "reuse and edit message from specified commit" msgstr "" #: builtin/commit.c:1369 msgid "reuse message from specified commit" msgstr "" #: builtin/commit.c:1370 msgid "use autosquash formatted message to fixup specified commit" msgstr "" #: builtin/commit.c:1371 msgid "use autosquash formatted message to squash specified commit" msgstr "" #: builtin/commit.c:1372 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" #: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "" #: builtin/commit.c:1374 msgid "use specified template file" msgstr "" #: builtin/commit.c:1375 msgid "force edit of commit" msgstr "" #: builtin/commit.c:1376 msgid "default" msgstr "" #: builtin/commit.c:1376 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "" #: builtin/commit.c:1377 msgid "include status in commit message template" msgstr "" #: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 msgid "key id" msgstr "" #: builtin/commit.c:1379 builtin/merge.c:216 msgid "GPG sign commit" msgstr "" #. end commit message options #: builtin/commit.c:1382 msgid "Commit contents options" msgstr "" #: builtin/commit.c:1383 msgid "commit all changed files" msgstr "" #: builtin/commit.c:1384 msgid "add specified files to index for commit" msgstr "" #: builtin/commit.c:1385 msgid "interactively add files" msgstr "" #: builtin/commit.c:1386 msgid "interactively add changes" msgstr "" #: builtin/commit.c:1387 msgid "commit only specified files" msgstr "" #: builtin/commit.c:1388 msgid "bypass pre-commit hook" msgstr "" #: builtin/commit.c:1389 msgid "show what would be committed" msgstr "" #: builtin/commit.c:1400 msgid "amend previous commit" msgstr "" #: builtin/commit.c:1401 msgid "bypass post-rewrite hook" msgstr "" #: builtin/commit.c:1406 msgid "ok to record an empty change" msgstr "" #: builtin/commit.c:1409 msgid "ok to record a change with an empty message" msgstr "" #: builtin/commit.c:1441 msgid "could not parse HEAD commit" msgstr "" #: builtin/commit.c:1479 builtin/merge.c:510 #, c-format msgid "could not open '%s' for reading" msgstr "" #: builtin/commit.c:1486 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" #: builtin/commit.c:1493 msgid "could not read MERGE_MODE" msgstr "" #: builtin/commit.c:1512 #, c-format msgid "could not read commit message: %s" msgstr "" #: builtin/commit.c:1526 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" #: builtin/commit.c:1531 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" #: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 msgid "failed to write commit object" msgstr "" #: builtin/commit.c:1567 msgid "cannot lock HEAD ref" msgstr "" #: builtin/commit.c:1571 msgid "cannot update HEAD ref" msgstr "" #: builtin/commit.c:1582 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" #: builtin/config.c:7 msgid "git config [options]" msgstr "" #: builtin/config.c:51 msgid "Config file location" msgstr "" #: builtin/config.c:52 msgid "use global config file" msgstr "" #: builtin/config.c:53 msgid "use system config file" msgstr "" #: builtin/config.c:54 msgid "use repository config file" msgstr "" #: builtin/config.c:55 msgid "use given config file" msgstr "" #: builtin/config.c:56 msgid "Action" msgstr "" #: builtin/config.c:57 msgid "get value: name [value-regex]" msgstr "" #: builtin/config.c:58 msgid "get all values: key [value-regex]" msgstr "" #: builtin/config.c:59 msgid "get values for regexp: name-regex [value-regex]" msgstr "" #: builtin/config.c:60 msgid "replace all matching variables: name value [value_regex]" msgstr "" #: builtin/config.c:61 msgid "add a new variable: name value" msgstr "" #: builtin/config.c:62 msgid "remove a variable: name [value-regex]" msgstr "" #: builtin/config.c:63 msgid "remove all matches: name [value-regex]" msgstr "" #: builtin/config.c:64 msgid "rename section: old-name new-name" msgstr "" #: builtin/config.c:65 msgid "remove a section: name" msgstr "" #: builtin/config.c:66 msgid "list all" msgstr "" #: builtin/config.c:67 msgid "open an editor" msgstr "" #: builtin/config.c:68 builtin/config.c:69 msgid "slot" msgstr "" #: builtin/config.c:68 msgid "find the color configured: [default]" msgstr "" #: builtin/config.c:69 msgid "find the color setting: [stdout-is-tty]" msgstr "" #: builtin/config.c:70 msgid "Type" msgstr "" #: builtin/config.c:71 msgid "value is \"true\" or \"false\"" msgstr "" #: builtin/config.c:72 msgid "value is decimal number" msgstr "" #: builtin/config.c:73 msgid "value is --bool or --int" msgstr "" #: builtin/config.c:74 msgid "value is a path (file or directory name)" msgstr "" #: builtin/config.c:75 msgid "Other" msgstr "" #: builtin/config.c:76 msgid "terminate values with NUL byte" msgstr "" #: builtin/config.c:77 msgid "respect include directives on lookup" msgstr "" #: builtin/count-objects.c:82 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" #: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:15 msgid "git describe [options] *" msgstr "" #: builtin/describe.c:16 msgid "git describe [options] --dirty" msgstr "" #: builtin/describe.c:233 #, c-format msgid "annotated tag %s not available" msgstr "" #: builtin/describe.c:237 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" #: builtin/describe.c:239 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" #: builtin/describe.c:266 #, c-format msgid "Not a valid object name %s" msgstr "" #: builtin/describe.c:269 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" #: builtin/describe.c:286 #, c-format msgid "no tag exactly matches '%s'" msgstr "" #: builtin/describe.c:288 #, c-format msgid "searching to describe %s\n" msgstr "" #: builtin/describe.c:328 #, c-format msgid "finished search at %s\n" msgstr "" #: builtin/describe.c:352 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" #: builtin/describe.c:356 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" #: builtin/describe.c:377 #, c-format msgid "traversed %lu commits\n" msgstr "" #: builtin/describe.c:380 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" #: builtin/describe.c:402 msgid "find the tag that comes after the commit" msgstr "" #: builtin/describe.c:403 msgid "debug search strategy on stderr" msgstr "" #: builtin/describe.c:404 msgid "use any ref" msgstr "" #: builtin/describe.c:405 msgid "use any tag, even unannotated" msgstr "" #: builtin/describe.c:406 msgid "always use long format" msgstr "" #: builtin/describe.c:409 msgid "only output exact matches" msgstr "" #: builtin/describe.c:411 msgid "consider most recent tags (default: 10)" msgstr "" #: builtin/describe.c:413 msgid "only consider tags matching " msgstr "" #: builtin/describe.c:415 builtin/name-rev.c:238 msgid "show abbreviated commit object as fallback" msgstr "" #: builtin/describe.c:416 msgid "mark" msgstr "" #: builtin/describe.c:417 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" #: builtin/describe.c:435 msgid "--long is incompatible with --abbrev=0" msgstr "" #: builtin/describe.c:461 msgid "No names found, cannot describe anything." msgstr "" #: builtin/describe.c:481 msgid "--dirty is incompatible with committishes" msgstr "" #: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" #: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "" #: builtin/diff.c:305 msgid "Not a git repository" msgstr "" #: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "" #: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "" #: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" msgstr "" #: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "" #: builtin/fast-export.c:22 msgid "git fast-export [rev-list-opts]" msgstr "" #: builtin/fast-export.c:658 msgid "show progress after objects" msgstr "" #: builtin/fast-export.c:660 msgid "select handling of signed tags" msgstr "" #: builtin/fast-export.c:663 msgid "select handling of tags that tag filtered objects" msgstr "" #: builtin/fast-export.c:666 msgid "Dump marks to this file" msgstr "" #: builtin/fast-export.c:668 msgid "Import marks from this file" msgstr "" #: builtin/fast-export.c:670 msgid "Fake a tagger when tags lack one" msgstr "" #: builtin/fast-export.c:672 msgid "Output full tree for each commit" msgstr "" #: builtin/fast-export.c:674 msgid "Use the done feature to terminate the stream" msgstr "" #: builtin/fast-export.c:675 msgid "Skip output of blob data" msgstr "" #: builtin/fetch.c:20 msgid "git fetch [] [ [...]]" msgstr "" #: builtin/fetch.c:21 msgid "git fetch [] " msgstr "" #: builtin/fetch.c:22 msgid "git fetch --multiple [] [( | )...]" msgstr "" #: builtin/fetch.c:23 msgid "git fetch --all []" msgstr "" #: builtin/fetch.c:60 msgid "fetch from all remotes" msgstr "" #: builtin/fetch.c:62 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" #: builtin/fetch.c:64 msgid "path to upload pack on remote end" msgstr "" #: builtin/fetch.c:65 msgid "force overwrite of local branch" msgstr "" #: builtin/fetch.c:67 msgid "fetch from multiple remotes" msgstr "" #: builtin/fetch.c:69 msgid "fetch all tags and associated objects" msgstr "" #: builtin/fetch.c:71 msgid "do not fetch all tags (--no-tags)" msgstr "" #: builtin/fetch.c:73 msgid "prune remote-tracking branches no longer on remote" msgstr "" #: builtin/fetch.c:74 msgid "on-demand" msgstr "" #: builtin/fetch.c:75 msgid "control recursive fetching of submodules" msgstr "" #: builtin/fetch.c:79 msgid "keep downloaded pack" msgstr "" #: builtin/fetch.c:81 msgid "allow updating of HEAD ref" msgstr "" #: builtin/fetch.c:84 msgid "deepen history of shallow clone" msgstr "" #: builtin/fetch.c:86 msgid "convert to a complete repository" msgstr "" #: builtin/fetch.c:88 builtin/log.c:1130 msgid "dir" msgstr "" #: builtin/fetch.c:89 msgid "prepend this to submodule path output" msgstr "" #: builtin/fetch.c:92 msgid "default mode for recursion" msgstr "" #: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "" #: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "" #: builtin/fetch.c:262 msgid "[up to date]" msgstr "" #: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" #: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "" #: builtin/fetch.c:288 msgid "[tag update]" msgstr "" #: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr "" #: builtin/fetch.c:308 msgid "[new tag]" msgstr "" #: builtin/fetch.c:311 msgid "[new branch]" msgstr "" #: builtin/fetch.c:314 msgid "[new ref]" msgstr "" #: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "" #: builtin/fetch.c:359 msgid "forced update" msgstr "" #: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "" #: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir %s : %s\n" #: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" #: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "" #: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" #: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr "" #: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr "" #: builtin/fetch.c:560 msgid "[deleted]" msgstr "" #: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "" #: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" #: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "" #: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" #: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" #: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "" #: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" #: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" #: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "" #: builtin/fetch.c:981 msgid "--depth and --unshallow cannot be used together" msgstr "" #: builtin/fetch.c:983 msgid "--unshallow on a complete repository does not make sense" msgstr "" #: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "" #: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "" #: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "" #: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" #: builtin/fmt-merge-msg.c:13 msgid "git fmt-merge-msg [-m ] [--log[=]|--no-log] [--file ]" msgstr "" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 #: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" msgstr "" #: builtin/fmt-merge-msg.c:664 msgid "populate log with at most entries from shortlog" msgstr "" #: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "" #: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "" #: builtin/fmt-merge-msg.c:671 msgid "use as start of message" msgstr "" #: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "" #: builtin/for-each-ref.c:979 msgid "git for-each-ref [options] []" msgstr "" #: builtin/for-each-ref.c:994 msgid "quote placeholders suitably for shells" msgstr "" #: builtin/for-each-ref.c:996 msgid "quote placeholders suitably for perl" msgstr "" #: builtin/for-each-ref.c:998 msgid "quote placeholders suitably for python" msgstr "" #: builtin/for-each-ref.c:1000 msgid "quote placeholders suitably for tcl" msgstr "" #: builtin/for-each-ref.c:1003 msgid "show only matched refs" msgstr "" #: builtin/for-each-ref.c:1004 msgid "format" msgstr "" #: builtin/for-each-ref.c:1004 msgid "format to use for the output" msgstr "" #: builtin/for-each-ref.c:1005 msgid "key" msgstr "" #: builtin/for-each-ref.c:1006 msgid "field name to sort on" msgstr "" #: builtin/fsck.c:608 msgid "git fsck [options] [...]" msgstr "" #: builtin/fsck.c:614 msgid "show unreachable objects" msgstr "" #: builtin/fsck.c:615 msgid "show dangling objects" msgstr "" #: builtin/fsck.c:616 msgid "report tags" msgstr "" #: builtin/fsck.c:617 msgid "report root nodes" msgstr "" #: builtin/fsck.c:618 msgid "make index objects head nodes" msgstr "" #: builtin/fsck.c:619 msgid "make reflogs head nodes (default)" msgstr "" #: builtin/fsck.c:620 msgid "also consider packs and alternate objects" msgstr "" #: builtin/fsck.c:621 msgid "enable more strict checking" msgstr "" #: builtin/fsck.c:623 msgid "write dangling objects in .git/lost-found" msgstr "" #: builtin/fsck.c:624 builtin/prune.c:134 msgid "show progress" msgstr "" #: builtin/gc.c:22 msgid "git gc [options]" msgstr "" #: builtin/gc.c:63 #, c-format msgid "Invalid %s: '%s'" msgstr "" #: builtin/gc.c:90 #, c-format msgid "insanely long object directory %.*s" msgstr "" #: builtin/gc.c:179 msgid "prune unreferenced objects" msgstr "" #: builtin/gc.c:181 msgid "be more thorough (increased runtime)" msgstr "" #: builtin/gc.c:182 msgid "enable auto-gc mode" msgstr "" #: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" #: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" #: builtin/grep.c:22 msgid "git grep [options] [-e] [...] [[--] ...]" msgstr "" #: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "" #: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "" #: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "" #: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "" #: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" #: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "" #: builtin/grep.c:643 msgid "search in index instead of in the work tree" msgstr "" #: builtin/grep.c:645 msgid "find in contents not managed by git" msgstr "" #: builtin/grep.c:647 msgid "search in both tracked and untracked files" msgstr "" #: builtin/grep.c:649 msgid "search also in ignored files" msgstr "" #: builtin/grep.c:652 msgid "show non-matching lines" msgstr "" #: builtin/grep.c:654 msgid "case insensitive matching" msgstr "" #: builtin/grep.c:656 msgid "match patterns only at word boundaries" msgstr "" #: builtin/grep.c:658 msgid "process binary files as text" msgstr "" #: builtin/grep.c:660 msgid "don't match patterns in binary files" msgstr "" #: builtin/grep.c:663 msgid "descend at most levels" msgstr "" #: builtin/grep.c:667 msgid "use extended POSIX regular expressions" msgstr "" #: builtin/grep.c:670 msgid "use basic POSIX regular expressions (default)" msgstr "" #: builtin/grep.c:673 msgid "interpret patterns as fixed strings" msgstr "" #: builtin/grep.c:676 msgid "use Perl-compatible regular expressions" msgstr "" #: builtin/grep.c:679 msgid "show line numbers" msgstr "" #: builtin/grep.c:680 msgid "don't show filenames" msgstr "" #: builtin/grep.c:681 msgid "show filenames" msgstr "" #: builtin/grep.c:683 msgid "show filenames relative to top directory" msgstr "" #: builtin/grep.c:685 msgid "show only filenames instead of matching lines" msgstr "" #: builtin/grep.c:687 msgid "synonym for --files-with-matches" msgstr "" #: builtin/grep.c:690 msgid "show only the names of files without match" msgstr "" #: builtin/grep.c:692 msgid "print NUL after filenames" msgstr "" #: builtin/grep.c:694 msgid "show the number of matches instead of matching lines" msgstr "" #: builtin/grep.c:695 msgid "highlight matches" msgstr "" #: builtin/grep.c:697 msgid "print empty line between matches from different files" msgstr "" #: builtin/grep.c:699 msgid "show filename only once above matches from same file" msgstr "" #: builtin/grep.c:702 msgid "show context lines before and after matches" msgstr "" #: builtin/grep.c:705 msgid "show context lines before matches" msgstr "" #: builtin/grep.c:707 msgid "show context lines after matches" msgstr "" #: builtin/grep.c:708 msgid "shortcut for -C NUM" msgstr "" #: builtin/grep.c:711 msgid "show a line with the function name before matches" msgstr "" #: builtin/grep.c:713 msgid "show the surrounding function" msgstr "" #: builtin/grep.c:716 msgid "read patterns from file" msgstr "" #: builtin/grep.c:718 msgid "match " msgstr "" #: builtin/grep.c:720 msgid "combine patterns specified with -e" msgstr "" #: builtin/grep.c:732 msgid "indicate hit with exit status without output" msgstr "" #: builtin/grep.c:734 msgid "show only matches from files that match all patterns" msgstr "" #: builtin/grep.c:736 msgid "show parse tree for grep expression" msgstr "" #: builtin/grep.c:740 msgid "pager" msgstr "" #: builtin/grep.c:740 msgid "show matching files in the pager" msgstr "" #: builtin/grep.c:743 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" #: builtin/grep.c:744 builtin/show-ref.c:184 msgid "show usage" msgstr "" #: builtin/grep.c:811 msgid "no pattern given." msgstr "" #: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "" #: builtin/grep.c:889 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" #: builtin/grep.c:894 msgid "--no-index or --untracked cannot be used with revs." msgstr "" #: builtin/grep.c:897 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" #: builtin/grep.c:905 msgid "both --cached and trees are given." msgstr "" #: builtin/hash-object.c:60 msgid "" "git hash-object [-t ] [-w] [--path=|--no-filters] [--stdin] [--] " "..." msgstr "" #: builtin/hash-object.c:61 msgid "git hash-object --stdin-paths < " msgstr "" #: builtin/hash-object.c:72 msgid "type" msgstr "" #: builtin/hash-object.c:72 msgid "object type" msgstr "" #: builtin/hash-object.c:73 msgid "write the object into the object database" msgstr "" #: builtin/hash-object.c:74 msgid "read the object from stdin" msgstr "" #: builtin/hash-object.c:76 msgid "store file as is without filters" msgstr "" #: builtin/hash-object.c:77 msgid "process file as it were from this path" msgstr "" #: builtin/help.c:43 msgid "print all available commands" msgstr "" #: builtin/help.c:44 msgid "print list of useful guides" msgstr "" #: builtin/help.c:45 msgid "show man page" msgstr "" #: builtin/help.c:46 msgid "show manual in web browser" msgstr "" #: builtin/help.c:48 msgid "show info page" msgstr "" #: builtin/help.c:54 msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "" #: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "" #: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "" #: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "" #: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" #: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 #, c-format msgid "failed to exec '%s': %s" msgstr "" #: builtin/help.c:218 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" #: builtin/help.c:230 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" #: builtin/help.c:351 #, c-format msgid "'%s': unknown man viewer." msgstr "" #: builtin/help.c:368 msgid "no man viewer handled the request" msgstr "" #: builtin/help.c:376 msgid "no info viewer handled the request" msgstr "" #: builtin/help.c:422 msgid "Defining attributes per path" msgstr "" #: builtin/help.c:423 msgid "A Git glossary" msgstr "" #: builtin/help.c:424 msgid "Specifies intentionally untracked files to ignore" msgstr "" #: builtin/help.c:425 msgid "Defining submodule properties" msgstr "" #: builtin/help.c:426 msgid "Specifying revisions and ranges for Git" msgstr "" #: builtin/help.c:427 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" #: builtin/help.c:428 msgid "An overview of recommended workflows with Git" msgstr "" #: builtin/help.c:440 msgid "The common Git guides are:\n" msgstr "" #: builtin/help.c:462 builtin/help.c:478 #, c-format msgid "usage: %s%s" msgstr "" #: builtin/help.c:494 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" #: builtin/index-pack.c:182 #, c-format msgid "object type mismatch at %s" msgstr "" #: builtin/index-pack.c:202 msgid "object of unexpected type" msgstr "" #: builtin/index-pack.c:239 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:249 msgid "early EOF" msgstr "" #: builtin/index-pack.c:250 msgid "read error on input" msgstr "" #: builtin/index-pack.c:262 msgid "used more bytes than were available" msgstr "" #: builtin/index-pack.c:269 msgid "pack too large for current definition of off_t" msgstr "" #: builtin/index-pack.c:285 #, c-format msgid "unable to create '%s'" msgstr "" #: builtin/index-pack.c:290 #, c-format msgid "cannot open packfile '%s'" msgstr "" #: builtin/index-pack.c:304 msgid "pack signature mismatch" msgstr "" #: builtin/index-pack.c:306 #, c-format msgid "pack version % unsupported" msgstr "" #: builtin/index-pack.c:324 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" #: builtin/index-pack.c:446 #, c-format msgid "inflate returned %d" msgstr "" #: builtin/index-pack.c:495 msgid "offset value overflow for delta base object" msgstr "" #: builtin/index-pack.c:503 msgid "delta base offset is out of bound" msgstr "" #: builtin/index-pack.c:511 #, c-format msgid "unknown object type %d" msgstr "" #: builtin/index-pack.c:542 msgid "cannot pread pack file" msgstr "" #: builtin/index-pack.c:544 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:570 msgid "serious inflate inconsistency" msgstr "" #: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 #: builtin/index-pack.c:724 builtin/index-pack.c:733 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" #: builtin/index-pack.c:664 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "" #: builtin/index-pack.c:730 #, c-format msgid "cannot read existing object %s" msgstr "" #: builtin/index-pack.c:744 #, c-format msgid "invalid blob object %s" msgstr "" #: builtin/index-pack.c:759 #, c-format msgid "invalid %s" msgstr "" #: builtin/index-pack.c:761 msgid "Error in object" msgstr "" #: builtin/index-pack.c:763 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" #: builtin/index-pack.c:833 builtin/index-pack.c:863 msgid "failed to apply delta" msgstr "" #: builtin/index-pack.c:1004 msgid "Receiving objects" msgstr "" #: builtin/index-pack.c:1004 msgid "Indexing objects" msgstr "" #: builtin/index-pack.c:1030 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" #: builtin/index-pack.c:1035 msgid "cannot fstat packfile" msgstr "" #: builtin/index-pack.c:1038 msgid "pack has junk at the end" msgstr "" #: builtin/index-pack.c:1049 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" #: builtin/index-pack.c:1072 msgid "Resolving deltas" msgstr "" #: builtin/index-pack.c:1082 #, c-format msgid "unable to create thread: %s" msgstr "" #: builtin/index-pack.c:1124 msgid "confusion beyond insanity" msgstr "" #: builtin/index-pack.c:1132 #, c-format msgid "completed with %d local objects" msgstr "" #: builtin/index-pack.c:1142 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" #: builtin/index-pack.c:1146 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:1171 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" #: builtin/index-pack.c:1250 #, c-format msgid "local object %s is corrupt" msgstr "" #: builtin/index-pack.c:1274 msgid "error while closing pack file" msgstr "" #: builtin/index-pack.c:1287 #, c-format msgid "cannot write keep file '%s'" msgstr "" #: builtin/index-pack.c:1295 #, c-format msgid "cannot close written keep file '%s'" msgstr "" #: builtin/index-pack.c:1308 msgid "cannot store pack file" msgstr "" #: builtin/index-pack.c:1319 msgid "cannot store index file" msgstr "" #: builtin/index-pack.c:1352 #, c-format msgid "bad pack.indexversion=%" msgstr "" #: builtin/index-pack.c:1358 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" #: builtin/index-pack.c:1362 builtin/index-pack.c:1535 #, c-format msgid "no threads support, ignoring %s" msgstr "" #: builtin/index-pack.c:1420 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" #: builtin/index-pack.c:1422 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" #: builtin/index-pack.c:1469 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:1476 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" #: builtin/index-pack.c:1503 msgid "Cannot come back to cwd" msgstr "" #: builtin/index-pack.c:1547 builtin/index-pack.c:1550 #: builtin/index-pack.c:1562 builtin/index-pack.c:1566 #, c-format msgid "bad %s" msgstr "" #: builtin/index-pack.c:1580 msgid "--fix-thin cannot be used without --stdin" msgstr "" #: builtin/index-pack.c:1584 builtin/index-pack.c:1594 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" #: builtin/index-pack.c:1603 msgid "--verify with no packfile name given" msgstr "" #: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" msgstr "" #: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" msgstr "" #: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" msgstr "" #: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "" #: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "" #: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" msgstr "" #: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" msgstr "" #: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" #: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" #: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "" #: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" msgstr "" #: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "" #: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" #: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" msgstr "" #: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s existe déjà" #: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "" #: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "" #: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "" #. #. * TRANSLATORS: The first '%s' is either "Reinitialized #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. #: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Dépôt git dans %s%s\n" #: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "" #: builtin/init-db.c:421 msgid "Initialized empty" msgstr "" #: builtin/init-db.c:422 msgid " shared" msgstr "" #: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "" #: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] [directory]" msgstr "" #: builtin/init-db.c:490 msgid "permissions" msgstr "" #: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" msgstr "" #: builtin/init-db.c:493 builtin/prune-packed.c:77 msgid "be quiet" msgstr "" #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "" #: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "" #: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" #: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "" #: builtin/init-db.c:586 #, c-format msgid "Cannot access work tree '%s'" msgstr "" #: builtin/log.c:40 msgid "git log [] [] [[--] ...]\n" msgstr "" #: builtin/log.c:41 msgid " or: git show [options] ..." msgstr "" #: builtin/log.c:103 msgid "suppress diff output" msgstr "" #: builtin/log.c:104 msgid "show source" msgstr "" #: builtin/log.c:105 msgid "Use mail map file" msgstr "" #: builtin/log.c:106 msgid "decorate options" msgstr "" #: builtin/log.c:199 #, c-format msgid "Final output: %d %s\n" msgstr "" #: builtin/log.c:422 builtin/log.c:514 #, c-format msgid "Could not read object %s" msgstr "" #: builtin/log.c:538 #, c-format msgid "Unknown type: %d" msgstr "" #: builtin/log.c:638 msgid "format.headers without value" msgstr "" #: builtin/log.c:720 msgid "name of output directory is too long" msgstr "" #: builtin/log.c:736 #, c-format msgid "Cannot open patch file %s" msgstr "" #: builtin/log.c:750 msgid "Need exactly one range." msgstr "" #: builtin/log.c:758 msgid "Not a range." msgstr "" #: builtin/log.c:860 msgid "Cover letter needs email format" msgstr "" #: builtin/log.c:936 #, c-format msgid "insane in-reply-to: %s" msgstr "" #: builtin/log.c:964 msgid "git format-patch [options] [ | ]" msgstr "" #: builtin/log.c:1009 msgid "Two output directories?" msgstr "" #: builtin/log.c:1108 msgid "use [PATCH n/m] even with a single patch" msgstr "" #: builtin/log.c:1111 msgid "use [PATCH] even with multiple patches" msgstr "" #: builtin/log.c:1115 msgid "print patches to standard out" msgstr "" #: builtin/log.c:1117 msgid "generate a cover letter" msgstr "" #: builtin/log.c:1119 msgid "use simple number sequence for output file names" msgstr "" #: builtin/log.c:1120 msgid "sfx" msgstr "" #: builtin/log.c:1121 msgid "use instead of '.patch'" msgstr "" #: builtin/log.c:1123 msgid "start numbering patches at instead of 1" msgstr "" #: builtin/log.c:1125 msgid "mark the series as Nth re-roll" msgstr "" #: builtin/log.c:1127 msgid "Use [] instead of [PATCH]" msgstr "" #: builtin/log.c:1130 msgid "store resulting files in " msgstr "" #: builtin/log.c:1133 msgid "don't strip/add [PATCH]" msgstr "" #: builtin/log.c:1136 msgid "don't output binary diffs" msgstr "" #: builtin/log.c:1138 msgid "don't include a patch matching a commit upstream" msgstr "" #: builtin/log.c:1140 msgid "show patch format instead of default (patch + stat)" msgstr "" #: builtin/log.c:1142 msgid "Messaging" msgstr "" #: builtin/log.c:1143 msgid "header" msgstr "" #: builtin/log.c:1144 msgid "add email header" msgstr "" #: builtin/log.c:1145 builtin/log.c:1147 msgid "email" msgstr "" #: builtin/log.c:1145 msgid "add To: header" msgstr "" #: builtin/log.c:1147 msgid "add Cc: header" msgstr "" #: builtin/log.c:1149 msgid "message-id" msgstr "" #: builtin/log.c:1150 msgid "make first mail a reply to " msgstr "" #: builtin/log.c:1151 builtin/log.c:1154 msgid "boundary" msgstr "" #: builtin/log.c:1152 msgid "attach the patch" msgstr "" #: builtin/log.c:1155 msgid "inline the patch" msgstr "" #: builtin/log.c:1159 msgid "enable message threading, styles: shallow, deep" msgstr "" #: builtin/log.c:1161 msgid "signature" msgstr "" #: builtin/log.c:1162 msgid "add a signature" msgstr "" #: builtin/log.c:1164 msgid "don't print the patch filenames" msgstr "" #: builtin/log.c:1248 msgid "-n and -k are mutually exclusive." msgstr "" #: builtin/log.c:1250 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" #: builtin/log.c:1258 msgid "--name-only does not make sense" msgstr "" #: builtin/log.c:1260 msgid "--name-status does not make sense" msgstr "" #: builtin/log.c:1262 msgid "--check does not make sense" msgstr "" #: builtin/log.c:1285 msgid "standard output, or directory, which one?" msgstr "" #: builtin/log.c:1287 #, c-format msgid "Could not create directory '%s'" msgstr "" #: builtin/log.c:1435 msgid "Failed to create output files" msgstr "" #: builtin/log.c:1484 msgid "git cherry [-v] [ [ []]]" msgstr "" #: builtin/log.c:1539 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" #: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 #, c-format msgid "Unknown commit %s" msgstr "" #: builtin/ls-files.c:402 msgid "git ls-files [options] [...]" msgstr "" #: builtin/ls-files.c:459 msgid "identify the file status with tags" msgstr "" #: builtin/ls-files.c:461 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" #: builtin/ls-files.c:463 msgid "show cached files in the output (default)" msgstr "" #: builtin/ls-files.c:465 msgid "show deleted files in the output" msgstr "" #: builtin/ls-files.c:467 msgid "show modified files in the output" msgstr "" #: builtin/ls-files.c:469 msgid "show other files in the output" msgstr "" #: builtin/ls-files.c:471 msgid "show ignored files in the output" msgstr "" #: builtin/ls-files.c:474 msgid "show staged contents' object name in the output" msgstr "" #: builtin/ls-files.c:476 msgid "show files on the filesystem that need to be removed" msgstr "" #: builtin/ls-files.c:478 msgid "show 'other' directories' name only" msgstr "" #: builtin/ls-files.c:481 msgid "don't show empty directories" msgstr "" #: builtin/ls-files.c:484 msgid "show unmerged files in the output" msgstr "" #: builtin/ls-files.c:486 msgid "show resolve-undo information" msgstr "" #: builtin/ls-files.c:488 msgid "skip files matching pattern" msgstr "" #: builtin/ls-files.c:491 msgid "exclude patterns are read from " msgstr "" #: builtin/ls-files.c:494 msgid "read additional per-directory exclude patterns in " msgstr "" #: builtin/ls-files.c:496 msgid "add the standard git exclusions" msgstr "" #: builtin/ls-files.c:499 msgid "make the output relative to the project top directory" msgstr "" #: builtin/ls-files.c:502 msgid "if any is not in the index, treat this as an error" msgstr "" #: builtin/ls-files.c:503 msgid "tree-ish" msgstr "" #: builtin/ls-files.c:504 msgid "pretend that paths removed since are still present" msgstr "" #: builtin/ls-files.c:506 msgid "show debugging data" msgstr "" #: builtin/ls-tree.c:27 msgid "git ls-tree [] [...]" msgstr "" #: builtin/ls-tree.c:125 msgid "only show trees" msgstr "" #: builtin/ls-tree.c:127 msgid "recurse into subtrees" msgstr "" #: builtin/ls-tree.c:129 msgid "show trees when recursing" msgstr "" #: builtin/ls-tree.c:132 msgid "terminate entries with NUL byte" msgstr "" #: builtin/ls-tree.c:133 msgid "include object size" msgstr "" #: builtin/ls-tree.c:135 builtin/ls-tree.c:137 msgid "list only filenames" msgstr "" #: builtin/ls-tree.c:140 msgid "use full path names" msgstr "" #: builtin/ls-tree.c:142 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" #: builtin/merge.c:43 msgid "git merge [options] [...]" msgstr "" #: builtin/merge.c:44 msgid "git merge [options] HEAD " msgstr "" #: builtin/merge.c:45 msgid "git merge --abort" msgstr "" #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "" #: builtin/merge.c:127 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" #: builtin/merge.c:128 #, c-format msgid "Available strategies are:" msgstr "" #: builtin/merge.c:133 #, c-format msgid "Available custom strategies are:" msgstr "" #: builtin/merge.c:183 msgid "do not show a diffstat at the end of the merge" msgstr "" #: builtin/merge.c:186 msgid "show a diffstat at the end of the merge" msgstr "" #: builtin/merge.c:187 msgid "(synonym to --stat)" msgstr "" #: builtin/merge.c:189 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" #: builtin/merge.c:192 msgid "create a single commit instead of doing a merge" msgstr "" #: builtin/merge.c:194 msgid "perform a commit if the merge succeeds (default)" msgstr "" #: builtin/merge.c:196 msgid "edit message before committing" msgstr "" #: builtin/merge.c:198 msgid "allow fast-forward (default)" msgstr "" #: builtin/merge.c:200 msgid "abort if fast-forward is not possible" msgstr "" #: builtin/merge.c:203 msgid "Verify that the named commit has a valid GPG signature" msgstr "" #: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" msgstr "" #: builtin/merge.c:205 msgid "merge strategy to use" msgstr "" #: builtin/merge.c:206 msgid "option=value" msgstr "" #: builtin/merge.c:207 msgid "option for selected merge strategy" msgstr "" #: builtin/merge.c:209 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" #: builtin/merge.c:213 msgid "abort the current in-progress merge" msgstr "" #: builtin/merge.c:242 msgid "could not run stash." msgstr "" #: builtin/merge.c:247 msgid "stash failed" msgstr "" #: builtin/merge.c:252 #, c-format msgid "not a valid object: %s" msgstr "" #: builtin/merge.c:271 builtin/merge.c:288 msgid "read-tree failed" msgstr "" #: builtin/merge.c:318 msgid " (nothing to squash)" msgstr " (rien à compresser)" #: builtin/merge.c:331 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" #: builtin/merge.c:363 msgid "Writing SQUASH_MSG" msgstr "" #: builtin/merge.c:365 msgid "Finishing SQUASH_MSG" msgstr "" #: builtin/merge.c:388 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" #: builtin/merge.c:438 #, c-format msgid "'%s' does not point to a commit" msgstr "" #: builtin/merge.c:550 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" #: builtin/merge.c:643 msgid "git write-tree failed to write a tree" msgstr "" #: builtin/merge.c:671 msgid "Not handling anything other than two heads merge." msgstr "" #: builtin/merge.c:685 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" #: builtin/merge.c:699 #, c-format msgid "unable to write %s" msgstr "" #: builtin/merge.c:788 #, c-format msgid "Could not read from '%s'" msgstr "" #: builtin/merge.c:797 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" #: builtin/merge.c:803 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" #: builtin/merge.c:827 msgid "Empty commit message." msgstr "" #: builtin/merge.c:839 #, c-format msgid "Wonderful.\n" msgstr "" #: builtin/merge.c:904 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" #: builtin/merge.c:920 #, c-format msgid "'%s' is not a commit" msgstr "" #: builtin/merge.c:961 msgid "No current branch." msgstr "" #: builtin/merge.c:963 msgid "No remote for the current branch." msgstr "" #: builtin/merge.c:965 msgid "No default upstream defined for the current branch." msgstr "" #: builtin/merge.c:970 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "" #: builtin/merge.c:1057 builtin/merge.c:1214 #, c-format msgid "%s - not something we can merge" msgstr "" #: builtin/merge.c:1125 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" #: builtin/merge.c:1141 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" #: builtin/merge.c:1144 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" #: builtin/merge.c:1148 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" #: builtin/merge.c:1151 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" #: builtin/merge.c:1160 msgid "You cannot combine --squash with --no-ff." msgstr "" #: builtin/merge.c:1165 msgid "You cannot combine --no-ff with --ff-only." msgstr "" #: builtin/merge.c:1172 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" #: builtin/merge.c:1204 msgid "Can merge only exactly one commit into empty head" msgstr "" #: builtin/merge.c:1207 msgid "Squash commit into empty head not supported yet" msgstr "" #: builtin/merge.c:1209 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" #: builtin/merge.c:1265 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" #: builtin/merge.c:1268 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" #. 'N' #: builtin/merge.c:1271 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" #: builtin/merge.c:1274 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" #: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "" #: builtin/merge.c:1397 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" #: builtin/merge.c:1404 #, c-format msgid "Nope.\n" msgstr "" #: builtin/merge.c:1436 msgid "Not possible to fast-forward, aborting." msgstr "" #: builtin/merge.c:1459 builtin/merge.c:1538 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" #: builtin/merge.c:1463 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" #: builtin/merge.c:1529 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" #: builtin/merge.c:1531 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" #: builtin/merge.c:1540 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" #: builtin/merge.c:1552 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" #: builtin/merge-base.c:26 msgid "git merge-base [-a|--all] ..." msgstr "" #: builtin/merge-base.c:27 msgid "git merge-base [-a|--all] --octopus ..." msgstr "" #: builtin/merge-base.c:28 msgid "git merge-base --independent ..." msgstr "" #: builtin/merge-base.c:29 msgid "git merge-base --is-ancestor " msgstr "" #: builtin/merge-base.c:98 msgid "output all common ancestors" msgstr "" #: builtin/merge-base.c:99 msgid "find ancestors for a single n-way merge" msgstr "" #: builtin/merge-base.c:100 msgid "list revs not reachable from others" msgstr "" #: builtin/merge-base.c:102 msgid "is the first one ancestor of the other?" msgstr "" #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " "file2" msgstr "" #: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" msgstr "" #: builtin/mktree.c:67 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" #: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "" #: builtin/mktree.c:154 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "" #: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "" #: builtin/mv.c:14 msgid "git mv [options] ... " msgstr "" #: builtin/mv.c:64 msgid "force move/rename even if target exists" msgstr "" #: builtin/mv.c:65 msgid "skip move/rename errors" msgstr "" #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" #: builtin/mv.c:112 msgid "bad source" msgstr "" #: builtin/mv.c:115 msgid "can not move directory into itself" msgstr "" #: builtin/mv.c:118 msgid "cannot move directory over file" msgstr "" #: builtin/mv.c:128 #, c-format msgid "Huh? %.*s is in index?" msgstr "" #: builtin/mv.c:140 msgid "source directory is empty" msgstr "" #: builtin/mv.c:171 msgid "not under version control" msgstr "" #: builtin/mv.c:173 msgid "destination exists" msgstr "" #: builtin/mv.c:181 #, c-format msgid "overwriting '%s'" msgstr "" #: builtin/mv.c:184 msgid "Cannot overwrite" msgstr "" #: builtin/mv.c:187 msgid "multiple sources for the same target" msgstr "" #: builtin/mv.c:202 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" #: builtin/mv.c:212 #, c-format msgid "Renaming %s to %s\n" msgstr "" #: builtin/mv.c:215 builtin/remote.c:731 #, c-format msgid "renaming '%s' failed" msgstr "" #: builtin/name-rev.c:175 msgid "git name-rev [options] ..." msgstr "" #: builtin/name-rev.c:176 msgid "git name-rev [options] --all" msgstr "" #: builtin/name-rev.c:177 msgid "git name-rev [options] --stdin" msgstr "" #: builtin/name-rev.c:229 msgid "print only names (no SHA-1)" msgstr "" #: builtin/name-rev.c:230 msgid "only use tags to name the commits" msgstr "" #: builtin/name-rev.c:232 msgid "only use refs matching " msgstr "" #: builtin/name-rev.c:234 msgid "list all commits reachable from all refs" msgstr "" #: builtin/name-rev.c:235 msgid "read from stdin" msgstr "" #: builtin/name-rev.c:236 msgid "allow to print `undefined` names" msgstr "" #: builtin/notes.c:26 msgid "git notes [--ref ] [list []]" msgstr "" #: builtin/notes.c:27 msgid "" "git notes [--ref ] add [-f] [-m | -F | (-c | -C) " "] []" msgstr "" #: builtin/notes.c:28 msgid "git notes [--ref ] copy [-f] " msgstr "" #: builtin/notes.c:29 msgid "" "git notes [--ref ] append [-m | -F | (-c | -C) " "] []" msgstr "" #: builtin/notes.c:30 msgid "git notes [--ref ] edit []" msgstr "" #: builtin/notes.c:31 msgid "git notes [--ref ] show []" msgstr "" #: builtin/notes.c:32 msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "" #: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "" #: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "" #: builtin/notes.c:35 msgid "git notes [--ref ] remove [...]" msgstr "" #: builtin/notes.c:36 msgid "git notes [--ref ] prune [-n | -v]" msgstr "" #: builtin/notes.c:37 msgid "git notes [--ref ] get-ref" msgstr "" #: builtin/notes.c:42 msgid "git notes [list []]" msgstr "" #: builtin/notes.c:47 msgid "git notes add [] []" msgstr "" #: builtin/notes.c:52 msgid "git notes copy [] " msgstr "" #: builtin/notes.c:53 msgid "git notes copy --stdin [ ]..." msgstr "" #: builtin/notes.c:58 msgid "git notes append [] []" msgstr "" #: builtin/notes.c:63 msgid "git notes edit []" msgstr "" #: builtin/notes.c:68 msgid "git notes show []" msgstr "" #: builtin/notes.c:73 msgid "git notes merge [] " msgstr "" #: builtin/notes.c:74 msgid "git notes merge --commit []" msgstr "" #: builtin/notes.c:75 msgid "git notes merge --abort []" msgstr "" #: builtin/notes.c:80 msgid "git notes remove []" msgstr "" #: builtin/notes.c:85 msgid "git notes prune []" msgstr "" #: builtin/notes.c:90 msgid "git notes get-ref" msgstr "" #: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" #: builtin/notes.c:143 msgid "could not read 'show' output" msgstr "" #: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" #: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "" #: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "" #: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "" #: builtin/notes.c:214 msgid "unable to write note object" msgstr "" #: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "" #: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "" #: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "" #: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 #: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 #: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 #: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" #: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "" #: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" #: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" #: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value #: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "" #: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "" #: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" #: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 #: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 #: builtin/notes.c:1032 msgid "too many parameters" msgstr "" #: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "" #: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" msgstr "" #: builtin/notes.c:537 builtin/notes.c:694 msgid "note contents in a file" msgstr "" #: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 #: builtin/notes.c:699 builtin/tag.c:474 msgid "object" msgstr "" #: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" msgstr "" #: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" msgstr "" #: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" msgstr "" #: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" #: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" #: builtin/notes.c:614 msgid "read objects from stdin" msgstr "" #: builtin/notes.c:616 msgid "load rewriting config for (implies --stdin)" msgstr "" #: builtin/notes.c:634 msgid "too few parameters" msgstr "" #: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" #: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" #: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" #: builtin/notes.c:863 msgid "General options" msgstr "" #: builtin/notes.c:865 msgid "Merge options" msgstr "" #: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" #: builtin/notes.c:869 msgid "Committing unmerged notes" msgstr "" #: builtin/notes.c:871 msgid "finalize notes merge by committing unmerged notes" msgstr "" #: builtin/notes.c:873 msgid "Aborting notes merge resolution" msgstr "" #: builtin/notes.c:875 msgid "abort notes merge" msgstr "" #: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "" #: builtin/notes.c:982 msgid "attempt to remove non-existent note is not an error" msgstr "" #: builtin/notes.c:985 msgid "read object names from the standard input" msgstr "" #: builtin/notes.c:1066 msgid "notes_ref" msgstr "" #: builtin/notes.c:1067 msgid "use notes from " msgstr "" #: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "" #: builtin/pack-objects.c:23 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" #: builtin/pack-objects.c:24 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "" #: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "" #: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "" #: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "" #: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" #: builtin/pack-objects.c:2447 msgid "do not show progress meter" msgstr "" #: builtin/pack-objects.c:2449 msgid "show progress meter" msgstr "" #: builtin/pack-objects.c:2451 msgid "show progress meter during object writing phase" msgstr "" #: builtin/pack-objects.c:2454 msgid "similar to --all-progress when progress meter is shown" msgstr "" #: builtin/pack-objects.c:2455 msgid "version[,offset]" msgstr "" #: builtin/pack-objects.c:2456 msgid "write the pack index file in the specified idx format version" msgstr "" #: builtin/pack-objects.c:2459 msgid "maximum size of each output pack file" msgstr "" #: builtin/pack-objects.c:2461 msgid "ignore borrowed objects from alternate object store" msgstr "" #: builtin/pack-objects.c:2463 msgid "ignore packed objects" msgstr "" #: builtin/pack-objects.c:2465 msgid "limit pack window by objects" msgstr "" #: builtin/pack-objects.c:2467 msgid "limit pack window by memory in addition to object limit" msgstr "" #: builtin/pack-objects.c:2469 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" #: builtin/pack-objects.c:2471 msgid "reuse existing deltas" msgstr "" #: builtin/pack-objects.c:2473 msgid "reuse existing objects" msgstr "" #: builtin/pack-objects.c:2475 msgid "use OFS_DELTA objects" msgstr "" #: builtin/pack-objects.c:2477 msgid "use threads when searching for best delta matches" msgstr "" #: builtin/pack-objects.c:2479 msgid "do not create an empty pack output" msgstr "" #: builtin/pack-objects.c:2481 msgid "read revision arguments from standard input" msgstr "" #: builtin/pack-objects.c:2483 msgid "limit the objects to those that are not yet packed" msgstr "" #: builtin/pack-objects.c:2486 msgid "include objects reachable from any reference" msgstr "" #: builtin/pack-objects.c:2489 msgid "include objects referred by reflog entries" msgstr "" #: builtin/pack-objects.c:2492 msgid "output pack to stdout" msgstr "" #: builtin/pack-objects.c:2494 msgid "include tag objects that refer to objects to be packed" msgstr "" #: builtin/pack-objects.c:2496 msgid "keep unreachable objects" msgstr "" #: builtin/pack-objects.c:2497 parse-options.h:141 msgid "time" msgstr "" #: builtin/pack-objects.c:2498 msgid "unpack unreachable objects newer than