2013-08-25 11:45:13 +02:00
|
|
|
# French translations for Git.
|
2015-06-29 21:05:18 +02:00
|
|
|
# Copyright (C) 2015 Jean-Noël Avila <jn.avila@free.fr>
|
2013-08-25 11:45:13 +02:00
|
|
|
# This file is distributed under the same license as the Git package.
|
2016-08-20 16:20:17 +02:00
|
|
|
# Jean-Noël Avila <jn.avila@free.fr>, 2016.
|
2013-08-25 11:45:13 +02:00
|
|
|
# Sébastien Helleu <flashcode@flashtux.org>, 2013.
|
|
|
|
#
|
|
|
|
# French translations of common Git words used in this file:
|
|
|
|
#
|
|
|
|
# English | French
|
|
|
|
# -----------------+---------------------------------
|
2013-08-21 21:49:43 +02:00
|
|
|
# 3-way merge | fusion à 3 points
|
2013-08-25 11:45:13 +02:00
|
|
|
# #NN | n°NN
|
|
|
|
# a commit | un commit
|
|
|
|
# backward |
|
|
|
|
# compatibility | rétrocompatibilité
|
|
|
|
# bare repository | dépôt nu
|
|
|
|
# bisect | bissection
|
|
|
|
# blob | blob
|
|
|
|
# bug | bogue
|
|
|
|
# bundle | colis
|
2013-08-21 21:49:43 +02:00
|
|
|
# bypass | éviter d'utiliser
|
|
|
|
# to checkout | extraire
|
2013-08-25 11:45:13 +02:00
|
|
|
# cherry-pick | picorer
|
2013-08-21 21:49:43 +02:00
|
|
|
# to commit | valider
|
|
|
|
# commit-ish | commit ou apparenté
|
|
|
|
# config file | fichier de configuration
|
2013-08-25 11:45:13 +02:00
|
|
|
# dangling | en suspens
|
2013-08-21 21:49:43 +02:00
|
|
|
# to debug | déboguer
|
2013-08-25 11:45:13 +02:00
|
|
|
# debugging | débogage
|
2013-08-21 21:49:43 +02:00
|
|
|
# to deflate | compresser
|
|
|
|
# email | e-mail
|
|
|
|
# entry | élément
|
2013-08-25 11:45:13 +02:00
|
|
|
# fast-forward | avance rapide
|
|
|
|
# fast-forwarded | mis à jour en avance rapide
|
2013-08-21 21:49:43 +02:00
|
|
|
# to fetch | rapatrier
|
|
|
|
# fix conflicts | réglez les conflits
|
|
|
|
# to format | formater
|
2013-08-25 11:45:13 +02:00
|
|
|
# glob | glob
|
|
|
|
# hash | hachage
|
|
|
|
# HEAD | HEAD (genre féminin)
|
2013-08-21 21:49:43 +02:00
|
|
|
# hook | crochet
|
2013-08-25 11:45:13 +02:00
|
|
|
# hunk | section
|
2013-08-21 21:49:43 +02:00
|
|
|
# to inflate | décompresser
|
|
|
|
# to list | afficher
|
|
|
|
# mapping | mise en correspondance
|
2013-08-25 11:45:13 +02:00
|
|
|
# merge | fusion
|
2013-08-21 21:49:43 +02:00
|
|
|
# pack | paquet
|
|
|
|
# patches | patchs
|
2013-08-25 11:45:13 +02:00
|
|
|
# pattern | motif
|
2013-08-21 21:49:43 +02:00
|
|
|
# to prune | éliminer
|
|
|
|
# to push | pousser
|
|
|
|
# to rebase | rebaser
|
2013-08-25 11:45:13 +02:00
|
|
|
# repository | dépôt
|
|
|
|
# remote | distante (ou serveur distant)
|
|
|
|
# revision | révision
|
2014-01-18 14:36:19 +01:00
|
|
|
# shallow | superficiel
|
2013-08-21 21:49:43 +02:00
|
|
|
# shell | interpréteur de commandes
|
2013-08-25 11:45:13 +02:00
|
|
|
# stash | remisage
|
2013-08-21 21:49:43 +02:00
|
|
|
# to stash | remiser
|
2013-08-25 11:45:13 +02:00
|
|
|
# tag | étiquette
|
|
|
|
# template | modèle
|
2013-08-21 21:49:43 +02:00
|
|
|
# thread | fil
|
2013-08-25 11:45:13 +02:00
|
|
|
# to track | suivre
|
2013-08-21 21:49:43 +02:00
|
|
|
# tree | arbre
|
|
|
|
# tree-ish | arbre ou apparenté
|
2013-08-25 11:45:13 +02:00
|
|
|
# to unstage | désindexer
|
|
|
|
# upstream | amont
|
2013-08-21 21:49:43 +02:00
|
|
|
# viewer | visualiseur
|
2013-08-25 11:45:13 +02:00
|
|
|
# worktree / |
|
|
|
|
# work(ing) tree | copie de travail
|
2013-07-01 22:19:04 +02:00
|
|
|
#
|
|
|
|
msgid ""
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
|
|
|
"Project-Id-Version: git\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
2017-05-05 11:55:14 +02:00
|
|
|
"POT-Creation-Date: 2017-05-05 09:35+0800\n"
|
|
|
|
"PO-Revision-Date: 2017-05-05 12:02+0200\n"
|
2014-02-02 14:36:32 +01:00
|
|
|
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
|
|
|
|
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"Language: fr\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"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"
|
|
|
|
|
2014-02-26 21:27:14 +01:00
|
|
|
#: advice.c:55
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "hint: %.*s\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "astuce: %.*s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: advice.c:83
|
|
|
|
msgid "Cherry-picking is not possible because you have unmerged files."
|
|
|
|
msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
|
|
|
|
|
|
|
|
#: advice.c:85
|
|
|
|
msgid "Committing is not possible because you have unmerged files."
|
|
|
|
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
|
|
|
|
|
|
|
|
#: advice.c:87
|
|
|
|
msgid "Merging is not possible because you have unmerged files."
|
|
|
|
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
|
|
|
|
|
|
|
|
#: advice.c:89
|
|
|
|
msgid "Pulling is not possible because you have unmerged files."
|
|
|
|
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
|
|
|
|
|
|
|
|
#: advice.c:91
|
|
|
|
msgid "Reverting is not possible because you have unmerged files."
|
|
|
|
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
|
|
|
|
|
|
|
|
#: advice.c:93
|
|
|
|
#, c-format
|
|
|
|
msgid "It is not possible to %s because you have unmerged files."
|
|
|
|
msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
|
|
|
|
|
|
|
|
#: advice.c:101
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2014-08-05 19:23:50 +02:00
|
|
|
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"as appropriate to mark resolution and make a commit."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
2015-06-29 21:05:18 +02:00
|
|
|
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
|
|
|
|
"si nécessaire pour marquer la résolution et valider."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: advice.c:109
|
|
|
|
msgid "Exiting because of an unresolved conflict."
|
|
|
|
msgstr "Abandon à cause de conflit non résolu."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: advice.c:114 builtin/merge.c:1185
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "You have not concluded your merge (MERGE_HEAD exists)."
|
|
|
|
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: advice.c:116
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "Please, commit your changes before merging."
|
|
|
|
msgstr "Veuillez valider vos changements avant de fusionner."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: advice.c:117
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Exiting because of unfinished merge."
|
|
|
|
msgstr "Abandon à cause d'une fusion non terminée."
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: advice.c:123
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Note: checking out '%s'.\n"
|
|
|
|
"\n"
|
|
|
|
"You are in 'detached HEAD' state. You can look around, make experimental\n"
|
|
|
|
"changes and commit them, and you can discard any commits you make in this\n"
|
|
|
|
"state without impacting any branches by performing another checkout.\n"
|
|
|
|
"\n"
|
|
|
|
"If you want to create a new branch to retain commits you create, you may\n"
|
|
|
|
"do so (now or later) by using -b with the checkout command again. Example:\n"
|
|
|
|
"\n"
|
|
|
|
" git checkout -b <new-branch-name>\n"
|
|
|
|
"\n"
|
|
|
|
msgstr ""
|
|
|
|
"Note : extraction de '%s'.\n"
|
|
|
|
"\n"
|
|
|
|
"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des "
|
|
|
|
"modifications\n"
|
|
|
|
"expérimentales et les valider. Il vous suffit de faire une autre extraction "
|
|
|
|
"pour\n"
|
|
|
|
"abandonner les commits que vous faites dans cet état sans impacter les "
|
|
|
|
"autres branches\n"
|
|
|
|
"\n"
|
|
|
|
"Si vous voulez créer une nouvelle branche pour conserver les commits que "
|
|
|
|
"vous créez,\n"
|
|
|
|
"il vous suffit d'utiliser « checkout -b » (maintenant ou plus tard) comme "
|
|
|
|
"ceci :\n"
|
|
|
|
"\n"
|
|
|
|
" git checkout -b <nom-de-la-nouvelle-branche>\n"
|
|
|
|
"\n"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:57
|
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized whitespace option '%s'"
|
|
|
|
msgstr "option d'espace non reconnue '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:73
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unrecognized whitespace ignore option '%s'"
|
|
|
|
msgstr "option d'ignorance d'espace non reconnue '%s'"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:125
|
|
|
|
msgid "--reject and --3way cannot be used together."
|
|
|
|
msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:127
|
|
|
|
msgid "--cached and --3way cannot be used together."
|
|
|
|
msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:130
|
|
|
|
msgid "--3way outside a repository"
|
|
|
|
msgstr "--3way hors d'un dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:141
|
|
|
|
msgid "--index outside a repository"
|
|
|
|
msgstr "--index hors d'un dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:144
|
|
|
|
msgid "--cached outside a repository"
|
|
|
|
msgstr "--cached hors d'un dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:845
|
|
|
|
#, c-format
|
|
|
|
msgid "Cannot prepare timestamp regexp %s"
|
|
|
|
msgstr "Impossible de préparer la regexp d'horodatage %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:854
|
|
|
|
#, c-format
|
|
|
|
msgid "regexec returned %d for input: %s"
|
|
|
|
msgstr "regexec a retourné %d pour l'entrée : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:938
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to find filename in patch at line %d"
|
|
|
|
msgstr "nom de fichier du patch introuvable à la ligne %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:977
|
|
|
|
#, c-format
|
|
|
|
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
|
|
|
|
msgstr ""
|
|
|
|
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
|
|
|
|
"ligne %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:983
|
|
|
|
#, c-format
|
|
|
|
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
|
|
|
|
msgstr ""
|
|
|
|
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
|
|
|
|
"à la ligne %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:984
|
|
|
|
#, c-format
|
|
|
|
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
|
|
|
|
msgstr ""
|
|
|
|
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
|
|
|
|
"à la ligne %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:990
|
|
|
|
#, c-format
|
|
|
|
msgid "git apply: bad git-diff - expected /dev/null on line %d"
|
|
|
|
msgstr ""
|
|
|
|
"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1488
|
|
|
|
#, c-format
|
|
|
|
msgid "recount: unexpected line: %.*s"
|
|
|
|
msgstr "recomptage : ligne inattendue : %.*s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1557
|
|
|
|
#, c-format
|
|
|
|
msgid "patch fragment without header at line %d: %.*s"
|
|
|
|
msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1577
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
|
|
"component (line %d)"
|
|
|
|
msgid_plural ""
|
|
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
|
|
"components (line %d)"
|
|
|
|
msgstr[0] ""
|
|
|
|
"information de nom de fichier manquante dans l'en-tête de git diff lors de "
|
|
|
|
"la suppression de %d composant de préfixe de chemin (ligne %d)"
|
|
|
|
msgstr[1] ""
|
|
|
|
"information de nom de fichier manquante dans l'en-tête de git diff lors de "
|
|
|
|
"la suppression de %d composants de préfixe de chemin (ligne %d)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1589
|
|
|
|
#, c-format
|
|
|
|
msgid "git diff header lacks filename information (line %d)"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1759
|
|
|
|
msgid "new file depends on old contents"
|
|
|
|
msgstr "le nouveau fichier dépend de contenus anciens"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1761
|
|
|
|
msgid "deleted file still has contents"
|
|
|
|
msgstr "le fichier supprimé a encore du contenu"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1795
|
|
|
|
#, c-format
|
|
|
|
msgid "corrupt patch at line %d"
|
|
|
|
msgstr "patch corrompu à la ligne %d"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1832
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "new file %s depends on old contents"
|
|
|
|
msgstr "le nouveau fichier %s dépend de contenus anciens"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1834
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "deleted file %s still has contents"
|
|
|
|
msgstr "le fichier supprimé %s a encore du contenu"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1837
|
|
|
|
#, c-format
|
|
|
|
msgid "** warning: file %s becomes empty but is not deleted"
|
|
|
|
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:1984
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "corrupt binary patch at line %d: %.*s"
|
|
|
|
msgstr "patch binaire corrompu à la ligne %d : %.*s"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:2021
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unrecognized binary patch at line %d"
|
|
|
|
msgstr "patch binaire non reconnu à la ligne %d"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: apply.c:2182
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "patch with only garbage at line %d"
|
|
|
|
msgstr "patch totalement incompréhensible à la ligne %d"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:2265
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to read symlink %s"
|
|
|
|
msgstr "lecture du lien symbolique %s impossible"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:2269
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to open or read %s"
|
|
|
|
msgstr "ouverture ou lecture de %s impossible"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:2922
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid start of line: '%c'"
|
|
|
|
msgstr "début de ligne invalide : '%c'"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3041
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Hunk #%d succeeded at %d (offset %d line)."
|
|
|
|
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
|
|
|
|
msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
|
|
|
|
msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3053
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
|
|
|
|
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3059
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"while searching for:\n"
|
|
|
|
"%.*s"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"pendant la recherche de :\n"
|
|
|
|
"%.*s"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3081
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "missing binary patch data for '%s'"
|
|
|
|
msgstr "données de patch binaire manquantes pour '%s'"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3089
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
|
|
|
|
"inverse"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3135
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot apply binary patch to '%s' without full index line"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3145
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"the patch applies to '%s' (%s), which does not match the current contents."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3153
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "the patch applies to an empty '%s' but it is not empty"
|
|
|
|
msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3171
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "the necessary postimage %s for '%s' cannot be read"
|
|
|
|
msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3184
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "binary patch does not apply to '%s'"
|
|
|
|
msgstr "le patch binaire ne s'applique par correctement à '%s'"
|
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3190
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
|
|
|
|
"trouvé)"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3211
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "patch failed: %s:%ld"
|
|
|
|
msgstr "le patch a échoué : %s:%ld"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3333
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot checkout %s"
|
|
|
|
msgstr "extraction de %s impossible"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to read %s"
|
|
|
|
msgstr "échec de la lecture de %s"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3389
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "reading from '%s' beyond a symbolic link"
|
|
|
|
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3418 apply.c:3658
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "path %s has been renamed/deleted"
|
|
|
|
msgstr "le chemin %s a été renommé/supprimé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3501 apply.c:3672
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s: does not exist in index"
|
|
|
|
msgstr "%s : n'existe pas dans l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3510 apply.c:3680
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s: does not match index"
|
|
|
|
msgstr "%s : ne correspond pas à l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3545
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "repository lacks the necessary blob to fall back on 3-way merge."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
|
|
|
|
"points."
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3548
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Falling back to three-way merge...\n"
|
|
|
|
msgstr "Retour à une fusion à 3 points…\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3564 apply.c:3568
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot read the current contents of '%s'"
|
|
|
|
msgstr "impossible de lire le contenu actuel de '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3580
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Failed to fall back on three-way merge...\n"
|
|
|
|
msgstr "Echec du retour à une fusion à 3 points…\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3594
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Applied patch to '%s' with conflicts.\n"
|
|
|
|
msgstr "Patch %s appliqué avec des conflits.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3599
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Applied patch to '%s' cleanly.\n"
|
|
|
|
msgstr "Patch %s appliqué proprement.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3625
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "removal patch leaves file contents"
|
|
|
|
msgstr "le patch de suppression laisse un contenu dans le fichier"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3697
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s: wrong type"
|
|
|
|
msgstr "%s : type erroné"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3699
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s has type %o, expected %o"
|
|
|
|
msgstr "%s est de type %o, mais %o attendu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3850 apply.c:3852
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid path '%s'"
|
|
|
|
msgstr "chemin invalide '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3908
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: already exists in index"
|
|
|
|
msgstr "%s : existe déjà dans l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3911
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s: already exists in working directory"
|
|
|
|
msgstr "%s : existe déjà dans la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3931
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3936
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3956
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "affected file '%s' is beyond a symbolic link"
|
|
|
|
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3960
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s: patch does not apply"
|
|
|
|
msgstr "%s : le patch ne s'applique pas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:3975
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Checking patch %s..."
|
|
|
|
msgstr "Vérification du patch %s..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4066
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "sha1 information is lacking or useless for submodule %s"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4073
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "mode change for %s, which is not in current HEAD"
|
|
|
|
msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4076
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "sha1 information is lacking or useless (%s)."
|
|
|
|
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "make_cache_entry failed for path '%s'"
|
|
|
|
msgstr "échec de make_cache_entry pour le chemin '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4085
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not add %s to temporary index"
|
|
|
|
msgstr "impossible d'ajouter %s à l'index temporaire"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4095
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not write temporary index to %s"
|
|
|
|
msgstr "impossible d'écrire l'index temporaire dans %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4233
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to remove %s from index"
|
|
|
|
msgstr "suppression de %s dans l'index impossible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4268
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "corrupt patch for submodule %s"
|
|
|
|
msgstr "patch corrompu pour le sous-module %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4274
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to stat newly created file '%s'"
|
|
|
|
msgstr "stat du fichier nouvellement créé '%s' impossible"
|
2014-11-20 03:53:48 +01:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4282
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to create backing store for newly created file %s"
|
|
|
|
msgstr ""
|
|
|
|
"création du magasin de stockage pour le fichier nouvellement créé %s "
|
|
|
|
"impossible"
|
2014-11-20 03:53:48 +01:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4288 apply.c:4432
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to add cache entry for %s"
|
|
|
|
msgstr "ajout de l'élément de cache %s impossible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4329
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to write to '%s'"
|
|
|
|
msgstr "échec de l'écriture dans '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4333
|
2014-11-20 03:53:48 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "closing file '%s'"
|
|
|
|
msgstr "fermeture du fichier '%s'"
|
2014-11-20 03:53:48 +01:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4403
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to write file '%s' mode %o"
|
|
|
|
msgstr "écriture du fichier '%s' mode %o impossible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4501
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Applied patch %s cleanly."
|
|
|
|
msgstr "Patch %s appliqué proprement."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4509
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "internal error"
|
|
|
|
msgstr "erreur interne"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4512
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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..."
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4523
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "truncating .rej filename to %.*s.rej"
|
|
|
|
msgstr "troncature du nom de fichier .rej en %.*s.rej"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot open %s"
|
|
|
|
msgstr "impossible d'ouvrir %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4545
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Hunk #%d applied cleanly."
|
|
|
|
msgstr "Section n°%d appliquée proprement."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4549
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Rejected hunk #%d."
|
|
|
|
msgstr "Section n°%d rejetée."
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4659
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Skipped patch '%s'."
|
|
|
|
msgstr "Chemin '%s' non traité."
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4667
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unrecognized input"
|
|
|
|
msgstr "entrée non reconnue"
|
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: apply.c:4686
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to read index file"
|
|
|
|
msgstr "lecture du fichier d'index impossible"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4823
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "can't open patch '%s': %s"
|
|
|
|
msgstr "ouverture impossible du patch '%s' :%s"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4850
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4856 apply.c:4871
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%d line adds whitespace errors."
|
|
|
|
msgid_plural "%d lines add whitespace errors."
|
|
|
|
msgstr[0] "%d ligne a ajouté des erreurs d'espace."
|
|
|
|
msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4864
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%d line applied after fixing whitespace errors."
|
|
|
|
msgid_plural "%d lines applied after fixing whitespace errors."
|
|
|
|
msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
|
|
|
|
msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unable to write new index file"
|
|
|
|
msgstr "Impossible d'écrire le nouveau fichier d'index"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
|
|
|
|
#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
|
|
|
|
#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
|
|
|
|
#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-add--interactive.perl:239
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "path"
|
|
|
|
msgstr "chemin"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4912
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "don't apply changes matching the given path"
|
|
|
|
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4915
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "apply changes matching the given path"
|
|
|
|
msgstr "appliquer les modifications qui correspondent au chemin donné"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: apply.c:4917 builtin/am.c:2285
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "num"
|
|
|
|
msgstr "num"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4918
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "remove <num> leading slashes from traditional diff paths"
|
|
|
|
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4921
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "ignore additions made by the patch"
|
|
|
|
msgstr "ignorer les additions réalisées par le patch"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4923
|
2016-11-05 21:43:53 +01:00
|
|
|
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"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4927
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "show number of added and deleted lines in decimal notation"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4929
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "instead of applying the patch, output a summary for the input"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4931
|
2016-11-05 21:43:53 +01:00
|
|
|
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"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4933
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "make sure the patch is applicable to the current index"
|
|
|
|
msgstr "s'assurer que le patch est applicable sur l'index actuel"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4935
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "apply a patch without touching the working tree"
|
|
|
|
msgstr "appliquer les patch sans toucher à la copie de travail"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4937
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "accept a patch that touches outside the working area"
|
|
|
|
msgstr "accepter un patch qui touche hors de la copie de travail"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4939
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "also apply the patch (use with --stat/--summary/--check)"
|
|
|
|
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4941
|
2016-11-05 21:43:53 +01:00
|
|
|
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"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4943
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "build a temporary index based on embedded index information"
|
2014-11-20 03:53:48 +01:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"construire un index temporaire fondé sur l'information de l'index embarqué"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "paths are separated with NUL character"
|
|
|
|
msgstr "les chemins sont séparés par un caractère NUL"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4948
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "ensure at least <n> lines of context match"
|
|
|
|
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: apply.c:4949 builtin/am.c:2264
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "action"
|
|
|
|
msgstr "action"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4950
|
2016-11-05 21:43:53 +01:00
|
|
|
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"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4953 apply.c:4956
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "ignore changes in whitespace when finding context"
|
|
|
|
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4959
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "apply the patch in reverse"
|
|
|
|
msgstr "appliquer le patch en sens inverse"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4961
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "don't expect at least one line of context"
|
|
|
|
msgstr "ne pas s'attendre à au moins une ligne de contexte"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4963
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "leave the rejected hunks in corresponding *.rej files"
|
|
|
|
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4965
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "allow overlapping hunks"
|
|
|
|
msgstr "accepter les recouvrements de sections"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "be verbose"
|
|
|
|
msgstr "mode verbeux"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4968
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
|
|
|
msgstr ""
|
|
|
|
"tolérer des erreurs de détection de retours chariot manquants en fin de "
|
|
|
|
"fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4971
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "do not trust the line counts in the hunk headers"
|
|
|
|
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: apply.c:4973 builtin/am.c:2273
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "root"
|
|
|
|
msgstr "racine"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: apply.c:4974
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "prepend <root> to all filenames"
|
|
|
|
msgstr "préfixer tous les noms de fichier avec <root>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: archive.c:12
|
|
|
|
msgid "git archive [<options>] <tree-ish> [<path>...]"
|
|
|
|
msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: archive.c:13
|
|
|
|
msgid "git archive --list"
|
|
|
|
msgstr "git archive --list"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: archive.c:14
|
|
|
|
msgid ""
|
|
|
|
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
|
|
|
|
msgstr ""
|
|
|
|
"git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou "
|
|
|
|
"apparenté> [<chemin>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: archive.c:15
|
|
|
|
msgid "git archive --remote <repo> [--exec <cmd>] --list"
|
|
|
|
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
|
2014-01-18 14:36:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "pathspec '%s' did not match any files"
|
|
|
|
msgstr "le chemin '%s' ne correspond à aucun fichier"
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:417
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "fmt"
|
|
|
|
msgstr "fmt"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:417
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "archive format"
|
|
|
|
msgstr "format d'archive"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:418 builtin/log.c:1436
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "prefix"
|
|
|
|
msgstr "préfixe"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:419
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "prepend prefix to each pathname in the archive"
|
|
|
|
msgstr "préfixer chaque chemin de fichier dans l'archive"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
|
2017-02-08 21:36:33 +01:00
|
|
|
#: parse-options.h:153
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "file"
|
|
|
|
msgstr "fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:421 builtin/archive.c:89
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "write the archive to this file"
|
|
|
|
msgstr "écrire l'archive dans ce fichier"
|
2014-08-05 19:23:50 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:423
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "read .gitattributes in working directory"
|
|
|
|
msgstr "lire .gitattributes dans le répertoire de travail"
|
2014-08-05 19:23:50 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:424
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "report archived files on stderr"
|
|
|
|
msgstr "afficher les fichiers archivés sur stderr"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:425
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "store only"
|
|
|
|
msgstr "stockage seulement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:426
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "compress faster"
|
|
|
|
msgstr "compression rapide"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:434
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "compress better"
|
|
|
|
msgstr "compression efficace"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:437
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "list supported archive formats"
|
|
|
|
msgstr "afficher les formats d'archive supportés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
|
|
|
|
#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "repo"
|
|
|
|
msgstr "dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:440 builtin/archive.c:91
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "retrieve the archive from remote repository <repo>"
|
|
|
|
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "command"
|
|
|
|
msgstr "commande"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:442 builtin/archive.c:93
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "path to the remote git-upload-archive command"
|
|
|
|
msgstr "chemin vers la commande distante git-upload-archive"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:449
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unexpected option --remote"
|
|
|
|
msgstr "Option --remote inattendue"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:451
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Option --exec can only be used together with --remote"
|
|
|
|
msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:453
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unexpected option --output"
|
|
|
|
msgstr "Option --output inattendue"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:475
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unknown archive format '%s'"
|
|
|
|
msgstr "Format d'archive inconnu '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: archive.c:482
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Argument not supported for format '%s': -%d"
|
|
|
|
msgstr "Argument non supporté pour le format '%s' : -%d"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: attr.c:212
|
|
|
|
#, c-format
|
|
|
|
msgid "%.*s is not a valid attribute name"
|
|
|
|
msgstr "%.*s n'est pas un nom valide d'attribut"
|
|
|
|
|
|
|
|
#: attr.c:408
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"Negative patterns are ignored in git attributes\n"
|
|
|
|
"Use '\\!' for literal leading exclamation."
|
|
|
|
msgstr ""
|
|
|
|
"Les motifs de négation sont ignorés dans les attributs git\n"
|
|
|
|
"Utilisez '\\!' pour un point d'exclamation littéral."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:444
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not open file '%s'"
|
|
|
|
msgstr "impossible d'ouvrir le fichier '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:449
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Badly quoted content in file '%s': %s"
|
|
|
|
msgstr "Contenu mal cité dans le fichier '%s' : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:657
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "We cannot bisect more!\n"
|
|
|
|
msgstr "Impossible de pousser la bissection plus loin !\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:710
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Not a valid commit name %s"
|
|
|
|
msgstr "%s n'est pas un nom de commit valide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:734
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"The merge base %s is bad.\n"
|
|
|
|
"This means the bug has been fixed between %s and [%s].\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"La base de fusion %s est mauvaise.\n"
|
|
|
|
"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:739
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"The merge base %s is new.\n"
|
|
|
|
"The property has changed between %s and [%s].\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"La base de fusion %s est nouvelle.\n"
|
|
|
|
"La propriété a changé entre %s et [%s].\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:744
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"The merge base %s is %s.\n"
|
|
|
|
"This means the first '%s' commit is between %s and [%s].\n"
|
|
|
|
msgstr ""
|
|
|
|
"La base de fusion %s est %s.\n"
|
|
|
|
"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:752
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
2017-02-08 21:36:33 +01:00
|
|
|
"Some %s revs are not ancestors of the %s rev.\n"
|
2016-11-05 21:43:53 +01:00
|
|
|
"git bisect cannot work properly in this case.\n"
|
|
|
|
"Maybe you mistook %s and %s revs?\n"
|
|
|
|
msgstr ""
|
|
|
|
"Certaines révision %s ne sont pas ancêtres de la révision %s.\n"
|
|
|
|
"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:765
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"the merge base between %s and [%s] must be skipped.\n"
|
|
|
|
"So we cannot be sure the first %s commit is between %s and %s.\n"
|
|
|
|
"We continue anyway."
|
2016-05-26 22:46:41 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"La base de fusion entre %s et [%s] doit être évitée.\n"
|
|
|
|
"On ne peut donc pas être certain que le premier commit %s se trouve entre %s "
|
|
|
|
"et %s.\n"
|
|
|
|
"On continue tout de même."
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:800
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Bisecting: a merge base must be tested\n"
|
|
|
|
msgstr "Bissection : une base de fusion doit être testée\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:851
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "a %s revision is needed"
|
|
|
|
msgstr "une révision %s est nécessaire"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not create file '%s'"
|
|
|
|
msgstr "impossible de créer le fichier '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:919
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not read file '%s'"
|
|
|
|
msgstr "impossible de lire le fichier '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:949
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "reading bisect refs failed"
|
|
|
|
msgstr "impossible de lire les références de bissection"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:969
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s was both %s and %s\n"
|
|
|
|
msgstr "%s était à la fois %s et %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:977
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"No testable commit found.\n"
|
|
|
|
"Maybe you started with bad path parameters?\n"
|
|
|
|
msgstr ""
|
|
|
|
"Aucun commit testable n'a été trouvé\n"
|
|
|
|
"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:996
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "(roughly %d step)"
|
|
|
|
msgid_plural "(roughly %d steps)"
|
|
|
|
msgstr[0] "(à peu près %d étape)"
|
|
|
|
msgstr[1] "(à peu près %d étapes)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#. TRANSLATORS: the last %s will be replaced with
|
|
|
|
#. "(roughly %d steps)" translation
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bisect.c:1000
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Bisecting: %d revision left to test after this %s\n"
|
|
|
|
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
|
|
|
|
msgstr[0] "Bissection : %d révision à tester après cette %s\n"
|
|
|
|
msgstr[1] "Bissection : %d révisions à tester après cette %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:53
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"After fixing the error cause you may try to fix up\n"
|
|
|
|
"the remote tracking information by invoking\n"
|
|
|
|
"\"git branch --set-upstream-to=%s%s%s\"."
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n"
|
|
|
|
"l'information de suivi distant en invoquant\n"
|
|
|
|
"\"git branch --setup-upstream-to=%s%s%s\"."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:67
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Not setting branch %s as its own upstream."
|
|
|
|
msgstr "La branche %s ne peut pas être sa propre branche amont."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:93
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:94
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Branch %s set up to track remote branch %s from %s."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"La branche %s est paramétrée pour suivre la branche distante %s depuis %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:98
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Branch %s set up to track local branch %s by rebasing."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"La branche %s est paramétrée pour suivre la branche locale %s en rebasant."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:99
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Branch %s set up to track local branch %s."
|
|
|
|
msgstr "La branche %s est paramétrée pour suivre la branche locale %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:104
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Branch %s set up to track remote ref %s by rebasing."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"La branche %s est paramétrée pour suivre la référence distante %s en "
|
|
|
|
"rebasant."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:105
|
|
|
|
#, 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."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:109
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Branch %s set up to track local ref %s by rebasing."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"La branche %s est paramétrée pour suivre la référence locale %s en rebasant."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:110
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:119
|
|
|
|
msgid "Unable to write upstream branch configuration"
|
|
|
|
msgstr "Échec de l'écriture de la configuration de branche amont"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:156
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Not tracking: ambiguous information for ref %s"
|
|
|
|
msgstr "Pas de suivi : information ambiguë pour la référence %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:185
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "'%s' is not a valid branch name."
|
|
|
|
msgstr "'%s' n'est pas un nom de branche valide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:190
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "A branch named '%s' already exists."
|
|
|
|
msgstr "Une branche nommée '%s' existe déjà."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:198
|
|
|
|
msgid "Cannot force update the current branch."
|
|
|
|
msgstr "Impossible de forcer la mise à jour de la branche courante."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:218
|
|
|
|
#, 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."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:220
|
|
|
|
#, c-format
|
|
|
|
msgid "the requested upstream branch '%s' does not exist"
|
|
|
|
msgstr "la branche amont demandée '%s' n'existe pas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: branch.c:222
|
|
|
|
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 pouvez\n"
|
|
|
|
"lancer \"git fetch\" pour la récupérer.\n"
|
|
|
|
"\n"
|
|
|
|
"Si vous comptez pousser une nouvelle branche locale qui suivra\n"
|
|
|
|
"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
|
|
|
|
"pour paramétrer le suivi distant en même temps que vous poussez."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
#: branch.c:265
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Not a valid object name: '%s'."
|
|
|
|
msgstr "Nom d'objet invalide : '%s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
#: branch.c:285
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Ambiguous object name: '%s'."
|
|
|
|
msgstr "Nom d'objet ambigu : '%s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
#: branch.c:290
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Not a valid branch point: '%s'."
|
|
|
|
msgstr "Point d'embranchement invalide : '%s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
#: branch.c:344
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "'%s' is already checked out at '%s'"
|
|
|
|
msgstr "'%s' est déjà extrait dans '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: branch.c:364
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "HEAD of working tree %s is not updated"
|
|
|
|
msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:34
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "'%s' does not look like a v2 bundle file"
|
|
|
|
msgstr "'%s' ne semble pas être un fichier bundle v2"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:61
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unrecognized header: %s%s (%d)"
|
|
|
|
msgstr "en-tête non reconnu : %s%s (%d)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not open '%s'"
|
|
|
|
msgstr "impossible d'ouvrir '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:139
|
|
|
|
msgid "Repository lacks these prerequisite commits:"
|
|
|
|
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
|
|
|
|
#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
|
|
|
|
#: builtin/merge.c:359 builtin/shortlog.c:176
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "revision walk setup failed"
|
|
|
|
msgstr "échec de la préparation du parcours des révisions"
|
|
|
|
|
|
|
|
#: bundle.c:185
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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 :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:192
|
|
|
|
msgid "The bundle records a complete history."
|
|
|
|
msgstr "Le colis enregistre l'historique complet."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:194
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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 :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:253
|
|
|
|
msgid "Could not spawn pack-objects"
|
|
|
|
msgstr "Impossible de créer des objets groupés"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:264
|
|
|
|
msgid "pack-objects died"
|
|
|
|
msgstr "les objets groupés ont disparu"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:304
|
|
|
|
msgid "rev-list died"
|
|
|
|
msgstr "rev-list a disparu"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:353
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "ref '%s' is excluded by the rev-list options"
|
|
|
|
msgstr "la référence '%s' est exclue par les options de rev-list"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unrecognized argument: %s"
|
|
|
|
msgstr "argument non reconnu : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:451
|
|
|
|
msgid "Refusing to create empty bundle."
|
|
|
|
msgstr "Refus de créer un colis vide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:463
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot create '%s'"
|
|
|
|
msgstr "impossible de créer '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: bundle.c:491
|
|
|
|
msgid "index-pack died"
|
|
|
|
msgstr "l'index de groupe a disparu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: color.c:300
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid color value: %.*s"
|
|
|
|
msgstr "Valeur invalide de couleur : %.*s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
|
|
|
|
#: builtin/am.c:1489 builtin/am.c:2126
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not parse %s"
|
|
|
|
msgstr "impossible d'analyser %s"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: commit.c:42
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s %s is not a commit!"
|
|
|
|
msgstr "%s %s n'est pas un commit !"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: commit.c:1511
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Warning: commit message did not conform to UTF-8.\n"
|
|
|
|
"You may want to amend it after fixing the message, or set the config\n"
|
|
|
|
"variable i18n.commitencoding to the encoding your project uses.\n"
|
2014-01-18 14:36:19 +01:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Avertissement : le message de validation ne se conforme pas à UTF-8.\n"
|
2016-11-22 15:24:59 +01:00
|
|
|
"Vous souhaitez peut-être le modifier après correction du message ou régler "
|
|
|
|
"la\n"
|
|
|
|
"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
|
|
|
|
"projet.\n"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: compat/obstack.c:406 compat/obstack.c:408
|
|
|
|
msgid "memory exhausted"
|
|
|
|
msgstr "plus de mémoire"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: config.c:191
|
|
|
|
msgid "relative config include conditionals must come from files"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"les conditions d'inclusion de configuration relative doivent venir de "
|
|
|
|
"fichiers"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:711
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad config line %d in blob %s"
|
|
|
|
msgstr "ligne %d de config incorrecte dans le blob %s"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:715
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad config line %d in file %s"
|
|
|
|
msgstr "ligne %d de config incorrecte dans le fichier %s"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:719
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad config line %d in standard input"
|
|
|
|
msgstr "ligne %d de config incorrecte dans l'entrée standard"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:723
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad config line %d in submodule-blob %s"
|
|
|
|
msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:727
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad config line %d in command line %s"
|
|
|
|
msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:731
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad config line %d in %s"
|
|
|
|
msgstr "ligne %d de config incorrecte dans %s"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:859
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "out of range"
|
|
|
|
msgstr "hors plage"
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:859
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid unit"
|
|
|
|
msgstr "unité invalide"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:865
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "bad numeric config value '%s' for '%s': %s"
|
|
|
|
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:870
|
2014-02-26 21:27:14 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
|
2014-02-26 21:27:14 +01:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
|
|
|
|
"%s : %s"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:873
|
2014-02-26 21:27:14 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
|
2014-02-26 21:27:14 +01:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
|
|
|
|
"%s : %s"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:876
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
|
|
|
|
msgstr ""
|
|
|
|
"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
|
|
|
|
"standard : %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:879
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
|
|
|
|
msgstr ""
|
|
|
|
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
|
|
|
|
"sous-module %s : %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:882
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
|
|
|
|
msgstr ""
|
|
|
|
"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
|
|
|
|
"commande %s : %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:885
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad numeric config value '%s' for '%s' in %s: %s"
|
|
|
|
msgstr ""
|
|
|
|
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:980
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to expand user dir in: '%s'"
|
|
|
|
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:1075 config.c:1086
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad zlib compression level %d"
|
|
|
|
msgstr "niveau de compression zlib incorrect %d"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:1203
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid mode for object creation: %s"
|
|
|
|
msgstr "mode invalide pour la création d'objet : %s"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:1359
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "bad pack compression level %d"
|
|
|
|
msgstr "niveau de compression du paquet %d"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:1557
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to parse command-line config"
|
|
|
|
msgstr "lecture de la configuration de ligne de commande impossible"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:1611
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unknown error occurred while reading the configuration files"
|
|
|
|
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:1970
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid %s: '%s'"
|
|
|
|
msgstr "%s invalide : '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:1991
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "
|
|
|
|
"défaut"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:2017
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
|
|
|
|
"100"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:2028
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to parse '%s' from command-line config"
|
|
|
|
msgstr ""
|
|
|
|
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:2030
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "bad config variable '%s' in file '%s' at line %d"
|
|
|
|
msgstr ""
|
|
|
|
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:2089
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s has multiple values"
|
|
|
|
msgstr "%s a des valeurs multiples"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:2423 config.c:2648
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "fstat on %s failed"
|
|
|
|
msgstr "échec de fstat sur %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:2541
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not set '%s' to '%s'"
|
|
|
|
msgstr "impossible de régler '%s' à '%s'"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: config.c:2543 builtin/remote.c:774
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not unset '%s'"
|
|
|
|
msgstr "impossible de désinitialiser '%s'"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: connect.c:49
|
|
|
|
msgid "The remote end hung up upon initial contact"
|
|
|
|
msgstr "L'hôte distant a fermé la connexion lors du contact initial"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: connect.c:51
|
|
|
|
msgid ""
|
|
|
|
"Could not read from remote repository.\n"
|
|
|
|
"\n"
|
|
|
|
"Please make sure you have the correct access rights\n"
|
|
|
|
"and the repository exists."
|
|
|
|
msgstr ""
|
2017-01-01 13:56:46 +01:00
|
|
|
"Impossible de lire le dépôt distant.\n"
|
2016-11-05 21:43:53 +01:00
|
|
|
"\n"
|
|
|
|
"Veuillez vérifier que vous avez les droits d'accès\n"
|
|
|
|
"et que le dépôt existe."
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Checking connectivity"
|
|
|
|
msgstr "Vérification de la connectivité"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: connected.c:75
|
|
|
|
msgid "Could not run 'git rev-list'"
|
|
|
|
msgstr "Impossible de lancer 'git rev-list'"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: connected.c:95
|
|
|
|
msgid "failed write to rev-list"
|
|
|
|
msgstr "impossible d'écrire dans la rev-list"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: connected.c:102
|
|
|
|
msgid "failed to close rev-list's stdin"
|
|
|
|
msgstr "impossible de fermer l'entrée standard du rev-list"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: convert.c:201
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"CRLF will be replaced by LF in %s.\n"
|
|
|
|
"The file will have its original line endings in your working directory."
|
|
|
|
msgstr ""
|
|
|
|
"Les CRLF seront remplacés par des LF dans %s.\n"
|
2016-11-22 15:24:59 +01:00
|
|
|
"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
|
|
|
|
"travail."
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: convert.c:205
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "CRLF would be replaced by LF in %s."
|
|
|
|
msgstr "Les CRLF seraient remplacés par des LF dans %s."
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: convert.c:211
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"LF will be replaced by CRLF in %s.\n"
|
|
|
|
"The file will have its original line endings in your working directory."
|
|
|
|
msgstr ""
|
|
|
|
"Les LF seront remplacés par des CRLF dans %s.\n"
|
2016-11-22 15:24:59 +01:00
|
|
|
"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
|
|
|
|
"travail."
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: convert.c:215
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "LF would be replaced by CRLF in %s"
|
|
|
|
msgstr "Les LF seraient remplacés par des CRLF dans %s"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: date.c:97
|
|
|
|
msgid "in the future"
|
|
|
|
msgstr "dans le futur"
|
|
|
|
|
|
|
|
#: date.c:103
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%lu second ago"
|
|
|
|
msgid_plural "%lu seconds ago"
|
|
|
|
msgstr[0] "il y a %lu seconde"
|
|
|
|
msgstr[1] "il y a %lu secondes"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: date.c:110
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%lu minute ago"
|
|
|
|
msgid_plural "%lu minutes ago"
|
|
|
|
msgstr[0] "il y a %lu minute"
|
|
|
|
msgstr[1] "il y a %lu minutes"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: date.c:117
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%lu hour ago"
|
|
|
|
msgid_plural "%lu hours ago"
|
|
|
|
msgstr[0] "il y a %lu heure"
|
|
|
|
msgstr[1] "il y a %lu heures"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: date.c:124
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%lu day ago"
|
|
|
|
msgid_plural "%lu days ago"
|
|
|
|
msgstr[0] "il y a %lu jour"
|
|
|
|
msgstr[1] "il y a %lu jours"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: date.c:130
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%lu week ago"
|
|
|
|
msgid_plural "%lu weeks ago"
|
|
|
|
msgstr[0] "il y a %lu semaine"
|
|
|
|
msgstr[1] "il y a %lu semaines"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: date.c:137
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%lu month ago"
|
|
|
|
msgid_plural "%lu months ago"
|
|
|
|
msgstr[0] "il y a %lu mois"
|
|
|
|
msgstr[1] "il y a %lu mois"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: date.c:148
|
2014-01-18 14:36:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%lu year"
|
|
|
|
msgid_plural "%lu years"
|
|
|
|
msgstr[0] "%lu an"
|
|
|
|
msgstr[1] "%lu ans"
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#. TRANSLATORS: "%s" is "<n> years"
|
|
|
|
#: date.c:151
|
2014-01-18 14:36:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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"
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: date.c:156 date.c:161
|
2014-01-18 14:36:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%lu year ago"
|
|
|
|
msgid_plural "%lu years ago"
|
|
|
|
msgstr[0] "il y a %lu an"
|
|
|
|
msgstr[1] "il y a %lu ans"
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: diffcore-order.c:24
|
|
|
|
#, c-format
|
|
|
|
msgid "failed to read orderfile '%s'"
|
|
|
|
msgstr "impossible de lire le fichier de commande '%s'"
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
#: diffcore-rename.c:536
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Performing inexact rename detection"
|
|
|
|
msgstr "Détection de renommage inexact en cours"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: diff.c:62
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "option '%s' requires a value"
|
|
|
|
msgstr "le commutateur '%s' a besoin d'une valeur"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: diff.c:124
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
|
|
|
|
msgstr ""
|
|
|
|
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: diff.c:129
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " Unknown dirstat parameter '%s'\n"
|
|
|
|
msgstr " Paramètre dirstat inconnu '%s'\n"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: diff.c:281
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: diff.c:344
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"Found errors in 'diff.dirstat' config variable:\n"
|
|
|
|
"%s"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
|
|
|
|
"%s"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: diff.c:3102
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "external diff died, stopping at %s"
|
|
|
|
msgstr "l'application de diff externe a disparu, arrêt à %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: diff.c:3428
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
|
|
|
|
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: diff.c:3518
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--follow requires exactly one pathspec"
|
|
|
|
msgstr "--follow a besoin d'une spécification de chemin unique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: diff.c:3681
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Failed to parse --dirstat/-X option parameter:\n"
|
|
|
|
"%s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
|
|
|
|
"%s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: diff.c:3695
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Failed to parse --submodule option parameter: '%s'"
|
|
|
|
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: diff.c:4719
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "inexact rename detection was skipped due to too many files."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"détection de renommage inexact annulée à cause d'un trop grand nombre de "
|
|
|
|
"fichiers."
|
2015-03-29 09:54:56 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: diff.c:4722
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "only found copies from modified paths due to too many files."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"recherche uniquement des copies par modification de chemin à cause d'un trop "
|
|
|
|
"grand nombre de fichiers."
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: diff.c:4725
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"you may want to set your %s variable to at least %d and retry the command."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
|
|
|
|
"commande."
|
2015-03-29 09:54:56 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: dir.c:1899
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to get kernel name and information"
|
|
|
|
msgstr "echec de l'obtention d'information de kernel"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: dir.c:2018
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Untracked cache is disabled on this system or location."
|
|
|
|
msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: dir.c:2776 dir.c:2781
|
|
|
|
#, c-format
|
|
|
|
msgid "could not create directories for %s"
|
|
|
|
msgstr "impossible de créer les répertoires pour %s"
|
|
|
|
|
|
|
|
#: dir.c:2806
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not migrate git directory from '%s' to '%s'"
|
|
|
|
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: entry.c:280
|
|
|
|
#, c-format
|
|
|
|
msgid "could not stat file '%s'"
|
|
|
|
msgstr "impossible de stat le fichier '%s'"
|
|
|
|
|
|
|
|
#: fetch-pack.c:249
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git fetch-pack: expected shallow list"
|
|
|
|
msgstr "git fetch-pack : list courte attendue"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: fetch-pack.c:261
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git fetch-pack: expected ACK/NAK, got EOF"
|
|
|
|
msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:280 builtin/archive.c:63
|
|
|
|
#, c-format
|
|
|
|
msgid "remote error: %s"
|
|
|
|
msgstr "erreur distante : %s"
|
|
|
|
|
|
|
|
#: fetch-pack.c:281
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-22 15:24:59 +01:00
|
|
|
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
|
2016-11-05 21:43:53 +01:00
|
|
|
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:333
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--stateless-rpc requires multi_ack_detailed"
|
|
|
|
msgstr "--stateless-rpc nécessite multi_ack_detailed"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:419
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid shallow line: %s"
|
|
|
|
msgstr "ligne de superficiel invalide : %s"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:425
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid unshallow line: %s"
|
|
|
|
msgstr "ligne de fin de superficiel invalide : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:427
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "object not found: %s"
|
|
|
|
msgstr "objet non trouvé : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:430
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "error in object: %s"
|
|
|
|
msgstr "Erreur dans l'objet : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:432
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "no shallow found: %s"
|
|
|
|
msgstr "Pas de superficiel trouvé : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:435
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "expected shallow/unshallow, got %s"
|
|
|
|
msgstr "superficiel/non superficiel attendu, %s trouvé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:474
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "got %s %d %s"
|
|
|
|
msgstr "réponse %s %d %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:488
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid commit %s"
|
|
|
|
msgstr "commit invalide %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:521
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "giving up"
|
|
|
|
msgstr "abandon"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:531 progress.c:235
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "done"
|
|
|
|
msgstr "fait"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:543
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "got %s (%d) %s"
|
|
|
|
msgstr "%s trouvé (%d) %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:589
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Marking %s as complete"
|
|
|
|
msgstr "Marquage de %s comme terminé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:737
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "already have %s (%s)"
|
|
|
|
msgstr "%s déjà possédé (%s)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:775
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "fetch-pack: unable to fork off sideband demultiplexer"
|
|
|
|
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:783
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "protocol error: bad pack header"
|
|
|
|
msgstr "erreur de protocole : mauvais entête de paquet"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:839
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "fetch-pack: unable to fork off %s"
|
|
|
|
msgstr "fetch-pack : impossible de dupliquer %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:855
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s failed"
|
|
|
|
msgstr "échec de %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:857
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "error in sideband demultiplexer"
|
|
|
|
msgstr "erreur dans le démultiplexer latéral"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:884
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server does not support shallow clients"
|
|
|
|
msgstr "Le serveur ne supporte les clients superficiels"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:888
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server supports multi_ack_detailed"
|
|
|
|
msgstr "Le serveur supporte multi_ack_detailed"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:891
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server supports no-done"
|
|
|
|
msgstr "Le serveur support no-done"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:897
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server supports multi_ack"
|
|
|
|
msgstr "Le serveur supporte multi_ack"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:901
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server supports side-band-64k"
|
|
|
|
msgstr "Le serveur supporte side-band-64k"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:905
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server supports side-band"
|
|
|
|
msgstr "Le serveru supporte side-band"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:909
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server supports allow-tip-sha1-in-want"
|
|
|
|
msgstr "Le serveur supporte allow-tip-sha1-in-want"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:913
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server supports allow-reachable-sha1-in-want"
|
|
|
|
msgstr "Le serveur supporte allow-reachable-sha1-in-want"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:923
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server supports ofs-delta"
|
|
|
|
msgstr "Le serveur support ofs-delta"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:930
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server version is %.*s"
|
|
|
|
msgstr "La version du serveur est %.*s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:936
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server does not support --shallow-since"
|
|
|
|
msgstr "Le receveur ne gère pas --shallow-since"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:940
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server does not support --shallow-exclude"
|
|
|
|
msgstr "Le receveur ne gère pas --shallow-exclude"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:942
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Server does not support --deepen"
|
|
|
|
msgstr "Le receveur ne gère pas --deepen"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:953
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "no common commits"
|
|
|
|
msgstr "pas de commit commun"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:965
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git fetch-pack: fetch failed."
|
|
|
|
msgstr "git fetch-pack : échec de le récupération."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:1127
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "no matching remote head"
|
|
|
|
msgstr "pas de HEAD distante correspondante"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:1149
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "no such remote ref %s"
|
|
|
|
msgstr "référence distante inconnue %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: fetch-pack.c:1152
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Server does not allow request for unadvertised object %s"
|
|
|
|
msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: gpg-interface.c:185
|
|
|
|
msgid "gpg failed to sign the data"
|
|
|
|
msgstr "gpg n'a pas pu signer les données"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: gpg-interface.c:215
|
|
|
|
msgid "could not create temporary file"
|
|
|
|
msgstr "impossible de créer un fichier temporaire"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: gpg-interface.c:217
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed writing detached signature to '%s'"
|
|
|
|
msgstr "impossible d'écrire la signature détachée dans '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: graph.c:96
|
|
|
|
#, c-format
|
|
|
|
msgid "ignore invalid color '%.*s' in log.graphColors"
|
|
|
|
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: grep.c:1796
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "'%s': unable to read %s"
|
|
|
|
msgstr "'%s' : lecture de %s impossible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to stat '%s'"
|
|
|
|
msgstr "échec du stat de '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: grep.c:1824
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "'%s': short read"
|
|
|
|
msgstr "'%s' : lecture tronquée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:218
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "available git commands in '%s'"
|
|
|
|
msgstr "commandes git disponibles dans '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:225
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git commands available from elsewhere on your $PATH"
|
|
|
|
msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:256
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "These are common Git commands used in various situations:"
|
|
|
|
msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:321
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"'%s' appears to be a git command, but we were not\n"
|
|
|
|
"able to execute it. Maybe git-%s is broken?"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"'%s' semble être une commande git, mais elle n'a pas pu\n"
|
|
|
|
"être exécutée. Peut-être git-%s est-elle cassée ?"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:376
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Uh oh. Your system reports no Git commands at all."
|
|
|
|
msgstr "Ahem. Votre système n'indique aucune commande Git."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:398
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"WARNING: You called a Git command named '%s', which does not exist.\n"
|
|
|
|
"Continuing under the assumption that you meant '%s'"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe "
|
|
|
|
"pas.\n"
|
|
|
|
"Continuons en supposant que vous avez voulu dire '%s'"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:403
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "in %0.1f seconds automatically..."
|
|
|
|
msgstr "dans %0.1f secondes automatiquement..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:410
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git: '%s' is not a git command. See 'git --help'."
|
|
|
|
msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:414 help.c:480
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"Did you mean this?"
|
|
|
|
msgid_plural ""
|
|
|
|
"\n"
|
|
|
|
"Did you mean one of these?"
|
|
|
|
msgstr[0] ""
|
|
|
|
"\n"
|
|
|
|
"Vouliez-vous dire cela ?"
|
|
|
|
msgstr[1] ""
|
|
|
|
"\n"
|
|
|
|
"Vouliez-vous dire un de ceux-là ?"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: help.c:476
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s: %s - %s"
|
|
|
|
msgstr "%s: %s - %s"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ident.c:343
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"\n"
|
|
|
|
"*** Please tell me who you are.\n"
|
|
|
|
"\n"
|
|
|
|
"Run\n"
|
|
|
|
"\n"
|
|
|
|
" git config --global user.email \"you@example.com\"\n"
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
"\n"
|
|
|
|
"to set your account's default identity.\n"
|
|
|
|
"Omit --global to set the identity only in this repository.\n"
|
|
|
|
"\n"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"\n"
|
|
|
|
"*** Veuillez me dire qui vous êtes.\n"
|
|
|
|
"\n"
|
|
|
|
"Lancez\n"
|
|
|
|
"\n"
|
|
|
|
" git config --global user.email \"Vous@exemple.com\"\n"
|
|
|
|
" git config --global user.name \"Votre Nom\"\n"
|
|
|
|
"\n"
|
|
|
|
"pour régler l'identité par défaut de votre compte.\n"
|
|
|
|
"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
|
|
|
|
"\n"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ident.c:367
|
|
|
|
msgid "no email was given and auto-detection is disabled"
|
|
|
|
msgstr "aucun courriel fourni et l'auto-détection est désactivée"
|
|
|
|
|
|
|
|
#: ident.c:372
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to auto-detect email address (got '%s')"
|
|
|
|
msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
|
|
|
|
|
|
|
|
#: ident.c:382
|
|
|
|
msgid "no name was given and auto-detection is disabled"
|
|
|
|
msgstr "aucun nom fourni et l'auto-détection est désactivée"
|
|
|
|
|
|
|
|
#: ident.c:388
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to auto-detect name (got '%s')"
|
|
|
|
msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
|
|
|
|
|
|
|
|
#: ident.c:396
|
|
|
|
#, c-format
|
|
|
|
msgid "empty ident name (for <%s>) not allowed"
|
|
|
|
msgstr "nom d'identifiant vide (pour <%s>) non permis"
|
|
|
|
|
|
|
|
#: ident.c:402
|
|
|
|
#, c-format
|
|
|
|
msgid "name consists only of disallowed characters: %s"
|
|
|
|
msgstr "le nom n'est constitué que de caractères interdits : %s"
|
|
|
|
|
|
|
|
#: ident.c:417 builtin/commit.c:611
|
|
|
|
#, c-format
|
|
|
|
msgid "invalid date format: %s"
|
|
|
|
msgstr "format de date invalide : %s"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: lockfile.c:152
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Unable to create '%s.lock': %s.\n"
|
|
|
|
"\n"
|
|
|
|
"Another git process seems to be running in this repository, e.g.\n"
|
|
|
|
"an editor opened by 'git commit'. Please make sure all processes\n"
|
|
|
|
"are terminated then try again. If it still fails, a git process\n"
|
|
|
|
"may have crashed in this repository earlier:\n"
|
|
|
|
"remove the file manually to continue."
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Impossible de créer '%s.lock' : %s.\n"
|
|
|
|
"\n"
|
|
|
|
"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n"
|
|
|
|
"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n"
|
|
|
|
"que tous les processus sont terminés et réessayez. Si l'echec persiste,\n"
|
|
|
|
"un processus git peut avoir planté :\n"
|
|
|
|
"supprimez le fichier manuellement pour poursuivre."
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: lockfile.c:160
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unable to create '%s.lock': %s"
|
|
|
|
msgstr "Impossible de créer '%s.lock' : %s"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: merge.c:41
|
|
|
|
msgid "failed to read the cache"
|
|
|
|
msgstr "impossible de lire le cache"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:607 builtin/clone.c:749
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to write new index file"
|
|
|
|
msgstr "impossible d'écrire le nouveau fichier d'index"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: merge-recursive.c:209
|
|
|
|
msgid "(bad commit)\n"
|
|
|
|
msgstr "(mauvais commit)\n"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:231 merge-recursive.c:239
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "addinfo_cache failed for path '%s'"
|
|
|
|
msgstr "échec de addinfo_cache pour le chemin '%s'"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:303
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "error building trees"
|
|
|
|
msgstr "erreur de construction des arbres"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:727
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to create path '%s'%s"
|
|
|
|
msgstr "impossible de créer le chemin '%s' %s"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:738
|
2016-11-05 21:43:53 +01:00
|
|
|
#, 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"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:752 merge-recursive.c:771
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ": perhaps a D/F conflict?"
|
|
|
|
msgstr ": peut-être un conflit D/F ?"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:761
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "refusing to lose untracked file at '%s'"
|
|
|
|
msgstr "refus de perdre le fichier non suivi '%s'"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:803 builtin/cat-file.c:34
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot read object %s '%s'"
|
|
|
|
msgstr "impossible de lire l'objet %s '%s'"
|
2016-03-14 20:26:53 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:805
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "blob expected for %s '%s'"
|
|
|
|
msgstr "blob attendu pour %s '%s'"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:829
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to open '%s': %s"
|
|
|
|
msgstr "échec à l'ouverture de '%s' : %s"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:840
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to symlink '%s': %s"
|
|
|
|
msgstr "échec à la création du lien symbolique '%s' : %s"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:845
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "do not know what to do with %06o %s '%s'"
|
|
|
|
msgstr "ne sait pas traiter %06o %s '%s'"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:985
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Failed to execute internal merge"
|
|
|
|
msgstr "Échec à l'exécution de la fusion interne"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: merge-recursive.c:989
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unable to add %s to database"
|
|
|
|
msgstr "Impossible d'ajouter %s à la base de données"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1092
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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."
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1097
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
|
|
|
|
"left in tree."
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
|
|
|
|
"%s de %s laissée dans l'arbre."
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: merge-recursive.c:1104
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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."
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1109
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
|
|
|
|
"left in tree at %s."
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
|
|
|
|
"%s de %s laissée dans l'arbre dans le fichier %s."
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: merge-recursive.c:1143
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "rename"
|
|
|
|
msgstr "renommage"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1143
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "renamed"
|
|
|
|
msgstr "renommé"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1200
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s is a directory in %s adding as %s instead"
|
|
|
|
msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1225
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
|
|
|
"\"->\"%s\" in \"%s\"%s"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
|
|
|
|
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1230
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (left unresolved)"
|
|
|
|
msgstr " (laissé non résolu)"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1292
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
|
|
|
|
">'%s' dans %s"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1325
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Renaming %s to %s and %s to %s instead"
|
|
|
|
msgstr "Renommage de %s en %s et de %s en %s à la place"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1528
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
|
2016-05-26 22:46:41 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1543
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Adding merged %s"
|
|
|
|
msgstr "Ajout de %s fusionné"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1550 merge-recursive.c:1780
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Adding as %s instead"
|
|
|
|
msgstr "Ajout plutôt comme %s"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1607
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot read object %s"
|
|
|
|
msgstr "impossible de lire l'objet %s"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1610
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "object %s is not a blob"
|
|
|
|
msgstr "l'objet %s n'est pas un blob"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1679
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "modify"
|
|
|
|
msgstr "modification"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1679
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "modified"
|
|
|
|
msgstr "modifié"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1689
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "content"
|
|
|
|
msgstr "contenu"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1696
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "add/add"
|
|
|
|
msgstr "ajout/ajout"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1732
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Skipped %s (merged same as existing)"
|
|
|
|
msgstr "%s sauté (fusion identique à l'existant)"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1746
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Auto-merging %s"
|
|
|
|
msgstr "Fusion automatique de %s"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1750 git-submodule.sh:944
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "submodule"
|
|
|
|
msgstr "sous-module"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1751
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "CONFLICT (%s): Merge conflict in %s"
|
|
|
|
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1845
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Removing %s"
|
|
|
|
msgstr "Suppression de %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1871
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "file/directory"
|
|
|
|
msgstr "fichier/répertoire"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1877
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "directory/file"
|
|
|
|
msgstr "répertoire/fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1883
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
2016-05-26 22:46:41 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1892
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Adding %s"
|
|
|
|
msgstr "Ajout de %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1929
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Already up-to-date!"
|
|
|
|
msgstr "Déjà à jour !"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:1938
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "merging of trees %s and %s failed"
|
|
|
|
msgstr "échec de fusion des arbres %s et %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:2021
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Merging:"
|
|
|
|
msgstr "Fusion :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:2034
|
2016-11-05 21:43:53 +01:00
|
|
|
#, 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 :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:2073
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "merge returned no commit"
|
|
|
|
msgstr "la fusion n'a pas retourné de commit"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:2136
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not parse object '%s'"
|
|
|
|
msgstr "Impossible d'analyser l'objet '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unable to write index."
|
|
|
|
msgstr "Impossible d'écrire l'index."
|
|
|
|
|
|
|
|
#: notes-merge.c:273
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"You have not concluded your previous notes merge (%s exists).\n"
|
|
|
|
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
|
|
|
|
"commit/abort the previous merge before you start a new notes merge."
|
2016-05-26 22:46:41 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Vous n'avez pas terminé votre précédente fusion de notes (%s existe).\n"
|
2016-11-22 15:24:59 +01:00
|
|
|
"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
|
|
|
|
"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
|
2016-11-05 21:43:53 +01:00
|
|
|
|
|
|
|
#: notes-merge.c:280
|
|
|
|
#, c-format
|
|
|
|
msgid "You have not concluded your notes merge (%s exists)."
|
|
|
|
msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
|
|
|
|
|
|
|
|
#: notes-utils.c:41
|
|
|
|
msgid "Cannot commit uninitialized/unreferenced notes tree"
|
|
|
|
msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
|
|
|
|
|
|
|
|
#: notes-utils.c:100
|
|
|
|
#, c-format
|
|
|
|
msgid "Bad notes.rewriteMode value: '%s'"
|
|
|
|
msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
|
|
|
|
|
|
|
|
#: notes-utils.c:110
|
|
|
|
#, c-format
|
|
|
|
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
|
|
|
|
msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
|
|
|
|
|
|
|
|
#. TRANSLATORS: The first %s is the name of the
|
|
|
|
#. environment variable, the second %s is its value
|
|
|
|
#: notes-utils.c:137
|
|
|
|
#, c-format
|
|
|
|
msgid "Bad %s value: '%s'"
|
|
|
|
msgstr "Mauvaise valeur de %s : '%s'"
|
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: object.c:240
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to parse object: %s"
|
|
|
|
msgstr "impossible d'analyser l'objet : %s"
|
|
|
|
|
|
|
|
#: parse-options.c:572
|
|
|
|
msgid "..."
|
|
|
|
msgstr "..."
|
|
|
|
|
|
|
|
#: parse-options.c:590
|
|
|
|
#, c-format
|
|
|
|
msgid "usage: %s"
|
|
|
|
msgstr "usage : %s"
|
|
|
|
|
|
|
|
#. TRANSLATORS: the colon here should align with the
|
|
|
|
#. one in "usage: %s" translation
|
|
|
|
#: parse-options.c:594
|
|
|
|
#, c-format
|
|
|
|
msgid " or: %s"
|
|
|
|
msgstr " ou : %s"
|
|
|
|
|
|
|
|
#: parse-options.c:597
|
|
|
|
#, c-format
|
|
|
|
msgid " %s"
|
|
|
|
msgstr " %s"
|
|
|
|
|
|
|
|
#: parse-options.c:631
|
|
|
|
msgid "-NUM"
|
|
|
|
msgstr "-NUM"
|
|
|
|
|
|
|
|
#: parse-options-cb.c:108
|
|
|
|
#, c-format
|
|
|
|
msgid "malformed object name '%s'"
|
|
|
|
msgstr "nom d'objet malformé '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: path.c:810
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not make %s writable by group"
|
|
|
|
msgstr "Impossible de rendre %s inscriptible pour le groupe"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:125
|
|
|
|
msgid "Escape character '\\' not allowed as last character in attr value"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "
|
|
|
|
"valeur d'attribut"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: pathspec.c:143
|
|
|
|
msgid "Only one 'attr:' specification is allowed."
|
|
|
|
msgstr "Une seule spécification 'attr:' est autorisée."
|
|
|
|
|
|
|
|
#: pathspec.c:146
|
|
|
|
msgid "attr spec must not be empty"
|
|
|
|
msgstr "un spécificateur d'attribut ne peut pas être vide"
|
|
|
|
|
|
|
|
#: pathspec.c:189
|
|
|
|
#, c-format
|
|
|
|
msgid "invalid attribute name %s"
|
|
|
|
msgstr "nom d'attribut invalide %s"
|
|
|
|
|
|
|
|
#: pathspec.c:254
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
|
|
|
|
msgstr ""
|
|
|
|
"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "
|
|
|
|
"incompatibles"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:261
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"global 'literal' pathspec setting is incompatible with all other global "
|
|
|
|
"pathspec settings"
|
|
|
|
msgstr ""
|
|
|
|
"le réglage global de spécificateur de chemin 'literal' est incompatible avec "
|
|
|
|
"tous les autres réglages globaux de spécificateur de chemin"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:301
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid parameter for pathspec magic 'prefix'"
|
|
|
|
msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:322
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid pathspec magic '%.*s' in '%s'"
|
|
|
|
msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:327
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Missing ')' at the end of pathspec magic in '%s'"
|
|
|
|
msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:365
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Unimplemented pathspec magic '%c' in '%s'"
|
|
|
|
msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:421 pathspec.c:443
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Pathspec '%s' is in submodule '%.*s'"
|
|
|
|
msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:483
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: 'literal' and 'glob' are incompatible"
|
|
|
|
msgstr "%s : 'literal' et 'glob' sont incompatibles"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:496
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: '%s' is outside repository"
|
|
|
|
msgstr "%s : '%s' est hors du dépôt"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:584
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "'%s' (mnemonic: '%c')"
|
|
|
|
msgstr "'%s' (mnémonique : '%c')"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:594
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: pathspec magic not supported by this command: %s"
|
|
|
|
msgstr ""
|
|
|
|
"%s : le spécificateur magique de chemin n'est pas supporté par cette "
|
|
|
|
"commande : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:644
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"empty strings as pathspecs will be made invalid in upcoming releases. please "
|
|
|
|
"use . instead if you meant to match all paths"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"les chaines de caractères vides comme spécificateurs de chemin seront "
|
|
|
|
"invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
|
|
|
|
"correspondre à tous le chemins"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: pathspec.c:668
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "pathspec '%s' is beyond a symbolic link"
|
|
|
|
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: pretty.c:982
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to parse --pretty format"
|
|
|
|
msgstr "impossible d'analyser le format --pretty"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: read-cache.c:1442
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"index.version set, but the value is invalid.\n"
|
|
|
|
"Using version %i"
|
|
|
|
msgstr ""
|
|
|
|
"version d'index renseignée, mais la valeur est invalide.\n"
|
|
|
|
"Utilisation de la version %i"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: read-cache.c:1452
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"GIT_INDEX_VERSION set, but the value is invalid.\n"
|
|
|
|
"Using version %i"
|
|
|
|
msgstr ""
|
|
|
|
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
|
|
|
|
"Utilisation de la version %i"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not stat '%s'"
|
|
|
|
msgstr "stat impossible de '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: read-cache.c:2388
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to open git dir: %s"
|
|
|
|
msgstr "impossible d'ouvrir le répertoire git : %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: read-cache.c:2400
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to unlink: %s"
|
|
|
|
msgstr "échec lors de l'unlink : %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: refs.c:620 builtin/merge.c:844
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not open '%s' for writing"
|
|
|
|
msgstr "Impossible d'ouvrir '%s' en écriture"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: refs.c:1667
|
|
|
|
msgid "ref updates forbidden inside quarantine environment"
|
|
|
|
msgstr "mises à jour des références interdites en environnement de quarantaine"
|
|
|
|
|
|
|
|
#: refs/files-backend.c:1631
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not delete reference %s: %s"
|
|
|
|
msgstr "Impossible de supprimer la référence %s : %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: refs/files-backend.c:1634
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not delete references: %s"
|
|
|
|
msgstr "impossible de supprimer les références : %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: refs/files-backend.c:1643
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not remove reference %s"
|
|
|
|
msgstr "impossible de supprimer la référence %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
# à priori on parle d'une branche ici
|
|
|
|
#: ref-filter.c:35 wt-status.c:1780
|
|
|
|
msgid "gone"
|
|
|
|
msgstr "disparue"
|
|
|
|
|
|
|
|
#: ref-filter.c:36
|
|
|
|
#, c-format
|
|
|
|
msgid "ahead %d"
|
|
|
|
msgstr "en avance de %d"
|
|
|
|
|
|
|
|
#: ref-filter.c:37
|
|
|
|
#, c-format
|
|
|
|
msgid "behind %d"
|
|
|
|
msgstr "en retard de %d"
|
|
|
|
|
|
|
|
#: ref-filter.c:38
|
|
|
|
#, c-format
|
|
|
|
msgid "ahead %d, behind %d"
|
|
|
|
msgstr "en avance de %d, en retard de %d"
|
|
|
|
|
|
|
|
#: ref-filter.c:104
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "expected format: %%(color:<color>)"
|
|
|
|
msgstr "format attendu : %%(color:<couleur>)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:106
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized color: %%(color:%s)"
|
|
|
|
msgstr "couleur non reconnue : %%(color:%s)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:120
|
|
|
|
#, c-format
|
|
|
|
msgid "Integer value expected refname:lstrip=%s"
|
|
|
|
msgstr "Valeur entière attendue refname:lstrip=%s"
|
|
|
|
|
|
|
|
#: ref-filter.c:124
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "Integer value expected refname:rstrip=%s"
|
|
|
|
msgstr "Valeur entière attendue refname:rstrip=%s"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:126
|
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized %%(%s) argument: %s"
|
|
|
|
msgstr "argument %%(%s) non reconnu : %s"
|
|
|
|
|
|
|
|
#: ref-filter.c:166
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%%(body) does not take arguments"
|
|
|
|
msgstr "%%(body) n'accepte pas d'argument"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:173
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%%(subject) does not take arguments"
|
|
|
|
msgstr "%%(subject) n'accepte pas d'argument"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:180
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%%(trailers) does not take arguments"
|
|
|
|
msgstr "%%(trailers) n'accepte pas d'argument"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:199
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "positive value expected contents:lines=%s"
|
|
|
|
msgstr "valeur positive attendue contents:lines=%s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:201
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized %%(contents) argument: %s"
|
|
|
|
msgstr "argument %%(contents) non reconnu : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:214
|
|
|
|
#, c-format
|
|
|
|
msgid "positive value expected objectname:short=%s"
|
|
|
|
msgstr "valeur positive attendue objectname:short=%s"
|
|
|
|
|
|
|
|
#: ref-filter.c:218
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized %%(objectname) argument: %s"
|
|
|
|
msgstr "argument %%(objectname) non reconnu : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:245
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "expected format: %%(align:<width>,<position>)"
|
|
|
|
msgstr "format attendu : %%(align:<largeur>,<position>)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:257
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized position:%s"
|
|
|
|
msgstr "position non reconnue : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:261
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized width:%s"
|
|
|
|
msgstr "largeur non reconnue : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:267
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized %%(align) argument: %s"
|
|
|
|
msgstr "argument %%(align) non reconnu : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:271
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "positive width expected with the %%(align) atom"
|
|
|
|
msgstr "valeur positive attendue avec l'atome %%(align)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:286
|
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized %%(if) argument: %s"
|
|
|
|
msgstr "argument %%(if) non reconnu : %s"
|
|
|
|
|
|
|
|
#: ref-filter.c:371
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "malformed field name: %.*s"
|
|
|
|
msgstr "nom de champ malformé %.*s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:397
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown field name: %.*s"
|
|
|
|
msgstr "nom de champ inconnu : %.*s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:501
|
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(if) atom used without a %%(then) atom"
|
|
|
|
msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
|
|
|
|
|
|
|
|
#: ref-filter.c:561
|
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(then) atom used without an %%(if) atom"
|
|
|
|
msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
|
|
|
|
|
|
|
|
#: ref-filter.c:563
|
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(then) atom used more than once"
|
|
|
|
msgstr "format : atome %%(then) utilisé plus d'une fois"
|
|
|
|
|
|
|
|
#: ref-filter.c:565
|
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(then) atom used after %%(else)"
|
|
|
|
msgstr "format: atome %%(then) utilisé après %%(else)"
|
|
|
|
|
|
|
|
#: ref-filter.c:591
|
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(else) atom used without an %%(if) atom"
|
|
|
|
msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
|
|
|
|
|
|
|
|
#: ref-filter.c:593
|
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(else) atom used without a %%(then) atom"
|
|
|
|
msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
|
|
|
|
|
|
|
|
#: ref-filter.c:595
|
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(else) atom used more than once"
|
|
|
|
msgstr "format : atome %%(else) utilisé plus d'une fois"
|
|
|
|
|
|
|
|
#: ref-filter.c:608
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(end) atom used without corresponding atom"
|
|
|
|
msgstr "format : atome %%(end) utilisé sans atome correspondant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:663
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "malformed format string %s"
|
|
|
|
msgstr "Chaîne de formatage mal formée %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:1247
|
|
|
|
#, c-format
|
|
|
|
msgid "(no branch, rebasing %s)"
|
|
|
|
msgstr "(aucune branche, rebasage de %s)"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:1250
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "(no branch, bisect started on %s)"
|
|
|
|
msgstr "(aucune branche, bisect a démarré sur %s)"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#. TRANSLATORS: make sure this matches
|
|
|
|
#. "HEAD detached at " in wt-status.c
|
|
|
|
#: ref-filter.c:1256
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "(HEAD detached at %s)"
|
|
|
|
msgstr "(HEAD détachée sur %s)"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#. TRANSLATORS: make sure this matches
|
|
|
|
#. "HEAD detached from " in wt-status.c
|
|
|
|
#: ref-filter.c:1261
|
|
|
|
#, c-format
|
|
|
|
msgid "(HEAD detached from %s)"
|
|
|
|
msgstr "(HEAD détachée depuis %s)"
|
|
|
|
|
|
|
|
#: ref-filter.c:1265
|
|
|
|
msgid "(no branch)"
|
|
|
|
msgstr "(aucune branche)"
|
|
|
|
|
|
|
|
#: ref-filter.c:1420 ref-filter.c:1451
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "missing object %s for %s"
|
|
|
|
msgstr "objet manquant %s pour %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:1423 ref-filter.c:1454
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "parse_object_buffer failed on %s for %s"
|
|
|
|
msgstr "echec de parse_object_buffer sur %s pour %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:1692
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "malformed object at '%s'"
|
|
|
|
msgstr "objet malformé à '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:1759
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "ignoring ref with broken name %s"
|
|
|
|
msgstr "réf avec un nom cassé %s ignoré"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:1764
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "ignoring broken ref %s"
|
|
|
|
msgstr "réf cassé %s ignoré"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:2028
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "format: %%(end) atom missing"
|
|
|
|
msgstr "format: atome %%(end) manquant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: ref-filter.c:2109
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "malformed object name %s"
|
|
|
|
msgstr "nom d'objet malformé %s"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:754
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot fetch both %s and %s to %s"
|
|
|
|
msgstr "Impossible de récupérer à la fois %s et %s pour %s"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:758
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s usually tracks %s, not %s"
|
|
|
|
msgstr "%s suit habituellement %s, pas %s"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:762
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s tracks both %s and %s"
|
|
|
|
msgstr "%s suit à la fois %s et %s"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:770
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Internal error"
|
|
|
|
msgstr "Erreur interne"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1685 remote.c:1787
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "HEAD does not point to a branch"
|
|
|
|
msgstr "HEAD ne pointe pas sur une branche"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1694
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "no such branch: '%s'"
|
|
|
|
msgstr "pas de branche '%s'"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1697
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "no upstream configured for branch '%s'"
|
|
|
|
msgstr "aucune branche amont configurée pour la branche '%s'"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1703
|
2016-11-05 21:43:53 +01:00
|
|
|
#, 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"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1718
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "push destination '%s' on remote '%s' has no local tracking branch"
|
|
|
|
msgstr ""
|
|
|
|
"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
|
|
|
|
"branche locale de suivi"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1730
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "branch '%s' has no remote for pushing"
|
|
|
|
msgstr "la branche '%s' n'a aucune branche distante de poussée"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1741
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "push refspecs for '%s' do not include '%s'"
|
|
|
|
msgstr "les références de spec pour '%s' n'incluent pas '%s'"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1754
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "push has no destination (push.default is 'nothing')"
|
|
|
|
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:1776
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot resolve 'simple' push to a single destination"
|
|
|
|
msgstr ""
|
|
|
|
"impossible de résoudre une poussée 'simple' pour une destination unique"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2081
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Your branch is based on '%s', but the upstream is gone.\n"
|
|
|
|
msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2085
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
|
|
|
|
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2088
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Your branch is up-to-date with '%s'.\n"
|
|
|
|
msgstr "Votre branche est à jour avec '%s'.\n"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2092
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Your branch is ahead of '%s' by %d commit.\n"
|
|
|
|
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
|
|
|
|
msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
|
|
|
|
msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2098
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git push\" to publish your local commits)\n"
|
|
|
|
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2101
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
|
|
|
|
msgid_plural ""
|
|
|
|
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
|
|
|
|
msgstr[0] ""
|
|
|
|
"Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour "
|
|
|
|
"en avance rapide.\n"
|
|
|
|
msgstr[1] ""
|
|
|
|
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
|
|
|
|
"en avance rapide.\n"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2109
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git pull\" to update your local branch)\n"
|
|
|
|
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2112
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"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"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: remote.c:2122
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
2016-05-26 22:46:41 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: revision.c:2158
|
|
|
|
msgid "your current branch appears to be broken"
|
|
|
|
msgstr "votre branche actuelle semble cassée"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: revision.c:2161
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "your current branch '%s' does not have any commits yet"
|
|
|
|
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: revision.c:2355
|
|
|
|
msgid "--first-parent is incompatible with --bisect"
|
|
|
|
msgstr "--first-parent est incompatible avec --bisect"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: run-command.c:125
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "open /dev/null failed"
|
|
|
|
msgstr "échec de l'ouverture de /dev/null"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: run-command.c:127
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "dup2(%d,%d) failed"
|
|
|
|
msgstr "échec de dup2(%d,%d)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: send-pack.c:150
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to parse remote unpack status: %s"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: send-pack.c:152
|
|
|
|
#, c-format
|
|
|
|
msgid "remote unpack failed: %s"
|
|
|
|
msgstr "le dépaquetage a échoué : %s"
|
|
|
|
|
|
|
|
#: send-pack.c:315
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to sign the push certificate"
|
|
|
|
msgstr "impossible de signer le certificat de poussée"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: send-pack.c:428
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "the receiving end does not support --signed push"
|
|
|
|
msgstr "Le receveur ne gère pas les poussées avec --signed"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: send-pack.c:430
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"not sending a push certificate since the receiving end does not support --"
|
|
|
|
"signed push"
|
2016-05-26 22:46:41 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
|
|
|
|
"poussées avec --signed"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: send-pack.c:442
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "the receiving end does not support --atomic push"
|
|
|
|
msgstr "Le receveur ne gère pas les poussées avec --atomic"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: send-pack.c:447
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "the receiving end does not support push options"
|
|
|
|
msgstr "Le receveur ne gère pas les options de poussées"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:215
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "revert"
|
|
|
|
msgstr "revert"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:217
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cherry-pick"
|
|
|
|
msgstr "cherry-pick"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:219
|
|
|
|
msgid "rebase -i"
|
|
|
|
msgstr "rebase -i"
|
|
|
|
|
|
|
|
#: sequencer.c:221
|
|
|
|
#, c-format
|
|
|
|
msgid "Unknown action: %d"
|
|
|
|
msgstr "Action inconnue : %d"
|
|
|
|
|
|
|
|
#: sequencer.c:278
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'"
|
2016-05-26 22:46:41 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"après résolution des conflits, marquez les chemins corrigés\n"
|
|
|
|
"avec 'git add <chemins>' ou 'git rm <chemins>'"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:281
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'\n"
|
|
|
|
"and commit the result with 'git commit'"
|
2016-05-26 22:46:41 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"après résolution des conflits, marquez les chemins corrigés\n"
|
|
|
|
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
|
|
|
|
"puis validez le résultat avec 'git commit'"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:294 sequencer.c:1682
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not lock '%s'"
|
|
|
|
msgstr "impossible de verrouiller '%s'"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not write to '%s'"
|
|
|
|
msgstr "impossible d'écrire dans '%s'"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:301
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-20 13:26:17 +01:00
|
|
|
msgid "could not write eol to '%s'"
|
2016-11-05 21:43:53 +01:00
|
|
|
msgstr "impossible d'écrire la fin de ligne dans '%s'"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to finalize '%s'."
|
|
|
|
msgstr "échec lors de la finalisation de '%s'."
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:749 builtin/merge.c:1018
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not read '%s'"
|
|
|
|
msgstr "impossible de lire '%s'"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:355
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "your local changes would be overwritten by %s."
|
|
|
|
msgstr "vos modifications locales seraient écrasées par %s."
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:359
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "commit your changes or stash them to proceed."
|
|
|
|
msgstr "validez vos modifications ou les remiser pour continuer."
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:388
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s: fast-forward"
|
|
|
|
msgstr "%s : avance rapide"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
|
|
|
|
#. * "rebase -i".
|
|
|
|
#.
|
|
|
|
#: sequencer.c:470
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: Unable to write new index file"
|
|
|
|
msgstr "%s: Impossible d'écrire le nouveau fichier index"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:489
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not resolve HEAD commit\n"
|
|
|
|
msgstr "impossible de résoudre le commit HEAD\n"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:509
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to update cache tree\n"
|
|
|
|
msgstr "impossible de mettre à jour l'arbre de cache\n"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: sequencer.c:592
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"you have staged changes in your working tree\n"
|
|
|
|
"If these changes are meant to be squashed into the previous commit, run:\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --amend %s\n"
|
|
|
|
"\n"
|
|
|
|
"If they are meant to go into a new commit, run:\n"
|
|
|
|
"\n"
|
|
|
|
" git commit %s\n"
|
|
|
|
"\n"
|
|
|
|
"In both cases, once you're done, continue with:\n"
|
|
|
|
"\n"
|
|
|
|
" git rebase --continue\n"
|
|
|
|
msgstr ""
|
|
|
|
"Vous avez des modifications indexées dans votre copie de travail.\n"
|
|
|
|
"Si elles devaient être ajoutées dans le commit précédent, lancez :\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --amend %s\n"
|
|
|
|
"\n"
|
|
|
|
"Si elles devaient aller dans un nouveau commit, lancez :\n"
|
|
|
|
"\n"
|
|
|
|
" git commit %s\n"
|
|
|
|
"\n"
|
|
|
|
"Dans les deux cas, une fois fini, continuez avec :\n"
|
|
|
|
"\n"
|
|
|
|
" git rebase --continue\n"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:694
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not parse commit %s\n"
|
|
|
|
msgstr "impossible d'analyser le commit %s\n"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:699
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not parse parent commit %s\n"
|
|
|
|
msgstr "impossible d'analyser le commit parent %s\n"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:821
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"unexpected 1st line of squash message:\n"
|
|
|
|
"\n"
|
|
|
|
"\t%.*s"
|
|
|
|
msgstr ""
|
|
|
|
"première ligne de message de compression inattendue :\n"
|
|
|
|
"\n"
|
|
|
|
"\t%.*s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:827
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"invalid 1st line of squash message:\n"
|
|
|
|
"\n"
|
|
|
|
"\t%.*s"
|
|
|
|
msgstr ""
|
|
|
|
"première ligne de message de compression invalide :\n"
|
|
|
|
"\n"
|
|
|
|
"\t%.*s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:833 sequencer.c:858
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "This is a combination of %d commits."
|
|
|
|
msgstr "Ceci est la combinaison de %d commits."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:842
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "need a HEAD to fixup"
|
|
|
|
msgstr "une HEAD est nécessaire à la correction"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:844
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "could not read HEAD"
|
|
|
|
msgstr "Impossible de lire HEAD"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:846
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "could not read HEAD's commit message"
|
|
|
|
msgstr "impossible de lire le message de validation de HEAD"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:852
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot write '%s'"
|
|
|
|
msgstr "impossible d'écrire '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:861 git-rebase--interactive.sh:445
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "This is the 1st commit message:"
|
|
|
|
msgstr "Ceci est le premier message de validation :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:869
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not read commit message of %s"
|
|
|
|
msgstr "impossible de lire le message de validation de %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:876
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "This is the commit message #%d:"
|
|
|
|
msgstr "Ceci est le message de validation numéro %d :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:881
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "The commit message #%d will be skipped:"
|
|
|
|
msgstr "Le message de validation %d sera ignoré :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:886
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown command: %d"
|
|
|
|
msgstr "commande inconnue : %d"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:952
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "your index file is unmerged."
|
|
|
|
msgstr "votre fichier d'index n'est pas fusionné."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:970
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:978
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "commit %s does not have parent %d"
|
|
|
|
msgstr "le commit %s n'a pas de parent %d"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:982
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "mainline was specified but commit %s is not a merge."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"une branche principale a été spécifiée mais le commit %s n'est pas une "
|
|
|
|
"fusion."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:988
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot get commit message for %s"
|
|
|
|
msgstr "impossible d'obtenir un message de validation pour %s"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#. TRANSLATORS: The first %s will be a "todo" command like
|
|
|
|
#. "revert" or "pick", the second %s a SHA1.
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:1009
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "%s: cannot parse parent commit %s"
|
|
|
|
msgstr "%s : impossible d'analyser le commit parent %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1071 sequencer.c:1827
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "could not rename '%s' to '%s'"
|
|
|
|
msgstr "impossible de renommer '%s' en '%s'"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:1122
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not revert %s... %s"
|
|
|
|
msgstr "impossible d'annuler %s... %s"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:1123
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not apply %s... %s"
|
|
|
|
msgstr "impossible d'appliquer %s... %s"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:1165
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "empty commit set passed"
|
|
|
|
msgstr "l'ensemble de commits spécifié est vide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:1175
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git %s: failed to read the index"
|
|
|
|
msgstr "git %s : échec à la lecture de l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sequencer.c:1182
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "git %s: failed to refresh the index"
|
|
|
|
msgstr "git %s : échec du rafraîchissement de l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1303
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid line %d: %.*s"
|
|
|
|
msgstr "ligne %d invalide : %.*s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1311
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot '%s' without a previous commit"
|
|
|
|
msgstr "'%s' impossible avec le commit précédent"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1344
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not read '%s'."
|
|
|
|
msgstr "impossible de lire '%s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1356
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "please fix this using 'git rebase --edit-todo'."
|
|
|
|
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1358
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unusable instruction sheet: '%s'"
|
|
|
|
msgstr "feuille d'instruction inutilisable : '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1363
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "no commits parsed."
|
|
|
|
msgstr "aucun commit analysé."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1374
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot cherry-pick during a revert."
|
|
|
|
msgstr "impossible de picorer pendant l'annulation d'un commit."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1376
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot revert during a cherry-pick."
|
|
|
|
msgstr "impossible d'annuler un commit pendant un picorage."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1439
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid key: %s"
|
|
|
|
msgstr "clé invalide : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1442
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid value for %s: %s"
|
|
|
|
msgstr "valeur invalide pour %s : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1499
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "malformed options sheet: '%s'"
|
|
|
|
msgstr "feuille d'options malformée : %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1537
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "a cherry-pick or revert is already in progress"
|
|
|
|
msgstr "un picorage ou un retour est déjà en cours"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1538
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
|
|
|
|
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1541
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not create sequencer directory '%s'"
|
|
|
|
msgstr "impossible de créer le répertoire de séquenceur '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1555
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not lock HEAD"
|
|
|
|
msgstr "impossible de verrouiller HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1611 sequencer.c:2181
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "no cherry-pick or revert in progress"
|
|
|
|
msgstr "aucun picorage ou retour en cours"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1613
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot resolve HEAD"
|
|
|
|
msgstr "impossible de résoudre HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1615 sequencer.c:1649
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot abort from a branch yet to be born"
|
|
|
|
msgstr "impossible d'abandonner depuis une branche non encore créée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1635 builtin/grep.c:910
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot open '%s'"
|
|
|
|
msgstr "impossible d'ouvrir '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1637
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot read '%s': %s"
|
|
|
|
msgstr "impossible de lire '%s' : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1638
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unexpected end of file"
|
|
|
|
msgstr "fin de fichier inattendue"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1644
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
|
|
|
|
msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1655
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1792 sequencer.c:2080
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "cannot read HEAD"
|
|
|
|
msgstr "impossible de lire HEAD"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1832 builtin/difftool.c:616
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not copy '%s' to '%s'"
|
|
|
|
msgstr "impossible de copier '%s' vers '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1848
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "could not read index"
|
|
|
|
msgstr "impossible de lire l'index"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1853
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"execution failed: %s\n"
|
|
|
|
"%sYou can fix the problem, and then run\n"
|
|
|
|
"\n"
|
|
|
|
" git rebase --continue\n"
|
|
|
|
"\n"
|
|
|
|
msgstr ""
|
|
|
|
"échec d'exécution : %s\n"
|
|
|
|
"%sVous pouvez corriger le problème, puis lancer\n"
|
|
|
|
"\n"
|
|
|
|
"git rebase --continue\n"
|
|
|
|
"\n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1859
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "and made changes to the index and/or the working tree\n"
|
|
|
|
msgstr "et a mis à jour l'index ou l'arbre de travail\n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1865
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"execution succeeded: %s\n"
|
|
|
|
"but left changes to the index and/or the working tree\n"
|
|
|
|
"Commit or stash your changes, and then run\n"
|
|
|
|
"\n"
|
|
|
|
" git rebase --continue\n"
|
|
|
|
"\n"
|
|
|
|
msgstr ""
|
|
|
|
"L'exécution a réussi : %s\n"
|
|
|
|
"mais a laissé des modifications dans l'index ou la copie de travail\n"
|
|
|
|
"Validez ou remisez vos modification, puis lancez\n"
|
|
|
|
"\n"
|
|
|
|
" git rebase --continue\n"
|
|
|
|
"\n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1920 git-rebase.sh:169
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Applied autostash."
|
|
|
|
msgstr "Autoremisage appliqué."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1932
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot store %s"
|
|
|
|
msgstr "impossible de stocker %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:1934 git-rebase.sh:173
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Applying autostash resulted in conflicts.\n"
|
|
|
|
"Your changes are safe in the stash.\n"
|
|
|
|
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
|
|
|
|
msgstr ""
|
|
|
|
"L'application de l'autoremisage a provoqué des conflits\n"
|
|
|
|
"Vos modifications sont à l'abri dans la remise.\n"
|
|
|
|
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2016
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "Stopped at %s... %.*s\n"
|
|
|
|
msgstr "arrêt à %s... %.*s\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2058
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown command %d"
|
|
|
|
msgstr "commande inconnue %d"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2088
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "could not read orig-head"
|
|
|
|
msgstr "impossible de lire orig-head"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2092
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "could not read 'onto'"
|
|
|
|
msgstr "impossible de lire 'onto'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2099
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not update %s"
|
|
|
|
msgstr "impossible de mettre à jour %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2106
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not update HEAD to %s"
|
|
|
|
msgstr "impossible de mettre à jour HEAD sur %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2190
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "cannot rebase: You have unstaged changes."
|
|
|
|
msgstr "impossible de rebaser : vous avez des modifications non indexées."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2195
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "could not remove CHERRY_PICK_HEAD"
|
|
|
|
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2204
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "cannot amend non-existing commit"
|
|
|
|
msgstr "impossible de corriger un commit non-existant"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2206
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid file: '%s'"
|
|
|
|
msgstr "fichier invalide : '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2208
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid contents: '%s'"
|
|
|
|
msgstr "contenu invalide : '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2211
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"You have uncommitted changes in your working tree. Please, commit them\n"
|
|
|
|
"first and then run 'git rebase --continue' again."
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Vous avez des modifications non validées dans votre copie de travail.\n"
|
|
|
|
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2221
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "could not commit staged changes."
|
|
|
|
msgstr "impossible de valider les modifications indexées."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2301
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: can't cherry-pick a %s"
|
|
|
|
msgstr "%s : impossible de picorer un %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2305
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: bad revision"
|
|
|
|
msgstr "%s : mauvaise révision"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: sequencer.c:2338
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "can't revert as initial commit"
|
|
|
|
msgstr "impossible d'annuler en tant que commit initial"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:165
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"%s: no such path in the working tree.\n"
|
|
|
|
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
|
|
|
|
msgstr ""
|
|
|
|
"%s : ce chemin n'existe pas dans la copie de travail.\n"
|
|
|
|
"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
|
|
|
|
"n'existent pas localement."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:178
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
|
|
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
|
|
msgstr ""
|
|
|
|
"argument '%s' ambigu : révision inconnue ou chemin inexistant.\n"
|
|
|
|
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
|
|
|
|
"'git <commande> [<révision>...] -- [<chemin>...]'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:228
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"ambiguous argument '%s': both revision and filename\n"
|
|
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
|
|
msgstr ""
|
|
|
|
"argument '%s' ambigu : révision et chemin spécifiés.\n"
|
|
|
|
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
|
|
|
|
"'git <commande> [<révision>...] -- [<chemin>...]'"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:475
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Expected git repo version <= %d, found %d"
|
|
|
|
msgstr "Version attendue du dépôt git <= %d, %d trouvée"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:483
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unknown repository extensions found:"
|
|
|
|
msgstr "extensions de dépôt inconnues trouvées :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:776
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Not a git repository (or any of the parent directories): %s"
|
|
|
|
msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:778 builtin/index-pack.c:1646
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Cannot come back to cwd"
|
|
|
|
msgstr "Impossible de revenir au répertoire de travail courant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:1010
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unable to read current working directory"
|
|
|
|
msgstr "Impossible d'accéder au répertoire de travail courant"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:1022 setup.c:1028
|
|
|
|
#, c-format
|
|
|
|
msgid "Cannot change to '%s'"
|
|
|
|
msgstr "Impossible de modifié en '%s'"
|
|
|
|
|
|
|
|
#: setup.c:1041
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Not a git repository (or any parent up to mount point %s)\n"
|
|
|
|
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
|
|
|
|
msgstr ""
|
|
|
|
"Ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "
|
|
|
|
"n'est un dépôt git\n"
|
|
|
|
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
|
|
|
|
"n'est pas activé)."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: setup.c:1106
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
2014-01-18 14:36:19 +01:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Problem with core.sharedRepository filemode value (0%.3o).\n"
|
|
|
|
"The owner of files must always have read and write permissions."
|
2014-01-18 14:36:19 +01:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Problème avec la valeur de core.sharedRepository (0%.3o).\n"
|
|
|
|
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
|
|
|
|
"écriture."
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_file.c:559
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' does not exist"
|
|
|
|
msgstr "le chemin '%s' n'existe pas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_file.c:585
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "reference repository '%s' as a linked checkout is not supported yet."
|
|
|
|
msgstr ""
|
|
|
|
"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
|
|
|
|
"encore supporté."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_file.c:591
|
2016-11-05 21:43:53 +01:00
|
|
|
#, 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."
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_file.c:597
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "reference repository '%s' is shallow"
|
|
|
|
msgstr "le dépôt de référence '%s' est superficiel"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_file.c:605
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "reference repository '%s' is grafted"
|
|
|
|
msgstr "le dépôt de référence '%s' est greffé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_file.c:1245
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "offset before end of packfile (broken .idx?)"
|
|
|
|
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_file.c:2721
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "offset before start of pack index for %s (corrupt index?)"
|
|
|
|
msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_file.c:2725
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "offset beyond end of pack index for %s (truncated index?)"
|
|
|
|
msgstr ""
|
|
|
|
"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_name.c:409
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "short SHA1 %s is ambiguous"
|
|
|
|
msgstr "le SHA1 court %s est ambigu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_name.c:420
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "The candidates are:"
|
|
|
|
msgstr "Les candidats sont :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: sha1_name.c:580
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"Git normally never creates a ref that ends with 40 hex characters\n"
|
|
|
|
"because it will be ignored when you just specify 40-hex. These refs\n"
|
|
|
|
"may be created by mistake. For example,\n"
|
|
|
|
"\n"
|
|
|
|
" git checkout -b $br $(git rev-parse ...)\n"
|
|
|
|
"\n"
|
|
|
|
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
|
|
|
|
"examine these refs and maybe delete them. Turn this message off by\n"
|
|
|
|
"running \"git config advice.objectNameWarning false\""
|
|
|
|
msgstr ""
|
2017-05-17 22:26:19 +02:00
|
|
|
"Git ne crée normalement jamais de référence qui se termine par 40 caractères "
|
2016-11-05 21:43:53 +01:00
|
|
|
"hexa\n"
|
|
|
|
"car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n"
|
|
|
|
"peuvent être créées par erreur. Par exemple,\n"
|
|
|
|
"\n"
|
|
|
|
" git checkout -b $br $(git rev-parse ...)\n"
|
|
|
|
"\n"
|
|
|
|
"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa "
|
|
|
|
"est créée.\n"
|
|
|
|
"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce "
|
|
|
|
"message\n"
|
|
|
|
"en lançant \"git config advice.objectNameWarning false\""
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:67 submodule.c:101
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
|
|
|
|
msgstr ""
|
|
|
|
"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
|
|
|
|
"d'abord"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:71 submodule.c:105
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not find section in .gitmodules where path=%s"
|
|
|
|
msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:79
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not update .gitmodules entry %s"
|
|
|
|
msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
# ici %s est un chemin
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:112
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not remove .gitmodules entry for %s"
|
|
|
|
msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:123
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "staging updated .gitmodules failed"
|
|
|
|
msgstr "échec de la mise en index du .gitmodules mis à jour"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:161
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "negative values not allowed for submodule.fetchJobs"
|
|
|
|
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:1194
|
|
|
|
#, c-format
|
|
|
|
msgid "'%s' not recognized as a git repository"
|
|
|
|
msgstr "'%s' n'est pas reconnu comme dépôt git"
|
|
|
|
|
|
|
|
#: submodule.c:1332
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "could not start 'git status' in submodule '%s'"
|
2017-02-08 21:36:33 +01:00
|
|
|
msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:1345
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "could not run 'git status' in submodule '%s'"
|
2017-02-08 21:36:33 +01:00
|
|
|
msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: submodule.c:1421
|
|
|
|
#, c-format
|
|
|
|
msgid "submodule '%s' has dirty index"
|
|
|
|
msgstr "le sous-module '%s' a un index sale"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: submodule.c:1678
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
|
|
|
|
"n'est pas supporté"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: submodule.c:1690 submodule.c:1746
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not lookup name for submodule '%s'"
|
|
|
|
msgstr "impossible de trouve le nom pour le sous-module '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: submodule.c:1694 builtin/submodule--helper.c:678
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:688
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not create directory '%s'"
|
|
|
|
msgstr "impossible de créer le répertoire '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: submodule.c:1697
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Migrating git directory of '%s%s' from\n"
|
|
|
|
"'%s' to\n"
|
|
|
|
"'%s'\n"
|
|
|
|
msgstr ""
|
|
|
|
"Migration du répertoire git de '%s%s' depuis\n"
|
|
|
|
"'%s' sur\n"
|
|
|
|
"'%s'\n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: submodule.c:1781
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not recurse into submodule '%s'"
|
|
|
|
msgstr "récursion impossible dans le sous-module '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: submodule.c:1825
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "could not start ls-files in .."
|
|
|
|
msgstr "impossible de démarrer ls-files dans .."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: submodule.c:1845
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "BUG: returned path string doesn't match cwd?"
|
|
|
|
msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: submodule.c:1864
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "ls-tree returned unexpected return code %d"
|
|
|
|
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
|
|
|
|
|
|
|
|
#: submodule-config.c:380
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid value for %s"
|
|
|
|
msgstr "Valeur invalide pour %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:240
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "running trailer command '%s' failed"
|
|
|
|
msgstr "échec de la commande trailer '%s'"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
|
|
|
|
#: trailer.c:543
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unknown value '%s' for key '%s'"
|
|
|
|
msgstr "valeur inconnue '%s' pour la clé '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:525 trailer.c:530 builtin/remote.c:289
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "more than one %s"
|
|
|
|
msgstr "plus d'un %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:702
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "empty trailer token in trailer '%.*s'"
|
|
|
|
msgstr "symbole vide dans la ligne de fin '%.*s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:722
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not read input file '%s'"
|
|
|
|
msgstr "impossible de lire le fichier d'entrée '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:725
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not read from stdin"
|
|
|
|
msgstr "Impossible de lire depuis l'entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:949 builtin/am.c:44
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not stat %s"
|
|
|
|
msgstr "stat impossible de %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:951
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "file %s is not a regular file"
|
|
|
|
msgstr "%s n'est pas un fichier régulier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:953
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "file %s is not writable by user"
|
|
|
|
msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:965
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not open temporary file"
|
|
|
|
msgstr "impossible de créer un fichier temporaire"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: trailer.c:1001
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not rename temporary file to %s"
|
|
|
|
msgstr "impossible de renommer un fichier temporaire en %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: transport.c:62
|
|
|
|
#, c-format
|
|
|
|
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
|
|
|
|
msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: transport.c:151
|
|
|
|
#, c-format
|
|
|
|
msgid "transport: invalid depth option '%s'"
|
|
|
|
msgstr "transport : option de profondeur invalide '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: transport.c:889
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"The following submodule paths contain changes that can\n"
|
|
|
|
"not be found on any remote:\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Les chemins suivant de sous-module contiennent des modifications\n"
|
|
|
|
"qui ne peuvent être trouvées sur aucun distant :\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: transport.c:893
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"Please try\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit push --recurse-submodules=on-demand\n"
|
|
|
|
"\n"
|
|
|
|
"or cd to the path and use\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit push\n"
|
|
|
|
"\n"
|
|
|
|
"to push them to a remote.\n"
|
|
|
|
"\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"\n"
|
|
|
|
"Veuillez essayer\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit push --recurse-submodules=on-demand\n"
|
|
|
|
"\n"
|
|
|
|
"ou bien changez de répertoire et utilisez\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit push\n"
|
|
|
|
"\n"
|
|
|
|
"pour les pousser vers un serveur distant.\n"
|
|
|
|
"\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: transport.c:901
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Aborting."
|
|
|
|
msgstr "Abandon."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: transport-helper.c:1080
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not read ref %s"
|
|
|
|
msgstr "impossible de lire la réf %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: tree-walk.c:31
|
|
|
|
msgid "too-short tree object"
|
|
|
|
msgstr "objet arbre trop court"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: tree-walk.c:37
|
|
|
|
msgid "malformed mode in tree entry"
|
|
|
|
msgstr "mode invalide dans l'entrée d'arbre"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: tree-walk.c:41
|
|
|
|
msgid "empty filename in tree entry"
|
|
|
|
msgstr "nom de fichier vide dans une entrée de l'arbre"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: tree-walk.c:113
|
|
|
|
msgid "too-short tree file"
|
|
|
|
msgstr "fichier arbre trop court"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:104
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
|
|
"%%sPlease commit your changes or stash them before you switch branches."
|
|
|
|
msgstr ""
|
|
|
|
"Vos modifications locales aux fichiers suivants seraient écrasées par "
|
|
|
|
"l'extraction :\n"
|
|
|
|
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
|
|
|
|
"branche."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:106
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
|
|
"%%s"
|
|
|
|
msgstr ""
|
|
|
|
"Vos modifications locales aux fichiers suivants seraient écrasées par "
|
|
|
|
"l'extraction :\n"
|
|
|
|
"%%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:109
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
|
|
"%%sPlease commit your changes or stash them before you merge."
|
|
|
|
msgstr ""
|
|
|
|
"Vos modifications locales aux fichiers suivants seraient écrasées par la "
|
|
|
|
"fusion :\n"
|
|
|
|
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:111
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
|
|
"%%s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Vos modifications locales aux fichiers suivants seraient écrasées par la "
|
|
|
|
"fusion :\n"
|
|
|
|
"%%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:114
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
|
|
"%%sPlease commit your changes or stash them before you %s."
|
|
|
|
msgstr ""
|
|
|
|
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
|
|
|
|
"%%sVeuillez valider ou remiser vos modifications avant %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:116
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
|
|
"%%s"
|
|
|
|
msgstr ""
|
|
|
|
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
|
|
|
|
"%%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:121
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2017-02-08 21:36:33 +01:00
|
|
|
"Updating the following directories would lose untracked files in them:\n"
|
2016-11-05 21:43:53 +01:00
|
|
|
"%s"
|
|
|
|
msgstr ""
|
2017-02-18 00:10:04 +01:00
|
|
|
"La mise à jour des répertoires suivants effacerait les fichiers non suivis "
|
|
|
|
"contenus :\n"
|
2016-11-05 21:43:53 +01:00
|
|
|
"%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:125
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
|
|
"%%sPlease move or remove them before you switch branches."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
|
|
|
|
"l'extraction :\n"
|
|
|
|
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:127
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
|
|
"%%s"
|
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
|
|
|
|
"%%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:130
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
|
|
"%%sPlease move or remove them before you merge."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
|
|
|
|
"la fusion :\n"
|
|
|
|
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:132
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
|
|
"%%s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
|
|
|
|
"%%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:135
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
|
|
"%%sPlease move or remove them before you %s."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
|
|
|
|
"%s :\n"
|
|
|
|
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:137
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
|
|
"%%s"
|
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants non suivis seraient effacés par %s :\n"
|
|
|
|
"%%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:142
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be overwritten by "
|
|
|
|
"checkout:\n"
|
|
|
|
"%%sPlease move or remove them before you switch branches."
|
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
|
|
|
|
"l'extraction :\n"
|
|
|
|
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:144
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be overwritten by "
|
|
|
|
"checkout:\n"
|
|
|
|
"%%s"
|
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
|
|
|
|
"%%s"
|
2016-03-15 23:01:59 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:147
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
|
|
"%%sPlease move or remove them before you merge."
|
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
|
|
|
|
"la fusion :\n"
|
|
|
|
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:149
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
|
|
"%%s"
|
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
|
|
|
|
"%%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:152
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
|
|
"%%sPlease move or remove them before you %s."
|
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
|
|
|
|
"%s :\n"
|
|
|
|
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:154
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
|
|
"%%s"
|
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
|
|
|
|
"%%s"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:161
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
|
|
|
|
msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:164
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
|
|
|
|
"%s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
|
|
|
|
"pas à jour :\n"
|
|
|
|
"%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:166
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The following working tree files would be overwritten by sparse checkout "
|
|
|
|
"update:\n"
|
|
|
|
"%s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-22 15:24:59 +01:00
|
|
|
"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
|
|
|
|
"jour par l'extraction creuse :\n"
|
2016-11-05 21:43:53 +01:00
|
|
|
"%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:168
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The following working tree files would be removed by sparse checkout "
|
|
|
|
"update:\n"
|
|
|
|
"%s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-22 15:24:59 +01:00
|
|
|
"Les fichiers suivants de la copie de travail seraient supprimés par la mise "
|
|
|
|
"à jour par extraction creuse :\n"
|
2016-11-05 21:43:53 +01:00
|
|
|
"%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:170
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Cannot update submodule:\n"
|
|
|
|
"%s"
|
|
|
|
msgstr ""
|
|
|
|
"Mise à jour impossible pour le sous-module :\n"
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
#: unpack-trees.c:247
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Aborting\n"
|
|
|
|
msgstr "Abandon\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: unpack-trees.c:272
|
|
|
|
#, c-format
|
|
|
|
msgid "submodule update strategy not supported for submodule '%s'"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"stratégie de mise à jour de sous-module non supportée pour le sous-module "
|
|
|
|
"'%s'"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: unpack-trees.c:340
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Checking out files"
|
|
|
|
msgstr "Extraction des fichiers"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: urlmatch.c:163
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid URL scheme name or missing '://' suffix"
|
|
|
|
msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid %XX escape sequence"
|
|
|
|
msgstr "séquence d'échappement %XX invalide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: urlmatch.c:215
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "missing host and scheme is not 'file:'"
|
|
|
|
msgstr "hôte manquant et le schéma n'est pas 'file:'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: urlmatch.c:232
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "a 'file:' URL may not have a port number"
|
|
|
|
msgstr "une URL 'file:' ne peut pas contenir de numéro de port"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: urlmatch.c:247
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid characters in host name"
|
|
|
|
msgstr "caractères invalides dans le nom d'hôte"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: urlmatch.c:292 urlmatch.c:303
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid port number"
|
|
|
|
msgstr "numéro de port invalide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: urlmatch.c:371
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid '..' path segment"
|
|
|
|
msgstr "segment de chemin '..' invalide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: worktree.c:285
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to read '%s'"
|
|
|
|
msgstr "échec de la lecture de '%s'"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wrapper.c:222 wrapper.c:392
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not open '%s' for reading and writing"
|
|
|
|
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not open '%s' for writing"
|
|
|
|
msgstr "impossible d'ouvrir '%s' en écriture"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
|
|
|
|
#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:341
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not open '%s' for reading"
|
|
|
|
msgstr "impossible d'ouvrir '%s' en lecture"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wrapper.c:581 wrapper.c:602
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to access '%s'"
|
|
|
|
msgstr "impossible d'accéder à '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wrapper.c:610
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to get current working directory"
|
|
|
|
msgstr "impossible d'accéder au répertoire de travail courant"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wrapper.c:634
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not write to %s"
|
|
|
|
msgstr "Impossible d'écrire dans %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wrapper.c:636
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not close %s"
|
|
|
|
msgstr "impossible de fermer %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:151
|
|
|
|
msgid "Unmerged paths:"
|
|
|
|
msgstr "Chemins non fusionnés :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:178 wt-status.c:205
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git reset %s <file>...\" to unstage)"
|
|
|
|
msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:180 wt-status.c:207
|
|
|
|
msgid " (use \"git rm --cached <file>...\" to unstage)"
|
|
|
|
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:184
|
|
|
|
msgid " (use \"git add <file>...\" to mark resolution)"
|
|
|
|
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:186 wt-status.c:190
|
|
|
|
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
|
|
|
|
msgstr ""
|
|
|
|
" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
|
|
|
|
"résolu)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:188
|
|
|
|
msgid " (use \"git rm <file>...\" to mark resolution)"
|
|
|
|
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:199 wt-status.c:958
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Changes to be committed:"
|
|
|
|
msgstr "Modifications qui seront validées :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:217 wt-status.c:967
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Changes not staged for commit:"
|
|
|
|
msgstr "Modifications qui ne seront pas validées :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:221
|
|
|
|
msgid " (use \"git add <file>...\" to update what will be committed)"
|
|
|
|
msgstr ""
|
|
|
|
" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:223
|
|
|
|
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
|
|
|
|
msgstr ""
|
|
|
|
" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
|
|
|
|
"validé)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:224
|
|
|
|
msgid ""
|
|
|
|
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
|
|
|
|
msgstr ""
|
|
|
|
" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
|
|
|
|
"dans la copie de travail)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:226
|
|
|
|
msgid " (commit or discard the untracked or modified content in submodules)"
|
|
|
|
msgstr ""
|
|
|
|
" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:238
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git %s <file>...\" to include in what will be committed)"
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:253
|
|
|
|
msgid "both deleted:"
|
|
|
|
msgstr "supprimé des deux côtés :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:255
|
|
|
|
msgid "added by us:"
|
|
|
|
msgstr "ajouté par nous :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:257
|
|
|
|
msgid "deleted by them:"
|
|
|
|
msgstr "supprimé par eux :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:259
|
|
|
|
msgid "added by them:"
|
|
|
|
msgstr "ajouté par eux :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:261
|
|
|
|
msgid "deleted by us:"
|
|
|
|
msgstr "supprimé par nous :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:263
|
|
|
|
msgid "both added:"
|
|
|
|
msgstr "ajouté de deux côtés :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:265
|
|
|
|
msgid "both modified:"
|
|
|
|
msgstr "modifié des deux côtés :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:275
|
|
|
|
msgid "new file:"
|
|
|
|
msgstr "nouveau fichier :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:277
|
|
|
|
msgid "copied:"
|
|
|
|
msgstr "copié :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:279
|
|
|
|
msgid "deleted:"
|
|
|
|
msgstr "supprimé :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:281
|
|
|
|
msgid "modified:"
|
|
|
|
msgstr "modifié :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:283
|
|
|
|
msgid "renamed:"
|
|
|
|
msgstr "renommé :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: wt-status.c:285
|
|
|
|
msgid "typechange:"
|
|
|
|
msgstr "modif. type :"
|
|
|
|
|
|
|
|
#: wt-status.c:287
|
|
|
|
msgid "unknown:"
|
|
|
|
msgstr "inconnu :"
|
|
|
|
|
|
|
|
#: wt-status.c:289
|
|
|
|
msgid "unmerged:"
|
|
|
|
msgstr "non fusionné :"
|
|
|
|
|
|
|
|
#: wt-status.c:371
|
|
|
|
msgid "new commits, "
|
|
|
|
msgstr "nouveaux commits, "
|
|
|
|
|
|
|
|
#: wt-status.c:373
|
|
|
|
msgid "modified content, "
|
|
|
|
msgstr "contenu modifié, "
|
|
|
|
|
|
|
|
#: wt-status.c:375
|
|
|
|
msgid "untracked content, "
|
|
|
|
msgstr "contenu non suivi, "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:831
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Submodules changed but not updated:"
|
|
|
|
msgstr "Sous-modules modifiés mais non mis à jour :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:833
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Submodule changes to be committed:"
|
|
|
|
msgstr "Changements du sous-module à valider :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:914
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"Do not touch the line above.\n"
|
|
|
|
"Everything below will be removed."
|
2015-09-09 22:55:10 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Ne touchez pas à la ligne ci-dessus\n"
|
|
|
|
"Tout ce qui suit sera éliminé."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1026
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "You have unmerged paths."
|
|
|
|
msgstr "Vous avez des chemins non fusionnés."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1029
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (fix conflicts and run \"git commit\")"
|
|
|
|
msgstr " (réglez les conflits puis lancez \"git commit\")"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1031
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git merge --abort\" to abort the merge)"
|
|
|
|
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1036
|
2016-11-05 21:43:53 +01:00
|
|
|
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."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1039
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git commit\" to conclude merge)"
|
|
|
|
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1049
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "You are in the middle of an am session."
|
|
|
|
msgstr "Vous êtes au milieu d'une session am."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1052
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "The current patch is empty."
|
|
|
|
msgstr "Le patch actuel est vide."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1056
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (fix conflicts and then run \"git am --continue\")"
|
|
|
|
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1058
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git am --skip\" to skip this patch)"
|
|
|
|
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1060
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git am --abort\" to restore the original branch)"
|
|
|
|
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1189
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "git-rebase-todo is missing."
|
|
|
|
msgstr "git-rebase-todo est manquant."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1191
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "No commands done."
|
|
|
|
msgstr "Aucune commande réalisée."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1194
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Last command done (%d command done):"
|
|
|
|
msgid_plural "Last commands done (%d commands done):"
|
|
|
|
msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
|
|
|
|
msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1205
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid " (see more in file %s)"
|
|
|
|
msgstr " (voir plus dans le fichier %s)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1210
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "No commands remaining."
|
|
|
|
msgstr "Aucune commande restante."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1213
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Next command to do (%d remaining command):"
|
|
|
|
msgid_plural "Next commands to do (%d remaining commands):"
|
|
|
|
msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
|
|
|
|
msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1221
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git rebase --edit-todo\" to view and edit)"
|
|
|
|
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1234
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "You are currently rebasing branch '%s' on '%s'."
|
|
|
|
msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1239
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "You are currently rebasing."
|
|
|
|
msgstr "Vous êtes en train de rebaser."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1253
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (fix conflicts and then run \"git rebase --continue\")"
|
|
|
|
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1255
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git rebase --skip\" to skip this patch)"
|
|
|
|
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1257
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git rebase --abort\" to check out the original branch)"
|
|
|
|
msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1263
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (all conflicts fixed: run \"git rebase --continue\")"
|
|
|
|
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1267
|
2016-11-05 21:43:53 +01:00
|
|
|
#, 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'."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1272
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "You are currently splitting a commit during a rebase."
|
|
|
|
msgstr ""
|
|
|
|
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1275
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
|
|
|
|
msgstr ""
|
|
|
|
" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1279
|
2016-11-05 21:43:53 +01:00
|
|
|
#, 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'."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1284
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "You are currently editing a commit during a rebase."
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1287
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git commit --amend\" to amend the current commit)"
|
|
|
|
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1289
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
" (use \"git rebase --continue\" once you are satisfied with your changes)"
|
|
|
|
msgstr ""
|
2016-12-16 16:56:31 +01:00
|
|
|
" (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
|
2016-11-05 21:43:53 +01:00
|
|
|
"modifications)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1299
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "You are currently cherry-picking commit %s."
|
|
|
|
msgstr "Vous êtes actuellement en train de picorer le commit %s."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1304
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
|
|
|
|
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1307
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
|
|
|
|
msgstr ""
|
|
|
|
" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1309
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
|
|
|
|
msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1318
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "You are currently reverting commit %s."
|
|
|
|
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1323
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (fix conflicts and run \"git revert --continue\")"
|
|
|
|
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1326
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (all conflicts fixed: run \"git revert --continue\")"
|
|
|
|
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1328
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git revert --abort\" to cancel the revert operation)"
|
|
|
|
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1339
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "You are currently bisecting, started from branch '%s'."
|
|
|
|
msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1343
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "You are currently bisecting."
|
|
|
|
msgstr "Vous êtes en cours de bissection."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1346
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use \"git bisect reset\" to get back to the original branch)"
|
|
|
|
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1543
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "On branch "
|
|
|
|
msgstr "Sur la branche "
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1549
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "interactive rebase in progress; onto "
|
|
|
|
msgstr "rebasage interactif en cours ; sur "
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1551
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "rebase in progress; onto "
|
|
|
|
msgstr "rebasage en cours ; sur "
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1556
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "HEAD detached at "
|
|
|
|
msgstr "HEAD détachée sur "
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1558
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "HEAD detached from "
|
|
|
|
msgstr "HEAD détachée depuis "
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1561
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Not currently on any branch."
|
|
|
|
msgstr "Actuellement sur aucun branche."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1579
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Initial commit"
|
|
|
|
msgstr "Validation initiale"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1593
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Untracked files"
|
|
|
|
msgstr "Fichiers non suivis"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1595
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Ignored files"
|
|
|
|
msgstr "Fichiers ignorés"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1599
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"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')."
|
2015-09-09 22:55:10 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n"
|
|
|
|
"peut l'accélérer, mais vous devez alors faire attention à ne pas\n"
|
|
|
|
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
|
|
|
|
"status')."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1605
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Untracked files not listed%s"
|
|
|
|
msgstr "Fichiers non suivis non affichés%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1607
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid " (use -u option to show untracked files)"
|
|
|
|
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1613
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "No changes"
|
|
|
|
msgstr "Aucune modification"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1618
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
|
|
|
|
msgstr ""
|
|
|
|
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
|
|
|
|
"\"git commit -a\")\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1621
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "no changes added to commit\n"
|
|
|
|
msgstr "aucune modification ajoutée à la validation\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1624
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"nothing added to commit but untracked files present (use \"git add\" to "
|
|
|
|
"track)\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"aucune modification ajoutée à la validation mais des fichiers non suivis "
|
|
|
|
"sont présents (utilisez \"git add\" pour les suivre)\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1627
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "nothing added to commit but untracked files present\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"aucune modification ajoutée à la validation mais des fichiers non suivis "
|
|
|
|
"sont présents\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1630
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
|
|
|
|
"suivre)\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1633 wt-status.c:1638
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "nothing to commit\n"
|
|
|
|
msgstr "rien à valider\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1636
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "nothing to commit (use -u to show untracked files)\n"
|
|
|
|
msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1640
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "nothing to commit, working tree clean\n"
|
|
|
|
msgstr "rien à valider, la copie de travail est propre\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1749
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Initial commit on "
|
|
|
|
msgstr "Validation initiale sur "
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1753
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "HEAD (no branch)"
|
|
|
|
msgstr "HEAD (aucune branche)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1782 wt-status.c:1790
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "behind "
|
|
|
|
msgstr "derrière "
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:1785 wt-status.c:1788
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "ahead "
|
|
|
|
msgstr "devant "
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#. TRANSLATORS: the action is e.g. "pull with rebase"
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:2280
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot %s: You have unstaged changes."
|
|
|
|
msgstr "Impossible de %s : vous avez des modifications non indexées."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:2286
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "additionally, your index contains uncommitted changes."
|
|
|
|
msgstr "de plus, votre index contient des modifications non validées."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: wt-status.c:2288
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot %s: Your index contains uncommitted changes."
|
|
|
|
msgstr "%s impossible : votre index contient des modifications non validées."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: compat/precompose_utf8.c:57 builtin/clone.c:432
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to unlink '%s'"
|
|
|
|
msgstr "échec lors de l'unlink de '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:22
|
|
|
|
msgid "git add [<options>] [--] <pathspec>..."
|
|
|
|
msgstr "git add [<options>] [--] <chemin>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:80
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unexpected diff status %c"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "état de diff inattendu %c"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:85 builtin/commit.c:291
|
|
|
|
msgid "updating files failed"
|
|
|
|
msgstr "échec de la mise à jour des fichiers"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:95
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "remove '%s'\n"
|
|
|
|
msgstr "suppression de '%s'\n"
|
|
|
|
|
|
|
|
#: builtin/add.c:149
|
|
|
|
msgid "Unstaged changes after refreshing the index:"
|
|
|
|
msgstr "Modifications non indexées après rafraîchissement de l'index :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/add.c:209 builtin/rev-parse.c:872
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not read the index"
|
|
|
|
msgstr "Impossible de lire l'index"
|
|
|
|
|
|
|
|
#: builtin/add.c:220
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not open '%s' for writing."
|
|
|
|
msgstr "Impossible d'ouvrir '%s' en écriture."
|
|
|
|
|
|
|
|
#: builtin/add.c:224
|
|
|
|
msgid "Could not write patch"
|
|
|
|
msgstr "Impossible d'écrire le patch"
|
|
|
|
|
|
|
|
#: builtin/add.c:227
|
|
|
|
msgid "editing patch failed"
|
|
|
|
msgstr "échec de l'édition du patch"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:230
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not stat '%s'"
|
|
|
|
msgstr "Stat de '%s' impossible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:232
|
|
|
|
msgid "Empty patch. Aborted."
|
|
|
|
msgstr "Patch vide. Abandon."
|
|
|
|
|
|
|
|
#: builtin/add.c:237
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not apply '%s'"
|
|
|
|
msgstr "Impossible d'appliquer '%s'"
|
|
|
|
|
|
|
|
#: builtin/add.c:247
|
|
|
|
msgid "The following paths are ignored by one of your .gitignore files:\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "dry run"
|
|
|
|
msgstr "simuler l'action"
|
|
|
|
|
|
|
|
#: builtin/add.c:269
|
|
|
|
msgid "interactive picking"
|
|
|
|
msgstr "sélection interactive"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "select hunks interactively"
|
|
|
|
msgstr "sélection interactive des sections"
|
|
|
|
|
|
|
|
#: builtin/add.c:271
|
|
|
|
msgid "edit current diff and apply"
|
|
|
|
msgstr "édition du diff actuel et application"
|
|
|
|
|
|
|
|
#: builtin/add.c:272
|
|
|
|
msgid "allow adding otherwise ignored files"
|
|
|
|
msgstr "permettre l'ajout de fichiers ignorés"
|
|
|
|
|
|
|
|
#: builtin/add.c:273
|
|
|
|
msgid "update tracked files"
|
|
|
|
msgstr "mettre à jour les fichiers suivis"
|
|
|
|
|
|
|
|
#: builtin/add.c:274
|
|
|
|
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:275
|
|
|
|
msgid "add changes from all tracked and untracked files"
|
|
|
|
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
|
|
|
|
|
|
|
|
#: builtin/add.c:278
|
|
|
|
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:280
|
|
|
|
msgid "don't add, only refresh the index"
|
|
|
|
msgstr "ne pas ajouter, juste rafraîchir l'index"
|
|
|
|
|
|
|
|
#: builtin/add.c:281
|
|
|
|
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:282
|
|
|
|
msgid "check if - even missing - files are ignored in dry run"
|
|
|
|
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/add.c:283 builtin/update-index.c:951
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "(+/-)x"
|
|
|
|
msgstr "(+/-)x"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/add.c:283 builtin/update-index.c:952
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "override the executable bit of the listed files"
|
|
|
|
msgstr "outrepasser le bit exécutable pour les fichiers listés"
|
|
|
|
|
|
|
|
#: builtin/add.c:305
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
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:312
|
|
|
|
msgid "adding files failed"
|
|
|
|
msgstr "échec de l'ajout de fichiers"
|
|
|
|
|
|
|
|
#: builtin/add.c:348
|
|
|
|
msgid "-A and -u are mutually incompatible"
|
|
|
|
msgstr "-A et -u sont mutuellement incompatibles"
|
|
|
|
|
|
|
|
#: builtin/add.c:355
|
|
|
|
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"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:359
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--chmod param '%s' must be either -x or +x"
|
|
|
|
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:374
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Nothing specified, nothing added.\n"
|
|
|
|
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/add.c:375
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Maybe you wanted to say 'git add .'?\n"
|
|
|
|
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
|
|
|
|
#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/submodule--helper.c:244
|
|
|
|
msgid "index file corrupt"
|
|
|
|
msgstr "fichier d'index corrompu"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:412
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not parse author script"
|
|
|
|
msgstr "impossible d'analyser le script author"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:489
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "'%s' was deleted by the applypatch-msg hook"
|
|
|
|
msgstr "'%s' a été effacé par le crochet applypatch-msg"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:530
|
2015-03-29 09:54:56 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Malformed input line: '%s'."
|
|
|
|
msgstr "Ligne en entrée malformée : '%s'."
|
2015-03-29 09:54:56 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:567
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Failed to copy notes from '%s' to '%s'"
|
|
|
|
msgstr "Impossible de copier les notes de '%s' vers '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:593
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "fseek failed"
|
|
|
|
msgstr "échec de fseek"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:777
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not parse patch '%s'"
|
|
|
|
msgstr "impossible d'analyser le patch '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:842
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Only one StGIT patch series can be applied at once"
|
|
|
|
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:889
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid timestamp"
|
|
|
|
msgstr "horodatage invalide"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:892 builtin/am.c:900
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid Date line"
|
|
|
|
msgstr "ligne de Date invalide"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:897
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid timezone offset"
|
|
|
|
msgstr "décalage horaire invalide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:986
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Patch format detection failed."
|
|
|
|
msgstr "Échec de détection du format du patch."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:991 builtin/clone.c:397
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to create directory '%s'"
|
|
|
|
msgstr "échec de la création du répertoire '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:995
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Failed to split patches."
|
|
|
|
msgstr "Échec de découpage des patchs."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1127 builtin/commit.c:376
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to write index file"
|
|
|
|
msgstr "impossible d'écrire le fichier d'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1178
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "When you have resolved this problem, run \"%s --continue\"."
|
|
|
|
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1179
|
2015-03-29 09:54:56 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
|
|
|
|
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
|
2015-03-29 09:54:56 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1180
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
|
|
|
|
msgstr ""
|
|
|
|
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
|
|
|
|
"abort\"."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1315
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Patch is empty. Was it split wrong?"
|
|
|
|
msgstr "Le patch est vide. Le découpage était-il bon ?"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1386 builtin/log.c:1557
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "invalid ident line: %s"
|
|
|
|
msgstr "ligne d'identification invalide : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1413
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unable to parse commit %s"
|
|
|
|
msgstr "impossible d'analyser le commit %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1606
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
|
|
|
|
"points."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1608
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Using index info to reconstruct a base tree..."
|
|
|
|
msgstr ""
|
|
|
|
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
|
2015-03-29 09:54:56 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1627
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"Did you hand edit your patch?\n"
|
|
|
|
"It does not apply to blobs recorded in its index."
|
|
|
|
msgstr ""
|
|
|
|
"Avez-vous édité le patch à la main ?\n"
|
|
|
|
"Il ne s'applique pas aux blobs enregistrés dans son index."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1633
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Falling back to patching base and 3-way merge..."
|
|
|
|
msgstr "Retour à un patch de la base et fusion à 3 points..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1658
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Failed to merge in the changes."
|
|
|
|
msgstr "Échec d'intégration des modifications."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1682 builtin/merge.c:631
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git write-tree failed to write a tree"
|
|
|
|
msgstr "git write-tree a échoué à écrire un arbre"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1689
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "applying to an empty history"
|
|
|
|
msgstr "application à un historique vide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:827
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to write commit object"
|
|
|
|
msgstr "échec de l'écriture de l'objet commit"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1735 builtin/am.c:1739
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot resume: %s does not exist."
|
|
|
|
msgstr "impossible de continuer : %s n'existe pas."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1755
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot be interactive without stdin connected to a terminal."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"impossible d'être interactif sans entrée standard connectée à un terminal."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1760
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Commit Body is:"
|
|
|
|
msgstr "Le corps de la validation est :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
|
|
|
|
#. in your translation. The program will only accept English
|
|
|
|
#. input at this point.
|
|
|
|
#.
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1770
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
|
|
|
|
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1820
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
|
|
|
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1860 builtin/am.c:1932
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Applying: %.*s"
|
|
|
|
msgstr "Application de %.*s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1876
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "No changes -- Patch already applied."
|
|
|
|
msgstr "Pas de changement -- Patch déjà appliqué."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1884
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Patch failed at %s %.*s"
|
|
|
|
msgstr "le patch a échoué à %s %.*s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1890
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "The copy of the patch that failed is found in: %s"
|
|
|
|
msgstr "La copie du patch qui a échoué se trouve dans : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1935
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"No changes - did you forget to use 'git add'?\n"
|
|
|
|
"If there is nothing left to stage, chances are that something else\n"
|
|
|
|
"already introduced the same changes; you might want to skip this patch."
|
|
|
|
msgstr ""
|
|
|
|
"Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n"
|
|
|
|
"S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n"
|
|
|
|
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
|
|
|
|
"patch."
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:1942
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"You still have unmerged paths in your index.\n"
|
|
|
|
"Did you forget to use 'git add'?"
|
|
|
|
msgstr ""
|
|
|
|
"Vous avez toujours des chemins non fusionnés dans votre index\n"
|
|
|
|
"Auriez-vous oublié de faire 'git add' ?"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/reset.c:316
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not parse object '%s'."
|
|
|
|
msgstr "Impossible d'analyser l'objet '%s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2102
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to clean index"
|
|
|
|
msgstr "échec du nettoyage de l'index"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2136
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"You seem to have moved HEAD since the last 'am' failure.\n"
|
|
|
|
"Not rewinding to ORIG_HEAD"
|
|
|
|
msgstr ""
|
|
|
|
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
|
|
|
|
"Pas de retour à ORIG_HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2199
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid value for --patch-format: %s"
|
|
|
|
msgstr "Valeur invalide pour --patch-format : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2232
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
|
|
|
|
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2233
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git am [<options>] (--continue | --skip | --abort)"
|
|
|
|
msgstr "git am [<options>] (--continue | --quit | --abort)"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2239
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "run interactively"
|
|
|
|
msgstr "exécution interactive"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2241
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "historical option -- no-op"
|
|
|
|
msgstr "option historique -- no-op"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2243
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "allow fall back on 3way merging if needed"
|
|
|
|
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:178
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "be quiet"
|
|
|
|
msgstr "être silencieux"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2246
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "add a Signed-off-by line to the commit message"
|
|
|
|
msgstr "ajouter une ligne Signed-off-by au message de validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2249
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "recode into utf8 (default)"
|
|
|
|
msgstr "recoder en utf-8 (par défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2251
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "pass -k flag to git-mailinfo"
|
|
|
|
msgstr "passer l'option -k à git-mailinfo"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2253
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "pass -b flag to git-mailinfo"
|
|
|
|
msgstr "passer l'option -b à git-mailinfo"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2255
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "pass -m flag to git-mailinfo"
|
|
|
|
msgstr "passer l'option -m à git-mailinfo"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2257
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
|
|
|
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2260
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2263
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "strip everything before a scissors line"
|
|
|
|
msgstr "retirer tout le contenu avant la ligne des ciseaux"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
|
|
|
|
#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
|
|
|
|
#: builtin/am.c:2292
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "pass it through git-apply"
|
|
|
|
msgstr "le passer jusqu'à git-apply"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
|
2016-11-22 15:24:59 +01:00
|
|
|
#: parse-options.h:132 parse-options.h:134 parse-options.h:245
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "n"
|
|
|
|
msgstr "n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
|
|
|
|
#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "format"
|
|
|
|
msgstr "format"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2289
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "format the patch(es) are in"
|
|
|
|
msgstr "format de présentation des patchs"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2295
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "override error message when patch failure occurs"
|
|
|
|
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2297
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "continue applying patches after resolving a conflict"
|
|
|
|
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
|
2015-03-29 09:54:56 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2300
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "synonyms for --continue"
|
|
|
|
msgstr "synonymes de --continue"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2303
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "skip the current patch"
|
|
|
|
msgstr "sauter le patch courant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2306
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "restore the original branch and abort the patching operation."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"restaurer la branche originale et abandonner les applications de patch."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2310
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "lie about committer date"
|
|
|
|
msgstr "mentir sur la date de validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2312
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "use current timestamp for author date"
|
|
|
|
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "key-id"
|
|
|
|
msgstr "id-clé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2315
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "GPG-sign commits"
|
|
|
|
msgstr "signer les commits avec GPG"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2318
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "(internal use for git-rebase)"
|
|
|
|
msgstr "(utilisation interne pour git-rebase)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2333
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"The -b/--binary option has been a no-op for long time, and\n"
|
|
|
|
"it will be removed. Please do not use it anymore."
|
|
|
|
msgstr ""
|
|
|
|
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
|
|
|
|
"et elle sera supprimée. Veuillez ne plus l'utiliser."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2340
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to read the index"
|
|
|
|
msgstr "échec à la lecture de l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2355
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "previous rebase directory %s still exists but mbox given."
|
|
|
|
msgstr ""
|
|
|
|
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2379
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Stray %s directory found.\n"
|
|
|
|
"Use \"git am --abort\" to remove it."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"Répertoire abandonné %s trouvé.\n"
|
|
|
|
"Utilisez \"git am --abort\" pour le supprimer."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/am.c:2385
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Resolve operation not in progress, we are not resuming."
|
|
|
|
msgstr ""
|
|
|
|
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
|
|
|
|
"reprise."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/apply.c:8
|
|
|
|
msgid "git apply [<options>] [<patch>...]"
|
|
|
|
msgstr "git apply [<options>] [<patch>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: 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: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"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/blame.c:33
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
|
|
|
|
msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/blame.c:38
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "<rev-opts> are documented in git-rev-list(1)"
|
|
|
|
msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:1777
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "Blaming lines"
|
|
|
|
msgstr "Assignation de blâme au lignes"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2573
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show blame entries as we find them, incrementally"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
|
|
|
|
"manière incrémentale"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2574
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show blank SHA-1 for boundary commits (Default: off)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2575
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Do not treat root commits as boundaries (Default: off)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2576
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show work cost statistics"
|
|
|
|
msgstr "Montrer les statistiques de coût d'activité"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2577
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "Force progress reporting"
|
|
|
|
msgstr "Forcer l'affichage de l'état d'avancement"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2578
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show output score for blame entries"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Montrer le score de sortie pour les éléments de blâme"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2579
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show original filename (Default: auto)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2580
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show original linenumber (Default: off)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2581
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show in a format designed for machine consumption"
|
|
|
|
msgstr "Afficher dans un format propice à la consommation par machine"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2582
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show porcelain format with per-line commit information"
|
|
|
|
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2583
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Use the same output mode as git-annotate (Default: off)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2584
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show raw timestamp (Default: off)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2585
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show long commit SHA1 (Default: off)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2586
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Suppress author name and timestamp (Default: off)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2587
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show author email instead of name (Default: off)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2588
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Ignore whitespace differences"
|
|
|
|
msgstr "Ignorer les différences d'espace"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2595
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Use an experimental heuristic to improve diffs"
|
|
|
|
msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2597
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Spend extra cycles to find better match"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2598
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Use revisions from <file> instead of calling git-rev-list"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2599
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Use <file>'s contents as the final image"
|
|
|
|
msgstr "Utiliser le contenu de <fichier> comme image finale"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2600 builtin/blame.c:2601
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "score"
|
|
|
|
msgstr "score"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2600
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Find line copies within and across files"
|
|
|
|
msgstr "Trouver les copies de ligne dans et entre les fichiers"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2601
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Find line movements within and across files"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2602
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "n,m"
|
|
|
|
msgstr "n,m"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2602
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Process only line range n,m, counting from 1"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2649
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--progress can't be used with --incremental or porcelain formats"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"--progress ne peut pas être utilisé avec --incremental ou les formats "
|
|
|
|
"porcelaine"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2014-08-05 19:23:50 +02:00
|
|
|
#. TRANSLATORS: This string is used to tell us the maximum
|
|
|
|
#. display width for a relative timestamp in "git blame"
|
|
|
|
#. output. For C locale, "4 years, 11 months ago", which
|
|
|
|
#. takes 22 places, is the longest among various forms of
|
|
|
|
#. relative timestamps, but your language may need more or
|
|
|
|
#. fewer display columns.
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2697
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "4 years, 11 months ago"
|
|
|
|
msgstr "il y a 10 ans et 11 mois"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2777
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--contents and --reverse do not blend well."
|
|
|
|
msgstr "--contents et --reverse ne font pas bon ménage."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2797
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot use --contents with final commit object name"
|
|
|
|
msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2802
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--reverse and --first-parent together require specified latest commit"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"--reverse et --first-parent ensemble nécessitent la spécification d'un "
|
|
|
|
"dernier commit"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2829
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"--reverse --first-parent together require range along first-parent chain"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
|
|
|
|
"premier parent"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2840
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "no such path %s in %s"
|
|
|
|
msgstr "pas de chemin %s dans %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2851
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot read blob %s for path %s"
|
|
|
|
msgstr "impossible de lire le blob %s pour le chemin %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/blame.c:2870
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "file %s has only %lu line"
|
|
|
|
msgid_plural "file %s has only %lu lines"
|
|
|
|
msgstr[0] "le fichier %s n'a qu'%lu ligne"
|
|
|
|
msgstr[1] "le fichier %s n'a que %lu lignes"
|
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#: builtin/branch.c:26
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
|
|
|
|
msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#: builtin/branch.c:27
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
|
|
|
|
msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#: builtin/branch.c:28
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
|
|
|
|
msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#: builtin/branch.c:29
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#: builtin/branch.c:30
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "git branch [<options>] [-r | -a] [--points-at]"
|
|
|
|
msgstr "git branch [<options>] [-r | -a] [--points-at]"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:31
|
|
|
|
msgid "git branch [<options>] [-r | -a] [--format]"
|
|
|
|
msgstr "git branch [<options>] [-r | -a] [--format]"
|
|
|
|
|
|
|
|
#: builtin/branch.c:144
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"deleting branch '%s' that has been merged to\n"
|
|
|
|
" '%s', but not yet merged to HEAD."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
|
|
|
"suppression de la branche '%s' qui a été fusionnée dans\n"
|
|
|
|
" '%s', mais pas dans HEAD."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:148
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"not deleting branch '%s' that is not yet merged to\n"
|
|
|
|
" '%s', even though it is merged to HEAD."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
|
|
|
"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
|
|
|
|
" '%s', même si elle est fusionnée dans HEAD."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:162
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Couldn't look up commit object for '%s'"
|
|
|
|
msgstr "Impossible de rechercher l'objet commit pour '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:166
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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'."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
|
|
|
"La branche '%s' n'est pas totalement fusionnée.\n"
|
2016-12-16 16:56:31 +01:00
|
|
|
"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:179
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Update of config-file failed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Échec de la mise à jour du fichier de configuration"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:210
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot use -a with -d"
|
|
|
|
msgstr "impossible d'utiliser -a avec -d"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:216
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Couldn't look up commit object for HEAD"
|
|
|
|
msgstr "Impossible de rechercher l'objet commit pour HEAD"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:230
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Cannot delete branch '%s' checked out at '%s'"
|
|
|
|
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:245
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "remote-tracking branch '%s' not found."
|
|
|
|
msgstr "branche de suivi '%s' non trouvée."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:246
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "branch '%s' not found."
|
|
|
|
msgstr "branche '%s' non trouvée."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:261
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "Error deleting remote-tracking branch '%s'"
|
|
|
|
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:262
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Error deleting branch '%s'"
|
|
|
|
msgstr "Erreur lors de la suppression de la branche '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:269
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "Deleted remote-tracking branch %s (was %s).\n"
|
|
|
|
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:270
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Deleted branch %s (was %s).\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Branche %s supprimée (précédemment %s).\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:441
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Branch %s is being rebased at %s"
|
|
|
|
msgstr "La branche %s est en cours de rebasage sur %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:445
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Branch %s is being bisected at %s"
|
|
|
|
msgstr "La branche %s est en cours de bissection sur %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:460
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot rename the current branch while not on any."
|
|
|
|
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:470
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid branch name: '%s'"
|
|
|
|
msgstr "Nom de branche invalide : '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:487
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Branch rename failed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Échec de renommage de la branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:490
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Renamed a misnamed branch '%s' away"
|
|
|
|
msgstr "Renommage d'un branche mal nommée '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:493
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Branch renamed to %s, but HEAD is not updated!"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:502
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Branch is renamed, but update of config-file failed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"La branche est renommée, mais la mise à jour du fichier de configuration a "
|
|
|
|
"échoué"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:518
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Please edit the description for the branch\n"
|
|
|
|
" %s\n"
|
|
|
|
"Lines starting with '%c' will be stripped.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Veuillez éditer la description de la branche\n"
|
|
|
|
" %s\n"
|
|
|
|
"Les lignes commençant par '%c' seront ignorées.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:551
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Generic options"
|
|
|
|
msgstr "Options génériques"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:553
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show hash and subject, give twice for upstream branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:554
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "suppress informational messages"
|
|
|
|
msgstr "supprimer les messages d'information"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:555
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "set up tracking mode (see git-pull(1))"
|
|
|
|
msgstr "régler le mode de suivi (voir git-pull(1))"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:557
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "change upstream info"
|
|
|
|
msgstr "modifier l'information amont"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:559
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "upstream"
|
|
|
|
msgstr "amont"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:559
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "change the upstream info"
|
|
|
|
msgstr "modifier l'information amont"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:560
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Unset the upstream info"
|
|
|
|
msgstr "Désactiver l'information amont"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:561
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use colored output"
|
|
|
|
msgstr "utiliser la coloration dans la sortie"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:562
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "act on remote-tracking branches"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "agir sur les branches de suivi distantes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:564 builtin/branch.c:566
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print only branches that contain the commit"
|
|
|
|
msgstr "afficher seulement les branches qui contiennent le commit"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:565 builtin/branch.c:567
|
|
|
|
msgid "print only branches that don't contain the commit"
|
|
|
|
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
|
|
|
|
|
|
|
|
#: builtin/branch.c:570
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Specific git-branch actions:"
|
|
|
|
msgstr "Actions spécifiques à git-branch :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:571
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list both remote-tracking and local branches"
|
|
|
|
msgstr "afficher à la fois les branches de suivi et les branches locales"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:573
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete fully merged branch"
|
|
|
|
msgstr "supprimer une branche totalement fusionnée"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:574
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete branch (even if not merged)"
|
|
|
|
msgstr "supprimer une branche (même non fusionnée)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:575
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "move/rename a branch and its reflog"
|
|
|
|
msgstr "déplacer/renommer une branche et son reflog"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:576
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "move/rename a branch, even if target exists"
|
|
|
|
msgstr "déplacer/renommer une branche, même si la cible existe"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:577
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list branch names"
|
|
|
|
msgstr "afficher les noms des branches"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:578
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create the branch's reflog"
|
|
|
|
msgstr "créer le reflog de la branche"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:580
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "edit the description for the branch"
|
|
|
|
msgstr "éditer la description de la branche"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:581
|
2015-01-13 20:22:58 +01:00
|
|
|
msgid "force creation, move/rename, deletion"
|
|
|
|
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:582
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "print only branches that are merged"
|
|
|
|
msgstr "afficher seulement les branches qui sont fusionnées"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:583
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "print only branches that are not merged"
|
|
|
|
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:584
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list branches in columns"
|
|
|
|
msgstr "afficher les branches en colonnes"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "key"
|
|
|
|
msgstr "clé"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "field name to sort on"
|
|
|
|
msgstr "nom du champ servant à trier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:429
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "object"
|
|
|
|
msgstr "objet"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:589
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "print only branches of the object"
|
|
|
|
msgstr "afficher seulement les branches de l'objet"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "sorting and filtering are case insensitive"
|
|
|
|
msgstr "le tri et le filtrage sont non-sensibles à la casse"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
|
|
|
|
#: builtin/verify-tag.c:38
|
|
|
|
msgid "format to use for the output"
|
|
|
|
msgstr "format à utiliser pour la sortie"
|
|
|
|
|
|
|
|
#: builtin/branch.c:611
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Failed to resolve HEAD as a valid ref."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Échec de résolution de HEAD comme référence valide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:615 builtin/clone.c:724
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "HEAD not found below refs/heads!"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "HEAD non trouvée sous refs/heads !"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:638
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--column and --verbose are incompatible"
|
|
|
|
msgstr "--column et --verbose sont incompatibles"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:649 builtin/branch.c:701
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "branch name required"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "le nom de branche est requis"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:677
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot give description to detached HEAD"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de décrire une HEAD détachée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:682
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot edit description of more than one branch"
|
|
|
|
msgstr "impossible d'éditer la description de plus d'une branche"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:689
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No commit on branch '%s' yet."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Aucun commit sur la branche '%s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:692
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No branch named '%s'."
|
|
|
|
msgstr "Aucune branche nommée '%s'."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:707
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "too many branches for a rename operation"
|
|
|
|
msgstr "trop de branches pour une opération de renommage"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:712
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "too many branches to set new upstream"
|
|
|
|
msgstr "trop de branches pour spécifier une branche amont"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:716
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"could not set upstream of HEAD to %s when it does not point to any branch."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
|
|
|
|
"aucune branche."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "no such branch '%s'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "pas de branche '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:723
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "branch '%s' does not exist"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "la branche '%s' n'existe pas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:735
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "too many branches to unset upstream"
|
|
|
|
msgstr "trop de branches pour désactiver un amont"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:739
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not unset upstream of HEAD when it does not point to any branch."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
|
|
|
|
"aucune branche."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:745
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Branch '%s' has no upstream information"
|
|
|
|
msgstr "La branche '%s' n'a aucune information de branche amont"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:759
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "it does not make sense to create 'HEAD' manually"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "créer manuellement 'HEAD' n'a pas de sens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:765
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:768
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The --set-upstream flag is deprecated and will be removed. Consider using --"
|
|
|
|
"track or --set-upstream-to\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
|
|
|
|
"track ou --set-upstream-to\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/branch.c:785
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"If you wanted to make '%s' track '%s', do this:\n"
|
|
|
|
"\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"\n"
|
2016-12-18 02:16:06 +01:00
|
|
|
"Si vous vouliez que '%s' suive '%s', faites ceci :\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/bundle.c:45
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%s is okay\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "%s est correct\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/bundle.c:58
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Need a repository to create a bundle."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "La création d'un colis requiert un dépôt."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/bundle.c:62
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Need a repository to unbundle."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Le dépaquetage d'un colis requiert un dépôt."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:513
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid ""
|
2016-11-05 21:43:53 +01:00
|
|
|
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
|
|
|
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
|
|
|
|
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:514
|
|
|
|
msgid ""
|
|
|
|
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
|
|
|
"filters]"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
|
|
|
"filters]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:551
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "<type> can be one of: blob, tree, commit, tag"
|
|
|
|
msgstr "<type> peut être : blob, tree, commit ou tag"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:552
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show object type"
|
|
|
|
msgstr "afficher le type de l'objet"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:553
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show object size"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher la taille de l'objet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:555
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "exit with zero when there's no error"
|
|
|
|
msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:556
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pretty-print object's content"
|
|
|
|
msgstr "afficher avec mise en forme le contenu de l'objet"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:558
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "for blob objects, run textconv on object's content"
|
|
|
|
msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:560
|
|
|
|
msgid "for blob objects, run filters on object's content"
|
|
|
|
msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/cat-file.c:561 git-submodule.sh:943
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "blob"
|
|
|
|
msgstr "blob"
|
|
|
|
|
|
|
|
#: builtin/cat-file.c:562
|
|
|
|
msgid "use a specific path for --textconv/--filters"
|
|
|
|
msgstr "utiliser un chemin spécifique pour --textconv/--filters"
|
|
|
|
|
|
|
|
#: builtin/cat-file.c:564
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "allow -s and -t to work with broken/corrupt objects"
|
|
|
|
msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:565
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "buffer --batch output"
|
|
|
|
msgstr "bufferiser la sortie de --batch"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:567
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show info and content of objects fed from the standard input"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"afficher l'information et le contenu des objets passés en entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:570
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show info about objects fed from the standard input"
|
|
|
|
msgstr "afficher l'information des objets passés en entrée standard"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:573
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
|
|
|
|
"batch ou --batch-check)"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/cat-file.c:575
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "show all objects with --batch or --batch-check"
|
|
|
|
msgstr "montrer tous les objets avec --batch ou --batch-check"
|
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#: builtin/check-attr.c:11
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
|
|
|
|
msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/check-attr.c:12
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
|
|
|
|
msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: 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"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read file names from stdin"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire les noms de fichier depuis l'entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "terminate input and output records by a NUL character"
|
2014-01-18 14:36:19 +01:00
|
|
|
msgstr ""
|
|
|
|
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "suppress progress reporting"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer l'état d'avancement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2013-08-21 21:49:43 +02:00
|
|
|
#: builtin/check-ignore.c:26
|
|
|
|
msgid "show non-matching input paths"
|
|
|
|
msgstr "afficher les chemins en entrée qui ne correspondent pas"
|
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/check-ignore.c:28
|
|
|
|
msgid "ignore index when checking"
|
|
|
|
msgstr "ignorer l'index pendant la vérification"
|
|
|
|
|
|
|
|
#: builtin/check-ignore.c:154
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot specify pathnames with --stdin"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "impossible de spécifier les chemins avec --stdin"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/check-ignore.c:157
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "-z only makes sense with --stdin"
|
|
|
|
msgstr "-z n'a de sens qu'avec l'option --stdin"
|
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/check-ignore.c:159
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "no path specified"
|
|
|
|
msgstr "aucun chemin spécifié"
|
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/check-ignore.c:163
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--quiet is only valid with a single pathname"
|
|
|
|
msgstr "--quiet n'est valide qu'avec un seul chemin"
|
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/check-ignore.c:165
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot have both --quiet and --verbose"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "impossible d'avoir --quiet et --verbose"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/check-ignore.c:168
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "--non-matching is only valid with --verbose"
|
|
|
|
msgstr "--non-matching n'est valide qu'avec --verbose"
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:8
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git check-mailmap [<options>] <contact>..."
|
|
|
|
msgstr "git check-mailmap [<options>] <contact>..."
|
2013-08-21 21:49:43 +02:00
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:13
|
|
|
|
msgid "also read contacts from stdin"
|
|
|
|
msgstr "lire aussi les contacts depuis l'entrée standard"
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:24
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to parse contact: %s"
|
|
|
|
msgstr "impossible d'analyser le contact : %s"
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:47
|
|
|
|
msgid "no contacts specified"
|
|
|
|
msgstr "aucun contact spécifié"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:127
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git checkout-index [<options>] [--] [<file>...]"
|
|
|
|
msgstr "git checkout-index [<options>] [--] [<fichier>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:144
|
|
|
|
msgid "stage should be between 1 and 3 or all"
|
|
|
|
msgstr "stage doit valoir entre 1 et 3, ou all"
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:160
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "check out all files in the index"
|
|
|
|
msgstr "extraire tous les fichiers présents dans l'index"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:161
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "force overwrite of existing files"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "forcer l'écrasement des fichiers existants"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:163
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "no warning for existing files and files not in index"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"pas d'avertissement pour les fichiers existants et les fichiers absents de "
|
|
|
|
"l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:165
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't checkout new files"
|
|
|
|
msgstr "ne pas extraire les nouveaux fichiers"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:167
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "update stat information in the index file"
|
|
|
|
msgstr "mettre à jour l'information de stat dans le fichier d'index"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:171
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read list of paths from the standard input"
|
|
|
|
msgstr "lire la liste des chemins depuis l'entrée standard"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:173
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "write the content to temporary files"
|
|
|
|
msgstr "écrire le contenu dans des fichiers temporaires"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:174 builtin/column.c:30
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
|
|
|
|
#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:477
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "string"
|
|
|
|
msgstr "chaîne"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:175
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "when creating files, prepend <string>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "lors de la création de fichiers, préfixer par <chaîne>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/checkout-index.c:177
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "copy out the files from named stage"
|
|
|
|
msgstr "copier les fichiers depuis l'index nommé"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:27
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git checkout [<options>] <branch>"
|
|
|
|
msgstr "git checkout [<options>] <branche>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:28
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
|
|
|
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:153 builtin/checkout.c:186
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' does not have our version"
|
|
|
|
msgstr "le chemin '%s' n'a pas notre version"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:155 builtin/checkout.c:188
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' does not have their version"
|
|
|
|
msgstr "le chemin '%s' n'a pas leur version"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:171
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' does not have all necessary versions"
|
|
|
|
msgstr "le chemin '%s' n'a aucune des versions nécessaires"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:215
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' does not have necessary versions"
|
|
|
|
msgstr "le chemin '%s' n'a pas les versions nécessaires"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:232
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s': cannot merge"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "chemin '%s' : impossible de fusionner"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:249
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Unable to add merge result for '%s'"
|
|
|
|
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
|
|
|
|
#: builtin/checkout.c:278
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' cannot be used with updating paths"
|
|
|
|
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:281 builtin/checkout.c:284
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' cannot be used with %s"
|
|
|
|
msgstr "'%s' ne peut pas être utilisé avec %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:287
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
|
|
|
|
"même temps."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:358 builtin/checkout.c:365
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' is unmerged"
|
|
|
|
msgstr "le chemin '%s' n'est pas fusionné"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:513
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "you need to resolve your current index first"
|
|
|
|
msgstr "vous devez d'abord résoudre votre index courant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:644
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Can not do reflog for '%s': %s\n"
|
|
|
|
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:685
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "HEAD is now at"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "HEAD est maintenant sur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:689 builtin/clone.c:678
|
2016-03-14 20:26:53 +01:00
|
|
|
msgid "unable to update HEAD"
|
|
|
|
msgstr "impossible de mettre à jour HEAD"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:693
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Reset branch '%s'\n"
|
|
|
|
msgstr "Remise à zéro de la branche '%s'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:696
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Already on '%s'\n"
|
|
|
|
msgstr "Déjà sur '%s'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:700
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Switched to and reset branch '%s'\n"
|
|
|
|
msgstr "Basculement et remise à zéro de la branche '%s'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:702 builtin/checkout.c:1090
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Switched to a new branch '%s'\n"
|
|
|
|
msgstr "Basculement sur la nouvelle branche '%s'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:704
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Switched to branch '%s'\n"
|
|
|
|
msgstr "Basculement sur la branche '%s'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:755
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " ... and %d more.\n"
|
|
|
|
msgstr " ... et %d en plus.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:761
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr[0] ""
|
2014-05-06 23:29:57 +02:00
|
|
|
"Attention : vous abandonnez %d commit, non connecté à\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"une branche :\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"\n"
|
|
|
|
"%s\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr[1] ""
|
2014-05-06 23:29:57 +02:00
|
|
|
"Attention : vous abandonnez %d commits, non connectés à\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"une branche :\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"\n"
|
|
|
|
"%s\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:780
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2015-06-29 21:05:18 +02:00
|
|
|
"If you want to keep it 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"
|
|
|
|
msgid_plural ""
|
2013-07-01 22:19:04 +02:00
|
|
|
"If you want to keep them by creating a new branch, this may be a good time\n"
|
|
|
|
"to do so with:\n"
|
|
|
|
"\n"
|
2015-03-29 09:54:56 +02:00
|
|
|
" git branch <new-branch-name> %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"\n"
|
2015-06-29 21:05:18 +02:00
|
|
|
msgstr[0] ""
|
2015-07-14 12:25:06 +02:00
|
|
|
"Si vous souhaitez le garder en créant une nouvelle branche, c'est le bon "
|
|
|
|
"moment\n"
|
2015-06-29 21:05:18 +02:00
|
|
|
"pour le faire avec :\n"
|
|
|
|
"\n"
|
|
|
|
"git branch <nouvelle-branche> %s\n"
|
|
|
|
"\n"
|
|
|
|
msgstr[1] ""
|
2015-07-14 12:25:06 +02:00
|
|
|
"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon "
|
|
|
|
"moment\n"
|
2014-05-06 23:29:57 +02:00
|
|
|
"pour le faire avec :\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"\n"
|
2015-03-29 09:54:56 +02:00
|
|
|
"git branch <nouvelle-branche> %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:816
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "internal error in revision walk"
|
|
|
|
msgstr "erreur interne lors du parcours des révisions"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:820
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Previous HEAD position was"
|
2015-01-13 20:22:58 +01:00
|
|
|
msgstr "La position précédente de HEAD était sur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:847 builtin/checkout.c:1085
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You are on a branch yet to be born"
|
|
|
|
msgstr "Vous êtes sur une branche qui doit encore naître"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:991
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "only one reference expected, %d given."
|
|
|
|
msgstr "une seule référence attendue, %d fournies."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1031 builtin/worktree.c:214
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid reference: %s"
|
|
|
|
msgstr "référence invalide : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1060
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "reference is not a tree: %s"
|
|
|
|
msgstr "la référence n'est pas un arbre : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1099
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "paths cannot be used with switching branches"
|
|
|
|
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1102 builtin/checkout.c:1106
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' cannot be used with switching branches"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
|
|
|
|
#: builtin/checkout.c:1121
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' cannot be used with '%s'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "'%s' ne peut pas être utilisé avec '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1126
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
|
|
|
|
#: builtin/worktree.c:331
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "branch"
|
|
|
|
msgstr "branche"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1160
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create and checkout a new branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "créer et extraire une nouvelle branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1162
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create/reset and checkout a branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "créer/réinitialiser et extraire une branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1163
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create reflog for new branch"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "créer un reflog pour une nouvelle branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/checkout.c:1164 builtin/worktree.c:333
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "detach HEAD at named commit"
|
|
|
|
msgstr "détacher la HEAD au commit nommé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1165
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "set upstream info for new branch"
|
2014-05-06 23:29:57 +02:00
|
|
|
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1167
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "new-branch"
|
2013-07-01 22:19:04 +02:00
|
|
|
msgstr "nouvelle branche"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1167
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "new unparented branch"
|
|
|
|
msgstr "nouvelle branche sans parent"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1168
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "checkout our version for unmerged files"
|
|
|
|
msgstr "extraire notre version pour les fichiers non fusionnés"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1170
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "checkout their version for unmerged files"
|
|
|
|
msgstr "extraire leur version pour les fichiers non fusionnés"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1172
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "force checkout (throw away local modifications)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1173
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "perform a 3-way merge with the new branch"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1174 builtin/merge.c:234
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "update ignored files (default)"
|
|
|
|
msgstr "mettre à jour les fichiers ignorés (par défaut)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "style"
|
|
|
|
msgstr "style"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1176
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "conflict style (merge or diff3)"
|
2016-03-15 01:34:22 +01:00
|
|
|
msgstr "style de conflit (merge (fusion) ou diff3)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1179
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not limit pathspecs to sparse entries only"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1181
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "second guess 'git checkout <no-such-branch>'"
|
|
|
|
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1183
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "do not check if another worktree is holding the given ref"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"ne pas vérifier si une autre copie de travail contient le référence fournie"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
|
|
|
|
#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
|
|
|
|
#: builtin/send-pack.c:172
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "force progress reporting"
|
|
|
|
msgstr "forcer l'affichage de l'état d'avancement"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1224
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "-b, -B and --orphan are mutually exclusive"
|
|
|
|
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1241
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--track needs a branch name"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "--track requiert un nom de branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1246
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Missing branch name; try -b"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Nom de branche manquant ; essayez -b"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1282
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "invalid path specification"
|
|
|
|
msgstr "spécification de chemin invalide"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1289
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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?"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Impossible de mettre à jour les chemins et de basculer sur la branche '%s' "
|
|
|
|
"en même temps.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1294
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "git checkout: --detach does not take a path argument '%s'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/checkout.c:1298
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
|
|
|
"checking out of the index."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
|
|
|
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"de l'extraction de l'index."
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/clean.c:25
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid ""
|
|
|
|
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
|
|
|
|
msgstr ""
|
|
|
|
"git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/clean.c:29
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing %s\n"
|
|
|
|
msgstr "Suppression de %s\n"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/clean.c:30
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Would remove %s\n"
|
|
|
|
msgstr "Supprimerait %s\n"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/clean.c:31
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Skipping repository %s\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Ignore le dépôt %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/clean.c:32
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Would skip repository %s\n"
|
|
|
|
msgstr "Ignorerait le dépôt %s\n"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/clean.c:33
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to remove %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "échec de la suppression de %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:297 git-add--interactive.perl:614
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid ""
|
|
|
|
"Prompt help:\n"
|
|
|
|
"1 - select a numbered item\n"
|
|
|
|
"foo - select item based on unique prefix\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
" - (empty) select nothing\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Aide en ligne :\n"
|
|
|
|
"1 - sélectionner un élément numéroté\n"
|
|
|
|
"foo - sélectionner un élément par un préfixe unique\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
" - (vide) ne rien sélectionner\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:301 git-add--interactive.perl:623
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid ""
|
|
|
|
"Prompt help:\n"
|
|
|
|
"1 - select a single item\n"
|
|
|
|
"3-5 - select a range of items\n"
|
|
|
|
"2-3,6-9 - select multiple ranges\n"
|
|
|
|
"foo - select item based on unique prefix\n"
|
|
|
|
"-... - unselect specified items\n"
|
|
|
|
"* - choose all items\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
" - (empty) finish selecting\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Aide en ligne :\n"
|
|
|
|
"1 - sélectionner un seul élément\n"
|
|
|
|
"3-5 - sélectionner une plage d'éléments\n"
|
|
|
|
"2-3,6-9 - sélectionner plusieurs plages\n"
|
|
|
|
"foo - sélectionner un élément par un préfixe unique\n"
|
|
|
|
"-... - désélectionner les éléments spécifiés\n"
|
|
|
|
"* - choisir tous les éléments\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
" - (vide) terminer la sélection\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:517 git-add--interactive.perl:589
|
|
|
|
#: git-add--interactive.perl:594
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format, perl-format
|
|
|
|
msgid "Huh (%s)?\n"
|
|
|
|
msgstr "Hein (%s) ?\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:659
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Input ignore patterns>> "
|
|
|
|
msgstr "Entrez les motifs à ignorer>> "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:696
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "WARNING: Cannot find items matched by: %s"
|
|
|
|
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:717
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Select items to delete"
|
|
|
|
msgstr "Sélectionner les éléments à supprimer"
|
|
|
|
|
2015-03-29 09:54:56 +02:00
|
|
|
#. TRANSLATORS: Make sure to keep [y/N] as is
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:758
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "Remove %s [y/N]? "
|
|
|
|
msgstr "Supprimer %s [y/N] ? "
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:783 git-add--interactive.perl:1660
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Bye.\n"
|
|
|
|
msgstr "Au revoir.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:791
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid ""
|
|
|
|
"clean - start cleaning\n"
|
|
|
|
"filter by pattern - exclude items from deletion\n"
|
|
|
|
"select by numbers - select items to be deleted by numbers\n"
|
|
|
|
"ask each - confirm each deletion (like \"rm -i\")\n"
|
|
|
|
"quit - stop cleaning\n"
|
|
|
|
"help - this screen\n"
|
|
|
|
"? - help for prompt selection"
|
|
|
|
msgstr ""
|
|
|
|
"clean - démarrer le nettoyage\n"
|
|
|
|
"filter by pattern - exclure des éléments par motif\n"
|
|
|
|
"select by numbers - sélectionner les éléments à supprimer par numéros\n"
|
|
|
|
"ask each - confirmer chaque suppression (comme \"rm -i\")\n"
|
|
|
|
"quit - arrêter le nettoyage\n"
|
|
|
|
"help - cet écran\n"
|
|
|
|
"? - aide pour la sélection en ligne"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:818 git-add--interactive.perl:1736
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "*** Commands ***"
|
|
|
|
msgstr "*** Commandes ***"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:819 git-add--interactive.perl:1733
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "What now"
|
|
|
|
msgstr "Et maintenant ?"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:827
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Would remove the following item:"
|
|
|
|
msgid_plural "Would remove the following items:"
|
|
|
|
msgstr[0] "Supprimerait l'élément suivant :"
|
|
|
|
msgstr[1] "Supprimerait les éléments suivants :"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:844
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "No more files to clean, exiting."
|
|
|
|
msgstr "Plus de fichier à nettoyer, sortie."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:875
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not print names of files removed"
|
|
|
|
msgstr "ne pas afficher les noms des fichiers supprimés"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:877
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "force"
|
|
|
|
msgstr "forcer"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:878
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "interactive cleaning"
|
|
|
|
msgstr "nettoyage interactif"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:880
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "remove whole directories"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer les répertoires entiers"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:350 builtin/show-ref.c:176
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pattern"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "motif"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:882
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add <pattern> to ignore rules"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ajouter <motif> aux règles ignore"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:883
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "remove ignored files, too"
|
|
|
|
msgstr "supprimer les fichiers ignorés, aussi"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:885
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "remove only ignored files"
|
|
|
|
msgstr "supprimer seulement les fichiers ignorés"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:903
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "-x and -X cannot be used together"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:907
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2014-02-26 21:27:14 +01:00
|
|
|
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
|
2013-08-21 21:49:43 +02:00
|
|
|
"clean"
|
2014-08-05 19:23:50 +02:00
|
|
|
msgstr ""
|
|
|
|
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
|
|
|
|
"nettoyer"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clean.c:910
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2014-02-26 21:27:14 +01:00
|
|
|
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
|
2013-08-21 21:49:43 +02:00
|
|
|
"refusing to clean"
|
|
|
|
msgstr ""
|
|
|
|
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
|
|
|
|
"nettoyer"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/clone.c:37
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git clone [<options>] [--] <repo> [<dir>]"
|
|
|
|
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:80
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't create a checkout"
|
|
|
|
msgstr "ne pas créer d'extraction"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create a bare repository"
|
|
|
|
msgstr "créer un dépôt nu"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:85
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create a mirror repository (implies bare)"
|
|
|
|
msgstr "créer un dépôt miroir (implique dépôt nu)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:87
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "to clone from a local repository"
|
|
|
|
msgstr "pour cloner depuis un dépôt local"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:89
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't use local hardlinks, always copy"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:91
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "setup as shared repository"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "régler comme dépôt partagé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:93 builtin/clone.c:97
|
|
|
|
msgid "pathspec"
|
|
|
|
msgstr "spécificateur de chemin"
|
|
|
|
|
|
|
|
#: builtin/clone.c:93 builtin/clone.c:97
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "initialize submodules in the clone"
|
|
|
|
msgstr "initialiser les sous-modules dans le clone"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:100
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "number of submodules cloned in parallel"
|
|
|
|
msgstr "nombre de sous-modules clonés en parallèle"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:101 builtin/init-db.c:475
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "template-directory"
|
|
|
|
msgstr "répertoire-modèle"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:102 builtin/init-db.c:476
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "directory from which templates will be used"
|
|
|
|
msgstr "répertoire depuis lequel les modèles vont être utilisés"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
|
|
|
|
#: builtin/submodule--helper.c:983
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reference repository"
|
|
|
|
msgstr "dépôt de référence"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:108
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "use --reference only while cloning"
|
|
|
|
msgstr "utiliser seulement --reference pour cloner"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "name"
|
|
|
|
msgstr "nom"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:110
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use <name> instead of 'origin' to track upstream"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:112
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "checkout <branch> instead of the remote's HEAD"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:114
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "path to git-upload-pack on the remote"
|
|
|
|
msgstr "chemin vers git-upload-pack sur le serveur distant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
|
|
|
|
#: builtin/pull.c:202
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "depth"
|
|
|
|
msgstr "profondeur"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:116
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create a shallow clone of that depth"
|
|
|
|
msgstr "créer un clone superficiel de cette profondeur"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
|
2016-11-05 21:43:53 +01:00
|
|
|
#: parse-options.h:142
|
|
|
|
msgid "time"
|
|
|
|
msgstr "heure"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:118
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "create a shallow clone since a specific time"
|
|
|
|
msgstr "créer un clone superficiel depuis une date spécifique"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:119 builtin/fetch.c:124
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "revision"
|
|
|
|
msgstr "révision"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:120 builtin/fetch.c:125
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "deepen history of shallow clone, excluding rev"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"approfondir l'historique d'un clone superficiel en excluant une révision"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:122
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "clone only one branch, HEAD or --branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "cloner seulement une branche, HEAD ou --branch"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:124
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "any cloned submodules will be shallow"
|
|
|
|
msgstr "tous les sous-modules clonés seront superficiels"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:125 builtin/init-db.c:484
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "gitdir"
|
|
|
|
msgstr "gitdir"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:126 builtin/init-db.c:485
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "separate git dir from working tree"
|
|
|
|
msgstr "séparer le répertoire git de la copie de travail"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:127
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "key=value"
|
|
|
|
msgstr "clé=valeur"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:128
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "set config inside the new repository"
|
|
|
|
msgstr "régler la configuration dans le nouveau dépôt"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "use IPv4 addresses only"
|
|
|
|
msgstr "n'utiliser que des adresses IPv4"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "use IPv6 addresses only"
|
|
|
|
msgstr "n'utiliser que des adresses IPv6"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:268
|
2016-03-14 20:26:53 +01:00
|
|
|
msgid ""
|
|
|
|
"No directory name could be guessed.\n"
|
|
|
|
"Please specify a directory on the command line"
|
|
|
|
msgstr ""
|
|
|
|
"Aucun nom de répertoire n'a pu être deviné\n"
|
|
|
|
"Veuillez spécifier un répertoire dans la ligne de commande"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:321
|
2014-01-18 14:36:19 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "info: Could not add alternate for '%s': %s\n"
|
|
|
|
msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:393
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to open '%s'"
|
|
|
|
msgstr "échec à l'ouverture de '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:401
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%s exists and is not a directory"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "%s existe et n'est pas un répertoire"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:415
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to stat %s\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "échec du stat de %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:437
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to create link '%s'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "échec de la création du lien '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:441
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to copy file to '%s'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "échec de la copie vers '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:466
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "done.\n"
|
|
|
|
msgstr "fait.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:478
|
2013-07-01 22:19:04 +02:00
|
|
|
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"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Le clone a réussi, mais l'extraction a échoué.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
|
|
|
|
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:555
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not find remote branch %s to clone."
|
|
|
|
msgstr "Impossible de trouver la branche distante '%s' à cloner."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:650
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "remote did not send all necessary objects"
|
|
|
|
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:666
|
2016-03-14 20:26:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to update %s"
|
|
|
|
msgstr "impossible de mettre à jour %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:715
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"la HEAD distante réfère à une référence non existante, impossible de "
|
|
|
|
"l'extraire.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:746
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unable to checkout working tree"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'extraire la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:786
|
2016-03-14 20:26:53 +01:00
|
|
|
msgid "unable to write parameters to config file"
|
|
|
|
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:849
|
2015-01-13 20:22:58 +01:00
|
|
|
msgid "cannot repack to clean up"
|
|
|
|
msgstr "impossible de remballer pour nettoyer"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:851
|
2015-01-13 20:22:58 +01:00
|
|
|
msgid "cannot unlink temporary alternates file"
|
|
|
|
msgstr "impossible de unlinker le fichier temporaire alternates"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/clone.c:884 builtin/receive-pack.c:1900
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Too many arguments."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Trop d'arguments."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:888
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You must specify a repository to clone."
|
|
|
|
msgstr "Vous devez spécifier un dépôt à cloner."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:901
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "--bare and --origin %s options are incompatible."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "les options --bare et --origin %s sont incompatibles."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:904
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--bare and --separate-git-dir are incompatible."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "--bare et --separate-git-dir sont incompatibles."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:917
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "repository '%s' does not exist"
|
|
|
|
msgstr "le dépôt '%s' n'existe pas"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:923 builtin/fetch.c:1337
|
2014-01-18 14:36:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "depth %s is not a positive number"
|
|
|
|
msgstr "la profondeur %s n'est pas un entier positif"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:933
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "destination path '%s' already exists and is not an empty directory."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:943
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "working tree '%s' already exists."
|
|
|
|
msgstr "la copie de travail '%s' existe déjà."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:221 builtin/worktree.c:251
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not create leading directories of '%s'"
|
|
|
|
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:961
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "could not create work tree dir '%s'"
|
|
|
|
msgstr "impossible de créer le répertoire de la copie de travail '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:973
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cloning into bare repository '%s'...\n"
|
|
|
|
msgstr "Clonage dans le dépôt nu '%s'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:975
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cloning into '%s'...\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Clonage dans '%s'...\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:999
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"clone --recursive is not compatible with both --reference and --reference-if-"
|
|
|
|
"able"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"clone --recursive n'est pas compatible avec à la fois --reference et --"
|
|
|
|
"reference-if-able"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:1055
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "--depth is ignored in local clones; use file:// instead."
|
|
|
|
msgstr ""
|
|
|
|
"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:1057
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--shallow-since is ignored in local clones; use file:// instead."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
|
|
|
|
"\"."
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:1059
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
|
|
|
|
"\"file://\"."
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:1062
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "source repository is shallow, ignoring --local"
|
|
|
|
msgstr "le dépôt source est superficiel, option --local ignorée"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:1067
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "--local is ignored"
|
|
|
|
msgstr "--local est ignoré"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:1071
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Don't know how to clone %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Je ne sais pas cloner %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:1126 builtin/clone.c:1134
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/clone.c:1137
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You appear to have cloned an empty repository."
|
|
|
|
msgstr "Vous semblez avoir cloné un dépôt vide."
|
|
|
|
|
|
|
|
#: builtin/column.c:9
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git column [<options>]"
|
|
|
|
msgstr "git column [<options>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: 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"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Remplissage d'espace sur la bordure gauche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/column.c:31
|
|
|
|
msgid "Padding space on right border"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Remplissage d'espace sur le côté droit"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/column.c:32
|
|
|
|
msgid "Padding space between columns"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Remplissage d'espace entre les colonnes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/column.c:51
|
|
|
|
msgid "--command must be the first argument"
|
|
|
|
msgstr "--command doit être le premier argument"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/commit.c:38
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git commit [<options>] [--] <pathspec>..."
|
|
|
|
msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/commit.c:43
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git status [<options>] [--] <pathspec>..."
|
|
|
|
msgstr "git status [<options>] [--] <spécification-de-chemin>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/commit.c:48
|
2014-11-01 16:29:19 +01:00
|
|
|
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. Run the\n"
|
|
|
|
"following command and follow the instructions in your editor to edit\n"
|
|
|
|
"your configuration file:\n"
|
|
|
|
"\n"
|
|
|
|
" git config --global --edit\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\n"
|
|
|
|
"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
|
|
|
|
"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
|
|
|
|
"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
|
|
|
|
"instruction dans votre éditeur pour éditer votre fichier de configuration :\n"
|
|
|
|
"\n"
|
|
|
|
" git config --global --edit\n"
|
|
|
|
"\n"
|
2014-11-20 03:53:48 +01:00
|
|
|
"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation "
|
|
|
|
"avec :\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"\n"
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/commit.c:61
|
2013-07-01 22:19:04 +02:00
|
|
|
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"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Votre nom et votre adresse e-mail ont été configurés automatiquement en se "
|
|
|
|
"fondant\n"
|
2014-05-06 23:29:57 +02:00
|
|
|
"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "
|
2013-08-21 21:49:43 +02:00
|
|
|
"qu'ils sont corrects.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"Vous pouvez supprimer ce message en les paramétrant explicitement :\n"
|
|
|
|
"\n"
|
|
|
|
" git config --global user.name \"Votre Nom\"\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
" git config --global user.email vous@exemple.com\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"\n"
|
|
|
|
"Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/commit.c:73
|
2013-07-01 22:19:04 +02:00
|
|
|
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"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Vous avez demandé de corriger le commit le plus récent, mais le faire le "
|
|
|
|
"rendrait\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"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"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/commit.c:78
|
2013-07-01 22:19:04 +02:00
|
|
|
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"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
2016-11-22 15:24:59 +01:00
|
|
|
"Le picorage précédent est à présent vide, vraisemblablement dû à une "
|
|
|
|
"résolution de conflit.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"Si vous souhaitez tout de même le valider, utilisez :\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --allow-empty\n"
|
|
|
|
"\n"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/commit.c:85
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Otherwise, please use 'git reset'\n"
|
|
|
|
msgstr "Sinon, veuillez utiliser 'git reset'\n"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/commit.c:88
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid ""
|
|
|
|
"If you wish to skip this commit, use:\n"
|
|
|
|
"\n"
|
|
|
|
" git reset\n"
|
|
|
|
"\n"
|
|
|
|
"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
|
|
|
|
"the remaining commits.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Si vous souhaitez sauter ce commit, utilisez :\n"
|
|
|
|
"\n"
|
|
|
|
" git reset\n"
|
|
|
|
"\n"
|
|
|
|
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
|
|
|
|
"des commits restants.\n"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:318
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "failed to unpack HEAD tree object"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "échec du dépaquetage de l'objet arbre HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:359
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unable to create temporary index"
|
|
|
|
msgstr "impossible de créer l'index temporaire"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:365
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "interactive add failed"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "échec de l'ajout interactif"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:378
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "unable to update temporary index"
|
|
|
|
msgstr "impossible de mettre à jour l'index temporaire"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:380
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "Failed to update main cache tree"
|
|
|
|
msgstr "Impossible de mettre à jour l'arbre de cache principal"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unable to write new_index file"
|
|
|
|
msgstr "impossible d'écrire le fichier new_index"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:458
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot do a partial commit during a merge."
|
|
|
|
msgstr "impossible de faire une validation partielle pendant une fusion."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:460
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot do a partial commit during a cherry-pick."
|
|
|
|
msgstr "impossible de faire une validation partielle pendant un picorage."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:469
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot read the index"
|
|
|
|
msgstr "impossible de lire l'index"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:488
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unable to write temporary index file"
|
|
|
|
msgstr "impossible d'écrire le fichier d'index temporaire"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:582
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "commit '%s' lacks author header"
|
|
|
|
msgstr "entête d'auteur manquant dans le commit '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:584
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "commit '%s' has malformed author line"
|
|
|
|
msgstr "le commit '%s' a une ligne d'auteur malformée"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:603
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "malformed --author parameter"
|
|
|
|
msgstr "paramètre --author mal formé"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:655
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid ""
|
|
|
|
"unable to select a comment character that is not used\n"
|
|
|
|
"in the current commit message"
|
|
|
|
msgstr ""
|
|
|
|
"impossible de sélectionner un caractère de commentaire\n"
|
|
|
|
"qui n'est pas utilisé dans le message de validation actuel"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not lookup commit %s"
|
|
|
|
msgstr "impossible de rechercher le commit %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:704 builtin/shortlog.c:294
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "(reading log message from standard input)\n"
|
|
|
|
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:706
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not read log from standard input"
|
|
|
|
msgstr "impossible de lire le journal depuis l'entrée standard"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:710
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not read log file '%s'"
|
|
|
|
msgstr "impossible de lire le fichier de journal '%s'"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:737 builtin/commit.c:745
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not read SQUASH_MSG"
|
|
|
|
msgstr "impossible de lire SQUASH_MSG"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:742
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "could not read MERGE_MSG"
|
|
|
|
msgstr "impossible de lire MERGE_MSG"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:796
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not write commit template"
|
|
|
|
msgstr "impossible d'écrire le modèle de commit"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:814
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
|
|
|
"\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"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"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:819
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
|
|
|
"\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"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"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:832
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr ""
|
|
|
|
"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
"commençant par '%c' seront ignorées, et un message vide abandonne la "
|
|
|
|
"validation.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:839
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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"
|
2013-08-25 11:45:13 +02:00
|
|
|
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-même\n"
|
|
|
|
"si vous le souhaitez. Un message vide abandonne la validation.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:859
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "%sAuthor: %.*s <%.*s>"
|
|
|
|
msgstr "%sAuteur : %.*s <%.*s>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:867
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "%sDate: %s"
|
|
|
|
msgstr "%sDate : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:874
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%sCommitter: %.*s <%.*s>"
|
|
|
|
msgstr "%sValidateur : %.*s <%.*s>"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:892
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot read index"
|
|
|
|
msgstr "Impossible de lire l'index"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:954
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Error building trees"
|
|
|
|
msgstr "Erreur lors de la construction des arbres"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:968 builtin/tag.c:273
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1071
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
|
|
|
|
"auteur existant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1086 builtin/commit.c:1325
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid untracked files mode '%s'"
|
|
|
|
msgstr "Mode de fichier non suivi invalide '%s'"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1124
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "--long and -z are incompatible"
|
|
|
|
msgstr "--long et -z sont incompatibles"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1154
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Using both --reset-author and --author does not make sense"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1163
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You have nothing to amend."
|
|
|
|
msgstr "Il n'y a rien à corriger."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1166
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You are in the middle of a merge -- cannot amend."
|
|
|
|
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1168
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
|
|
|
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1171
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Options --squash and --fixup cannot be used together"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1181
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Only one of -c/-C/-F/--fixup can be used."
|
|
|
|
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1183
|
2013-07-01 22:19:04 +02:00
|
|
|
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."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1191
|
2013-07-01 22:19:04 +02:00
|
|
|
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."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1208
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
|
|
|
|
"être utilisée."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1210
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No paths with --include/--only does not make sense."
|
|
|
|
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/commit.c:1212
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:1224 builtin/tag.c:551
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid cleanup mode %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Mode de nettoyage invalide %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1229
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Paths with -a does not make sense."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1339 builtin/commit.c:1612
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show status concisely"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "afficher l'état avec concision"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1341 builtin/commit.c:1614
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show branch information"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher l'information de branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1343
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "version"
|
|
|
|
msgstr "version"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:448
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "machine-readable output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "sortie pour traitement automatique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1346 builtin/commit.c:1618
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show status in long format (default)"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "afficher l'état en format long (par défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1349 builtin/commit.c:1621
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "terminate entries with NUL"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "terminer les éléments par NUL"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fast-export.c:984 builtin/tag.c:411
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "mode"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mode"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1352 builtin/commit.c:1624
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
|
|
|
|
"no. (Défaut : all)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1355
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show ignored files"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les fichiers ignorés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1356 parse-options.h:155
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "when"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "quand"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1357
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"ignore changes to submodules, optional when: all, dirty, untracked. "
|
|
|
|
"(Default: all)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
|
|
|
|
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1359
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list untracked files in columns"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les fichiers non suivis en colonnes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1435
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "couldn't look up newly created commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de retrouver le commit nouvellement créé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1437
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not parse newly created commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'analyser le commit nouvellement créé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1482
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "detached HEAD"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "HEAD détachée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1485
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid " (root-commit)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr " (commit racine)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1582
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "suppress summary after successful commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "supprimer le résumé après une validation réussie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1583
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show diff in commit message template"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les diff dans le modèle de message de validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1585
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Commit message options"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Options du message de validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:1586 builtin/tag.c:409
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read message from file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire le message depuis un fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1587
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "author"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "auteur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1587
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "override author for commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "remplacer l'auteur pour la validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/commit.c:1588 builtin/gc.c:357
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "date"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "date"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1588
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "override date for commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "remplacer la date pour la validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
|
|
|
|
#: builtin/notes.c:561 builtin/tag.c:407
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "message"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "message"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1589
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "commit message"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "message de validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "commit"
|
|
|
|
msgstr "commit"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1590
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reuse and edit message from specified commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "réutiliser et éditer le message du commit spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1591
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reuse message from specified commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "réutiliser le message du commit spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1592
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use autosquash formatted message to fixup specified commit"
|
|
|
|
msgstr ""
|
2014-05-06 23:29:57 +02:00
|
|
|
"utiliser un message au format autosquash pour corriger le commit spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1593
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use autosquash formatted message to squash specified commit"
|
|
|
|
msgstr ""
|
2014-05-06 23:29:57 +02:00
|
|
|
"utiliser un message au format autosquash pour compresser le commit spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1594
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "the commit is authored by me now (used with -C/-c/--amend)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add Signed-off-by:"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter une entrée Signed-off-by :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1596
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use specified template file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser le fichier de modèle spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1597
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "force edit of commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "forcer l'édition du commit"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1598
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "default"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "défaut"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:1598 builtin/tag.c:412
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "how to strip spaces and #comments from message"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "comment éliminer les espaces et les commentaires # du message"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1599
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "include status in commit message template"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "inclure l'état dans le modèle de message de validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
|
|
|
|
#: builtin/revert.c:112
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "GPG sign commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "signer la validation avec GPG"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1604
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Commit contents options"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Valider les options des contenus"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1605
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "commit all changed files"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "valider tous les fichiers modifiés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1606
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add specified files to index for commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1607
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "interactively add files"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter des fichiers en mode interactif"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1608
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "interactively add changes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter les modifications en mode interactif"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1609
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "commit only specified files"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "valider seulement les fichiers spécifiés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1610
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "bypass pre-commit and commit-msg hooks"
|
|
|
|
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1611
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show what would be committed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher ce qui serait validé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1622
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "amend previous commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "corriger la validation précédente"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1623
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "bypass post-rewrite hook"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "éviter d'utiliser le crochet post-rewrite"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1628
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "ok to record an empty change"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "accepter d'enregistrer une modification vide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1630
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "ok to record a change with an empty message"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "accepter d'enregistrer une modification avec un message vide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1659
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not parse HEAD commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'analyser le commit HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1707
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Corrupt MERGE_HEAD file (%s)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Fichier MERGE_HEAD corrompu (%s)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1714
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not read MERGE_MODE"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lire MERGE_MODE"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1733
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not read commit message: %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lire le message de validation : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1744
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Aborting commit; you did not edit the message.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1749
|
|
|
|
#, c-format
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Aborting commit due to empty commit message.\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
msgstr "Abandon de la validation dû à un message de validation vide.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/commit.c:1797
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"Repository has been updated, but unable to write\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"new_index file. Check that disk is not full and quota is\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"not exceeded, and then \"git reset HEAD\" to recover."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Le dépôt a été mis à jour, mais impossible d'écrire le fichier\n"
|
|
|
|
"new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"
|
|
|
|
"n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/config.c:9
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git config [<options>]"
|
|
|
|
msgstr "git config [<options>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:56
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Config file location"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Emplacement du fichier de configuration"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:57
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use global config file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser les fichier de configuration global"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:58
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use system config file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser le fichier de configuration du système"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:59
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use repository config file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser le fichier de configuration du dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:60
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use given config file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser le fichier de configuration spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:61
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "blob-id"
|
|
|
|
msgstr "blob-id"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:61
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "read config from given blob object"
|
|
|
|
msgstr "lire la configuration depuis l'objet blob fourni"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:62
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Action"
|
|
|
|
msgstr "Action"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:63
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "get value: name [value-regex]"
|
|
|
|
msgstr "obtenir la valeur : nom [regex-de-valeur]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:64
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "get all values: key [value-regex]"
|
2015-06-29 21:05:18 +02:00
|
|
|
msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:65
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "get values for regexp: name-regex [value-regex]"
|
|
|
|
msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:66
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "get value specific for the URL: section[.var] URL"
|
|
|
|
msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:67
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "replace all matching variables: name value [value_regex]"
|
2013-07-01 22:19:04 +02:00
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:68
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "add a new variable: name value"
|
|
|
|
msgstr "ajouter une nouvelle variable : nom valeur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:69
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "remove a variable: name [value-regex]"
|
|
|
|
msgstr "supprimer une variable : nom [regex-de-valeur]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:70
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "remove all matches: name [value-regex]"
|
|
|
|
msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:71
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "rename section: old-name new-name"
|
|
|
|
msgstr "renommer une section : ancien-nom nouveau-nom"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:72
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "remove a section: name"
|
|
|
|
msgstr "supprimer une section : nom"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:73
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "list all"
|
|
|
|
msgstr "afficher tout"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:74
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "open an editor"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ouvrir un éditeur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:75
|
2015-01-13 20:22:58 +01:00
|
|
|
msgid "find the color configured: slot [default]"
|
|
|
|
msgstr "trouver la couleur configurée : slot [par défaut]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:76
|
2015-01-13 20:22:58 +01:00
|
|
|
msgid "find the color setting: slot [stdout-is-tty]"
|
|
|
|
msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:77
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Type"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Type"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:78
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "value is \"true\" or \"false\""
|
2014-02-26 21:27:14 +01:00
|
|
|
msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:79
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "value is decimal number"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "la valeur est un nombre décimal"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:80
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "value is --bool or --int"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "la valeur est --bool ou --int"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:81
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "value is a path (file or directory name)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:82
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Other"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Autre"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:83
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "terminate values with NUL byte"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "terminer les valeurs avec un caractère NUL"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:84
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "show variable names only"
|
|
|
|
msgstr "n'afficher que les noms de variable"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:85
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "respect include directives on lookup"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "respecter les directives d'inclusion lors de la recherche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:86
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "show origin of config (file, standard input, blob, command line)"
|
2016-03-14 20:26:53 +01:00
|
|
|
msgstr ""
|
|
|
|
"afficher l'origine de la configuration (fichier, entrée standard, blob, "
|
|
|
|
"ligne de commande)"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:328
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "unable to parse default color value"
|
|
|
|
msgstr "impossible de lire la valeur de couleur par défaut"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:472
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"# This is Git's per-user configuration file.\n"
|
2015-06-29 21:05:18 +02:00
|
|
|
"[user]\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"# Please adapt and uncomment the following lines:\n"
|
2015-06-29 21:05:18 +02:00
|
|
|
"#\tname = %s\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"#\temail = %s\n"
|
|
|
|
msgstr ""
|
2015-06-29 21:05:18 +02:00
|
|
|
"# Ceci est le fichier de configuration personnel de Git.\n"
|
|
|
|
"[user]\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"# Veuillez adapter et décommenter les lignes suivantes :\n"
|
2015-06-29 21:05:18 +02:00
|
|
|
"#\tname = %s\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"#\temail = %s\n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:615
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot create configuration file %s"
|
|
|
|
msgstr "création impossible du fichier de configuration '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/config.c:627
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"cannot overwrite multiple values with a single value\n"
|
|
|
|
" Use a regexp, --add or --replace-all to change %s."
|
|
|
|
msgstr ""
|
|
|
|
"impossible de surcharger des valeurs multiples avec une seule valeur\n"
|
|
|
|
" Utilisez une regexp, --add ou --replace-all pour modifier %s."
|
|
|
|
|
|
|
|
#: builtin/count-objects.c:86
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git count-objects [-v] [-H | --human-readable]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git count-objects [-v] [-H | --human-readable]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/count-objects.c:96
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print sizes in human readable format"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "affiche les tailles dans un format humainement lisible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:18
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git describe [<options>] [<commit-ish>...]"
|
|
|
|
msgstr "git describe [<options>] <commit ou apparenté>*"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:19
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git describe [<options>] --dirty"
|
|
|
|
msgstr "git describe [<options>] --dirty"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:53
|
|
|
|
msgid "head"
|
|
|
|
msgstr "tête"
|
|
|
|
|
|
|
|
#: builtin/describe.c:53
|
|
|
|
msgid "lightweight"
|
|
|
|
msgstr "léger"
|
|
|
|
|
|
|
|
#: builtin/describe.c:53
|
|
|
|
msgid "annotated"
|
|
|
|
msgstr "annoté"
|
|
|
|
|
|
|
|
#: builtin/describe.c:250
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "annotated tag %s not available"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "l'étiquette annotée %s n'est pas disponible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:254
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "annotated tag %s has no embedded name"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:256
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "tag '%s' is really '%s' here"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "l'étiquette '%s' est en fait '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:283 builtin/log.c:487
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Not a valid object name %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "%s n'est pas un nom d'objet valide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:286
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%s is not a valid '%s' object"
|
|
|
|
msgstr "%s n'est pas un objet '%s' valide"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:303
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "no tag exactly matches '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "aucune étiquette ne correspond parfaitement à '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:305
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "searching to describe %s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "recherche de la description de %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:352
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "finished search at %s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "recherche terminée à %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:379
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"No annotated tags can describe '%s'.\n"
|
|
|
|
"However, there were unannotated tags: try --tags."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Aucune étiquette annotée ne peut décrire '%s'.\n"
|
|
|
|
"Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:383
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"No tags can describe '%s'.\n"
|
|
|
|
"Try --always, or create some tags."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Aucune étiquette ne peut décrire '%s'.\n"
|
|
|
|
"Essayez --always, ou créez des étiquettes."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:413
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "traversed %lu commits\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "%lu commits parcourus\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:416
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"more than %i tags found; listed %i most recent\n"
|
|
|
|
"gave up search at %s\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"plus de %i étiquettes ont été trouvées; seules les %i plus récentes sont "
|
|
|
|
"affichées\n"
|
|
|
|
"abandon de la recherche à %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:438
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "find the tag that comes after the commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "rechercher l'étiquette qui suit le commit"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:439
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "debug search strategy on stderr"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "déboguer la stratégie de recherche sur stderr"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:440
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use any ref"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser n'importe quelle référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:441
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use any tag, even unannotated"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser n'importe quelle étiquette, même non-annotée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:442
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "always use long format"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "toujours utiliser le format long"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:443
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "only follow first parent"
|
|
|
|
msgstr "ne suivre que le premier parent"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:446
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only output exact matches"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "n'afficher que les correspondances exactes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:448
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "consider <n> most recent tags (default: 10)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:450
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only consider tags matching <pattern>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne considérer que les étiquettes correspondant à <motif>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:452
|
|
|
|
msgid "do not consider tags matching <pattern>"
|
|
|
|
msgstr "ne pas considérer les étiquettes correspondant à <motif>"
|
|
|
|
|
|
|
|
#: builtin/describe.c:454 builtin/name-rev.c:357
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show abbreviated commit object as fallback"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les objets commits abrégés en dernier recours"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:455 builtin/describe.c:458
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "mark"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "marque"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:456
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:459
|
|
|
|
msgid "append <mark> on broken working tree (default: \"-broken\")"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: builtin/describe.c:477
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--long is incompatible with --abbrev=0"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--long et --abbrev=0 sont incompatibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:506
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No names found, cannot describe anything."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:549
|
2013-09-04 21:04:31 +02:00
|
|
|
msgid "--dirty is incompatible with commit-ishes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/describe.c:551
|
|
|
|
msgid "--broken is incompatible with commit-ishes"
|
|
|
|
msgstr "--broken est incompatible avec les commits ou assimilés"
|
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/diff.c:83
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s': not a regular file or symlink"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/diff.c:234
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid option: %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "option invalide : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/diff.c:358
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Not a git repository"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Ce n'est pas un dépôt git !"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/diff.c:401
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid object '%s' given."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "objet spécifié '%s' invalide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/diff.c:410
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "more than two blobs given: '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "plus de deux blobs spécifiés : '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/diff.c:417
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unhandled object '%s' given."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "objet non géré '%s' spécifié."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/difftool.c:28
|
|
|
|
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
|
|
|
|
msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
|
|
|
|
|
|
|
|
#: builtin/difftool.c:241
|
|
|
|
#, c-format
|
|
|
|
msgid "failed: %d"
|
|
|
|
msgstr "échec : %d"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:283
|
|
|
|
#, c-format
|
|
|
|
msgid "could not read symlink %s"
|
|
|
|
msgstr "lecture du lien symbolique %s impossible"
|
|
|
|
|
|
|
|
#: builtin/difftool.c:285
|
|
|
|
#, c-format
|
|
|
|
msgid "could not read symlink file %s"
|
|
|
|
msgstr "impossible de lire le fichier symlink %s"
|
|
|
|
|
|
|
|
#: builtin/difftool.c:293
|
|
|
|
#, c-format
|
|
|
|
msgid "could not read object %s for symlink %s"
|
|
|
|
msgstr "Impossible de lire l'objet %s pour le symlink %s"
|
|
|
|
|
|
|
|
#: builtin/difftool.c:395
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"combined diff formats('-c' and '--cc') are not supported in\n"
|
|
|
|
"directory diff mode('-d' and '--dir-diff')."
|
|
|
|
msgstr ""
|
|
|
|
"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
|
|
|
|
"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:609
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "both files modified: '%s' and '%s'."
|
|
|
|
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:611
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "working tree file has been left."
|
|
|
|
msgstr "le fichier dans l'arbre de travail a été laissé."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:622
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "temporary files exist in '%s'."
|
|
|
|
msgstr "des fichiers temporaires existent dans '%s'."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:623
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "you may want to cleanup or recover these."
|
|
|
|
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:669
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "use `diff.guitool` instead of `diff.tool`"
|
|
|
|
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:671
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "perform a full-directory diff"
|
|
|
|
msgstr "réalise un diff de répertoire complet"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:673
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "do not prompt before launching a diff tool"
|
|
|
|
msgstr "ne pas confirmer avant de lancer l'outil de diff"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:679
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "use symlinks in dir-diff mode"
|
|
|
|
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:680
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "<tool>"
|
|
|
|
msgstr "<outil>"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:681
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "use the specified diff tool"
|
|
|
|
msgstr "utiliser l'outil de diff spécifié"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:683
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "print a list of diff tools that may be used with `--tool`"
|
|
|
|
msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:686
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
|
|
|
|
"code"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
|
|
|
|
"non-nul"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:688
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "<command>"
|
|
|
|
msgstr "<commande>"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:689
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "specify a custom command for viewing diffs"
|
|
|
|
msgstr "spécifier une commande personnalisée pour visualiser les différences"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:713
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "no <tool> given for --tool=<tool>"
|
|
|
|
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/difftool.c:720
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "no <cmd> given for --extcmd=<cmd>"
|
|
|
|
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:25
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git fast-export [rev-list-opts]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git fast-export [options-de-liste-de-révisions]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:980
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show progress after <n> objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher la progression après <n> objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:982
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "select handling of signed tags"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "sélectionner la gestion des étiquettes signées"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:985
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "select handling of tags that tag filtered objects"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:988
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Dump marks to this file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Enregistrer les marques dans ce fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:990
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Import marks from this file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "importer les marques depuis ce fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:992
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Fake a tagger when tags lack one"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:994
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Output full tree for each commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Afficher l'arbre complet pour chaque commit"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:996
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Use the done feature to terminate the stream"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Utiliser la fonction \"done\" pour terminer le flux"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:997
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Skip output of blob data"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Sauter l'affichage de données de blob"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:998
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "refspec"
|
|
|
|
msgstr "spécificateur de référence"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:999
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "Apply refspec to exported refs"
|
|
|
|
msgstr "Appliquer le spécificateur de référence aux références exportées"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fast-export.c:1000
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "anonymize output"
|
|
|
|
msgstr "anonymise la sortie"
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/fetch.c:21
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/fetch.c:22
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git fetch [<options>] <group>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git fetch [<options>] <groupe>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/fetch.c:23
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/fetch.c:24
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git fetch --all [<options>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git fetch --all [<options>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:95 builtin/pull.c:175
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "fetch from all remotes"
|
2016-04-06 16:57:04 +02:00
|
|
|
msgstr "récupérer depuis tous les dépôts distants"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:97 builtin/pull.c:178
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "append to .git/FETCH_HEAD instead of overwriting"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:99 builtin/pull.c:181
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "path to upload pack on remote end"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:100 builtin/pull.c:183
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "force overwrite of local branch"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "forcer l'écrasement de la branche locale"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:102
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "fetch from multiple remotes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "récupérer depuis plusieurs dépôts distants"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:104 builtin/pull.c:185
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "fetch all tags and associated objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "récupérer toutes les étiquettes et leurs objets associés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:106
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not fetch all tags (--no-tags)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:108
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "number of submodules fetched in parallel"
|
|
|
|
msgstr "nombre de sous-modules récupérés en parallèle"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:110 builtin/pull.c:188
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "prune remote-tracking branches no longer on remote"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"éliminer les branches de suivi distant si la branche n'existe plus dans le "
|
|
|
|
"dépôt distant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:111 builtin/pull.c:191
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "on-demand"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "à la demande"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:112 builtin/pull.c:192
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "control recursive fetching of submodules"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "contrôler la récupération récursive dans les sous-modules"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:116 builtin/pull.c:200
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "keep downloaded pack"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "conserver le paquet téléchargé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:118
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "allow updating of HEAD ref"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "permettre la mise à jour de la référence HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "deepen history of shallow clone"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "approfondir l'historique d'un clone superficiel"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:123
|
|
|
|
msgid "deepen history of shallow repository based on time"
|
|
|
|
msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
|
|
|
|
|
|
|
|
#: builtin/fetch.c:129 builtin/pull.c:206
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "convert to a complete repository"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "convertir en un dépôt complet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:131 builtin/log.c:1440
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "dir"
|
2016-03-13 13:56:03 +01:00
|
|
|
msgstr "répertoire"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:132
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "prepend this to submodule path output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "préfixer ceci à la sortie du chemin du sous-module"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:135
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "default mode for recursion"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mode par défaut pour la récursion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:137 builtin/pull.c:209
|
2014-01-18 14:36:19 +01:00
|
|
|
msgid "accept refs that update .git/shallow"
|
|
|
|
msgstr "accepter les références qui mettent à jour .git/shallow"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:138 builtin/pull.c:211
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "refmap"
|
|
|
|
msgstr "correspondance de référence"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fetch.c:139 builtin/pull.c:212
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "specify fetch refmap"
|
|
|
|
msgstr "spécifier une correspondance de référence pour la récupération"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fetch.c:395
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Couldn't find remote ref HEAD"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de trouver la référence HEAD distante"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:513
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "configuration fetch.output contains invalid value %s"
|
|
|
|
msgstr ""
|
|
|
|
"le paramètre de configuration fetch.output contient une valeur invalide %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:606
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "object %s not found"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "objet %s non trouvé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:610
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "[up to date]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "[à jour]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:623 builtin/fetch.c:703
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "[rejected]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "[rejeté]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:624
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "can't fetch in current branch"
|
|
|
|
msgstr "impossible de récupérer dans la branche actuelle"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:633
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "[tag update]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "[mise à jour de l'étiquette]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
|
|
|
|
#: builtin/fetch.c:698
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "unable to update local ref"
|
|
|
|
msgstr "impossible de mettre à jour la référence locale"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:653
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "[new tag]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "[nouvelle étiquette]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:656
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "[new branch]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "[nouvelle branche]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:659
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "[new ref]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "[nouvelle référence]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:698
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "forced update"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mise à jour forcée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:703
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "non-fast-forward"
|
|
|
|
msgstr "pas en avance rapide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:748
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%s did not send all necessary objects\n"
|
|
|
|
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:768
|
2014-01-18 14:36:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "reject %s because shallow roots are not allowed to be updated"
|
2014-02-02 14:36:32 +01:00
|
|
|
msgstr ""
|
|
|
|
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
|
2014-01-18 14:36:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:855 builtin/fetch.c:951
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "From %.*s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Depuis %.*s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:866
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"some local refs could not be updated; try running\n"
|
|
|
|
" 'git remote prune %s' to remove any old, conflicting branches"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
|
|
|
|
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:921
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " (%s will become dangling)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr " (%s sera en suspens)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:922
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " (%s has become dangling)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr " (%s est devenu en suspens)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:954
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "[deleted]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "[supprimé]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:955 builtin/remote.c:1022
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "(none)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "(aucun(e))"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:978
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Refusing to fetch into current branch %s of non-bare repository"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:997
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Option \"%s\" value \"%s\" is not valid for %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1000
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Option \"%s\" is ignored for %s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "L'option \"%s\" est ignorée pour %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1076
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Don't know how to fetch from %s"
|
|
|
|
msgstr "Je ne sais pas récupérer depuis %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1236
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Fetching %s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Récupération de %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1238 builtin/remote.c:96
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not fetch %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible de récupérer %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1256
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"No remote repository specified. Please, specify either a URL or a\n"
|
|
|
|
"remote name from which new revisions should be fetched."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
|
|
|
|
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1279
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You need to specify a tag name."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Vous devez spécifier un nom d'étiquette."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1321
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Negative depth in --deepen is not supported"
|
|
|
|
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1323
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--deepen and --depth are mutually exclusive"
|
|
|
|
msgstr "--deepen et --depth sont mutuellement exclusifs"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1328
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--depth and --unshallow cannot be used together"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1330
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--unshallow on a complete repository does not make sense"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1352
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "fetch --all does not take a repository argument"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "fetch --all n'accepte pas d'argument de dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1354
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "fetch --all does not make sense with refspecs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1365
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No such remote or remote group: %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "distant ou groupe distant inexistant : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/fetch.c:1373
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Fetching a group and specifying refspecs does not make sense"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"La récupération d'un groupe et les spécifications de référence n'ont pas de "
|
|
|
|
"sens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/fmt-merge-msg.c:14
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid ""
|
|
|
|
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:663
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "populate log with at most <n> entries from shortlog"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:666
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "alias for --log (deprecated)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "alias pour --log (obsolète)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:669
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "text"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "texte"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:670
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use <text> as start of message"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser <texte> comme début de message"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/fmt-merge-msg.c:671
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "file to read from"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "fichier d'où lire"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/for-each-ref.c:9
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git for-each-ref [<options>] [<pattern>]"
|
|
|
|
msgstr "git for-each-ref [<options>] [<motif>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/for-each-ref.c:10
|
|
|
|
msgid "git for-each-ref [--points-at <object>]"
|
|
|
|
msgstr "git for-each-ref [--point-at <objet>]"
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:11
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
|
|
|
|
msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:12
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
|
|
|
|
msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:27
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "quote placeholders suitably for shells"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "échapper les champs réservés pour les interpréteurs de commandes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/for-each-ref.c:29
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "quote placeholders suitably for perl"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "échapper les champs réservés pour perl"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/for-each-ref.c:31
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "quote placeholders suitably for python"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "échapper les champs réservés pour python"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/for-each-ref.c:33
|
2015-01-13 20:22:58 +01:00
|
|
|
msgid "quote placeholders suitably for Tcl"
|
|
|
|
msgstr "échapper les champs réservés pour compatibilité avec Tcl"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/for-each-ref.c:36
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show only <n> matched refs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "n'afficher que <n> références correspondant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/for-each-ref.c:41
|
|
|
|
msgid "print only refs which points at the given object"
|
|
|
|
msgstr "afficher seulement les références pointant sur l'objet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/for-each-ref.c:43
|
|
|
|
msgid "print only refs that are merged"
|
|
|
|
msgstr "afficher seulement les références qui sont fusionnées"
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:44
|
|
|
|
msgid "print only refs that are not merged"
|
|
|
|
msgstr "afficher seulement les références qui ne sont pas fusionnées"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/for-each-ref.c:45
|
|
|
|
msgid "print only refs which contain the commit"
|
|
|
|
msgstr "afficher seulement les références qui contiennent le commit"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/for-each-ref.c:46
|
|
|
|
msgid "print only refs which don't contain the commit"
|
|
|
|
msgstr "afficher seulement les références qui ne contiennent pas le commit"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:554
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Checking object directories"
|
|
|
|
msgstr "Vérification des répertoires d'objet"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:646
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git fsck [<options>] [<object>...]"
|
|
|
|
msgstr "git fsck [<options>] [<objet>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:652
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show unreachable objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les objets inaccessibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:653
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show dangling objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les objets en suspens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:654
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "report tags"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les étiquettes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:655
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "report root nodes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "signaler les nœuds racines"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:656
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "make index objects head nodes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "considérer les objets de l'index comme nœuds tête"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2013-08-21 21:49:43 +02:00
|
|
|
# translated from man page
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:657
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "make reflogs head nodes (default)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:658
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "also consider packs and alternate objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "inspecter aussi les objets pack et alternatifs"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:659
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "check only connectivity"
|
|
|
|
msgstr "ne vérifier que la connectivité"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:660
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "enable more strict checking"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "activer une vérification plus strict"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:662
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "write dangling objects in .git/lost-found"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "écrire les objets en suspens dans .git/lost-found"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:663 builtin/prune.c:107
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show progress"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher la progression"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:664
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "show verbose names for reachable objects"
|
|
|
|
msgstr "afficher les noms étendus pour les objets inaccessibles"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/fsck.c:725
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Checking objects"
|
|
|
|
msgstr "Vérification des objets"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/gc.c:25
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git gc [<options>]"
|
|
|
|
msgstr "git gc [<options>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/gc.c:78
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "Failed to fstat %s: %s"
|
|
|
|
msgstr "Échec du stat de %s : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:310
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2017-04-23 23:29:44 +02:00
|
|
|
msgid "Can't stat %s"
|
|
|
|
msgstr "impossible de faire un stat de %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:319
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The last gc run reported the following. Please correct the root cause\n"
|
|
|
|
"and remove %s.\n"
|
|
|
|
"Automatic cleanup will not be performed until the file is removed.\n"
|
|
|
|
"\n"
|
|
|
|
"%s"
|
|
|
|
msgstr ""
|
|
|
|
"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n"
|
|
|
|
"la cause et supprimer %s.\n"
|
2015-12-24 07:38:22 +01:00
|
|
|
"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "
|
|
|
|
"supprimé.\n"
|
2015-12-18 22:00:37 +01:00
|
|
|
"\n"
|
|
|
|
"%s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:358
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "prune unreferenced objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "éliminer les objets non référencés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:360
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "be more thorough (increased runtime)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "être plus consciencieux (durée de traitement allongée)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:361
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "enable auto-gc mode"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "activer le mode auto-gc"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:362
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "force running gc even if there may be another gc running"
|
2014-01-18 14:36:19 +01:00
|
|
|
msgstr ""
|
|
|
|
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
|
|
|
|
"tourne déjà"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:379
|
2017-04-23 23:29:44 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to parse gc.logexpiry value %s"
|
|
|
|
msgstr "impossible de lire la valeur de gc.logexpiry %s"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:407
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Auto packing the repository in background for optimum performance.\n"
|
2014-08-05 19:23:50 +02:00
|
|
|
msgstr ""
|
|
|
|
"Compression automatique du dépôt en tâche de fond pour optimiser les "
|
|
|
|
"performances.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:409
|
2014-02-26 21:27:14 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Auto packing the repository for optimum performance.\n"
|
|
|
|
msgstr "Compression du dépôt pour optimiser les performances.\n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:410
|
2014-02-26 21:27:14 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "See \"git help gc\" for manual housekeeping.\n"
|
|
|
|
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:431
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
|
2014-01-18 14:36:19 +01:00
|
|
|
msgstr ""
|
|
|
|
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
|
|
|
|
"(utilisez --force si ce n'est pas le cas)"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/gc.c:475
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
|
|
|
|
"supprimer."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/grep.c:25
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
|
|
|
|
msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/grep.c:232
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "grep: failed to create thread: %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "grep : échec de création du fil: %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/grep.c:290
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid number of threads specified (%d) for %s"
|
|
|
|
msgstr "nombre de fils spécifié invalide (%d) pour %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:769 builtin/grep.c:810
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to read tree (%s)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lire l'arbre (%s)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:829
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to grep from object of type %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de faire un grep sur un objet de type %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:893
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "switch `%c' expects a numerical value"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "l'option '%c' attend un valeur numérique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:980
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "search in index instead of in the work tree"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "rechercher dans l'index plutôt que dans la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:982
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "find in contents not managed by git"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "rechercher dans les contenus non gérés par git"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:984
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "search in both tracked and untracked files"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "rechercher dans les fichiers suivis et non-suivis"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:986
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "ignore files specified via '.gitignore'"
|
|
|
|
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:988
|
|
|
|
msgid "recursively search in each submodule"
|
2017-02-08 21:36:33 +01:00
|
|
|
msgstr "rechercher récursivement dans chaque sous-module"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:990
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "basename"
|
|
|
|
msgstr "nom de base"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:991
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "prepend parent project's basename to output"
|
|
|
|
msgstr "préfixer le nom de base du projet parent à la sortie"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:994
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show non-matching lines"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les lignes qui ne correspondent pas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:996
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "case insensitive matching"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "correspondance insensible à la casse"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:998
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "match patterns only at word boundaries"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "rechercher les motifs aux séparateurs de mots"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1000
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "process binary files as text"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "traiter les fichiers binaires comme texte"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1002
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't match patterns in binary files"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas chercher les motifs dans les fichiers binaires"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1005
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "process binary files with textconv filters"
|
|
|
|
msgstr "traiter les fichiers binaires avec les filtres textconv"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1007
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "descend at most <depth> levels"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "descendre au plus de <profondeur> dans l'arborescence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1011
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use extended POSIX regular expressions"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser des expressions régulières étendues POSIX"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1014
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use basic POSIX regular expressions (default)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1017
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "interpret patterns as fixed strings"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "interpréter les motifs comme de chaînes fixes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1020
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use Perl-compatible regular expressions"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser des expressions régulières compatibles avec Perl"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1023
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show line numbers"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les numéros de ligne"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1024
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't show filenames"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas pas afficher les noms de fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1025
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show filenames"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les noms de fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1027
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show filenames relative to top directory"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les noms de fichiers relativement au répertoire de base"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1029
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show only filenames instead of matching lines"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1031
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "synonym for --files-with-matches"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "synonyme pour --files-with-matches"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1034
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show only the names of files without match"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "n'afficher que les noms des fichiers sans correspondance"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1036
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print NUL after filenames"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "imprimer une caractère NUL après le noms de fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1038
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show the number of matches instead of matching lines"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1039
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "highlight matches"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mettre en évidence les correspondances"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1041
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print empty line between matches from different files"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"imprimer une ligne vide entre les correspondances de fichiers différents"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1043
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show filename only once above matches from same file"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"afficher le nom de fichier une fois au dessus des correspondances du même "
|
|
|
|
"fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1046
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show <n> context lines before and after matches"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1049
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show <n> context lines before matches"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher <n> lignes de contexte avant les correspondances"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1051
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show <n> context lines after matches"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher <n> lignes de contexte après les correspondances"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1053
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "use <n> worker threads"
|
|
|
|
msgstr "utiliser <n> fils de travail"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1054
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "shortcut for -C NUM"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "raccourci pour -C NUM"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1057
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show a line with the function name before matches"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"afficher une ligne avec le nom de la fonction avant les correspondances"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1059
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show the surrounding function"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher la fonction contenante"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1062
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read patterns from file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire les motifs depuis fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1064
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "match <pattern>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "rechercher <motif>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1066
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "combine patterns specified with -e"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "combiner les motifs spécifiés par -e"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1078
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "indicate hit with exit status without output"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1080
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show only matches from files that match all patterns"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"n'afficher que les correspondances de fichiers qui correspondent à tous les "
|
|
|
|
"motifs"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1082
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show parse tree for grep expression"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher l'arbre d'analyse pour le motif grep"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1086
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pager"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pagineur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1086
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show matching files in the pager"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les fichiers correspondant dans le pagineur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1089
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "allow calling of grep(1) (ignored by this build)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1153
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "no pattern given."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "aucun motif fourni."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1189
|
|
|
|
msgid "--no-index or --untracked cannot be used with revs"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: builtin/grep.c:1195
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to resolve revision: %s"
|
|
|
|
msgstr "impossible de résoudre la révision : %s"
|
|
|
|
|
|
|
|
#: builtin/grep.c:1228 builtin/index-pack.c:1485
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid number of threads specified (%d)"
|
|
|
|
msgstr "nombre de fils spécifié invalide (%d)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1251
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--open-files-in-pager only works on the worktree"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1274
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "option not supported with --recurse-submodules."
|
|
|
|
msgstr "option non supportée avec --recurse-submodules."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1280
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--cached or --untracked cannot be used with --no-index."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1286
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--[no-]exclude-standard cannot be used for tracked contents."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/grep.c:1294
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "both --cached and trees are given."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--cached et des arbres sont fournis en même temps."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/hash-object.c:81
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
|
|
|
|
"[--] <file>..."
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
|
|
|
|
"[--] <fichier>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/hash-object.c:82
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "git hash-object --stdin-paths"
|
|
|
|
msgstr "git hash-object --stdin-paths"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/hash-object.c:94
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "type"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "type"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/hash-object.c:94
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "object type"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "type d'objet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/hash-object.c:95
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "write the object into the object database"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "écrire l'objet dans la base de donnée d'objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/hash-object.c:97
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read the object from stdin"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire l'objet depuis l'entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/hash-object.c:99
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "store file as is without filters"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "stocker le fichier tel quel sans filtrage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/hash-object.c:100
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid ""
|
|
|
|
"just hash any random garbage to create corrupt objects for debugging Git"
|
2014-11-20 03:53:48 +01:00
|
|
|
msgstr ""
|
|
|
|
"juste hasher n'importe quel contenu pour créer des objets corrompus pour "
|
|
|
|
"debugger Git"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/hash-object.c:101
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "process file as it were from this path"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "traiter le fichier comme s'il venait de ce chemin"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:42
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print all available commands"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher toutes les commandes disponibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:43
|
|
|
|
msgid "exclude guides"
|
|
|
|
msgstr "exclure les guides"
|
|
|
|
|
|
|
|
#: builtin/help.c:44
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print list of useful guides"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher une liste de guides utiles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:45
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show man page"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher la page de manuel"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:46
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show manual in web browser"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher le manuel dans un navigateur web"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:48
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show info page"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher la page info"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:54
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
|
|
|
|
msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:66
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized help format '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "format d'aide non reconnu '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:93
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Failed to start emacsclient."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "échec de démarrage d'emacsclient."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:106
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Failed to parse emacsclient version."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "échec d'analyse de la version d'emacsclient."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:114
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "emacsclient version '%d' too old (< 22)."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "failed to exec '%s'"
|
|
|
|
msgstr "échec de l'exécution de '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:207
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"'%s': path for unsupported man viewer.\n"
|
|
|
|
"Please consider using 'man.<tool>.cmd' instead."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
|
|
|
|
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:219
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"'%s': cmd for supported man viewer.\n"
|
|
|
|
"Please consider using 'man.<tool>.path' instead."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
|
|
|
|
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:336
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s': unknown man viewer."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "'%s' : visualiseur de manuel inconnu."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:353
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "no man viewer handled the request"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:361
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "no info viewer handled the request"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:403
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Defining attributes per path"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Définition des attributs par chemin"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:404
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "Everyday Git With 20 Commands Or So"
|
|
|
|
msgstr "Git de tous les jours avec à peu près 20 commandes"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:405
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "A Git glossary"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Un glossaire Git"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:406
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Specifies intentionally untracked files to ignore"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:407
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Defining submodule properties"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Définition des propriétés de sous-module"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:408
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Specifying revisions and ranges for Git"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Spécification des révisions et portées pour Git"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:409
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:410
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "An overview of recommended workflows with Git"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Un aperçu des flux de travail recommandés avec Git"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:422
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "The common Git guides are:\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Les guides Git populaires sont : \n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:440
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "`git %s' is aliased to `%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "`git %s\" est un alias de `%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/help.c:462 builtin/help.c:479
|
|
|
|
#, c-format
|
|
|
|
msgid "usage: %s%s"
|
|
|
|
msgstr "usage : %s%s"
|
|
|
|
|
|
|
|
#: builtin/index-pack.c:154
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to open %s"
|
|
|
|
msgstr "impossible d'ouvrir %s"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:204
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "object type mismatch at %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "type d'objet non correspondant à %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:224
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "did not receive expected object %s"
|
|
|
|
msgstr "objet attendu non reçu %s"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:227
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "object %s: expected type %s, found %s"
|
|
|
|
msgstr "objet %s : type attendu %s, reçu %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:269
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot fill %d byte"
|
|
|
|
msgid_plural "cannot fill %d bytes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr[0] "impossible de remplir %d octet"
|
|
|
|
msgstr[1] "impossible de remplir %d octets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:279
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "early EOF"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "fin de fichier prématurée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:280
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read error on input"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "erreur de lecture sur l'entrée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:292
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "used more bytes than were available"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "plus d'octets utilisés que disponibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:299
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pack too large for current definition of off_t"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
|
|
|
|
msgid "pack exceeds maximum allowed size"
|
|
|
|
msgstr "le paquet dépasse la taille maximale permise"
|
|
|
|
|
|
|
|
#: builtin/index-pack.c:317
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to create '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de créer '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:323
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot open packfile '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'ouvrir le fichier paquet '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:337
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pack signature mismatch"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "la signature du paquet ne correspond pas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:339
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "pack version %<PRIu32> unsupported"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "la version de paquet %<PRIu32> non supportée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:357
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "pack has bad object at offset %<PRIuMAX>: %s"
|
|
|
|
msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:479
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "inflate returned %d"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "la décompression (inflate) a retourné %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:528
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "offset value overflow for delta base object"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:536
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delta base offset is out of bound"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "l'objet delta de base est hors limite"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:544
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown object type %d"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "type d'objet inconnu %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:575
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot pread pack file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lire (pread) le fichier paquet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:577
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "premature end of pack file, %<PRIuMAX> byte missing"
|
|
|
|
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
|
|
|
|
msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
|
|
|
|
msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:603
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "serious inflate inconsistency"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "grave incohérence dans la décompression (inflate)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
|
|
|
|
#: builtin/index-pack.c:816 builtin/index-pack.c:825
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "SHA1 COLLISION FOUND WITH %s !"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:752 builtin/pack-objects.c:164
|
|
|
|
#: builtin/pack-objects.c:257
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to read %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lire %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:814
|
|
|
|
#, c-format
|
|
|
|
msgid "cannot read existing object info %s"
|
|
|
|
msgstr "impossible de lire l'information existante de l'objet %s"
|
|
|
|
|
|
|
|
#: builtin/index-pack.c:822
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot read existing object %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lire l'objet existant %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:836
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid blob object %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "objet blob invalide %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:850
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "%s invalide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:853
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Error in object"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Erreur dans l'objet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:855
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Not all child objects of %s are reachable"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:927 builtin/index-pack.c:958
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "failed to apply delta"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "échec d'application du delta"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1128
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Receiving objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Réception d'objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1128
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Indexing objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Indexation d'objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1160
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pack is corrupted (SHA1 mismatch)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1165
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot fstat packfile"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1168
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pack has junk at the end"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "le paquet est invalide à la fin"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1179
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "confusion beyond insanity in parse_pack_objects()"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "confusion extrême dans parse_pack_objects()"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1202
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Resolving deltas"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Résolution des deltas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1213
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to create thread: %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de créer le fil : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1255
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "confusion beyond insanity"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "confusion extrême"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1261
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "completed with %d local object"
|
|
|
|
msgid_plural "completed with %d local objects"
|
|
|
|
msgstr[0] "complété avec %d objet local"
|
|
|
|
msgstr[1] "complété avec %d objets locaux"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1273
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Unexpected tail checksum for %s (disk corruption?)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1277
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "pack has %d unresolved delta"
|
|
|
|
msgid_plural "pack has %d unresolved deltas"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr[0] "le paquet a %d delta non résolu"
|
|
|
|
msgstr[1] "le paquet a %d deltas non résolus"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1301
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to deflate appended object (%d)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de compresser l'objet ajouté (%d)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1377
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "local object %s is corrupt"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "l'objet local %s est corrompu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1403
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "error while closing pack file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "erreur en fermeture du fichier paquet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1415
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot write keep file '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1423
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot close written keep file '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de fermer le fichier \"keep\" '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1433
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot store pack file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de stocker le fichier paquet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1441
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot store index file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de stocker le fichier d'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1479
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "bad pack.indexversion=%<PRIu32>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mauvais pack.indexversion=%<PRIu32>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "no threads support, ignoring %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pas de support des fils, ignore %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1547
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot open existing pack file '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1549
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot open existing pack idx file for '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1596
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "non delta: %d object"
|
|
|
|
msgid_plural "non delta: %d objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr[0] "pas un delta : %d objet"
|
|
|
|
msgstr[1] "pas un delta : %d objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1603
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "chain length = %d: %lu object"
|
|
|
|
msgid_plural "chain length = %d: %lu objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr[0] "longueur chaînée = %d : %lu objet"
|
|
|
|
msgstr[1] "longueur chaînée = %d : %lu objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1616
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "packfile name '%s' does not end with '.pack'"
|
|
|
|
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
|
|
|
|
#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "bad %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mauvais %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1737
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--fix-thin cannot be used without --stdin"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1739
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "--stdin requires a git repository"
|
|
|
|
msgstr "--stdin requiert un dépôt git"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/index-pack.c:1747
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--verify with no packfile name given"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--verify sans nom de fichier paquet donné"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:54
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot stat '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de faire un stat de '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:60
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot stat template '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de faire un stat du modèle '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:65
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot opendir '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'ouvrir (opendir) '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:76
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot readlink '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de readlink '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:78
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot symlink '%s' '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de créer un lien symbolique de '%s' '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:84
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot copy '%s' to '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de copier '%s' vers '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:88
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "ignoring template %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "modèle %s ignoré"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:119
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "templates not found %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "modèles non trouvés %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:134
|
|
|
|
#, c-format
|
|
|
|
msgid "not copying templates from '%s': %s"
|
|
|
|
msgstr "pas de copie des modèles depuis '%s' : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:327
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to handle file type %d"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de traiter le fichier de type %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:330
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to move %s to %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de déplacer %s vers %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:347 builtin/init-db.c:350
|
|
|
|
#, c-format
|
|
|
|
msgid "%s already exists"
|
|
|
|
msgstr "%s existe déjà"
|
|
|
|
|
|
|
|
#: builtin/init-db.c:403
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
|
|
|
msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:404
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Reinitialized existing Git repository in %s%s\n"
|
|
|
|
msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:408
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Initialized empty shared Git repository in %s%s\n"
|
|
|
|
msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:409
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Initialized empty Git repository in %s%s\n"
|
|
|
|
msgstr "Dépôt Git vide initialisé dans %s%s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:457
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
|
2015-03-29 09:54:56 +02:00
|
|
|
"shared[=<permissions>]] [<directory>]"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
|
|
|
|
"shared[=<permissions>]] [<répertoire>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:480
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "permissions"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "permissions"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:481
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "specify that the git repository is to be shared amongst several users"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:515 builtin/init-db.c:520
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot mkdir %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de créer le répertoire (mkdir) %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:524
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot chdir to %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:545
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
|
|
|
|
"dir=<directory>)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
|
|
|
|
"git-dir=<répertoire>)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/init-db.c:573
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot access work tree '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/interpret-trailers.c:15
|
|
|
|
msgid ""
|
2016-02-28 22:44:35 +01:00
|
|
|
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
|
|
|
|
"<token>[(=|:)<value>])...] [<file>...]"
|
2016-03-14 20:26:53 +01:00
|
|
|
msgstr ""
|
|
|
|
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
|
|
|
|
"<symbole>[(=|:)<valeur>])...] [<fichier>...]"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/interpret-trailers.c:26
|
|
|
|
msgid "edit files in place"
|
|
|
|
msgstr "éditer les fichiers sur place"
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:27
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "trim empty trailers"
|
|
|
|
msgstr "éliminer les lignes de fin vides"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/interpret-trailers.c:28
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "trailer"
|
|
|
|
msgstr "ligne de fin"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/interpret-trailers.c:29
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "trailer(s) to add"
|
|
|
|
msgstr "ligne(s) de fin à ajouter"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/interpret-trailers.c:42
|
|
|
|
msgid "no input file given for in-place editing"
|
|
|
|
msgstr "aucun fichier en entrée pour l'éditon sur place"
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/log.c:44
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
|
2015-01-18 17:03:27 +01:00
|
|
|
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/log.c:45
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git show [<options>] <object>..."
|
|
|
|
msgstr "git show [<options>] <objet>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:89
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid --decorate option: %s"
|
|
|
|
msgstr "option --decorate invalide : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:144
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "suppress diff output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "supprimer la sortie des différences"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:145
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show source"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher la source"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:146
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Use mail map file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Utiliser le fichier de correspondance de mail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:147
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "decorate options"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "décorer les options"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:150
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "Process line range n,m in file, counting from 1"
|
2014-11-20 03:53:48 +01:00
|
|
|
msgstr ""
|
|
|
|
"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
|
|
|
|
"compte à 1"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:246
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Final output: %d %s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Sortie finale : %d %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:493
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "git show %s: bad file"
|
|
|
|
msgstr "git show %s : fichier incorrect"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:507 builtin/log.c:601
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not read object %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible de lire l'objet %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:625
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Unknown type: %d"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Type inconnu : %d"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:746
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "format.headers without value"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "format.headers sans valeur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:846
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "name of output directory is too long"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "le nom du répertoire de sortie est trop long"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:861
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot open patch file %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible d'ouvrir le fichier correctif %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:875
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Need exactly one range."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Exactement une plage nécessaire."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:885
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Not a range."
|
2014-05-06 23:29:57 +02:00
|
|
|
msgstr "Ceci n'est pas une plage."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:991
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cover letter needs email format"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "La lettre de motivation doit être au format e-mail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1071
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "insane in-reply-to: %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "in-reply-to aberrant : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1098
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git format-patch [<options>] [<since> | <revision-range>]"
|
|
|
|
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1148
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Two output directories?"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Deux répertoires de sortie ?"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Unknown commit %s"
|
|
|
|
msgstr "Commit inconnu %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to resolve '%s' as a valid ref."
|
|
|
|
msgstr "Impossible de résoudre '%s' comme une référence valide."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1270
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Could not find exact merge base."
|
|
|
|
msgstr "Impossible de trouver la base de fusion exacte."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1274
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid ""
|
|
|
|
"Failed to get upstream, if you want to record base commit automatically,\n"
|
|
|
|
"please use git branch --set-upstream-to to track a remote branch.\n"
|
|
|
|
"Or you could specify base commit by --base=<base-commit-id> manually."
|
|
|
|
msgstr ""
|
2016-08-20 16:20:17 +02:00
|
|
|
"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de "
|
|
|
|
"base automatiquement,\n"
|
|
|
|
"veuillez utiliser git branch --set-upstream-to pour suivre une branche "
|
|
|
|
"distante\n"
|
|
|
|
"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
|
|
|
|
"manuellement."
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1294
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Failed to find exact merge base"
|
|
|
|
msgstr "Impossible de trouver la base de fusion exacte"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1305
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "base commit should be the ancestor of revision list"
|
|
|
|
msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1309
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "base commit shouldn't be in revision list"
|
|
|
|
msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1358
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "cannot get patch id"
|
|
|
|
msgstr "impossible d'obtenir l'id du patch"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1415
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use [PATCH n/m] even with a single patch"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser [PATCH n/m] même avec un patch unique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1418
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use [PATCH] even with multiple patches"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser [PATCH] même avec des patchs multiples"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1422
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print patches to standard out"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les patchs sur la sortie standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1424
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "generate a cover letter"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "générer une lettre de motivation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1426
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use simple number sequence for output file names"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1427
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "sfx"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "sfx"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1428
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use <sfx> instead of '.patch'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser <sfx> au lieu de '.patch'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1430
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "start numbering patches at <n> instead of 1"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1432
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "mark the series as Nth re-roll"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "marquer la série comme une Nième réédition"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1434
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Use [RFC PATCH] instead of [PATCH]"
|
|
|
|
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1437
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Use [<prefix>] instead of [PATCH]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1440
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "store resulting files in <dir>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "stocker les fichiers résultats dans <répertoire>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1443
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't strip/add [PATCH]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas retirer/ajouter [PATCH]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1446
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't output binary diffs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas imprimer les diffs binaires"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1448
|
2015-12-24 07:38:22 +01:00
|
|
|
msgid "output all-zero hash in From header"
|
|
|
|
msgstr "écrire une empreinte à zéro dans l'entête From"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1450
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't include a patch matching a commit upstream"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas inclure un patch correspondant à un commit amont"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1452
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show patch format instead of default (patch + stat)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1454
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Messaging"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Communication"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1455
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "header"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "en-tête"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1456
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add email header"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter l'en-tête d'e-mail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1457 builtin/log.c:1459
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "email"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "e-mail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1457
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add To: header"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter l'en-tête \"To:\""
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1459
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add Cc: header"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter l'en-tête \"Cc:\""
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1461
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "ident"
|
|
|
|
msgstr "ident"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1462
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "set From address to <ident> (or committer ident if absent)"
|
2014-01-18 14:36:19 +01:00
|
|
|
msgstr ""
|
|
|
|
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1464
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "message-id"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "id-message"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1465
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "make first mail a reply to <message-id>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "répondre dans le premier message à <id-message>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1466 builtin/log.c:1469
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "boundary"
|
2014-05-06 23:29:57 +02:00
|
|
|
msgstr "limite"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1467
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "attach the patch"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "attacher le patch"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1470
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "inline the patch"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "patch à l'intérieur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1474
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "enable message threading, styles: shallow, deep"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1476
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "signature"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "signature"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1477
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add a signature"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter une signature"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1478
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "base-commit"
|
|
|
|
msgstr "commit-de-base"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1479
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "add prerequisite tree info to the patch series"
|
|
|
|
msgstr "Ajouter un arbre prérequis à la série de patchs"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1481
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "add a signature from a file"
|
|
|
|
msgstr "ajouter une signature depuis un fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1482
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't print the patch filenames"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas afficher les noms de fichiers des patchs"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1572
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "-n and -k are mutually exclusive."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "-n et -k sont mutuellement exclusifs."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1574
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
|
|
|
|
msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1582
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--name-only does not make sense"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--name-only n'a pas de sens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1584
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--name-status does not make sense"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--name-status n'a pas de sens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1586
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--check does not make sense"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--check n'a pas de sens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1616
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "standard output, or directory, which one?"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "sortie standard, ou répertoire, lequel ?"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1618
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not create directory '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible de créer le répertoire '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1712
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to read signature file '%s'"
|
|
|
|
msgstr "lecture du fichier de signature '%s' impossible"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1784
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Failed to create output files"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Échec de création des fichiers en sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1833
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/log.c:1887
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Impossible de trouver une branche distante suivie, merci de spécifier "
|
|
|
|
"<branche_amont> manuellement.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:468
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git ls-files [<options>] [<file>...]"
|
|
|
|
msgstr "git ls-files [<options>] [<fichier>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:517
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "identify the file status with tags"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "identifier l'état de fichier avec les étiquettes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:519
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use lowercase letters for 'assume unchanged' files"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:521
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show cached files in the output (default)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:523
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show deleted files in the output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les fichiers supprimés dans la sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:525
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show modified files in the output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les fichiers modifiés dans la sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:527
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show other files in the output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les autres fichiers dans la sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:529
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show ignored files in the output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les fichiers ignorés dans la sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:532
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show staged contents' object name in the output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les nom des objets indexés dans la sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:534
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show files on the filesystem that need to be removed"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:536
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "show 'other' directories' names only"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher seulement les noms des répertoires 'other'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:538
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "show line endings of files"
|
|
|
|
msgstr "afficher les fins de lignes des fichiers"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:540
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't show empty directories"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas afficher les répertoires vides"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:543
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show unmerged files in the output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les fichiers non fusionnés dans la sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:545
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show resolve-undo information"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher l'information resolv-undo"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:547
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "skip files matching pattern"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "sauter les fichiers correspondant au motif"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:550
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "exclude patterns are read from <file>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:553
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read additional per-directory exclude patterns in <file>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:555
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add the standard git exclusions"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter les exclusions git standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:558
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "make the output relative to the project top directory"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher en relatif par rapport au répertoire racine du projet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:561
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "recurse through submodules"
|
|
|
|
msgstr "parcourir récursivement les sous-modules"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:563
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "if any <file> is not in the index, treat this as an error"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:564
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "tree-ish"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "arbre ou apparenté"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:565
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pretend that paths removed since <tree-ish> are still present"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
|
|
|
|
"toujours présents"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/ls-files.c:567
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show debugging data"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les données de débogage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/ls-remote.c:7
|
|
|
|
msgid ""
|
|
|
|
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
|
|
" [--symref] [<repository> [<refs>...]]"
|
|
|
|
msgstr ""
|
|
|
|
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
|
|
" [--symref] [<dépôt> [<références>...]]"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:52
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "do not print remote URL"
|
|
|
|
msgstr "ne pas afficher les URL distantes"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "exec"
|
|
|
|
msgstr "exécutable"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "path of git-upload-pack on the remote host"
|
|
|
|
msgstr "chemin vers git-upload-pack sur le serveur distant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:58
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "limit to tags"
|
|
|
|
msgstr "limiter aux étiquettes"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:59
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "limit to heads"
|
|
|
|
msgstr "limiter aux heads"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:60
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "do not show peeled tags"
|
|
|
|
msgstr "ne pas afficher les étiquettes pelées"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:62
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "take url.<base>.insteadOf into account"
|
|
|
|
msgstr "prendre en compte url.<base>.insteadOf"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:64
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "exit with exit code 2 if no matching refs are found"
|
2016-03-14 20:26:53 +01:00
|
|
|
msgstr ""
|
|
|
|
"sortir avec un code d'erreur 2 si aucune correspondance de référence n'est "
|
|
|
|
"trouvée"
|
2016-02-28 22:44:35 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/ls-remote.c:66
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "show underlying ref in addition to the object pointed by it"
|
|
|
|
msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
|
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/ls-tree.c:28
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/ls-tree.c:126
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only show trees"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher seulement les arbres"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/ls-tree.c:128
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "recurse into subtrees"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "parcourir les sous-arbres"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/ls-tree.c:130
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show trees when recursing"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les arbres en les parcourant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/ls-tree.c:133
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "terminate entries with NUL byte"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "terminer les éléments avec un octet NUL"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/ls-tree.c:134
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "include object size"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "inclure la taille d'objet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list only filenames"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher seulement les noms de fichiers"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/ls-tree.c:141
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use full path names"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser les noms de chemins complets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/ls-tree.c:143
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list entire tree; not just current directory (implies --full-name)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
|
|
|
|
"full-name)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/merge.c:46
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git merge [<options>] [<commit>...]"
|
|
|
|
msgstr "git merge [<options>] [<commit>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/merge.c:47
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git merge --abort"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git merge --abort"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:48
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "git merge --continue"
|
|
|
|
msgstr "git merge --continue"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:103
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "switch `m' requires a value"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "le commutateur `m' a besoin d'une valeur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:140
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not find merge strategy '%s'.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:141
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Available strategies are:"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Les stratégies disponibles sont :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:146
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Available custom strategies are:"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Les stratégies personnalisées sont :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:196 builtin/pull.c:127
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not show a diffstat at the end of the merge"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas afficher un diffstat à la fin de la fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:199 builtin/pull.c:130
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show a diffstat at the end of the merge"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher un diffstat à la fin de la fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:200 builtin/pull.c:133
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "(synonym to --stat)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "(synonyme de --stat)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:202 builtin/pull.c:136
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add (at most <n>) entries from shortlog to merge commit message"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"ajouter (au plus <n>) éléments du journal court au message de validation de "
|
|
|
|
"la fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:205 builtin/pull.c:139
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create a single commit instead of doing a merge"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "créer une validation unique au lieu de faire une fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:207 builtin/pull.c:142
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "perform a commit if the merge succeeds (default)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "effectuer une validation si la fusion réussit (défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:209 builtin/pull.c:145
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "edit message before committing"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "éditer le message avant la validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:210
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "allow fast-forward (default)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "autoriser l'avance rapide (défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:212 builtin/pull.c:151
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "abort if fast-forward is not possible"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "abandonner si l'avance rapide n'est pas possible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:216 builtin/pull.c:154
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "verify that the named commit has a valid GPG signature"
|
|
|
|
msgstr "vérifier que le commit nommé a une signature GPG valide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
|
|
|
|
#: builtin/revert.c:108
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "strategy"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "stratégie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:218 builtin/pull.c:159
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "merge strategy to use"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "stratégie de fusion à utiliser"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:219 builtin/pull.c:162
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "option=value"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "option=valeur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:220 builtin/pull.c:163
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "option for selected merge strategy"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "option pour la stratégie de fusion sélectionnée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:222
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "merge commit message (for a non-fast-forward merge)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"message de validation de la fusion (pour une fusion sans avance rapide)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:226
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "abort the current in-progress merge"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "abandonner la fusion en cours"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:228
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "continue the current in-progress merge"
|
|
|
|
msgstr "continuer la fusion en cours"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:230 builtin/pull.c:170
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "allow merging unrelated histories"
|
|
|
|
msgstr "permettre la fusion d'historiques sans rapport"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:258
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not run stash."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lancer le remisage."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:263
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "stash failed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "échec du remisage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:268
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "not a valid object: %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pas un objet valide : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:287 builtin/merge.c:304
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read-tree failed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "read-tree a échoué"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:334
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid " (nothing to squash)"
|
|
|
|
msgstr " (rien à compresser)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:345
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Squash commit -- not updating HEAD\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Validation compressée -- HEAD non mise à jour\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:395
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No merge message -- not updating HEAD\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:446
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' does not point to a commit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "'%s' ne pointe pas sur un commit"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:536
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Bad branch.%s.mergeoptions string: %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:656
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Not handling anything other than two heads merge."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:670
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Unknown option for merge-recursive: -X%s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Options inconnue pour merge-recursive : -X%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:685
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to write %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'écrire %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:737
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not read from '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible de lire depuis '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:746
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
|
|
|
|
"fusion.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:752
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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 ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Veuillez entrer un message de validation pour expliquer en quoi cette fusion "
|
|
|
|
"est\n"
|
|
|
|
"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une "
|
|
|
|
"branche de sujet.\n"
|
|
|
|
"\n"
|
|
|
|
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
|
|
|
|
"abandonne la validation.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:776
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Empty commit message."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Message de validation vide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:796
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Wonderful.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Merveilleux.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/merge.c:851
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"La fusion automatique a échoué ; réglez les conflits et validez le "
|
|
|
|
"résultat.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:890
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No current branch."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Pas de branche courante."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:892
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No remote for the current branch."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Pas de branche distante pour la branche courante."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:894
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No default upstream defined for the current branch."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Pas de branche amont par défaut définie pour la branche courante."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:899
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "No remote-tracking branch for %s from %s"
|
|
|
|
msgstr "Pas de branche de suivi pour %s depuis %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:946
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Bad value '%s' in environment '%s'"
|
|
|
|
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1020
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not close '%s'"
|
|
|
|
msgstr "impossible de fermer '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1047
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "not something we can merge in %s: %s"
|
|
|
|
msgstr "pas possible de fusionner ceci dans %s : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1081
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "not something we can merge"
|
|
|
|
msgstr "pas possible de fusionner ceci"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1146
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "--abort expects no arguments"
|
|
|
|
msgstr "--abort n'accepte pas d'argument"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1150
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "There is no merge to abort (MERGE_HEAD missing)."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1162
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "--continue expects no arguments"
|
|
|
|
msgstr "--continue ne supporte aucun argument"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1166
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "There is no merge in progress (MERGE_HEAD missing)."
|
|
|
|
msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1182
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"You have not concluded your merge (MERGE_HEAD exists).\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"Please, commit your changes before you merge."
|
2013-07-01 22:19:04 +02:00
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"Veuillez valider vos modifications avant de pouvoir fusionner."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1189
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"Please, commit your changes before you merge."
|
2013-07-01 22:19:04 +02:00
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"Veuillez valider vos modifications avant de pouvoir fusionner."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1192
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1201
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You cannot combine --squash with --no-ff."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1209
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No commit specified and merge.defaultToUpstream not set."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1226
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Squash commit into empty head not supported yet"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1228
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Non-fast-forward commit does not make sense into an empty head"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1233
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%s - not something we can merge"
|
|
|
|
msgstr "%s - pas possible de fusionner ceci"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1235
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "Can merge only exactly one commit into empty head"
|
|
|
|
msgstr ""
|
|
|
|
"Possible de fusionner exactement une seule validation dans une tête vide"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1269
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1272
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Commit %s has a bad GPG signature allegedly by %s."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1275
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Commit %s does not have a GPG signature."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "La validation %s n'a pas de signature GPG."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1278
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Commit %s has a good GPG signature by %s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "La validation %s a une signature GPG correcte par %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1340
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "refusing to merge unrelated histories"
|
|
|
|
msgstr "refus de fusionner des historiques sans relation"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1349
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Already up-to-date."
|
|
|
|
msgstr "Déjà à jour."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1359
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Updating %s..%s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Mise à jour %s..%s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1400
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Trying really trivial in-index merge...\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1407
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Nope.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Non.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1432
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Already up-to-date. Yeeah!"
|
|
|
|
msgstr "Déjà à jour. Ouais !"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1438
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Not possible to fast-forward, aborting."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Pas possible d'avancer rapidement, abandon."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1461 builtin/merge.c:1540
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Rewinding the tree to pristine...\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Retour de l'arbre à l'original...\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1465
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Trying merge strategy %s...\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Essai de la stratégie de fusion %s...\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1531
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No merge strategy handled the merge.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1533
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Merge with strategy %s failed.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "La fusion avec la stratégie %s a échoué.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1542
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Using the %s to prepare resolving by hand.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge.c:1554
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Automatic merge went well; stopped before committing as requested\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"La fusion automatique a réussi ; stoppée avant la validation comme demandé\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/merge-base.c:29
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git merge-base [-a | --all] <commit> <commit>..."
|
|
|
|
msgstr "git merge-base [-a | --all] <commit> <commit>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/merge-base.c:30
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git merge-base [-a | --all] --octopus <commit>..."
|
|
|
|
msgstr "git merge-base [-a | --all] --octopus <commit>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/merge-base.c:31
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git merge-base --independent <commit>..."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git merge-base --independent <validation>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/merge-base.c:32
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git merge-base --is-ancestor <commit> <commit>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git merge-base --is-ancestor <validation> <validation>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/merge-base.c:33
|
|
|
|
msgid "git merge-base --fork-point <ref> [<commit>]"
|
|
|
|
msgstr "git merge-base --fork-point <référence> [<validation>]"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/merge-base.c:217
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "output all common ancestors"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher tous les ancêtres communs"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/merge-base.c:219
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "find ancestors for a single n-way merge"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "trouver les ancêtres pour une fusion simple à n points"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/merge-base.c:221
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list revs not reachable from others"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les révisions inaccessibles depuis les autres"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/merge-base.c:223
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "is the first one ancestor of the other?"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "est le premier ancêtre de l'autre ?"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/merge-base.c:225
|
2014-01-18 14:36:19 +01:00
|
|
|
msgid "find where <commit> forked from reflog of <ref>"
|
|
|
|
msgstr "trouver où <validation> a divergé du reflog de <référence>"
|
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#: builtin/merge-file.c:8
|
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
|
|
|
|
"<orig-file> <file2>"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> "
|
|
|
|
"<fichier-orig> <fichier2>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge-file.c:32
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "send results to standard output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "envoyer les résultats sur la sortie standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge-file.c:33
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use a diff3 based merge"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser une fusion basée sur diff3"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge-file.c:34
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "for conflicts, use our version"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pour les conflits, utiliser notre version (our)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge-file.c:36
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "for conflicts, use their version"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pour les conflits, utiliser leur version (their)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge-file.c:38
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "for conflicts, use a union version"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pour les conflits, utiliser l'ensemble des versions"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge-file.c:41
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "for conflicts, use this marker size"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pour les conflits, utiliser cette taille de marqueur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge-file.c:42
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not warn about conflicts"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas avertir à propos des conflits"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/merge-file.c:44
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "set labels for file1/orig-file/file2"
|
|
|
|
msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/merge-recursive.c:45
|
|
|
|
#, c-format
|
|
|
|
msgid "unknown option %s"
|
|
|
|
msgstr "option inconnue %s"
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:51
|
|
|
|
#, c-format
|
|
|
|
msgid "could not parse object '%s'"
|
|
|
|
msgstr "Impossible d'analyser l'objet '%s'"
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:55
|
|
|
|
#, c-format
|
|
|
|
msgid "cannot handle more than %d base. Ignoring %s."
|
|
|
|
msgid_plural "cannot handle more than %d bases. Ignoring %s."
|
|
|
|
msgstr[0] "impossible de gérer plus de %d base. %s ignoré."
|
|
|
|
msgstr[1] "impossible de gérer plus de %d bases. %s ignoré."
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:63
|
|
|
|
msgid "not handling anything other than two heads merge."
|
|
|
|
msgstr "impossible de gérer autre chose que la fusion de deux têtes."
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
|
|
|
|
#, c-format
|
|
|
|
msgid "could not resolve ref '%s'"
|
|
|
|
msgstr "impossible de résoudre la référence '%s'"
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:77
|
|
|
|
#, c-format
|
|
|
|
msgid "Merging %s with %s\n"
|
|
|
|
msgstr "Fusion de %s avec %s\n"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/mktree.c:65
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git mktree [-z] [--missing] [--batch]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git mktree [-z] [--missing] [--batch]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/mktree.c:152
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "input is NUL terminated"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "l'entrée se termine par NUL"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/mktree.c:153 builtin/write-tree.c:24
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "allow missing objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "autoriser les objets manquants"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/mktree.c:154
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "allow creation of more than one tree"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "autoriser la création de plus d'un arbre"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:16
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git mv [<options>] <source>... <destination>"
|
|
|
|
msgstr "git mv [<options>] <source>... <destination>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:82
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Directory %s is in index and no submodule?"
|
|
|
|
msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:84 builtin/rm.c:290
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "Please stage your changes to .gitmodules or stash them to proceed"
|
2014-11-20 03:53:48 +01:00
|
|
|
msgstr ""
|
|
|
|
"Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
|
|
|
|
"continuer"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:102
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%.*s is in index"
|
|
|
|
msgstr "%.*s est dans l'index"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:124
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "force move/rename even if target exists"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "forcer le déplacement/renommage même si la cible existe"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:125
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "skip move/rename errors"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "sauter les erreurs de déplacement/renommage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:167
|
2014-11-01 16:29:19 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "destination '%s' is not a directory"
|
|
|
|
msgstr "la destination '%s' n'est pas un répertoire"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:178
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Checking rename of '%s' to '%s'\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Vérification du renommage de '%s' en '%s'\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:182
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "bad source"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mauvaise source"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:185
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "can not move directory into itself"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de déplacer un répertoire dans lui-même"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:188
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cannot move directory over file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de déplacer un répertoire sur un fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:197
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "source directory is empty"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "le répertoire source est vide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:222
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "not under version control"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pas sous le contrôle de version"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:225
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "destination exists"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "la destination existe"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:233
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "overwriting '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "écrasement de '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:236
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot overwrite"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Impossible d'écraser"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:239
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "multiple sources for the same target"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "multiples sources pour la même destination"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:241
|
2014-01-18 14:36:19 +01:00
|
|
|
msgid "destination directory does not exist"
|
|
|
|
msgstr "le répertoire de destination n'existe pas"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:248
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%s, source=%s, destination=%s"
|
|
|
|
msgstr "%s, source=%s, destination=%s"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:269
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Renaming %s to %s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Renommage de %s en %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "renaming '%s' failed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "le renommage de '%s' a échoué"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:289
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git name-rev [<options>] <commit>..."
|
|
|
|
msgstr "git name-rev [<options>] <validation>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:290
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git name-rev [<options>] --all"
|
|
|
|
msgstr "git name-rev [<options>] --all"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:291
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git name-rev [<options>] --stdin"
|
|
|
|
msgstr "git name-rev [<options>] --stdin"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:346
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print only names (no SHA-1)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher seulement les noms (pas de SHA-1)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:347
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only use tags to name the commits"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser seulement les étiquettes pour nommer les validations"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:349
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only use refs matching <pattern>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser seulement les références correspondant à <motif>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:351
|
|
|
|
msgid "ignore refs matching <pattern>"
|
|
|
|
msgstr "ignorer les références correspondant à <motif>"
|
|
|
|
|
|
|
|
#: builtin/name-rev.c:353
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list all commits reachable from all refs"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"afficher toutes les validations accessibles depuis toutes les références"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:354
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read from stdin"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire depuis l'entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:355
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "allow to print `undefined` names (default)"
|
|
|
|
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/name-rev.c:361
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "dereference tags in the input (internal use)"
|
|
|
|
msgstr "déréférencer les étiquettes en entrée (usage interne)"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:25
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
|
|
|
msgstr "git notes [--ref <références-notes>] [list [<object>]]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:26
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
2015-01-13 20:22:58 +01:00
|
|
|
"| (-c | -C) <object>] [<object>]"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> "
|
|
|
|
"| -F <fichier> | (-c | -C) <objet>] [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:27
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:28
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
2015-01-13 20:22:58 +01:00
|
|
|
"(-c | -C) <object>] [<object>]"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -"
|
|
|
|
"F <fichier> | (-c | -C) <objet>] [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:29
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
|
|
|
msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:30
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git notes [--ref <notes-ref>] show [<object>]"
|
|
|
|
msgstr "git notes [--ref <références-notes>] show [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:31
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] "
|
|
|
|
"<références-notes>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:32
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes merge --commit [-v | -q]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes merge --commit [-v | -q]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:33
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes merge --abort [-v | -q]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes merge --abort [-v | -q]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:34
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
|
|
|
|
msgstr "git notes [--ref <références-notes>] remove [<objet>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:35
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
|
|
|
|
msgstr "git notes [--ref <références-notes>] prune [-n | -v]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:36
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git notes [--ref <notes-ref>] get-ref"
|
|
|
|
msgstr "git notes [--ref <références-notes>] get-ref"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:41
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes [list [<object>]]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes [list [<objet>]]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:46
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes add [<options>] [<object>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes add [<options>] [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:51
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes copy [<options>] <from-object> <to-object>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes copy [<options>] <depuis-objet> <vers-objet>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:52
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes copy --stdin [<from-object> <to-object>]..."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes copy --stdin [<depuis-objet> <vers-objet>]..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:57
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes append [<options>] [<object>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes append [<options>] [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:62
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes edit [<object>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes edit [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:67
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes show [<object>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes show [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:72
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git notes merge [<options>] <notes-ref>"
|
|
|
|
msgstr "git notes merge [<options>] <références-notes>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:73
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes merge --commit [<options>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes merge --commit [<options>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:74
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes merge --abort [<options>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes merge --abort [<options>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:79
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes remove [<object>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes remove [<objet>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:84
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes prune [<options>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes prune [<options>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:89
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git notes get-ref"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git notes get-ref"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/notes.c:94
|
|
|
|
msgid "Write/edit the notes for the following object:"
|
|
|
|
msgstr "Écrire/éditer les notes pour l'objet suivant :"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:147
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to start 'show' for object '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de démarrer 'show' pour l'objet '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:151
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "could not read 'show' output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lire la sortie de 'show'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/notes.c:159
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to finish 'show' for object '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de finir 'show' pour l'objet '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/notes.c:194
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "please supply the note contents using either -m or -F option"
|
|
|
|
msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/notes.c:203
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unable to write note object"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'écrire l'objet note"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/notes.c:205
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "the note contents have been left in %s"
|
|
|
|
msgstr "le contenu de la note a été laissé dans %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:233 builtin/tag.c:516
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot read '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de lire '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:235 builtin/tag.c:519
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not open or read '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible d'ouvrir ou lire '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
|
|
|
|
#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to resolve '%s' as a valid ref."
|
|
|
|
msgstr "impossible de résoudre '%s' comme une référence valide."
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/notes.c:257
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to read object '%s'."
|
|
|
|
msgstr "impossible de lire l'objet '%s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/notes.c:261
|
2014-02-26 21:27:14 +01:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "cannot read note data from non-blob object '%s'."
|
|
|
|
msgstr "impossible de lire les informations de note d'un objet non-blob '%s'."
|
|
|
|
|
|
|
|
#: builtin/notes.c:301
|
|
|
|
#, c-format
|
|
|
|
msgid "malformed input line: '%s'."
|
|
|
|
msgstr "ligne en entrée malformée : '%s'."
|
|
|
|
|
|
|
|
#: builtin/notes.c:316
|
|
|
|
#, c-format
|
|
|
|
msgid "failed to copy notes from '%s' to '%s'"
|
|
|
|
msgstr "impossible de copier les notes de '%s' vers '%s'"
|
|
|
|
|
|
|
|
#. TRANSLATORS: the first %s will be replaced by a
|
|
|
|
#. git notes command: 'add', 'merge', 'remove', etc.
|
|
|
|
#: builtin/notes.c:345
|
|
|
|
#, c-format
|
|
|
|
msgid "refusing to %s notes in %s (outside of refs/notes/)"
|
|
|
|
msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
|
|
|
|
#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "too many parameters"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "trop de paramètres"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:378 builtin/notes.c:664
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "no note found for object %s."
|
|
|
|
msgstr "pas de note trouvée pour l'objet %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:399 builtin/notes.c:562
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "note contents as a string"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "contenu de la note sous forme de chaîne"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:402 builtin/notes.c:565
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "note contents in a file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "contenu de la note dans un fichier"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:405 builtin/notes.c:568
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reuse and edit specified note object"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "réutiliser et éditer l'objet de note spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:408 builtin/notes.c:571
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reuse specified note object"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "réutiliser l'objet de note spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:411 builtin/notes.c:574
|
2015-01-13 20:22:58 +01:00
|
|
|
msgid "allow storing empty note"
|
|
|
|
msgstr "permettre de stocker une note vide"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:412 builtin/notes.c:483
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "replace existing notes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "remplacer les notes existantes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:437
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
"existing notes"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
|
|
|
|
"Utilisez '-f' pour écraser les notes existantes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:452 builtin/notes.c:531
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Overwriting existing notes for object %s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Écrasement des notes existantes pour l'objet %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
|
2015-01-13 20:22:58 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing note for object %s\n"
|
|
|
|
msgstr "Suppression de la note pour l'objet %s\n"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:484
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read objects from stdin"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire les objets depuis l'entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:486
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "load rewriting config for <command> (implies --stdin)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"charger la configuration de réécriture pour <commande> (implique --stdin)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:504
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "too few parameters"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pas assez de paramètres"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:525
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
"existing notes"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
|
|
|
|
"Utilisez '-f' pour écraser les notes existantes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:537
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "missing notes on source object %s. Cannot copy."
|
|
|
|
msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/notes.c:589
|
2013-07-01 22:19:04 +02:00
|
|
|
#, 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 ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
|
|
|
|
"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:684
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
|
|
|
|
msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:686
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to delete ref NOTES_MERGE_REF"
|
|
|
|
msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:688
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to remove 'git notes merge' worktree"
|
|
|
|
msgstr "échec de la suppression de la copie de travail 'git notes merge'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:708
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to read ref NOTES_MERGE_PARTIAL"
|
|
|
|
msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:710
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not find commit from NOTES_MERGE_PARTIAL."
|
|
|
|
msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:712
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
|
|
|
|
msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:725
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to resolve NOTES_MERGE_REF"
|
|
|
|
msgstr "échec de la résolution de NOTES_MERGE_REF"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:728
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to finalize notes merge"
|
|
|
|
msgstr "impossible de finaliser la fusion de notes"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:754
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown notes merge strategy %s"
|
|
|
|
msgstr "stratégie de fusion de notes inconnue %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:770
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "General options"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Options générales"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:772
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Merge options"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Options de fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:774
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
|
|
|
|
"cat_sort_uniq)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
|
|
|
|
"theirs/union/cat_sort_uniq)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:776
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Committing unmerged notes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Validation des notes non fusionnées"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:778
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "finalize notes merge by committing unmerged notes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:780
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Aborting notes merge resolution"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Abandon de la résolution de fusion des notes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:782
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "abort notes merge"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "abandonner la fusion de notes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:793
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "cannot mix --commit, --abort or -s/--strategy"
|
|
|
|
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:798
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "must specify a notes ref to merge"
|
|
|
|
msgstr "vous devez spécifier une référence de notes à fusionner"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:822
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unknown -s/--strategy: %s"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr "-s/--strategy inconnu : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:859
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "a notes merge into %s is already in-progress at %s"
|
|
|
|
msgstr "une fusion de notes dans %s est déjà en cours avec %s"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:862
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "failed to store link to current notes ref (%s)"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:864
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
|
|
|
|
"'git notes merge --commit', or abort the merge with 'git notes merge --"
|
|
|
|
"abort'.\n"
|
|
|
|
msgstr ""
|
|
|
|
"La fusion automatique des notes a échoué. Corrigez les conflits dans %s et "
|
|
|
|
"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
|
|
|
|
"avec 'git notes merge --abort'.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:886
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Object %s has no note\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "L'objet %s n'a pas de note\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:898
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "attempt to remove non-existent note is not an error"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"la tentative de suppression d'une note non existante n'est pas une erreur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:901
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read object names from the standard input"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire les noms d'objet depuis l'entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "do not remove, show only"
|
|
|
|
msgstr "ne pas supprimer, afficher seulement"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:940
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "report pruned notes"
|
|
|
|
msgstr "afficher les notes éliminées"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:982
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "notes-ref"
|
|
|
|
msgstr "références-notes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:983
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "use notes from <notes-ref>"
|
|
|
|
msgstr "utiliser les notes depuis <références-notes>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/notes.c:1018
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "unknown subcommand: %s"
|
|
|
|
msgstr "sous-commande inconnue : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pack-objects.c:29
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid ""
|
|
|
|
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
|
|
|
"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
|
|
|
|
"objets>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pack-objects.c:30
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid ""
|
|
|
|
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
|
|
|
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
|
|
|
|
"objets>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "deflate error (%d)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "erreur de compression (%d)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:770
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
|
|
|
"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
|
|
|
|
"cause de pack.packSizeLimit"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:783
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Writing objects"
|
|
|
|
msgstr "Écriture des objets"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:1063
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "disabling bitmap writing, as some objects are not being packed"
|
2014-08-05 19:23:50 +02:00
|
|
|
msgstr ""
|
|
|
|
"désactivation de l'écriture en bitmap car certains objets ne sont pas "
|
|
|
|
"compressés"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2426
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Compressing objects"
|
|
|
|
msgstr "Compression des objets"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2829
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unsupported index version %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "version d'index non supportée %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2833
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "bad index version '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mauvaise version d'index '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2863
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not show progress meter"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas afficher la barre de progression"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2865
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show progress meter"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher la barre de progression"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2867
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show progress meter during object writing phase"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2870
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "similar to --all-progress when progress meter is shown"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "similaire à --all-progress quand la barre de progression est affichée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2871
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "version[,offset]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "version[,offset]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2872
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "write the pack index file in the specified idx format version"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"écrire le fichier d'index du paquet dans le format d'index de version "
|
|
|
|
"spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2875
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "maximum size of each output pack file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "taille maximum de chaque fichier paquet en sortie"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2877
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "ignore borrowed objects from alternate object store"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2879
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "ignore packed objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ignorer les objets empaquetés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2881
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "limit pack window by objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "limiter la fenêtre d'empaquetage par objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2883
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "limit pack window by memory in addition to object limit"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2885
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "maximum length of delta chain allowed in the resulting pack"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2887
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reuse existing deltas"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "réutiliser les deltas existants"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2889
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reuse existing objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "réutiliser les objets existants"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2891
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use OFS_DELTA objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser les objets OFS_DELTA"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2893
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use threads when searching for best delta matches"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"utiliser des fils lors de la recherche pour une meilleurs correspondance des "
|
|
|
|
"deltas"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2895
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not create an empty pack output"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas créer un paquet vide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2897
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read revision arguments from standard input"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire les paramètres de révision depuis l'entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2899
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "limit the objects to those that are not yet packed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2902
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "include objects reachable from any reference"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "inclure les objets accessibles depuis toute référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2905
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "include objects referred by reflog entries"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "inclure les objets référencés par les éléments de reflog"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2908
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "include objects referred to by the index"
|
|
|
|
msgstr "inclure les objets référencés par l'index"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2911
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "output pack to stdout"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher l'empaquetage sur la sortie standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2913
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "include tag objects that refer to objects to be packed"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2915
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "keep unreachable objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "garder les objets inaccessibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2917
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "pack loose unreachable objects"
|
|
|
|
msgstr "empaqueter les objets inaccessibles détachés"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2919
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unpack unreachable objects newer than <time>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2922
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create thin packs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "créer des paquets légers"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2924
|
2015-01-13 20:22:58 +01:00
|
|
|
msgid "create packs suitable for shallow fetches"
|
|
|
|
msgstr "créer des paquets permettant des récupérations superficielles"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2926
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "ignore packs that have companion .keep file"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ignorer les paquets qui ont un fichier .keep"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2928
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "pack compression level"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "niveau de compression du paquet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2930
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not hide commits by grafts"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas cacher les validations par greffes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2932
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "use a bitmap index if available to speed up counting objects"
|
2014-08-05 19:23:50 +02:00
|
|
|
msgstr ""
|
|
|
|
"utiliser un index en bitmap si disponible pour accélerer le décompte des "
|
|
|
|
"objets"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:2934
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "write a bitmap index together with the pack index"
|
|
|
|
msgstr "écrire un index en bitmap associé à l'index de paquet"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pack-objects.c:3061
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Counting objects"
|
|
|
|
msgstr "Décompte des objets"
|
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#: builtin/pack-refs.c:6
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git pack-refs [<options>]"
|
|
|
|
msgstr "git pack-refs [<options>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/pack-refs.c:14
|
|
|
|
msgid "pack everything"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "empaqueter tout"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/pack-refs.c:15
|
|
|
|
msgid "prune loose refs (default)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "éliminer les références perdues (défaut)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/prune-packed.c:7
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|
|
|
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/prune-packed.c:40
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Removing duplicate objects"
|
|
|
|
msgstr "Suppression des objets dupliqués"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/prune.c:11
|
|
|
|
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
|
|
|
msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]"
|
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/prune.c:106
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "report pruned objects"
|
|
|
|
msgstr "afficher les objets éliminés"
|
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/prune.c:109
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "expire objects older than <time>"
|
|
|
|
msgstr "faire expirer les objets plus vieux que <heure>"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/prune.c:123
|
|
|
|
msgid "cannot prune in a precious-objects repo"
|
|
|
|
msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:51 builtin/pull.c:53
|
|
|
|
#, c-format
|
|
|
|
msgid "Invalid value for %s: %s"
|
|
|
|
msgstr "Valeur invalide pour %s : %s"
|
|
|
|
|
|
|
|
#: builtin/pull.c:73
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "git pull [<options>] [<repository> [<refspec>...]]"
|
2015-09-09 22:55:10 +02:00
|
|
|
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:121
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Options related to merging"
|
|
|
|
msgstr "Options relatives à la fusion"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:124
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "incorporate changes by rebasing rather than merging"
|
|
|
|
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "allow fast-forward"
|
|
|
|
msgstr "autoriser l'avance rapide"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:157
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "automatically stash/stash pop before and after rebase"
|
|
|
|
msgstr "remiser avant et réappliquer après le rebasage automatiquement"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:173
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Options related to fetching"
|
|
|
|
msgstr "Options relatives au rapatriement"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:195
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "number of submodules pulled in parallel"
|
|
|
|
msgstr "nombre de sous-modules tirés en parallèle"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:284
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid value for pull.ff: %s"
|
|
|
|
msgstr "Valeur invalide pour pull.ff : %s"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:397
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid ""
|
|
|
|
"There is no candidate for rebasing against among the refs that you just "
|
|
|
|
"fetched."
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
|
|
|
"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
|
|
|
|
"venez de récupérer."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:399
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid ""
|
|
|
|
"There are no candidates for merging among the refs that you just fetched."
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
|
|
|
"Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
|
|
|
|
"vous venez de récupérer."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:400
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid ""
|
|
|
|
"Generally this means that you provided a wildcard refspec which had no\n"
|
|
|
|
"matches on the remote end."
|
|
|
|
msgstr ""
|
|
|
|
"Généralement, cela signifie que vous avez indiqué un spécificateur\n"
|
|
|
|
"de référence joker qui n'a pas eu de correspondance sur le serveur distant."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:403
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"You asked to pull from the remote '%s', but did not specify\n"
|
|
|
|
"a branch. Because this is not the default configured remote\n"
|
|
|
|
"for your current branch, you must specify a branch on the command line."
|
|
|
|
msgstr ""
|
|
|
|
"Vous avez demandé de tirer depuis le dépôt distant '%s', mais sans indiquer\n"
|
2015-09-15 20:22:52 +02:00
|
|
|
"la branche. Comme ce n'est pas le dépôt distant par défaut dans la "
|
|
|
|
"configuration\n"
|
2015-09-09 22:55:10 +02:00
|
|
|
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:408 git-parse-remote.sh:73
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "You are not currently on a branch."
|
|
|
|
msgstr "Vous n'êtes actuellement sur aucune branche."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Please specify which branch you want to rebase against."
|
|
|
|
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Please specify which branch you want to merge with."
|
|
|
|
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:413 builtin/pull.c:428
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "See git-pull(1) for details."
|
|
|
|
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
|
2016-05-26 22:46:41 +02:00
|
|
|
#: git-parse-remote.sh:64
|
|
|
|
msgid "<remote>"
|
|
|
|
msgstr "<distant>"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
|
2016-05-26 22:46:41 +02:00
|
|
|
#: git-parse-remote.sh:65
|
|
|
|
msgid "<branch>"
|
|
|
|
msgstr "<branche>"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:423 git-parse-remote.sh:75
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "There is no tracking information for the current branch."
|
|
|
|
msgstr "Pas d'information de suivi distant pour la branche actuelle."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:432 git-parse-remote.sh:95
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid ""
|
2016-05-26 22:46:41 +02:00
|
|
|
"If you wish to set tracking information for this branch you can do so with:"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
|
|
|
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
|
|
|
|
"branche, vous pouvez le faire avec :"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:437
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Your configuration specifies to merge with the ref '%s'\n"
|
|
|
|
"from the remote, but no such ref was fetched."
|
|
|
|
msgstr ""
|
2015-09-15 20:22:52 +02:00
|
|
|
"Votre information de configuration indique de fusionner avec la référence "
|
|
|
|
"'%s'\n"
|
2015-09-09 22:55:10 +02:00
|
|
|
"du serveur distant, mais cette référence n'a pas été récupérée."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:754
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "ignoring --verify-signatures for rebase"
|
|
|
|
msgstr "--verify-signatures est ignoré pour un rebasage"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:801
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "--[no-]autostash option is only valid with --rebase."
|
|
|
|
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:809
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Updating an unborn branch with changes added to the index."
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
|
|
|
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
|
|
|
|
"l'index."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:812
|
|
|
|
msgid "pull with rebase"
|
|
|
|
msgstr "tirer avec un rebasage"
|
|
|
|
|
|
|
|
#: builtin/pull.c:813
|
|
|
|
msgid "please commit or stash them."
|
|
|
|
msgstr "veuillez les valider ou les remiser."
|
|
|
|
|
|
|
|
#: builtin/pull.c:838
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"fetch updated the current branch head.\n"
|
|
|
|
"fast-forwarding your working tree from\n"
|
|
|
|
"commit %s."
|
|
|
|
msgstr ""
|
|
|
|
"la récupération a mis à jour la tête de la branche actuelle.\n"
|
|
|
|
"avance rapide de votre copie de travail\n"
|
|
|
|
"depuis le commit %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:843
|
2015-09-09 22:55:10 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Cannot fast-forward your working tree.\n"
|
|
|
|
"After making sure that you saved anything precious from\n"
|
|
|
|
"$ git diff %s\n"
|
|
|
|
"output, run\n"
|
|
|
|
"$ git reset --hard\n"
|
|
|
|
"to recover."
|
|
|
|
msgstr ""
|
|
|
|
"Avance rapide de votre arbre de travail impossible.\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
"Après avoir vérifié que toute modification précieuse a été sauvegardée avec\n"
|
2015-09-09 22:55:10 +02:00
|
|
|
"$ git diff %s\n"
|
|
|
|
"lancez\n"
|
|
|
|
"$ git reset --hard\n"
|
|
|
|
"pour régénérer."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:858
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Cannot merge multiple branches into empty head."
|
|
|
|
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/pull.c:862
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Cannot rebase onto multiple branches."
|
|
|
|
msgstr "Impossible de rebaser sur de multiples branches."
|
|
|
|
|
2015-12-24 07:38:22 +01:00
|
|
|
#: builtin/push.c:16
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/push.c:89
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "tag shorthand without <tag>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "raccourci d'étiquette sans <étiquette>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/push.c:99
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--delete only accepts plain target ref names"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--delete accepte seulement des noms entiers de références cibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/push.c:143
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"To choose either option permanently, see push.default in 'git help config'."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"\n"
|
|
|
|
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
|
|
|
|
"help config'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/push.c:146
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The upstream branch of your current branch does not match\n"
|
|
|
|
"the name of your current branch. To push to the upstream branch\n"
|
|
|
|
"on the remote, use\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s HEAD:%s\n"
|
|
|
|
"\n"
|
|
|
|
"To push to the branch of the same name on the remote, use\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s %s\n"
|
|
|
|
"%s"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"La branche amont de votre branche courante ne correspond pas\n"
|
|
|
|
"au nom de votre branche courante. Pour pousser vers la branche amont\n"
|
|
|
|
"sur le serveur distant, utilisez\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s HEAD:%s\n"
|
|
|
|
"\n"
|
|
|
|
"Pour pousser vers la branche du même nom sur le serveur distant, utilisez\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s %s\n"
|
|
|
|
"%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/push.c:161
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"You are not currently on a branch.\n"
|
|
|
|
"To push the history leading to the current (detached HEAD)\n"
|
|
|
|
"state now, use\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s HEAD:<name-of-remote-branch>\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Vous n'êtes actuellement sur aucune branche.\n"
|
|
|
|
"Pour pousser l'historique menant à l'état actuel (HEAD détachée),\n"
|
|
|
|
"utilisez\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s HEAD:<nom-de-la-branche-amont>\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/push.c:175
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The current branch %s has no upstream branch.\n"
|
|
|
|
"To push the current branch and set the remote as upstream, use\n"
|
|
|
|
"\n"
|
|
|
|
" git push --set-upstream %s %s\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"La branche courante %s n'a pas de branche amont.\n"
|
|
|
|
"Pour pousser la branche courante et définir la distante comme amont, "
|
|
|
|
"utilisez\n"
|
|
|
|
"\n"
|
|
|
|
" git push --set-upstream %s %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/push.c:183
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "The current branch %s has multiple upstream branches, refusing to push."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"La branche courante %s a de multiples branches amont, impossible de pousser."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/push.c:186
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"You are pushing to remote '%s', which is not the upstream of\n"
|
|
|
|
"your current branch '%s', without telling me what to push\n"
|
|
|
|
"to update which remote branch."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Vous êtes en train de pousser vers la branche distante '%s', qui n'est\n"
|
|
|
|
"pas une branche amont de votre branche courante '%s', sans me dire\n"
|
|
|
|
"quoi pousser pour mettre à jour quelle branche amont."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:245
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
|
|
|
|
"default est \"nothing\"."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:252
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"Updates were rejected because the tip of your current branch is behind\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
|
|
|
"'git pull ...') before pushing again.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Les mises à jour ont été rejetées car la pointe de la branche courante est "
|
|
|
|
"derrière\n"
|
|
|
|
"son homologue distant. Intégrez les changements distants (par exemple 'git "
|
|
|
|
"pull ...')\n"
|
|
|
|
"avant de pousser à nouveau.\n"
|
|
|
|
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
|
|
|
|
"d'information."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:258
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
"counterpart. Check out this branch and integrate the remote changes\n"
|
|
|
|
"(e.g. 'git pull ...') before pushing again.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Les mises à jour ont été rejetées car la pointe de la branche courante est "
|
|
|
|
"derrière\n"
|
2016-02-04 19:37:23 +01:00
|
|
|
"son homologue distant. Extrayez cette branche et intégrez les changements "
|
2013-08-21 21:49:43 +02:00
|
|
|
"distants\n"
|
|
|
|
"(par exemple 'git pull ...') avant de pousser à nouveau.\n"
|
|
|
|
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
|
|
|
|
"d'information."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:264
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"Updates were rejected because the remote contains work that you do\n"
|
|
|
|
"not have locally. This is usually caused by another repository pushing\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
"to the same ref. You may want to first integrate the remote changes\n"
|
|
|
|
"(e.g., 'git pull ...') before pushing again.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Les mises à jour ont été rejetées car la branche distante contient du "
|
|
|
|
"travail que\n"
|
|
|
|
"vous n'avez pas en local. Ceci est généralement causé par un autre dépôt "
|
|
|
|
"poussé\n"
|
|
|
|
"vers la même référence. Vous pourriez intégrer d'abord les changements "
|
|
|
|
"distants\n"
|
|
|
|
"(par exemple 'git pull ...') avant de pousser à nouveau.\n"
|
|
|
|
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
|
|
|
|
"d'information."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:271
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Updates were rejected because the tag already exists in the remote."
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
|
|
|
|
"branche distante."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:274
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"You cannot update a remote ref that points at a non-commit object,\n"
|
|
|
|
"or update a remote ref to make it point at a non-commit object,\n"
|
|
|
|
"without using the '--force' option.\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Vous ne pouvez pas mettre à jour une référence distante qui pointe sur un "
|
|
|
|
"objet qui\n"
|
|
|
|
"n'est pas un commit, ou mettre à jour une référence distante pour la faire "
|
|
|
|
"pointer\n"
|
|
|
|
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:334
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Pushing to %s\n"
|
2014-05-06 23:29:57 +02:00
|
|
|
msgstr "Poussée vers %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:338
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to push some refs to '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "impossible de pousser des références vers '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:369
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "bad repository '%s'"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mauvais dépôt '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:370
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"No configured push destination.\n"
|
|
|
|
"Either specify the URL from the command-line or configure a remote "
|
|
|
|
"repository using\n"
|
|
|
|
"\n"
|
|
|
|
" git remote add <name> <url>\n"
|
|
|
|
"\n"
|
|
|
|
"and then push using the remote name\n"
|
|
|
|
"\n"
|
|
|
|
" git push <name>\n"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Pas de destination pour pousser.\n"
|
|
|
|
"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant "
|
|
|
|
"en utilisant\n"
|
|
|
|
"\n"
|
|
|
|
" git remote add <nom> <url>\n"
|
|
|
|
"\n"
|
|
|
|
"et poussez alors en utilisant le dépôt distant\n"
|
|
|
|
"\n"
|
|
|
|
" git push <nom>\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:388
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--all and --tags are incompatible"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--all et --tags sont incompatibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:389
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--all can't be combined with refspecs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:394
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--mirror and --tags are incompatible"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--mirror et --tags sont incompatibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:395
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--mirror can't be combined with refspecs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:400
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--all and --mirror are incompatible"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--all et --mirror sont incompatibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:518
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "repository"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:519 builtin/send-pack.c:162
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "push all refs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pousser toutes les références"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:520 builtin/send-pack.c:164
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "mirror all refs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "refléter toutes les références"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:522
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete refs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "supprimer les références"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:523
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "push tags (can't be used with --all or --mirror)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:526 builtin/send-pack.c:165
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "force updates"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "forcer les mises à jour"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:528 builtin/send-pack.c:179
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "refname>:<expect"
|
|
|
|
msgstr "nom de référence>:<attendu"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:529 builtin/send-pack.c:180
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "require old value of ref to be at this value"
|
|
|
|
msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:532
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "control recursive pushing of submodules"
|
2014-05-06 23:29:57 +02:00
|
|
|
msgstr "contrôler la poussée récursive des sous-modules"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:534 builtin/send-pack.c:173
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use thin pack"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "utiliser un empaquetage léger"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
|
|
|
|
#: builtin/send-pack.c:160
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "receive pack program"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "recevoir le programme d'empaquetage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:537
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "set upstream for git pull/status"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "définir la branche amont pour git pull/status"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:540
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "prune locally removed refs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "éliminer les références locales supprimées"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:542
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "bypass pre-push hook"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "éviter d'utiliser le crochet pre-push"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:543
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "push missing but relevant tags"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "pousser les étiquettes manquantes mais pertinentes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:546 builtin/send-pack.c:167
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "GPG sign the push"
|
|
|
|
msgstr "signer la poussée avec GPG"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:548 builtin/send-pack.c:174
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "request atomic transaction on remote side"
|
|
|
|
msgstr "demande une transaction atomique sur le serveur distant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:549 builtin/send-pack.c:170
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "server-specific"
|
|
|
|
msgstr "spécifique au serveur"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/push.c:549 builtin/send-pack.c:171
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "option to transmit"
|
|
|
|
msgstr "option à transmettre"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:563
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--delete is incompatible with --all, --mirror and --tags"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--delete est incompatible avec --all, --mirror et --tags"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:565
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--delete doesn't make sense without any refs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "--delete n'a pas de sens sans aucune référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/push.c:584
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "push options must not have new line characters"
|
|
|
|
msgstr ""
|
|
|
|
"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
|
|
|
|
"ligne"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:40
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-09-09 22:55:10 +02:00
|
|
|
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
|
2013-07-01 22:19:04 +02:00
|
|
|
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
|
|
|
|
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
|
|
|
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
|
|
|
|
"prefix=<préfixe>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
|
|
|
|
"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté "
|
|
|
|
"1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:130
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "write resulting index to <file>"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "écrire l'index résultant dans <fichier>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:133
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only empty the index"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "juste vider l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:135
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Merging"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:137
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "perform a merge in addition to a read"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "effectuer une fusion en plus d'une lecture"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:139
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "3-way merge if no file level merging required"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:141
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "3-way merge in presence of adds and removes"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "fusion à 3 points en présence d'ajouts et suppressions"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:143
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "same as -m, but discard unmerged entries"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "comme -m, mais annule les éléments non fusionnés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:144
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "<subdirectory>/"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "<sous-répertoire>/"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:145
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read the tree into the index under <subdirectory>/"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:148
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "update working tree with merge result"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mettre à jour la copie de travail avec le résultat de la fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:150
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "gitignore"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "gitignore"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:151
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "allow explicitly ignored files to be overwritten"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:154
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't check the working tree after merging"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas vérifier la copie de travail après la fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:155
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't update the index or the work tree"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ne pas mettre à jour l'index ou la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:157
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "skip applying sparse checkout filter"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "sauter l'application du filtre d'extraction creuse"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/read-tree.c:159
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "debug unpack-trees"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "déboguer unpack-trees"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/rebase--helper.c:7
|
|
|
|
msgid "git rebase--helper [<options>]"
|
|
|
|
msgstr "git rebase-helper [<options>]"
|
|
|
|
|
|
|
|
#: builtin/rebase--helper.c:19
|
|
|
|
msgid "continue rebase"
|
|
|
|
msgstr "continuer le rebasage"
|
|
|
|
|
|
|
|
#: builtin/rebase--helper.c:21
|
|
|
|
msgid "abort rebase"
|
|
|
|
msgstr "abandonner le rebasage"
|
|
|
|
|
|
|
|
#: builtin/receive-pack.c:27
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "git receive-pack <git-dir>"
|
|
|
|
msgstr "git receive-pack <répertoire-git>"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/receive-pack.c:795
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"By default, updating the current branch in a non-bare repository\n"
|
|
|
|
"is denied, because it will make the index and work tree inconsistent\n"
|
|
|
|
"with what you pushed, and will require 'git reset --hard' to match\n"
|
|
|
|
"the work tree to HEAD.\n"
|
|
|
|
"\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
"You can set the 'receive.denyCurrentBranch' configuration variable\n"
|
|
|
|
"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
|
2016-11-05 21:43:53 +01:00
|
|
|
"its current branch; however, this is not recommended unless you\n"
|
|
|
|
"arranged to update its work tree to match what you pushed in some\n"
|
|
|
|
"other way.\n"
|
|
|
|
"\n"
|
|
|
|
"To squelch this message and still keep the default behaviour, set\n"
|
|
|
|
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
|
|
|
|
msgstr ""
|
|
|
|
"Par défaut, mettre à jour la branche actuelle dans un dépôt non-nu\n"
|
|
|
|
"est réfusé parce que cela rendrait l'index et la copie de travail\n"
|
|
|
|
"inconsistants avec ce que vous avez poussé et nécessiterait\n"
|
|
|
|
"'git reset --hard' pour réaligner la copie de travail avec HEAD.\n"
|
|
|
|
"\n"
|
|
|
|
"Vous pouvez régler « receive.denyCurrentBranch » à 'ignore' ou\n"
|
|
|
|
"'warn' dans le dépôt distant pour permettre la poussée dans la\n"
|
|
|
|
"branche actuelle ; cependant, ce n'est pas recommandé à moins que\n"
|
|
|
|
"vous ayez déjà mis à jour sa copie de travail par une moyen détourné\n"
|
|
|
|
"pour correspondre à ce que vous avez poussé.\n"
|
|
|
|
"\n"
|
|
|
|
"Pour éliminer ce message et conserver le comportement par défaut,\n"
|
|
|
|
"réglez « receive.denyCurrentBranch » à 'refuse'."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/receive-pack.c:815
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"By default, deleting the current branch is denied, because the next\n"
|
|
|
|
"'git clone' won't result in any file checked out, causing confusion.\n"
|
|
|
|
"\n"
|
|
|
|
"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
|
|
|
|
"'warn' or 'ignore' in the remote repository to allow deleting the\n"
|
|
|
|
"current branch, with or without a warning message.\n"
|
|
|
|
"\n"
|
|
|
|
"To squelch this message, you can set it to 'refuse'."
|
|
|
|
msgstr ""
|
|
|
|
"Par défaut, supprimer la branche actuelle est refusé parce que le\n"
|
|
|
|
"prochain 'git clone' n'extraira aucun fichier et causer de la confusion.\n"
|
|
|
|
"\n"
|
|
|
|
"Vous pouvez régler « receive.denyDeleteCurrent » à 'warn' ou 'ignore'\n"
|
|
|
|
"dans le dépôt distant pour permettre la suppression la branche actuelle\n"
|
|
|
|
"avec ou sans message d'avertissement.\n"
|
|
|
|
"\n"
|
|
|
|
"Pour éliminer ce message, réglez-le à 'refuse'."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/receive-pack.c:1888
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "quiet"
|
|
|
|
msgstr "quiet"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/receive-pack.c:1902
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "You must specify a directory."
|
|
|
|
msgstr "Vous devez spécifier un répertoire."
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/reflog.c:423
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "'%s' for '%s' is not a valid timestamp"
|
|
|
|
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/reflog.c:540 builtin/reflog.c:545
|
2013-08-21 21:49:43 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not a valid timestamp"
|
|
|
|
msgstr "'%s' n'est pas un horodatage valide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/remote.c:12
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote [-v | --verbose]"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote [-v | --verbose]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/remote.c:13
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
|
2013-07-01 22:19:04 +02:00
|
|
|
"mirror=<fetch|push>] <name> <url>"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
|
|
|
|
"mirror=<fetch|push>] <nom> <url>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:14 builtin/remote.c:34
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote rename <old> <new>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote rename <ancienne> <nouvelle>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:15 builtin/remote.c:39
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote remove <name>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote remove <nom>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:16 builtin/remote.c:44
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
|
|
|
|
msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/remote.c:17
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote [-v | --verbose] show [-n] <name>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote [-v | --verbose] show [-n] <nom>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/remote.c:18
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote prune [-n | --dry-run] <name>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote prune [-n | --dry-run] <nom>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/remote.c:19
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"git remote [-v | --verbose] update [-p | --prune] [(<groupe> | "
|
|
|
|
"<distante>)...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-01-18 14:36:19 +01:00
|
|
|
#: builtin/remote.c:20
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote set-branches [--add] <name> <branch>..."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote set-branches [--add] <nom> <branche>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:21 builtin/remote.c:70
|
|
|
|
msgid "git remote get-url [--push] [--all] <name>"
|
|
|
|
msgstr "git remote get-url [--push] [--all] <nom>"
|
|
|
|
|
|
|
|
#: builtin/remote.c:22 builtin/remote.c:75
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:23 builtin/remote.c:76
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote set-url --add <name> <newurl>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote set-url --add <nom> <nouvelle-URL>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:24 builtin/remote.c:77
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote set-url --delete <name> <url>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote set-url --delete <nom> <URL>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:29
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote add [<options>] <name> <url>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote add [<options>] <nom> <URL>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:49
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote set-branches <name> <branch>..."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote set-branches <nom> <branche>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:50
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote set-branches --add <name> <branch>..."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote set-branches --add <nom> <branche>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:55
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote show [<options>] <name>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote show [<options>] <nom>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:60
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote prune [<options>] <name>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote prune [<options>] <nom>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:65
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git remote update [<options>] [<group> | <remote>]..."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git remote update [<options>] [<groupe> | <distante>]..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:94
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Updating %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Mise à jour de %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:126
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"--mirror is dangerous and deprecated; please\n"
|
|
|
|
"\t use --mirror=fetch or --mirror=push instead"
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"--mirror est dangereux et obsolète ; merci\n"
|
|
|
|
"\t d'utiliser --mirror=fetch ou --mirror=push à la place"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:143
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown mirror argument: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "argument miroir inconnu : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:159
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "fetch the remote branches"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "rapatrier les branches distantes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:161
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "import all tags and associated objects when fetching"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"importer toutes les étiquettes et les objets associés lors du rapatriement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:164
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "or do not fetch any tag at all (--no-tags)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:166
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "branch(es) to track"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "branche(s) à suivre"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:167
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "master branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "branche maîtresse"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:168
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "push|fetch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "push|fetch"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:169
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "set up remote as a mirror to push to or fetch from"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:181
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "specifying a master branch makes no sense with --mirror"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/remote.c:183
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "specifying branches to track makes sense only with fetch mirrors"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
|
|
|
|
"rapatriement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/remote.c:190 builtin/remote.c:629
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "remote %s already exists."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "la distante %s existe déjà."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/remote.c:194 builtin/remote.c:633
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not a valid remote name"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "'%s' n'est pas un nom valide de distante"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/remote.c:234
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not setup master '%s'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de paramétrer la maîtresse '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/remote.c:336
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not get fetch map for refspec %s"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr ""
|
|
|
|
"Impossible d'obtenir une correspondance distante pour la spécification de "
|
|
|
|
"référence %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/remote.c:437 builtin/remote.c:445
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "(matching)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "(correspond)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/remote.c:449
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "(delete)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "(supprimer)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No such remote: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Distante inconnue : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/remote.c:639
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not rename config section '%s' to '%s'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/remote.c:659
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Not updating non-default fetch refspec\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"\tPlease update the configuration manually if necessary."
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"Pas de mise à jour du refspec de rapatriement qui n'est pas par défaut\n"
|
|
|
|
"\t%s\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/remote.c:695
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "deleting '%s' failed"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "échec de suppression de '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/remote.c:729
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "creating '%s' failed"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "échec de création de '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:794
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
|
|
|
|
"to delete it, use:"
|
|
|
|
msgid_plural ""
|
|
|
|
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
|
|
|
|
"to delete them, use:"
|
|
|
|
msgstr[0] ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"Note : Une branche en dehors de refs/remotes/ n'a pas été supprimée ;\n"
|
|
|
|
"pour la supprimer, utilisez :"
|
2013-07-01 22:19:04 +02:00
|
|
|
msgstr[1] ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Note : Plusieurs branches en dehors de refs/remotes/ n'ont pas été "
|
|
|
|
"supprimées ;\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"pour les supprimer, utilisez :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:808
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not remove config section '%s'"
|
|
|
|
msgstr "Impossible de supprimer la section de configuration '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:909
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " new (next fetch will store in remotes/%s)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:912
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid " tracked"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " suivi"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:914
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid " stale (use 'git remote prune' to remove)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:916
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid " ???"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " ???"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:957
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:965
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "rebases interactively onto remote %s"
|
|
|
|
msgstr "rebase de manière interactive sur la distante %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:966
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "rebases onto remote %s"
|
|
|
|
msgstr "rebase sur la distante %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:969
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " merges with remote %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " fusionne avec la distante %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:972
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "merges with remote %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "fusionne avec la distante %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:975
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%-*s and with remote %s\n"
|
|
|
|
msgstr "%-*s et avec la distante %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1018
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "create"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "créer"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1021
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1025
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "up to date"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "à jour"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1028
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "fast-forwardable"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "peut être mis à jour en avance rapide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1031
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "local out of date"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "le local n'est pas à jour"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1038
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " %-*s forces to %-*s (%s)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " %-*s force vers %-*s (%s)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1041
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " %-*s pushes to %-*s (%s)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " %-*s pousse vers %-*s (%s)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1045
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " %-*s forces to %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " %-*s force vers %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1048
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " %-*s pushes to %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " %-*s pousse vers %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1116
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not query remotes"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ne pas interroger les distantes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1143
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "* remote %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "* distante %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1144
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " Fetch URL: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " URL de rapatriement : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "(no URL)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "(pas d'URL)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#. TRANSLATORS: the colon ':' should align with
|
|
|
|
#. the one in " Fetch URL: %s" translation
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1156 builtin/remote.c:1158
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " Push URL: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " URL push : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " HEAD branch: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " Branche HEAD : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1160
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "(not queried)"
|
|
|
|
msgstr "(non demandé)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1162
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "(unknown)"
|
|
|
|
msgstr "(inconnu)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1166
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
|
|
|
|
"suivantes) :\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1178
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " Remote branch:%s"
|
|
|
|
msgid_plural " Remote branches:%s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr[0] " Branche distante :%s"
|
|
|
|
msgstr[1] " Branches distantes :%s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1181 builtin/remote.c:1207
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid " (status not queried)"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr " (état non demandé)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1190
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid " Local branch configured for 'git pull':"
|
|
|
|
msgid_plural " Local branches configured for 'git pull':"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr[0] " Branche locale configurée pour 'git pull' :"
|
|
|
|
msgstr[1] " Branches locales configurées pour 'git pull' :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1198
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid " Local refs will be mirrored by 'git push'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr " Les références locales seront reflétées par 'git push'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1204
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " Local ref configured for 'git push'%s:"
|
|
|
|
msgid_plural " Local refs configured for 'git push'%s:"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr[0] " Référence locale configurée pour 'git push'%s :"
|
|
|
|
msgstr[1] " Références locales configurées pour 'git push'%s :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1225
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "set refs/remotes/<name>/HEAD according to remote"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1227
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete refs/remotes/<name>/HEAD"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer refs/remotes/<nom>/HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1242
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot determine remote HEAD"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de déterminer la HEAD distante"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1244
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
|
|
|
|
"explicitement avec :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1254
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not delete %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de supprimer %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1262
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Not a valid ref: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Référence non valide : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1264
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not setup %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de paramétrer %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1282
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " %s will become dangling!"
|
2014-05-06 23:29:57 +02:00
|
|
|
msgstr " %s se retrouvera en suspens !"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1283
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " %s has become dangling!"
|
2014-05-06 23:29:57 +02:00
|
|
|
msgstr " %s se retrouve en suspens !"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1293
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Pruning %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Élimination de %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1294
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "URL: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "URL : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1310
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " * [would prune] %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr " * [serait éliminé] %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1313
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid " * [pruned] %s"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr " * [éliminé] %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1358
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "prune remotes after fetching"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "éliminer les distants après le rapatriement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No such remote '%s'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Pas de serveur remote '%s'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1437
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ajouter une branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1444
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "no remote specified"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "pas de serveur distant spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1461
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "query push URLs rather than fetch URLs"
|
|
|
|
msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1463
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "return all URLs"
|
|
|
|
msgstr "retourner toutes les URLs"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1491
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "no URLs configured for remote '%s'"
|
|
|
|
msgstr "aucune URL configurée pour le dépôt distant '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1517
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "manipulate push URLs"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "manipuler les URLs push"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1519
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add URL"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ajouter une URL"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1521
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete URLs"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer des URLs"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1528
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--add --delete doesn't make sense"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "--add --delete n'a aucun sens"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1569
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid old URL pattern: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Motif d'URL ancien invalide : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1577
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No such URL found: %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Pas d'URL trouvée : %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1579
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Will not delete all non-push URLs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Pas de suppression de toutes les URLs non-push"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1593
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "be verbose; must be placed before a subcommand"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "être verbeux : doit être placé avant une sous-commande"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/remote.c:1624
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Unknown subcommand: %s"
|
|
|
|
msgstr "Sous-commande inconnue : %s"
|
|
|
|
|
2014-08-05 19:23:50 +02:00
|
|
|
#: builtin/repack.c:17
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git repack [<options>]"
|
|
|
|
msgstr "git repack [<options>]"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:22
|
|
|
|
msgid ""
|
|
|
|
"Incremental repacks are incompatible with bitmap indexes. Use\n"
|
|
|
|
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
|
|
|
|
msgstr ""
|
2017-02-18 00:10:04 +01:00
|
|
|
"Les repaquetages incrémentaux sont incompatibles avec les index bitmap. "
|
|
|
|
"Utilisez\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
|
|
|
|
|
|
|
|
#: builtin/repack.c:166
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "pack everything in a single pack"
|
|
|
|
msgstr "empaqueter tout dans un seul paquet"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:168
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "same as -a, and turn unreachable objects loose"
|
|
|
|
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:171
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "remove redundant packs, and run git-prune-packed"
|
|
|
|
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:173
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "pass --no-reuse-delta to git-pack-objects"
|
|
|
|
msgstr "passer --no-reuse-delta à git-pack-objects"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:175
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "pass --no-reuse-object to git-pack-objects"
|
|
|
|
msgstr "passer --no-reuse-object à git-pack-objects"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:177
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "do not run git-update-server-info"
|
|
|
|
msgstr "ne pas lancer git update-server-info"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:180
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "pass --local to git-pack-objects"
|
|
|
|
msgstr "passer --local à git-pack-objects"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:182
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "write bitmap index"
|
|
|
|
msgstr "écrire un index en bitmap"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:183
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "approxidate"
|
|
|
|
msgstr "date approximative"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:184
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "with -A, do not loosen objects older than this"
|
|
|
|
msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:186
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "with -a, repack unreachable objects"
|
|
|
|
msgstr "avec -a, repaquétiser les objets inaccessibles"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:188
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "size of the window used for delta compression"
|
|
|
|
msgstr "taille de la fenêtre utilisée pour la compression des deltas"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:189 builtin/repack.c:193
|
2014-02-02 14:36:32 +01:00
|
|
|
msgid "bytes"
|
|
|
|
msgstr "octets"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:190
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "same as the above, but limit memory size instead of entries count"
|
2014-01-18 14:36:19 +01:00
|
|
|
msgstr ""
|
|
|
|
"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:192
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "limits the maximum delta depth"
|
|
|
|
msgstr "limite la profondeur maximale des deltas"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:194
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "maximum size of each packfile"
|
|
|
|
msgstr "taille maximum de chaque fichier paquet"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:196
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "repack objects in packs marked with .keep"
|
|
|
|
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:206
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "cannot delete packs in a precious-objects repo"
|
|
|
|
msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:210
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "--keep-unreachable and -A are incompatible"
|
|
|
|
msgstr "--keep-unreachable et -A sont incompatibles"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/repack.c:400 builtin/worktree.c:115
|
2013-11-01 15:35:08 +01:00
|
|
|
#, c-format
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "failed to remove '%s'"
|
|
|
|
msgstr "échec de la suppression de '%s'"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2014-08-05 19:23:50 +02:00
|
|
|
#: builtin/replace.c:19
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git replace [-f] <object> <replacement>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git replace [-f] <objet> <remplacement>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-08-05 19:23:50 +02:00
|
|
|
#: builtin/replace.c:20
|
|
|
|
msgid "git replace [-f] --edit <object>"
|
|
|
|
msgstr "git replace [-f] --edit <objet>"
|
|
|
|
|
|
|
|
#: builtin/replace.c:21
|
|
|
|
msgid "git replace [-f] --graft <commit> [<parent>...]"
|
|
|
|
msgstr "git replace [-f] --graft <commit> [<parent>...]"
|
|
|
|
|
|
|
|
#: builtin/replace.c:22
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git replace -d <object>..."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git replace -d <objet>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-08-05 19:23:50 +02:00
|
|
|
#: builtin/replace.c:23
|
2014-01-18 14:36:19 +01:00
|
|
|
msgid "git replace [--format=<format>] [-l [<pattern>]]"
|
|
|
|
msgstr "git replace [--format=<format>] [-l [<motif>]]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Not a valid object name: '%s'"
|
|
|
|
msgstr "Nom d'objet invalide : '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:360
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "bad mergetag in commit '%s'"
|
|
|
|
msgstr "mauvaise étiquette de fusion dans le commit '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:362
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "malformed mergetag in commit '%s'"
|
|
|
|
msgstr "étiquette de fusion malformée dans le commit '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:373
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
|
|
|
|
"instead of --graft"
|
2014-11-01 16:29:19 +01:00
|
|
|
msgstr ""
|
|
|
|
"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
|
|
|
|
"utilisez --edit au lieu de --graft"
|
2014-08-05 19:23:50 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:406
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "the original commit '%s' has a gpg signature."
|
|
|
|
msgstr "le commit original '%s' contient une signature GPG."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:407
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "the signature will be removed in the replacement commit!"
|
|
|
|
msgstr "la signature sera éliminée dans la validation de remplacement !"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:413
|
2014-08-05 19:23:50 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not write replacement commit for: '%s'"
|
|
|
|
msgstr "Impossible d'écrire le commit de remplacement pour '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:437
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list replace refs"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher les références de remplacement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:438
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete replace refs"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer les références de remplacement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:439
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "edit existing object"
|
|
|
|
msgstr "éditer l'objet existant"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:440
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "change a commit's parents"
|
|
|
|
msgstr "Modifier les parents d'un commit"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:441
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "replace the ref if it exists"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "remplacer la référence si elle existe"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:442
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "do not pretty-print contents for --edit"
|
|
|
|
msgstr "afficher sans mise en forme pour --edit"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/replace.c:443
|
2014-01-18 14:36:19 +01:00
|
|
|
msgid "use this format"
|
|
|
|
msgstr "utiliser ce format"
|
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/rerere.c:12
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/rerere.c:58
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "register clean resolutions in index"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "enregistrer des résolutions propres dans l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:26
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:27
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
|
|
|
|
msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:28
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:34
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "mixed"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "mixed"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:34
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "soft"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "soft"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:34
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "hard"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "hard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:34
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "merge"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "merge"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:34
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "keep"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "keep"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:74
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You do not have a valid HEAD."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Vous n'avez pas une HEAD valide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:76
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Failed to find tree of HEAD."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de trouver l'arbre pour HEAD."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:82
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to find tree of %s."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de trouver l'arbre pour %s."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:100
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "HEAD is now at %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "HEAD est maintenant à %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:183
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot do a %s reset in the middle of a merge."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:276
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "be quiet, only report errors"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "être silencieux, afficher seulement les erreurs"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:278
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reset HEAD and index"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "réinitialiser HEAD et l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:279
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reset only HEAD"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "réinitialiser seulement HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:281 builtin/reset.c:283
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reset HEAD, index and working tree"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "réinitialiser HEAD, l'index et la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:285
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reset HEAD but keep local changes"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "réinitialiser HEAD mais garder les changements locaux"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:288
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "record only the fact that removed paths will be added later"
|
2014-08-05 19:23:50 +02:00
|
|
|
msgstr ""
|
|
|
|
"enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
|
|
|
|
"tard"
|
2014-02-26 21:27:14 +01:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:305
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to resolve '%s' as a valid revision."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Échec de résolution de '%s' comme une révision valide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:313
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to resolve '%s' as a valid tree."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Échec de résolution de '%s' comme un arbre valide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:322
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--patch is incompatible with --{hard,mixed,soft}"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:331
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
|
|
|
|
"place."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:333
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot do %s reset with paths."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:343
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%s reset is not allowed in a bare repository"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:347
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "-N can only be used with --mixed"
|
|
|
|
msgstr "-N ne peut être utilisé qu'avec --mixed"
|
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:364
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "Unstaged changes after reset:"
|
|
|
|
msgstr "Modifications non indexées après reset :"
|
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:370
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not reset index file to revision '%s'."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/reset.c:374
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Could not write new index file."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible d'écrire le nouveau fichier d'index."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/rev-list.c:354
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "rev-list does not support display of notes"
|
|
|
|
msgstr "rev-list ne supporte l'affichage des notes"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/rev-parse.c:393
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
|
|
|
|
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/rev-parse.c:398
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "keep the `--` passed as an arg"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "garder le `--` passé en argument"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/rev-parse.c:400
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "stop parsing after the first non-option argument"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/rev-parse.c:403
|
2014-01-18 14:36:19 +01:00
|
|
|
msgid "output in stuck long form"
|
|
|
|
msgstr "sortie en forme longue fixée"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/rev-parse.c:534
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
" or: git rev-parse --sq-quote [<arg>...]\n"
|
2015-03-29 09:54:56 +02:00
|
|
|
" or: git rev-parse [<options>] [<arg>...]\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"\n"
|
|
|
|
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
|
|
|
|
msgstr ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git rev-parse --parseopt [<options>] -- [<arguments>...]\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
" ou : git rev-parse --sq-quote [<argument>...]\n"
|
|
|
|
" ou : git rev-parse [options] [<argument>...]\n"
|
|
|
|
"\n"
|
2015-04-04 18:04:56 +02:00
|
|
|
"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur "
|
|
|
|
"l'utilisation principale."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/revert.c:22
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git revert [<options>] <commit-ish>..."
|
|
|
|
msgstr "git revert [<options>] <commit ou apparenté>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/revert.c:23
|
|
|
|
msgid "git revert <subcommand>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git revert <sous-commande>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/revert.c:28
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git cherry-pick [<options>] <commit-ish>..."
|
|
|
|
msgstr "git cherry-pick [<options>] <commit ou apparenté>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/revert.c:29
|
|
|
|
msgid "git cherry-pick <subcommand>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git cherry-pick <sous-commande>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:89
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: %s cannot be used with %s"
|
|
|
|
msgstr "%s : %s ne peut pas être utilisé avec %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:98
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "end revert or cherry-pick sequence"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "mettre fin au retour ou picorage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:99
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "resume revert or cherry-pick sequence"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "reprendre le retour ou picorage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:100
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cancel revert or cherry-pick sequence"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "annuler le retour ou picorage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:101
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "don't automatically commit"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ne pas valider automatiquement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:102
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "edit the commit message"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "éditer le message de validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:105
|
|
|
|
msgid "parent-number"
|
|
|
|
msgstr "numéro-de-parent"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:106
|
|
|
|
msgid "select mainline parent"
|
|
|
|
msgstr "sélectionner le parent principal"
|
|
|
|
|
|
|
|
#: builtin/revert.c:108
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "merge strategy"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "stratégie de fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:109
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "option"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "option"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:110
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "option for merge strategy"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "option pour la stratégie de fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:119
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "append commit name"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ajouter le nom de validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:121
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "preserve initially empty commits"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "préserver les validations vides initialement"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:122
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "allow commits with empty messages"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "autoriser les validations avec des messages vides"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:123
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "keep redundant, empty commits"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "garder les validations redondantes, vides"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:211
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "revert failed"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "revert a échoué"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/revert.c:224
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "cherry-pick failed"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "le picorage a échoué"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/rm.c:17
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git rm [<options>] [--] <file>..."
|
|
|
|
msgstr "git rm [<options>] [--] <fichier>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:205
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid ""
|
|
|
|
"the following file has staged content different from both the\n"
|
|
|
|
"file and the HEAD:"
|
|
|
|
msgid_plural ""
|
|
|
|
"the following files have staged content different from both the\n"
|
|
|
|
"file and the HEAD:"
|
|
|
|
msgstr[0] ""
|
|
|
|
"le fichier suivant a du contenu indexé différent\n"
|
|
|
|
"du fichier et de HEAD :"
|
|
|
|
msgstr[1] ""
|
|
|
|
"les fichiers suivants ont du contenu indexé différent\n"
|
|
|
|
"du fichier et de HEAD :"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:210
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"(use -f to force removal)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"(utilisez -f pour forcer la suppression)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:214
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "the following file has changes staged in the index:"
|
|
|
|
msgid_plural "the following files have changes staged in the index:"
|
|
|
|
msgstr[0] "le fichier suivant a des changements indexés :"
|
|
|
|
msgstr[1] "les fichiers suivants ont des changements indexés :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:218 builtin/rm.c:227
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"(use --cached to keep the file, or -f to force removal)"
|
|
|
|
msgstr ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:224
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "the following file has local modifications:"
|
|
|
|
msgid_plural "the following files have local modifications:"
|
|
|
|
msgstr[0] "le fichier suivant a des modifications locales :"
|
|
|
|
msgstr[1] "les fichiers suivants ont des modifications locales :"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:242
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not list removed files"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ne pas afficher les fichiers supprimés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:243
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only remove from the index"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer seulement de l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:244
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "override the up-to-date check"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "outrepasser la vérification des fichiers à jour"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:245
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "allow recursive removal"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "autoriser la suppression récursive"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:247
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "exit with a zero status even if nothing matched"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "sortir avec un état zéro même si rien ne correspondait"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:308
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "not removing '%s' recursively without -r"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "pas de suppression récursive de '%s' sans -r"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:347
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "git rm: unable to remove %s"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git rm : impossible de supprimer %s"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/rm.c:370
|
|
|
|
#, c-format
|
|
|
|
msgid "could not remove '%s'"
|
|
|
|
msgstr "impossible de supprimer '%s'"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/send-pack.c:18
|
|
|
|
msgid ""
|
|
|
|
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
|
|
|
|
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
|
|
|
|
"[<ref>...]\n"
|
|
|
|
" --all and explicit <ref> specification are mutually exclusive."
|
|
|
|
msgstr ""
|
2015-09-15 20:22:52 +02:00
|
|
|
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
|
|
|
|
"receive-pack>] [--verbose] [--thin] [--atomic] [<hôte>:]<répertoire> "
|
|
|
|
"[<référence>...]\n"
|
|
|
|
" --all et la spécification explicite de <référence> sont mutuellement "
|
|
|
|
"exclusifs."
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/send-pack.c:161
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "remote name"
|
|
|
|
msgstr "nom distant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/send-pack.c:175
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "use stateless RPC protocol"
|
|
|
|
msgstr "utiliser un protocole RPC sans état"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/send-pack.c:176
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "read refs from stdin"
|
|
|
|
msgstr "lire les références depuis l'entrée standard"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/send-pack.c:177
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "print status from remote helper"
|
|
|
|
msgstr "afficher les messages du greffon de protocole distant"
|
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#: builtin/shortlog.c:13
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
|
|
|
|
msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/shortlog.c:248
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Group by committer rather than author"
|
|
|
|
msgstr "Grouper par validateur plutôt que par auteur"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/shortlog.c:250
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "sort output according to the number of commits per author"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "trier la sortie sur le nombre de validations par auteur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/shortlog.c:252
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Suppress commit descriptions, only provides commit count"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Supprimer les descriptions de validation, fournit seulement le nombre de "
|
|
|
|
"validations"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/shortlog.c:254
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show the email address of each author"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Afficher l'adresse e-mail de chaque auteur"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/shortlog.c:255
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "w[,i1[,i2]]"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "w[,i1[,i2]]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/shortlog.c:256
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Linewrap output"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Couper les lignes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/show-branch.c:10
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
|
2015-01-21 08:05:03 +01:00
|
|
|
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
|
|
|
|
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
|
|
|
|
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git show-branch [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n"
|
2015-01-21 08:05:03 +01:00
|
|
|
"\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n"
|
|
|
|
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
|
|
|
|
"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/show-branch.c:14
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
|
|
|
|
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:374
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "ignoring %s; cannot handle more than %d ref"
|
|
|
|
msgid_plural "ignoring %s; cannot handle more than %d refs"
|
|
|
|
msgstr[0] "%s ignoré; impossible de gérer plus de %d référence"
|
|
|
|
msgstr[1] "%s ignoré; impossible de gérer plus de %d références"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:536
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "no matching refs with %s"
|
|
|
|
msgstr "aucune référence correspond à %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:632
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show remote-tracking and local branches"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher les branches de suivi distantes et les branches locales"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:634
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show remote-tracking branches"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher les branches de suivi distantes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:636
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "color '*!+-' corresponding to the branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "couleur '*!+-' correspondant à la branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:638
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show <n> more commits after the common ancestor"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher <n> validations de plus après l'ancêtre commun"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:640
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "synonym to more=-1"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "synonyme de more=-1"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:641
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "suppress naming strings"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "supprimer les chaînes de nommage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:643
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "include the current branch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "inclure la branche courante"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:645
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "name commits with their object names"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "nommer les validations avec leurs noms d'objet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:647
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show possible merge bases"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher les bases possibles de fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:649
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show refs unreachable from any other ref"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "afficher les références inaccessibles depuis toute autre référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:651
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show commits in topological order"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher les validations dans l'ordre topologique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:654
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show only commits not on the first branch"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"afficher seulement les validations qui ne sont pas sur la première branche"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:656
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show merges reachable from only one tip"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher les fusions accessibles depuis une seule pointe"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:658
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "topologically sort, maintaining date order where possible"
|
|
|
|
msgstr "tri topologique, maintenant l'ordre par date si possible"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:661
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "<n>[,<base>]"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "<n>[,<base>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:662
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show <n> most recent ref-log entries starting at base"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"afficher les <n> plus récents éléments de ref-log en commençant à la base"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:696
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"--reflog est incompatible avec --all, --remotes, --independant et --merge-"
|
|
|
|
"base"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:720
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "no branches given, and HEAD is not valid"
|
|
|
|
msgstr "aucune branche spécifiée, et HEAD est invalide"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:723
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "--reflog option needs one branch name"
|
|
|
|
msgstr "--reflog requiert un nom de branche"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:726
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "only %d entry can be shown at one time."
|
|
|
|
msgid_plural "only %d entries can be shown at one time."
|
|
|
|
msgstr[0] "%d entrée seulement ne peut être montrée en même temps."
|
|
|
|
msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:730
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "no such ref %s"
|
|
|
|
msgstr "référence inexistante %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:814
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot handle more than %d rev."
|
|
|
|
msgid_plural "cannot handle more than %d revs."
|
|
|
|
msgstr[0] "impossible de gérer plus de %d révision."
|
|
|
|
msgstr[1] "impossible de gérer plus de %d révisions."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:818
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not a valid ref."
|
|
|
|
msgstr "'%s' n'est pas une référence valide."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/show-branch.c:821
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot find commit %s (%s)"
|
|
|
|
msgstr "impossible de trouver le commit %s (%s)"
|
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#: builtin/show-ref.c:10
|
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
|
|
|
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
|
|
|
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/show-ref.c:11
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "git show-ref --exclude-existing[=<pattern>]"
|
|
|
|
msgstr "git show-ref --exclude-existing[=<motif>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/show-ref.c:159
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only show tags (can be combined with heads)"
|
2016-03-13 13:56:03 +01:00
|
|
|
msgstr "afficher seulement les étiquettes (peut être combiné avec heads)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/show-ref.c:160
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only show heads (can be combined with tags)"
|
2016-03-13 13:56:03 +01:00
|
|
|
msgstr "afficher seulement les têtes (peut être combiné avec tags)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/show-ref.c:161
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "stricter reference checking, requires exact ref path"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"vérification de référence plus stricte, nécessite un chemin de référence "
|
|
|
|
"exact"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/show-ref.c:164 builtin/show-ref.c:166
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "show the HEAD reference, even if it would be filtered out"
|
|
|
|
msgstr "afficher la référence HEAD, même si elle serait filtrée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/show-ref.c:168
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "dereference tags into object IDs"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "déréférencer les étiquettes en IDs d'objet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/show-ref.c:170
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only show SHA1 hash using <n> digits"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/show-ref.c:174
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not print results to stdout (useful with --verify)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"ne pas afficher les résultats sur la sortie standard (pratique avec --verify)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/show-ref.c:176
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show refs from stdin that aren't in local repository"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
|
|
|
|
"local"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/stripspace.c:17
|
|
|
|
msgid "git stripspace [-s | --strip-comments]"
|
|
|
|
msgstr "git stripspace [-s | --strip-comments]"
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:18
|
|
|
|
msgid "git stripspace [-c | --comment-lines]"
|
|
|
|
msgstr "git stripspace [-c | --comment-lines]"
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:35
|
|
|
|
msgid "skip and remove all lines starting with comment character"
|
2015-12-24 07:38:22 +01:00
|
|
|
msgstr ""
|
|
|
|
"sauter et supprimer toutes les lignes commençant par le caractère de "
|
|
|
|
"commentaire"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
|
|
|
#: builtin/stripspace.c:38
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "prepend comment character and space to each line"
|
2015-12-18 22:00:37 +01:00
|
|
|
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No such ref: %s"
|
|
|
|
msgstr "Référence inexistante : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Expecting a full ref name, got %s"
|
|
|
|
msgstr "Nom de référence complet attendu, %s obtenu"
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:71
|
|
|
|
#, c-format
|
|
|
|
msgid "cannot strip one component off url '%s'"
|
|
|
|
msgstr "impossible de supprimer un composant de l'URL '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "alternative anchor for relative paths"
|
|
|
|
msgstr "ancre alternative pour les chemins relatifs"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:310
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
|
|
|
|
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "No url found for submodule path '%s' in .gitmodules"
|
|
|
|
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:395
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"could not lookup configuration '%s'. Assuming this repository is its own "
|
|
|
|
"authoritative upstream."
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
|
|
|
|
"son propre amont d'autorité."
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:406
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to register url for submodule path '%s'"
|
|
|
|
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:410
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Submodule '%s' (%s) registered for path '%s'\n"
|
|
|
|
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:420
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "warning: command update mode suggested for submodule '%s'\n"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
|
|
|
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
|
|
|
|
"jour pour le sous-module '%s'\n"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:427
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to register update mode for submodule path '%s'"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
|
|
|
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
|
|
|
|
"'%s'"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:443
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Suppress output for initializing a submodule"
|
|
|
|
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:448
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "git submodule--helper init [<path>]"
|
|
|
|
msgstr "git submodule--helper init [<chemin>]"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:476
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "git submodule--helper name <path>"
|
|
|
|
msgstr "git submodule--helper <nom> <chemin>"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:482
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "no submodule mapping found in .gitmodules for path '%s'"
|
2015-12-24 07:38:22 +01:00
|
|
|
msgstr ""
|
|
|
|
"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
|
|
|
|
"chemin '%s'"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "submodule '%s' cannot add alternate: %s"
|
|
|
|
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:604
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:611
|
2016-11-05 21:43:53 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Value '%s' for submodule.alternateLocation is not recognized"
|
|
|
|
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:633
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "where the new submodule will be cloned to"
|
|
|
|
msgstr "emplacement où le sous-module sera cloné"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:636
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "name of the new submodule"
|
|
|
|
msgstr "nom du nouveau sous-module"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:639
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "url where to clone the submodule from"
|
|
|
|
msgstr "URL depuis laquelle cloner le sous-module"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:645
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "depth for shallow clones"
|
|
|
|
msgstr "profondeur de l'historique des clones superficiels"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "force cloning progress"
|
|
|
|
msgstr "forcer l'affichage de la progression du clonage"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:653
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid ""
|
|
|
|
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
|
2016-05-26 22:46:41 +02:00
|
|
|
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
|
|
|
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
|
|
|
|
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:684
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "clone of '%s' into submodule path '%s' failed"
|
|
|
|
msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:699
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "could not get submodule directory for '%s'"
|
|
|
|
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:764
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Submodule path '%s' not initialized"
|
|
|
|
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:768
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Maybe you want to use 'update --init'?"
|
|
|
|
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:793
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Skipping unmerged submodule %s"
|
|
|
|
msgstr "Sous-module non fusionné %s non traité"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:814
|
2016-05-26 22:46:41 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Skipping submodule '%s'"
|
|
|
|
msgstr "Sous-module '%s' non traité"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:942
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to clone '%s'. Retry scheduled"
|
|
|
|
msgstr "Impossible de cloner '%s'. Réessai prévu"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:953
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to clone '%s' a second time, aborting"
|
|
|
|
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "path into the working tree"
|
|
|
|
msgstr "chemin dans la copie de travail"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:977
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "path into the working tree, across nested submodule boundaries"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
|
|
|
"chemin dans la copie de travail, traversant les frontières de sous-modules"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:981
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "rebase, merge, checkout or none"
|
|
|
|
msgstr "valeurs possibles : rebase, merge, checkout ou none"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:985
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Create a shallow clone truncated to the specified number of revisions"
|
|
|
|
msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:988
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "parallel jobs"
|
|
|
|
msgstr "jobs parallèles"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:990
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "whether the initial clone should follow the shallow recommendation"
|
|
|
|
msgstr "spécifie si le clonage initial doit être aussi superficiel"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:991
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "don't print cloning progress"
|
|
|
|
msgstr "ne pas afficher la progression du clonage"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:998
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
|
|
|
|
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:1008
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "bad value for update parameter"
|
|
|
|
msgstr "valeur invalide pour la mise à jour du paramètre"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:1079
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Submodule (%s) branch configured to inherit branch from superproject, but "
|
|
|
|
"the superproject is not on any branch"
|
|
|
|
msgstr ""
|
|
|
|
"la branche du sous-module %s est configurée pour hériter de la branche du "
|
|
|
|
"superprojet, mais le superprojet n'est sur aucune branche"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:1163
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "recurse into submodules"
|
|
|
|
msgstr "parcourir récursivement les sous-modules"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:1169
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "git submodule--helper embed-git-dir [<path>...]"
|
|
|
|
msgstr "git submodule--helper embed-git-dir [<chemin>...]"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:1226
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "submodule--helper subcommand must be called with a subcommand"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
|
|
|
"la sous-commande submodule--helper doit être appelée avec une sous-commande"
|
2016-05-26 22:46:41 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:1233
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "%s doesn't support --super-prefix"
|
|
|
|
msgstr "%s ne gère pas --super-prefix"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/submodule--helper.c:1239
|
2015-12-18 22:00:37 +01:00
|
|
|
#, c-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "'%s' is not a valid submodule--helper subcommand"
|
|
|
|
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#: builtin/symbolic-ref.c:7
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git symbolic-ref [<options>] <name> [<ref>]"
|
|
|
|
msgstr "git symbolic-ref [<options>] nom [<référence>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:8
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git symbolic-ref -d [-q] <name>"
|
|
|
|
msgstr "git symbolic-ref -d [-q] <nom>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:40
|
|
|
|
msgid "suppress error message for non-symbolic (detached) refs"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"supprimer le message d'erreur pour une référence non symbolique (détachée)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:41
|
|
|
|
msgid "delete symbolic ref"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer la référence symbolique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:42
|
|
|
|
msgid "shorten ref output"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "raccourcir l'affichage de la référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reason"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "raison"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "reason of the update"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "raison de la mise à jour"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/tag.c:23
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
|
2013-08-21 21:49:43 +02:00
|
|
|
"[<head>]"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-"
|
|
|
|
"étiquette> [<head>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/tag.c:24
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git tag -d <tagname>..."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git tag -d <nométiquette>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/tag.c:25
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2017-04-23 23:29:44 +02:00
|
|
|
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
|
|
|
|
"points-at <object>]\n"
|
2015-12-18 22:00:37 +01:00
|
|
|
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
msgstr ""
|
2017-05-05 11:55:14 +02:00
|
|
|
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
|
|
|
|
"points-at <objet>]\n"
|
2015-12-18 22:00:37 +01:00
|
|
|
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/tag.c:27
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "git tag -v [--format=<format>] <tagname>..."
|
|
|
|
msgstr "git tag -v [--format=<format>] <nométiquette>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:83
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "tag '%s' not found."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "étiquette '%s' non trouvée."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:99
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Deleted tag '%s' (was %s)\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:128
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"\n"
|
2014-08-05 19:23:50 +02:00
|
|
|
"Write a message for tag:\n"
|
|
|
|
" %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"Lines starting with '%c' will be ignored.\n"
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"\n"
|
2014-08-05 19:23:50 +02:00
|
|
|
"Écrivez un message pour l'étiquette :\n"
|
|
|
|
" %s\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"Les lignes commençant par '%c' seront ignorées.\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:132
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"\n"
|
2014-08-05 19:23:50 +02:00
|
|
|
"Write a message for tag:\n"
|
|
|
|
" %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"Lines starting with '%c' will be kept; you may remove them yourself if you "
|
|
|
|
"want to.\n"
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"\n"
|
2014-08-05 19:23:50 +02:00
|
|
|
"Écrivez un message pour l'étiquette :\n"
|
|
|
|
" %s\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
|
|
|
|
"même si vous le souhaitez.\n"
|
2014-08-05 19:23:50 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:210
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unable to sign the tag"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "impossible de signer l'étiquette"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:212
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unable to write tag file"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "impossible d'écrire le fichier d'étiquettes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:236
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "bad object type."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "mauvais type d'objet."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:282
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "no tag message?"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "pas de message pour l'étiquette ?"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:289
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "The tag message has been left in %s\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Le message pour l'étiquette a été laissé dans %s\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:397
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "list tag names"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher les noms des étiquettes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:399
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print <n> lines of each tag message"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "affiche <n> lignes de chaque message d'étiquette"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:401
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete tags"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer des étiquettes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:402
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "verify tags"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "vérifier des étiquettes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:404
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Tag creation options"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Options de création de l'étiquette"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:406
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "annotated tag, needs a message"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "étiquette annotée, nécessite un message"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:408
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "tag message"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "message pour l'étiquette"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:410
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "annotated and GPG-signed tag"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "étiquette annotée et signée avec GPG"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:414
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "use another key to sign the tag"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "utiliser une autre clé pour signer l'étiquette"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:415
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "replace the tag if exists"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "remplacer l'étiquette si elle existe"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:416 builtin/update-ref.c:368
|
2015-09-15 20:22:52 +02:00
|
|
|
msgid "create a reflog"
|
|
|
|
msgstr "créer un reflog"
|
2015-09-09 22:55:10 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:418
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "Tag listing options"
|
|
|
|
msgstr "Options d'affichage des étiquettes"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:419
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show tag list in columns"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher la liste des étiquettes sous forme de colonnes"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:420 builtin/tag.c:422
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print only tags that contain the commit"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher seulement les étiquettes qui contiennent la validation"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:421 builtin/tag.c:423
|
|
|
|
msgid "print only tags that don't contain the commit"
|
|
|
|
msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
|
|
|
|
|
|
|
|
#: builtin/tag.c:424
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "print only tags that are merged"
|
|
|
|
msgstr "afficher seulement les étiquettes qui sont fusionnées"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:425
|
2015-12-18 22:00:37 +01:00
|
|
|
msgid "print only tags that are not merged"
|
|
|
|
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:430
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print only tags of the object"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher seulement les étiquettes de l'objet"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:469
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "--column and -n are incompatible"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "--column et -n sont incompatibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:491
|
|
|
|
msgid "-n option is only allowed in list mode"
|
|
|
|
msgstr "l'option -n est autorisée seulement en mode de liste"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:493
|
|
|
|
msgid "--contains option is only allowed in list mode"
|
|
|
|
msgstr "l'option --contains est autorisée seulement en mode de liste"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:495
|
|
|
|
msgid "--no-contains option is only allowed in list mode"
|
|
|
|
msgstr "l'option --contains est autorisée seulement en mode liste"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:497
|
|
|
|
msgid "--points-at option is only allowed in list mode"
|
|
|
|
msgstr "l'option --points-at est autorisée seulement en mode liste"
|
2015-12-18 22:00:37 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:499
|
|
|
|
msgid "--merged and --no-merged options are only allowed in list mode"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"les options --merged et --no-merged ne sont autorisées qu'en mode liste"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: builtin/tag.c:510
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only one -F or -m option is allowed."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "une seule option -F ou -m est autorisée."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:529
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "too many params"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "trop de paramètres"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:535
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not a valid tag name."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "'%s' n'est pas un nom d'étiquette valide."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:540
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "tag '%s' already exists"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "l'étiquette '%s' existe déjà"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/tag.c:570
|
2013-07-01 22:19:04 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Updated tag '%s' (was %s)\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: builtin/unpack-objects.c:493
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Unpacking objects"
|
|
|
|
msgstr "Dépaquetage des objets"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/update-index.c:79
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to create directory %s"
|
|
|
|
msgstr "échec de la création du répertoire %s"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/update-index.c:85
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to stat %s"
|
|
|
|
msgstr "échec du stat de %s"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/update-index.c:95
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to create file %s"
|
|
|
|
msgstr "échec de la création du fichier %s"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#: builtin/update-index.c:103
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to delete file %s"
|
|
|
|
msgstr "échec de la suppression du fichier %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:110 builtin/update-index.c:216
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to delete directory %s"
|
|
|
|
msgstr "échec de la suppression du répertoire %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:135
|
2015-06-29 21:05:18 +02:00
|
|
|
#, c-format
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "Testing mtime in '%s' "
|
|
|
|
msgstr "Test du mtime dans '%s' "
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:149
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "directory stat info does not change after adding a new file"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"l'information de stat du répertoire ne change pas après ajout d'un fichier"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:162
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "directory stat info does not change after adding a new directory"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"l'information de stat du répertoire ne change pas après ajout d'un répertoire"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:175
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "directory stat info changes after updating a file"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"l'information de stat du répertoire change après mise à jour d'un fichier"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:186
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "directory stat info changes after adding a file inside subdirectory"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"l'information de stat du répertoire change après l'ajout d'un fichier dans "
|
|
|
|
"un sous-répertoire"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:197
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "directory stat info does not change after deleting a file"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"l'information de stat du répertoire ne change pas après la suppression d'un "
|
|
|
|
"fichier<"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:210
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "directory stat info does not change after deleting a directory"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"l'information de stat du répertoire ne change pas après la suppression d'un "
|
|
|
|
"répertoire"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:217
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid " OK"
|
|
|
|
msgstr " OK"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:568
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git update-index [<options>] [--] [<file>...]"
|
|
|
|
msgstr "git update-index [<options>] [--] [<fichier>...]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:923
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "continue refresh even when index needs update"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:926
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "refresh: ignore submodules"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "rafraîchir : ignorer les sous-modules"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:929
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "do not ignore new files"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ne pas ignorer les nouveaux fichiers"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:931
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "let files replace directories and vice-versa"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:933
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "notice files missing from worktree"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "aviser des fichiers manquants dans la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:935
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "refresh even if index contains unmerged entries"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:938
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "refresh stat information"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "rafraîchir l'information de stat"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:942
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "like --refresh, but ignore assume-unchanged setting"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:946
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "<mode>,<object>,<path>"
|
|
|
|
msgstr "<mode>, <objet>, <chemin>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:947
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add the specified entry to the index"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter l'élément spécifié dans l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:956
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "mark files as \"not changing\""
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "marquer les fichiers comme \"non changeants\""
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:959
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "clear assumed-unchanged bit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mettre à zéro le bit supposé-non-modifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:962
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "mark files as \"index-only\""
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "marquer les fichiers comme \"index seulement\""
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:965
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "clear skip-worktree bit"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:968
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add to index only; do not add content to object database"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
|
|
|
|
"données des objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:970
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "remove named paths even if present in worktree"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
|
|
|
|
"travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:972
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "with --stdin: input lines are terminated by null bytes"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:974
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "read list of paths to be updated from standard input"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:978
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "add entries from standard input to the index"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:982
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "repopulate stages #2 and #3 for the listed paths"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:986
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "only update entries that differ from HEAD"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:990
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "ignore files missing from worktree"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "ignorer les fichiers manquants dans la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:993
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "report actions to standard output"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher les actions sur la sortie standard"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:995
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "(for porcelains) forget saved unresolved conflicts"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:999
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "write index in this format"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "écrire l'index dans ce format"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:1001
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "enable or disable split index"
|
|
|
|
msgstr "activer ou désactiver l'index divisé"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:1003
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "enable/disable untracked cache"
|
2016-02-28 22:44:35 +01:00
|
|
|
msgstr "activer ou désactiver le cache de non-suivis"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:1005
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "test if the filesystem supports untracked cache"
|
|
|
|
msgstr "tester si le système de fichier supporte le cache de non-suivis"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:1007
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "enable untracked cache without testing the filesystem"
|
2016-02-28 22:44:35 +01:00
|
|
|
msgstr "activer le cache de non-suivis sans tester le système de fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:1107
|
|
|
|
msgid ""
|
|
|
|
"core.splitIndex is set to false; remove or change it, if you really want to "
|
|
|
|
"enable split index"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
|
|
|
|
"souhaitez vraiment activer l'index coupé"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: builtin/update-index.c:1116
|
|
|
|
msgid ""
|
|
|
|
"core.splitIndex is set to true; remove or change it, if you really want to "
|
|
|
|
"disable split index"
|
2017-05-05 11:55:14 +02:00
|
|
|
msgstr ""
|
|
|
|
"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
|
|
|
|
"souhaitez vraiment désactiver l'index coupé"
|
2017-04-23 23:29:44 +02:00
|
|
|
|
|
|
|
#: builtin/update-index.c:1127
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"core.untrackedCache is set to true; remove or change it, if you really want "
|
|
|
|
"to disable the untracked cache"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
|
|
|
|
"souhaitez vraiment désactiver le cache des fichiers non-suivis"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:1131
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "Untracked cache disabled"
|
|
|
|
msgstr "Le cache non suivi est désactivé"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:1139
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"core.untrackedCache is set to false; remove or change it, if you really want "
|
|
|
|
"to enable the untracked cache"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
|
|
|
|
"souhaitez vraiment activer le cache des fichiers non-suivis"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: builtin/update-index.c:1143
|
2016-02-28 22:44:35 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "Untracked cache enabled for '%s'"
|
|
|
|
msgstr "Le cache non suivi est activé pour '%s'"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/update-ref.c:9
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
|
|
|
|
msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/update-ref.c:10
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-"
|
|
|
|
"valeur>]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#: builtin/update-ref.c:11
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git update-ref [<options>] --stdin [-z]"
|
|
|
|
msgstr "git update-ref [<options>] --stdin [-z]"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/update-ref.c:363
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "delete the reference"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "supprimer la référence"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/update-ref.c:365
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "update <refname> not the one it points to"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/update-ref.c:366
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "stdin has NUL-terminated arguments"
|
|
|
|
msgstr "l'entrée standard a des arguments qui se terminent par NUL"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/update-ref.c:367
|
2013-11-01 15:35:08 +01:00
|
|
|
msgid "read updates from stdin"
|
|
|
|
msgstr "lire les mises à jour depuis l'entrée standard"
|
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#: builtin/update-server-info.c:6
|
|
|
|
msgid "git update-server-info [--force]"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git update-server-info [--force]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/update-server-info.c:14
|
|
|
|
msgid "update the info files from scratch"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "mettre à jour les fichiers d'information à partir de zéro"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-08-05 19:23:50 +02:00
|
|
|
#: builtin/verify-commit.c:17
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git verify-commit [-v | --verbose] <commit>..."
|
|
|
|
msgstr "git verify-commit [-v | --verbose] <commit>..."
|
2014-08-05 19:23:50 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: builtin/verify-commit.c:72
|
2014-08-05 19:23:50 +02:00
|
|
|
msgid "print commit contents"
|
|
|
|
msgstr "afficher le contenu du commit"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "print raw gpg status output"
|
|
|
|
msgstr "afficher les messages bruts de gpg"
|
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/verify-pack.c:54
|
2015-03-29 09:54:56 +02:00
|
|
|
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
|
|
|
|
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/verify-pack.c:64
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "verbose"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "verbeux"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#: builtin/verify-pack.c:66
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "show statistics only"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher seulement les statistiques"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/verify-tag.c:18
|
|
|
|
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
|
|
|
|
msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: builtin/verify-tag.c:36
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "print tag contents"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "afficher le contenu de l'étiquette"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/worktree.c:15
|
|
|
|
msgid "git worktree add [<options>] <path> [<branch>]"
|
|
|
|
msgstr "git worktree add [<options>] <chemin> [<branche>]"
|
2015-07-14 12:25:06 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/worktree.c:16
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "git worktree list [<options>]"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr "git worktree prune [<options>]"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: builtin/worktree.c:17
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "git worktree lock [<options>] <path>"
|
|
|
|
msgstr "git worktree lock [<options>] <chemin>"
|
|
|
|
|
|
|
|
#: builtin/worktree.c:18
|
|
|
|
msgid "git worktree prune [<options>]"
|
2015-12-18 22:00:37 +01:00
|
|
|
msgstr "git worktree prune [<options>]"
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/worktree.c:19
|
|
|
|
msgid "git worktree unlock <path>"
|
|
|
|
msgstr "git worktree unlock <chemin>"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:43
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing worktrees/%s: not a valid directory"
|
|
|
|
msgstr "Suppression de worktrees/%s : répertoire invalide"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:49
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing worktrees/%s: gitdir file does not exist"
|
|
|
|
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:54
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
|
|
|
msgstr ""
|
|
|
|
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:65
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing worktrees/%s: invalid gitdir file"
|
|
|
|
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:81
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
|
|
|
msgstr ""
|
|
|
|
"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
|
|
|
|
"inexistant"
|
|
|
|
|
2017-02-18 00:10:04 +01:00
|
|
|
#: builtin/worktree.c:128
|
|
|
|
msgid "report pruned working trees"
|
|
|
|
msgstr "afficher les arbres de travail éliminés"
|
|
|
|
|
|
|
|
#: builtin/worktree.c:130
|
|
|
|
msgid "expire working trees older than <time>"
|
|
|
|
msgstr "faire expirer les arbres de travail plus vieux que <temps>"
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: builtin/worktree.c:204
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' already exists"
|
|
|
|
msgstr "'%s' existe déjà"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:235
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "could not create directory of '%s'"
|
|
|
|
msgstr "impossible de créer le répertoire de '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:274
|
2015-07-14 12:25:06 +02:00
|
|
|
#, c-format
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Preparing %s (identifier %s)"
|
|
|
|
msgstr "Préparation de %s (identifiant %s)"
|
2015-07-14 12:25:06 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:328
|
2015-07-14 12:25:06 +02:00
|
|
|
msgid "checkout <branch> even if already checked out in other worktree"
|
2015-09-09 22:55:10 +02:00
|
|
|
msgstr ""
|
|
|
|
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
|
|
|
|
"travail"
|
2015-07-14 12:25:06 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:330
|
2015-07-14 12:25:06 +02:00
|
|
|
msgid "create a new branch"
|
|
|
|
msgstr "créer une nouvelle branche"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:332
|
2015-07-14 12:25:06 +02:00
|
|
|
msgid "create or reset a branch"
|
|
|
|
msgstr "créer ou réinitialiser une branche"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:334
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "populate the new working tree"
|
|
|
|
msgstr "remplissage de la nouvelle copie de travail"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:335
|
|
|
|
msgid "keep the new working tree locked"
|
|
|
|
msgstr "conserver le verrou sur le nouvel arbre de travail"
|
|
|
|
|
|
|
|
#: builtin/worktree.c:343
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "-b, -B, and --detach are mutually exclusive"
|
|
|
|
msgstr "-b, -B et --detach sont mutuellement exclusifs"
|
2015-07-14 12:25:06 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:478
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "reason for locking"
|
|
|
|
msgstr "raison du vérouillage"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:490 builtin/worktree.c:523
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not a working tree"
|
|
|
|
msgstr "'%s' n'est pas une copie de travail"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:492 builtin/worktree.c:525
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "The main working tree cannot be locked or unlocked"
|
|
|
|
msgstr ""
|
|
|
|
"La copie de travail principale ne peut pas être vérouillée ou dévérouillée"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:497
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is already locked, reason: %s"
|
|
|
|
msgstr "'%s' est déjà verrouillé, car '%s'"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:499
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is already locked"
|
|
|
|
msgstr "'%s' est déjà verrouillé"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: builtin/worktree.c:527
|
2016-08-20 16:20:17 +02:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not locked"
|
|
|
|
msgstr "'%s' n'est pas verrouillé"
|
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#: builtin/write-tree.c:13
|
|
|
|
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/write-tree.c:26
|
|
|
|
msgid "<prefix>/"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "<préfixe>/"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/write-tree.c:27
|
|
|
|
msgid "write tree object for a subdirectory <prefix>"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#: builtin/write-tree.c:30
|
|
|
|
msgid "only useful for debugging"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "seulement utile pour le débogage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: upload-pack.c:22
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "git upload-pack [<options>] <dir>"
|
|
|
|
msgstr "git upload-pack [<options>] <répertoire>"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: upload-pack.c:1040
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "quit after a single request/response exchange"
|
|
|
|
msgstr "quitter après un unique échange requête/réponse"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: upload-pack.c:1042
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "exit immediately after initial ref advertisement"
|
|
|
|
msgstr "Sortir immédiatement après l'annonce initiale des références"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: upload-pack.c:1044
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
|
|
|
|
msgstr ""
|
|
|
|
"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
|
|
|
|
"Git"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: upload-pack.c:1046
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "interrupt transfer after <n> seconds of inactivity"
|
|
|
|
msgstr "interrompre le transfer après <n> secondes d'inactivité"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: credential-cache--daemon.c:223
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The permissions on your socket directory are too loose; other\n"
|
|
|
|
"users may be able to read your cached credentials. Consider running:\n"
|
|
|
|
"\n"
|
|
|
|
"\tchmod 0700 %s"
|
|
|
|
msgstr ""
|
|
|
|
"Les permissions de votre répertoire de socket sont trop permissives ;\n"
|
|
|
|
"les autres utilisateurs pourraient lire vos identifiants secrets. Lancez :\n"
|
|
|
|
"\n"
|
|
|
|
" chmod 0700 %s"
|
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#: credential-cache--daemon.c:271
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "print debugging messages to stderr"
|
|
|
|
msgstr "afficher les messages de debug sur stderr"
|
|
|
|
|
2015-01-18 17:03:27 +01:00
|
|
|
#: git.c:14
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2014-11-01 16:29:19 +01:00
|
|
|
"'git help -a' and 'git help -g' list available subcommands and some\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
|
|
|
|
"to read about a specific subcommand or concept."
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"'git help -a' et 'git help -g' listent les sous-commandes disponibles et\n"
|
2014-11-01 16:29:19 +01:00
|
|
|
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: http.c:336
|
|
|
|
#, c-format
|
|
|
|
msgid "negative value for http.postbuffer; defaulting to %d"
|
|
|
|
msgstr "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
|
|
|
|
|
|
|
|
#: http.c:357
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Delegation control is not supported with cURL < 7.22.0"
|
|
|
|
msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: http.c:366
|
2016-02-28 22:44:35 +01:00
|
|
|
msgid "Public key pinning not supported with cURL < 7.44.0"
|
|
|
|
msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: http.c:1766
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"unable to update url base from redirection:\n"
|
|
|
|
" asked for: %s\n"
|
|
|
|
" redirect: %s"
|
|
|
|
msgstr ""
|
|
|
|
"impossible de mettre à jour la base de l'url depuis la redirection :\n"
|
|
|
|
" demandé : %s\n"
|
|
|
|
" redirection : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: remote-curl.c:323
|
2017-02-08 21:36:33 +01:00
|
|
|
#, c-format
|
|
|
|
msgid "redirecting to %s"
|
|
|
|
msgstr "redirection vers %s"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:9
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "start a working area (see also: git help tutorial)"
|
|
|
|
msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:10
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "work on the current change (see also: git help everyday)"
|
2015-07-14 12:25:06 +02:00
|
|
|
msgstr ""
|
|
|
|
"travailler sur la modification actuelle (voir aussi : git help revisions)"
|
2015-06-29 21:05:18 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:11
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "examine the history and state (see also: git help revisions)"
|
|
|
|
msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:12
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "grow, mark and tweak your common history"
|
|
|
|
msgstr "agrandir, marquer et modifier votre historique"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:13
|
2015-06-29 21:05:18 +02:00
|
|
|
msgid "collaborate (see also: git help workflows)"
|
|
|
|
msgstr "collaborer (voir aussi : git help workflows)"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:17
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Add file contents to the index"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "Ajouter le contenu de fichiers dans l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:18
|
|
|
|
msgid "Use binary search to find the commit that introduced a bug"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "Trouver par recherche binaire la modification qui a introduit un bogue"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:19
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "List, create, or delete branches"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Lister, créer ou supprimer des branches"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:20
|
2015-07-14 12:25:06 +02:00
|
|
|
msgid "Switch branches or restore working tree files"
|
|
|
|
msgstr "Basculer de branche ou restaurer la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:21
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Clone a repository into a new directory"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Cloner un dépôt dans un nouveau répertoire"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:22
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Record changes to the repository"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "Enregistrer les modifications dans le dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:23
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show changes between commits, commit and working tree, etc"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Afficher les changements entre les validations, entre validation et copie de "
|
|
|
|
"travail, etc"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:24
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Download objects and refs from another repository"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Télécharger les objets et références depuis un autre dépôt"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:25
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Print lines matching a pattern"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Afficher les lignes correspondant à un motif"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:26
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Create an empty Git repository or reinitialize an existing one"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Créer un dépôt Git vide ou réinitialiser un existant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:27
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show commit logs"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Afficher l'historique des validations"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:28
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Join two or more development histories together"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "Fusionner deux ou plusieurs historiques de développement ensemble"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:29
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Move or rename a file, a directory, or a symlink"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:30
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Fetch from and integrate with another repository or a local branch"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:31
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Update remote refs along with associated objects"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Mettre à jour les références distantes ainsi que les objets associés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:32
|
2016-03-14 20:26:53 +01:00
|
|
|
msgid "Reapply commits on top of another base tip"
|
|
|
|
msgstr "Réapplication des commits sur le sommet de l'autre base"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:33
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Reset current HEAD to the specified state"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Réinitialiser la HEAD courante à l'état spécifié"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:34
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Remove files from the working tree and from the index"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "Supprimer des fichiers de la copie de travail et de l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:35
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show various types of objects"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Afficher différents types d'objets"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:36
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Show the working tree status"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "Afficher l'état de la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: common-cmds.h:37
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Create, list, delete or verify a tag object signed with GPG"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: parse-options.h:145
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "expiry-date"
|
|
|
|
msgstr "date-d'expiration"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#: parse-options.h:160
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "no-op (backward compatibility)"
|
|
|
|
msgstr "sans action (rétrocompatibilité)"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: parse-options.h:238
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "be more verbose"
|
|
|
|
msgstr "être plus verbeux"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: parse-options.h:240
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "be more quiet"
|
|
|
|
msgstr "être plus silencieux"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: parse-options.h:246
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "use <n> digits to display SHA-1s"
|
|
|
|
msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
|
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#: rerere.h:40
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "update the index with reused conflict resolution if possible"
|
2014-11-20 03:53:48 +01:00
|
|
|
msgstr ""
|
|
|
|
"met à jour l'index avec les résolutions de conflit réutilisées si possible"
|
2014-11-01 16:29:19 +01:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:54
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You need to start by \"git bisect start\""
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Vous devez démarrer avec \"git bisect start\""
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
#. at this point.
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:60
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Do you want me to do it for you [Y/n]? "
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:121
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "unrecognised option: '$arg'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "option inconnue : '$arg'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:125
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "'$arg' does not appear to be a valid revision"
|
|
|
|
msgstr "'$arg' ne semble être une révision valide"
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:154
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Bad HEAD - I need a HEAD"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:167
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
2015-03-29 09:54:56 +02:00
|
|
|
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
|
2015-04-04 18:04:56 +02:00
|
|
|
msgstr ""
|
|
|
|
"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-"
|
|
|
|
"valide>'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:177
|
2014-01-18 14:36:19 +01:00
|
|
|
msgid "won't bisect on cg-seek'ed tree"
|
|
|
|
msgstr "refus de bissecter sur un arbre 'cg-seeked'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:181
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Bad HEAD - strange symbolic ref"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Mauvaise HEAD - référence symbolique douteuse"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:233
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Bad bisect_write argument: $state"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Mauvais argument pour bisect_write : $state"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:262
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Bad rev input: $arg"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Mauvaise révision en entrée : $arg"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-bisect.sh:281
|
|
|
|
#, sh-format
|
|
|
|
msgid "Bad rev input: $bisected_head"
|
|
|
|
msgstr "Mauvaise révision en entrée : $bisected_head"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:290
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Bad rev input: $rev"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Mauvaise révision en entrée : $rev"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:299
|
2015-09-09 22:55:10 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "'git bisect $TERM_BAD' can take only one argument."
|
|
|
|
msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument."
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:322
|
2015-09-09 22:55:10 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Warning: bisecting only with a $TERM_BAD commit."
|
|
|
|
msgstr "Attention : bissection avec seulement une validation $TERM_BAD."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
#. at this point.
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:328
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Are you sure [Y/n]? "
|
2016-12-16 16:56:31 +01:00
|
|
|
msgstr "Confirmez-vous [Y/n] ? "
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:340
|
2015-09-09 22:55:10 +02:00
|
|
|
#, sh-format
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
2015-09-09 22:55:10 +02:00
|
|
|
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
|
|
|
|
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
|
2013-07-01 22:19:04 +02:00
|
|
|
msgstr ""
|
2015-09-15 20:22:52 +02:00
|
|
|
"Vous devez me donner au moins une révision $bad_syn et une révision "
|
|
|
|
"$good_syn.\n"
|
|
|
|
"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" "
|
|
|
|
"pour cela.)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:343
|
2015-09-09 22:55:10 +02:00
|
|
|
#, sh-format
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"You need to start by \"git bisect start\".\n"
|
2015-09-09 22:55:10 +02:00
|
|
|
"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
|
|
|
|
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
|
2013-07-01 22:19:04 +02:00
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"Vous devez démarrer avec \"git bisect start\".\n"
|
2015-09-15 20:22:52 +02:00
|
|
|
"Puis vous devez me donner au moins une révision $good_syn et une révision "
|
|
|
|
"$bad_syn.\n"
|
|
|
|
"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" "
|
|
|
|
"pour cela.)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:414 git-bisect.sh:546
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "We are not bisecting."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Pas de bissection en cours."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:421
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "'$invalid' is not a valid commit"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "'$invalid' n'est pas une validation valide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:430
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Could not check out original HEAD '$branch'.\n"
|
|
|
|
"Try 'git bisect reset <commit>'."
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"Échec d'extraction de la HEAD d'origine '$branch'.\n"
|
|
|
|
"Essayez 'git bisect reset <commit>'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:458
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No logfile given"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Pas de fichier de log donné"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:459
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "cannot read $file for replaying"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "impossible de lire $file pour rejouer"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:480
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "?? what are you talking about?"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "?? de quoi parlez-vous ?"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:492
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "running $command"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "lancement de $command"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:499
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"bisect run failed:\n"
|
|
|
|
"exit code $res from '$command' is < 0 or >= 128"
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"la bissection a échoué :\n"
|
|
|
|
"le code retour $res de '$command' est < 0 ou >= 128"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:525
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "bisect run cannot continue any more"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "la bissection ne peut plus continuer"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:531
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"bisect run failed:\n"
|
|
|
|
"'bisect_state $state' exited with error code $res"
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"la bissection a échoué :\n"
|
|
|
|
"'bisect_state $state' a retourné le code erreur $res"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:538
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "bisect run success"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "succès de la bissection"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#: git-bisect.sh:565
|
|
|
|
msgid "please use two different terms"
|
|
|
|
msgstr "veuillez utiliser deux termes différents"
|
|
|
|
|
|
|
|
#: git-bisect.sh:575
|
|
|
|
#, sh-format
|
|
|
|
msgid "'$term' is not a valid term"
|
|
|
|
msgstr "'$term' n'est pas un terme valide"
|
|
|
|
|
|
|
|
#: git-bisect.sh:578
|
|
|
|
#, sh-format
|
|
|
|
msgid "can't use the builtin command '$term' as a term"
|
|
|
|
msgstr "impossible d'utiliser la commande incluse '$term' comme terme"
|
|
|
|
|
|
|
|
#: git-bisect.sh:587 git-bisect.sh:593
|
|
|
|
#, sh-format
|
|
|
|
msgid "can't change the meaning of term '$term'"
|
|
|
|
msgstr "impossible de modifier la signification du terme '$term'"
|
|
|
|
|
|
|
|
#: git-bisect.sh:606
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2015-09-09 22:55:10 +02:00
|
|
|
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
|
2015-12-24 07:38:22 +01:00
|
|
|
msgstr ""
|
|
|
|
"Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/"
|
|
|
|
"$TERM_GOOD."
|
2015-12-18 22:00:37 +01:00
|
|
|
|
|
|
|
#: git-bisect.sh:636
|
|
|
|
msgid "no terms defined"
|
|
|
|
msgstr "aucun terme défini"
|
|
|
|
|
|
|
|
#: git-bisect.sh:653
|
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"invalid argument $arg for 'git bisect terms'.\n"
|
|
|
|
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
|
2015-09-15 20:22:52 +02:00
|
|
|
msgstr ""
|
2015-12-18 22:00:37 +01:00
|
|
|
"argument invalide $arg pour 'git bisect terms'.\n"
|
2015-12-24 07:38:22 +01:00
|
|
|
"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
|
|
|
|
"new."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-merge-octopus.sh:46
|
|
|
|
msgid ""
|
|
|
|
"Error: Your local changes to the following files would be overwritten by "
|
|
|
|
"merge"
|
|
|
|
msgstr ""
|
|
|
|
"Erreur : vos modifications locales aux fichiers suivants seraient écrasées "
|
|
|
|
"par la fusion"
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:61
|
|
|
|
msgid "Automated merge did not work."
|
|
|
|
msgstr "La fusion automatique a échoué."
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:62
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Should not be doing an octopus."
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr "L'Octopus ne devrait pas arriver."
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:73
|
|
|
|
#, sh-format
|
|
|
|
msgid "Unable to find common commit with $pretty_name"
|
|
|
|
msgstr "Impossible de trouver un commit commun avec $pretty_name"
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:77
|
|
|
|
#, sh-format
|
|
|
|
msgid "Already up-to-date with $pretty_name"
|
|
|
|
msgstr "Déjà à jour avec $pretty_name"
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:89
|
|
|
|
#, sh-format
|
|
|
|
msgid "Fast-forwarding to: $pretty_name"
|
|
|
|
msgstr "Mise à jour en avance rapide sur $pretty_name"
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:97
|
|
|
|
#, sh-format
|
|
|
|
msgid "Trying simple merge with $pretty_name"
|
|
|
|
msgstr "Essai de fusion simple avec $pretty_name"
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:102
|
|
|
|
msgid "Simple merge did not work, trying automatic merge."
|
|
|
|
msgstr "La fusion simple a échoué, essai avec la fusion automatique."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:58
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"When you have resolved this problem, run \"git rebase --continue\".\n"
|
|
|
|
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
|
|
|
|
"To check out the original branch and stop rebasing, run \"git rebase --abort"
|
|
|
|
"\"."
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"Lorsque vous aurez résolu ce problème, lancez \"git rebase --continue\".\n"
|
|
|
|
"Si vous préférez sauter ce patch, lancez \"git rebase --skip\" à la place.\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
|
|
|
|
"rebase --abort\"."
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:158 git-rebase.sh:397
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Could not move back to $head_name"
|
|
|
|
msgstr "Impossible de revenir à $head_name"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:172
|
2013-08-21 21:49:43 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot store $stash_sha1"
|
|
|
|
msgstr "Impossible de stocker $stash_sha1"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:212
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "The pre-rebase hook refused to rebase."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Le crochet pre-rebase a refusé de rebaser."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:217
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "It looks like git-am is in progress. Cannot rebase."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:358
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No rebase in progress?"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Pas de rebasage en cours ?"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:369
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "The --edit-todo action can only be used during interactive rebase."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
|
|
|
|
"interactif."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:376
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot read HEAD"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de lire HEAD"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:379
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid ""
|
|
|
|
"You must edit all merge conflicts and then\n"
|
|
|
|
"mark them as resolved using git add"
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"Vous devez éditer tous les conflits de fusion et\n"
|
|
|
|
"les marquer comme résolus avec git add"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:419
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"It seems that there is already a $state_dir_base directory, and\n"
|
|
|
|
"I wonder if you are in the middle of another rebase. If that is the\n"
|
|
|
|
"case, please try\n"
|
|
|
|
"\t$cmd_live_rebase\n"
|
|
|
|
"If that is not the case, please\n"
|
|
|
|
"\t$cmd_clear_stale_rebase\n"
|
|
|
|
"and run me again. I am stopping in case you still have something\n"
|
|
|
|
"valuable there."
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"Il semble qu'il y ait déjà un répertoire $state_dir_base, et je me demande\n"
|
2013-11-01 15:35:08 +01:00
|
|
|
"si un autre rebasage n'est pas déjà en cours. Si c'est le cas,\n"
|
|
|
|
"essayez\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"\t$cmd_live_rebase\n"
|
2013-11-01 15:35:08 +01:00
|
|
|
"Sinon, essayez\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"\t$cmd_clear_stale_rebase\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
"puis relancez-moi à nouveau. Je m'arrête au cas où vous auriez quelque "
|
|
|
|
"chose\n"
|
2013-08-25 11:45:13 +02:00
|
|
|
"d'important ici."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:470
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "invalid upstream $upstream_name"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "invalide $upstream_name en amont"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:494
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "$onto_name: there are more than one merge bases"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "$onto_name : il y a plus d'une base de fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:497 git-rebase.sh:501
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "$onto_name: there is no merge base"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "$onto_name : il n'y a pas de base de fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:506
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Does not point to a valid commit: $onto_name"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Ne pointe pas sur une validation valide : $onto_name"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:529
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "fatal: no such branch: $branch_name"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "fatal : pas de branche : $branch_name"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:562
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Cannot autostash"
|
|
|
|
msgstr "Autoremisage impossible"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:567
|
2013-08-21 21:49:43 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Created autostash: $stash_abbrev"
|
|
|
|
msgstr "Autoremisage créé : $stash_abbrev"
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:571
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Please commit or stash them."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "Veuillez les valider ou les remiser."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:591
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Current branch $branch_name is up to date."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "La branche courante $branch_name est à jour."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:595
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Current branch $branch_name is up to date, rebase forced."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:606
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Changes from $mb to $onto:"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Changements de $mb sur $onto :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:615
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "First, rewinding head to replay your work on top of it..."
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr ""
|
|
|
|
"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#: git-rebase.sh:625
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Fast-forwarded $branch_name to $onto_name."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:53
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "git stash clear with parameters is unimplemented"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "git stash clear avec des paramètres n'est pas implémenté"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:94
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "You do not have the initial commit yet"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Vous n'avez pas encore la validation initiale"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:109
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot save the current index state"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de sauver l'état courant de l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:124
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Cannot save the untracked files"
|
|
|
|
msgstr "Impossible de sauver les fichiers non-suivis"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:144 git-stash.sh:157
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot save the current worktree state"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de sauver l'état courant de la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:161
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No changes selected"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Aucun changement sélectionné"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:164
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot remove temporary index (can't happen)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:177
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot record working tree state"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible d'enregistrer l'état de la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:209
|
2013-08-21 21:49:43 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot update $ref_stash with $w_commit"
|
|
|
|
msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
|
|
|
|
|
2013-07-01 22:19:04 +02:00
|
|
|
#. TRANSLATORS: $option is an invalid option, like
|
|
|
|
#. `--blah-blah'. The 7 spaces at the beginning of the
|
|
|
|
#. second line correspond to "error: ". So you should line
|
|
|
|
#. up the second line with however many characters the
|
|
|
|
#. translation of "error: " takes in your language. E.g. in
|
|
|
|
#. English this is:
|
|
|
|
#.
|
|
|
|
#. $ git stash save --blah-blah 2>&1 | head -n 2
|
|
|
|
#. error: unknown option for 'stash save': --blah-blah
|
|
|
|
#. To provide a message, use git stash save -- '--blah-blah'
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:265
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"error: unknown option for 'stash save': $option\n"
|
|
|
|
" To provide a message, use git stash save -- '$option'"
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"erreur: option inconnue pour 'stash save': $option\n"
|
|
|
|
" Pour fournir un message, utilisez git stash save -- '$option'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:278
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Can't use --patch and --include-untracked or --all at the same time"
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
|
2016-11-05 21:43:53 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:286
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No local changes to save"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "Pas de modifications locales à sauver"
|
2013-08-21 21:49:43 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:291
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot initialize stash"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible d'initialiser le remisage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:295
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot save the current status"
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "Impossible de sauver l'état courant"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:296
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Saved working directory and index state $stash_msg"
|
|
|
|
msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:323
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot remove worktree changes"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de supprimer les changements de la copie de travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:471
|
2015-06-29 21:05:18 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "unknown option: $opt"
|
|
|
|
msgstr "option inconnue : $opt"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:484
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No stash found."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Pas de remisage trouvé."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:491
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Too many revisions specified: $REV"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Trop de révisions spécifiées : $REV"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:506
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2014-11-01 16:29:19 +01:00
|
|
|
msgid "$reference is not a valid reference"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "$reference n'est pas une référence valide"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:534
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "'$args' is not a stash-like commit"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "'$args' n'est pas une validation de type remisage"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:545
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "'$args' is not a stash reference"
|
|
|
|
msgstr "'$args' n'est pas une référence de remisage"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:553
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "unable to refresh index"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "impossible de rafraîchir l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:557
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot apply a stash in the middle of a merge"
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "Impossible d'appliquer un remisage en cours de fusion"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:565
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Conflicts in index. Try without --index."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Conflits dans l'index. Essayez sans --index."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:567
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Could not save index tree"
|
2014-05-06 23:29:57 +02:00
|
|
|
msgstr "Impossible de sauvegarder l'arbre d'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:576
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid "Could not restore untracked files from stash"
|
|
|
|
msgstr "Impossible de restaurer les fichiers non-suivis depuis le remisage"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:601
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Cannot unstage modified files"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de désindexer les fichiers modifiés"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:616
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "Index was not unstashed."
|
2013-11-01 15:35:08 +01:00
|
|
|
msgstr "L'index n'a pas été sorti de remise."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:630
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "The stash is kept in case you need it again."
|
|
|
|
msgstr "Le remisage est conservé au cas où vous en auriez encore besoin."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:639
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Dropped ${REV} ($s)"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "${REV} supprimé ($s)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:640
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "${REV}: Could not drop stash entry"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr "${REV}: Impossible de supprimer l'élément de stash"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:648
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "No branch name specified"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Aucune branche spécifiée"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-stash.sh:727
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "(To restore them type \"git stash apply\")"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "(Pour les restaurer tapez \"git stash apply\")"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:181
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Relative path can only be used from the toplevel of the working tree"
|
|
|
|
msgstr ""
|
|
|
|
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
|
|
|
|
"travail"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:191
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:210
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "'$sm_path' already exists in the index"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "'$sm_path' existe déjà dans l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:213
|
|
|
|
#, sh-format
|
|
|
|
msgid "'$sm_path' already exists in the index and is not a submodule"
|
|
|
|
msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
|
|
|
|
|
|
|
|
#: git-submodule.sh:218
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"The following path is ignored by one of your .gitignore files:\n"
|
|
|
|
"$sm_path\n"
|
|
|
|
"Use -f if you really want to add it."
|
|
|
|
msgstr ""
|
2013-08-25 11:45:13 +02:00
|
|
|
"Le chemin suivant est ignoré par un de vos fichiers .gitignore :\n"
|
|
|
|
"$sm_path\n"
|
|
|
|
"Utilisez -f si vous voulez vraiment l'ajouter."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:236
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Adding existing repo at '$sm_path' to the index"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:238
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "'$sm_path' already exists and is not a valid git repo"
|
|
|
|
msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:246
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "A git directory for '$sm_name' is found locally with remote(s):"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
|
|
|
|
"distant(s) :"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:248
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
2016-08-20 16:20:17 +02:00
|
|
|
"If you want to reuse this local git directory instead of cloning again from\n"
|
|
|
|
" $realrepo\n"
|
|
|
|
"use the '--force' option. If the local git directory is not the correct "
|
|
|
|
"repo\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"or you are unsure what this means choose another name with the '--name' "
|
|
|
|
"option."
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-08-20 16:20:17 +02:00
|
|
|
"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner "
|
|
|
|
"depuis\n"
|
|
|
|
" $realrepo\n"
|
|
|
|
"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
|
|
|
|
"correct\n"
|
|
|
|
"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:254
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Reactivating local git directory for submodule '$sm_name'."
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:266
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Unable to checkout submodule '$sm_path'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible d'extraire le sous-module '$sm_path'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:271
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Failed to add submodule '$sm_path'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Échec d'ajout du sous-module '$sm_path'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-submodule.sh:280
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Failed to register submodule '$sm_path'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:341
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Entering '$displaypath'"
|
|
|
|
msgstr "Entrée dans '$displaypath'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:361
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Stopping at '$displaypath'; script returned non-zero status."
|
2017-05-17 22:26:19 +02:00
|
|
|
msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul."
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:432
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "pathspec and --all are incompatible"
|
|
|
|
msgstr "un spécificateur de chemin et --all sont incompatibles"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:437
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Use '--all' if you really want to deinitialize all submodules"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-08-20 16:20:17 +02:00
|
|
|
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:457
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
2016-08-20 16:20:17 +02:00
|
|
|
"Submodule work tree '$displaypath' contains a .git directory\n"
|
2013-07-01 22:19:04 +02:00
|
|
|
"(use 'rm -rf' if you really want to remove it including all of its history)"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
2016-08-20 16:20:17 +02:00
|
|
|
"La copie de travail du sous-module '$displaypath' contient un répertoire ."
|
|
|
|
"git\n"
|
2013-08-21 21:49:43 +02:00
|
|
|
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
|
|
|
|
"historique)"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:465
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
2013-08-21 21:49:43 +02:00
|
|
|
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
|
2013-07-01 22:19:04 +02:00
|
|
|
"discard them"
|
2013-08-21 21:49:43 +02:00
|
|
|
msgstr ""
|
|
|
|
"La copie de travail du sous-module '$displaypath' contient des modifications "
|
|
|
|
"locales ; utilisez '-f' pour les annuler"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:468
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Cleared directory '$displaypath'"
|
|
|
|
msgstr "Répertoire '$displaypath' nettoyé"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:469
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Could not remove submodule work tree '$displaypath'"
|
|
|
|
msgstr ""
|
|
|
|
"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:472
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Could not create empty submodule directory '$displaypath'"
|
|
|
|
msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:481
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
|
|
|
|
msgstr ""
|
|
|
|
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
|
|
|
|
"'$displaypath'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:637
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Unable to find current revision in submodule path '$displaypath'"
|
|
|
|
msgstr ""
|
|
|
|
"Impossible de trouver la révision courante dans le chemin de sous-module "
|
|
|
|
"'$displaypath'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:647
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Unable to fetch in submodule path '$sm_path'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:652
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Unable to find current ${remote_name}/${branch} revision in submodule path "
|
|
|
|
"'$sm_path'"
|
|
|
|
msgstr ""
|
|
|
|
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
|
|
|
|
"chemin de sous-module '$sm_path'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:670
|
2013-08-21 21:49:43 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Unable to fetch in submodule path '$displaypath'"
|
|
|
|
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:676
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
|
|
|
|
"Direct fetching of that commit failed."
|
|
|
|
msgstr ""
|
|
|
|
"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
|
|
|
|
"$sha1. La récupération directe de ce commit a échoué."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:683
|
2014-02-26 21:27:14 +01:00
|
|
|
#, sh-format
|
|
|
|
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
|
|
|
|
msgstr ""
|
|
|
|
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:684
|
2013-08-21 21:49:43 +02:00
|
|
|
#, sh-format
|
2014-02-26 21:27:14 +01:00
|
|
|
msgid "Submodule path '$displaypath': checked out '$sha1'"
|
|
|
|
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:688
|
2014-02-26 21:27:14 +01:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
|
|
|
|
msgstr ""
|
|
|
|
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:689
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Submodule path '$displaypath': rebased into '$sha1'"
|
|
|
|
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:694
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
|
|
|
|
msgstr ""
|
|
|
|
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:695
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Submodule path '$displaypath': merged in '$sha1'"
|
|
|
|
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:700
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
|
2016-08-20 16:20:17 +02:00
|
|
|
msgstr ""
|
|
|
|
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
|
|
|
|
"'$displaypath'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:701
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2016-05-26 22:46:41 +02:00
|
|
|
msgid "Submodule path '$displaypath': '$command $sha1'"
|
|
|
|
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:732
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Failed to recurse into submodule path '$displaypath'"
|
|
|
|
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:840
|
2013-07-01 22:19:04 +02:00
|
|
|
msgid "The --cached option cannot be used with the --files option"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:892
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "unexpected mode $mod_dst"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "mode $mod_dst inattendu"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:912
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid " Warn: $display_name doesn't contain commit $sha1_src"
|
|
|
|
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:915
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
|
|
|
|
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:918
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
|
|
|
|
msgstr ""
|
|
|
|
" Attention : $display_name ne contient pas les validations $sha1_src et "
|
|
|
|
"$sha1_dst"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:1064
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Failed to recurse into submodule path '$sm_path'"
|
2013-08-25 11:45:13 +02:00
|
|
|
msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
|
2013-07-01 22:19:04 +02:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-submodule.sh:1136
|
2013-07-01 22:19:04 +02:00
|
|
|
#, sh-format
|
2013-08-21 21:49:43 +02:00
|
|
|
msgid "Synchronizing submodule url for '$displaypath'"
|
|
|
|
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
|
2013-11-01 15:35:08 +01:00
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#: git-parse-remote.sh:89
|
|
|
|
#, sh-format
|
|
|
|
msgid "See git-${cmd}(1) for details."
|
|
|
|
msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:140
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Rebasing ($new_count/$total)"
|
|
|
|
msgstr "Rebasage ($new_count/$total)"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:156
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"Commands:\n"
|
|
|
|
" p, pick = use commit\n"
|
|
|
|
" r, reword = use commit, but edit the commit message\n"
|
|
|
|
" e, edit = use commit, but stop for amending\n"
|
|
|
|
" s, squash = use commit, but meld into previous commit\n"
|
|
|
|
" f, fixup = like \"squash\", but discard this commit's log message\n"
|
|
|
|
" x, exec = run command (the rest of the line) using shell\n"
|
|
|
|
" d, drop = remove commit\n"
|
|
|
|
"\n"
|
|
|
|
"These lines can be re-ordered; they are executed from top to bottom.\n"
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Commandes :\n"
|
|
|
|
" p, pick = picorer le commit\n"
|
|
|
|
" r, reword = picorer le commit, mais reformuler son message\n"
|
|
|
|
" e, edit = picorer le commit, mais s'arrêter pour le modifier\n"
|
|
|
|
" s, squash = prendre le commit, mais le fusionner avec le précédent\n"
|
|
|
|
" f, fixup = comme \"squash\", mais en éliminant son message\n"
|
|
|
|
" x, exec = lancer la commande (reste de la ligne) dans un shell\n"
|
|
|
|
" d, drop = supprimer le commit\n"
|
|
|
|
"\n"
|
|
|
|
"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:171
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
|
|
|
|
"commit.\n"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:175
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:211
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"You can amend the commit now, with\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
"\n"
|
|
|
|
"Once you are satisfied with your changes, run\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
msgstr ""
|
|
|
|
"Vous pouvez corriger le commit maintenant, avec\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
"\n"
|
|
|
|
"après avoir réalisé vos modifications, lancez\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:236
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "$sha1: not a commit that can be picked"
|
|
|
|
msgstr "$sha1 n'est pas un commit qui peut être picorer"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:275
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Invalid commit name: $sha1"
|
|
|
|
msgstr "Nom de commit invalide : $sha1"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:317
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Cannot write current commit's replacement sha1"
|
|
|
|
msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:369
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Fast-forward to $sha1"
|
|
|
|
msgstr "Avance rapide sur $sha1"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:371
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot fast-forward to $sha1"
|
|
|
|
msgstr "Avance rapide impossible sur $sha1"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:380
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot move HEAD to $first_parent"
|
|
|
|
msgstr "Impossible de déplacer HEAD sur $first_parent"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:385
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Refusing to squash a merge: $sha1"
|
|
|
|
msgstr "Refus d'écraser un commit de fusion: $sha1"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:399
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Error redoing merge $sha1"
|
|
|
|
msgstr "Erreur lors de la réapplication de la fusion $sha1"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:407
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Could not pick $sha1"
|
|
|
|
msgstr "Impossible de picorer $sha1"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:416
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "This is the commit message #${n}:"
|
|
|
|
msgstr "Ceci est le ${n}ième message de validation :"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:421
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "The commit message #${n} will be skipped:"
|
|
|
|
msgstr "Le message de validation ${n} sera ignoré :"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:432
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "This is a combination of $count commit."
|
|
|
|
msgid_plural "This is a combination of $count commits."
|
|
|
|
msgstr[0] "Ceci est la combinaison de $count commit."
|
|
|
|
msgstr[1] "Ceci est la combinaison de $count commits."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:441
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot write $fixup_msg"
|
|
|
|
msgstr "Impossible d'écrire $fixup_msg"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:444
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "This is a combination of 2 commits."
|
|
|
|
msgstr "Ceci est la combinaison de 2 commits."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
|
|
|
|
#: git-rebase--interactive.sh:531
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Could not apply $sha1... $rest"
|
|
|
|
msgstr "Impossible d'appliquer $sha1... $rest"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:559
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Could not amend commit after successfully picking $sha1... $rest\n"
|
|
|
|
"This is most likely due to an empty commit message, or the pre-commit hook\n"
|
|
|
|
"failed. If the pre-commit hook failed, you may need to resolve the issue "
|
|
|
|
"before\n"
|
|
|
|
"you are able to reword the commit."
|
|
|
|
msgstr ""
|
2016-11-22 15:24:59 +01:00
|
|
|
"Impossible de corriger le commit après avoir réussi à picorer $sha1... "
|
|
|
|
"$rest\n"
|
|
|
|
"C'est probablement dû à un message de validation vide ou le crochet pre-"
|
|
|
|
"commit\n"
|
|
|
|
"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre "
|
|
|
|
"le\n"
|
2016-08-20 16:20:17 +02:00
|
|
|
"problème avant de pouvoir reformuler le message du commit."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:574
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Stopped at $sha1_abbrev... $rest"
|
|
|
|
msgstr "Arrêté à $sha1_abbrev... $rest"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:589
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot '$squash_style' without a previous commit"
|
|
|
|
msgstr "'$squash_style' impossible avec le commit précédent"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:631
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Executing: $rest"
|
|
|
|
msgstr "Exécution : $rest"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:639
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Execution failed: $rest"
|
|
|
|
msgstr "L'exécution a échoué : $rest"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:641
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "and made changes to the index and/or the working tree"
|
|
|
|
msgstr "et a mis à jour l'index ou la copie de travail"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:643
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"You can fix the problem, and then run\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
msgstr ""
|
|
|
|
"Vous pouvez corriger le problème, puis lancer\n"
|
|
|
|
"\n"
|
|
|
|
"git rebase --continue"
|
|
|
|
|
|
|
|
#. TRANSLATORS: after these lines is a command to be issued by the user
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:656
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Execution succeeded: $rest\n"
|
|
|
|
"but left changes to the index and/or the working tree\n"
|
|
|
|
"Commit or stash your changes, and then run\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
msgstr ""
|
|
|
|
"L'exécution a réussi : $rest\n"
|
|
|
|
"mais a laissé des modifications dans l'index ou la copie de travail\n"
|
|
|
|
"Validez ou remisez vos modification, puis lancez\n"
|
|
|
|
"\n"
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:667
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Unknown command: $command $sha1 $rest"
|
|
|
|
msgstr "Commande inconnue : $command $sha1 $rest"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:668
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Please fix this using 'git rebase --edit-todo'."
|
|
|
|
msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:703
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Successfully rebased and updated $head_name."
|
|
|
|
msgstr "Rebasage et mise à jour de $head_name avec succès."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:750
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Could not skip unnecessary pick commands"
|
|
|
|
msgstr "Impossible d'éviter les commandes de picorage non nécessaires"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:908
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
|
|
|
|
" - $line"
|
|
|
|
msgstr ""
|
|
|
|
"Attention : le SHA-1 manque ou n'est pas un commit dans la ligne suivante :\n"
|
|
|
|
" - $line"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:941
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Warning: the command isn't recognized in the following line:\n"
|
|
|
|
" - $line"
|
|
|
|
msgstr ""
|
|
|
|
"Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
|
|
|
|
" - $line"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:980
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "could not detach HEAD"
|
|
|
|
msgstr "Impossible de détacher HEAD"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:1018
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"Warning: some commits may have been dropped accidentally.\n"
|
|
|
|
"Dropped commits (newer to older):"
|
|
|
|
msgstr ""
|
|
|
|
"Attention : certains commits ont pu être accidentellement supprimés.\n"
|
|
|
|
"Commits supprimés (du plus jeune au plus vieux) :"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:1026
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
|
|
|
|
"\n"
|
|
|
|
"Use 'git config rebase.missingCommitsCheck' to change the level of "
|
|
|
|
"warnings.\n"
|
|
|
|
"The possible behaviours are: ignore, warn, error."
|
|
|
|
msgstr ""
|
|
|
|
"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
|
|
|
|
"commit.\n"
|
|
|
|
"\n"
|
|
|
|
"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
|
|
|
|
"d'avertissements.\n"
|
|
|
|
"Les comportements disponibles sont : ignore, warn, error."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:1037
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
|
|
|
|
"Ignoring."
|
|
|
|
msgstr ""
|
|
|
|
"Paramètre non reconnu $check_level pour l'option rebase.missingCommitsCheck. "
|
|
|
|
"Ignoré."
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:1054
|
2016-11-05 21:43:53 +01:00
|
|
|
msgid ""
|
|
|
|
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
|
|
|
"continue'."
|
2016-11-22 15:24:59 +01:00
|
|
|
msgstr ""
|
|
|
|
"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
|
|
|
|
"rebase --continue'."
|
2016-08-20 16:20:17 +02:00
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#: git-rebase--interactive.sh:1055
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Or you can abort the rebase with 'git rebase --abort'."
|
|
|
|
msgstr "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1083
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Could not remove CHERRY_PICK_HEAD"
|
|
|
|
msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1088
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"You have staged changes in your working tree.\n"
|
|
|
|
"If these changes are meant to be\n"
|
|
|
|
"squashed into the previous commit, run:\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
"\n"
|
|
|
|
"If they are meant to go into a new commit, run:\n"
|
|
|
|
"\n"
|
|
|
|
" git commit $gpg_sign_opt_quoted\n"
|
|
|
|
"\n"
|
2016-11-05 21:43:53 +01:00
|
|
|
"In both cases, once you're done, continue with:\n"
|
2016-08-20 16:20:17 +02:00
|
|
|
"\n"
|
|
|
|
" git rebase --continue\n"
|
|
|
|
msgstr ""
|
|
|
|
"Vous avez des modifications indexées dans votre copie de travail.\n"
|
|
|
|
"Si ces modifications devaient être ajoutées\n"
|
|
|
|
"dans le commit précédent, lancez :\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
"\n"
|
|
|
|
"Si elles devaient aller dans un nouveau commit, lancez :\n"
|
|
|
|
"\n"
|
|
|
|
" git commit $gpg_sign_opt_quoted\n"
|
|
|
|
"\n"
|
|
|
|
"Dans les deux cas, une fois fini, continuez avec :\n"
|
|
|
|
"\n"
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1105
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Error trying to find the author identity to amend commit"
|
|
|
|
msgstr ""
|
|
|
|
"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1110
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"You have uncommitted changes in your working tree. Please commit them\n"
|
|
|
|
"first and then run 'git rebase --continue' again."
|
|
|
|
msgstr ""
|
|
|
|
"Vous avez des modifications non validées dans votre copie de travail.\n"
|
|
|
|
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Could not commit staged changes."
|
|
|
|
msgstr "impossible de valider les modifications indexées."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1147
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"You are editing the todo file of an ongoing interactive rebase.\n"
|
|
|
|
"To continue rebase after editing, run:\n"
|
|
|
|
" git rebase --continue\n"
|
|
|
|
"\n"
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en "
|
|
|
|
"cours.\n"
|
|
|
|
"Pour continuer le rebasage après édition, lancez :\n"
|
|
|
|
" git rebase --continue\n"
|
|
|
|
"\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Could not execute editor"
|
|
|
|
msgstr "Impossible de lancer l'éditeur"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1168
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Could not checkout $switch_to"
|
|
|
|
msgstr "Impossible d'extraire $switch_to"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1173
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "No HEAD?"
|
|
|
|
msgstr "Pas de HEAD ?"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1174
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Could not create temporary $state_dir"
|
|
|
|
msgstr "Impossible de créer un répertoire temporaire $state_dir"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1176
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Could not mark as interactive"
|
|
|
|
msgstr "Impossible de marquer comme interactif"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Could not init rewritten commits"
|
|
|
|
msgstr "Impossible d'initialiser les commits réécrits"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1291
|
2016-08-20 16:20:17 +02:00
|
|
|
#, sh-format
|
|
|
|
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
|
|
|
|
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
|
|
|
|
msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
|
|
|
|
msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1296
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"However, if you remove everything, the rebase will be aborted.\n"
|
|
|
|
"\n"
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
|
|
|
|
"\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-rebase--interactive.sh:1303
|
2016-08-20 16:20:17 +02:00
|
|
|
msgid "Note that empty commits are commented out"
|
|
|
|
msgstr "Veuillez noter que les commits vides sont en commentaire"
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:89 git-sh-setup.sh:94
|
|
|
|
#, sh-format
|
|
|
|
msgid "usage: $dashless $USAGE"
|
|
|
|
msgstr "usage : $dashless $USAGE"
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:190
|
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
|
|
|
|
msgstr ""
|
|
|
|
"Impossible de se placer dans le répertoire $cdup, la racine de la copie de "
|
|
|
|
"travail"
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:199 git-sh-setup.sh:206
|
|
|
|
#, sh-format
|
|
|
|
msgid "fatal: $program_name cannot be used without a working tree."
|
|
|
|
msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:220
|
|
|
|
msgid "Cannot rebase: You have unstaged changes."
|
|
|
|
msgstr "Impossible de rebaser : vous avez des modifications non indexées."
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:223
|
|
|
|
msgid "Cannot rewrite branches: You have unstaged changes."
|
|
|
|
msgstr ""
|
|
|
|
"Impossible de réécrire les branches : vous avez des modifications non "
|
|
|
|
"indexées."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: git-sh-setup.sh:226
|
|
|
|
msgid "Cannot pull with rebase: You have unstaged changes."
|
|
|
|
msgstr ""
|
|
|
|
"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-sh-setup.sh:229
|
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot $action: You have unstaged changes."
|
|
|
|
msgstr "$action est impossible : vous avez des modifications non indexées."
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:242
|
|
|
|
msgid "Cannot rebase: Your index contains uncommitted changes."
|
|
|
|
msgstr ""
|
|
|
|
"Impossible de rebaser : votre index contient des modifications non validées."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: git-sh-setup.sh:245
|
|
|
|
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
|
|
|
|
msgstr ""
|
|
|
|
"impossible de tirer avec rebasage : votre index contient des modifications "
|
|
|
|
"non validées."
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-sh-setup.sh:248
|
|
|
|
#, sh-format
|
|
|
|
msgid "Cannot $action: Your index contains uncommitted changes."
|
|
|
|
msgstr ""
|
|
|
|
"$action est impossible : votre index contient des modifications non validées."
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#: git-sh-setup.sh:252
|
|
|
|
msgid "Additionally, your index contains uncommitted changes."
|
|
|
|
msgstr "De plus, votre index contient des modifications non validées."
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#: git-sh-setup.sh:372
|
|
|
|
msgid "You need to run this command from the toplevel of the working tree."
|
|
|
|
msgstr ""
|
|
|
|
"Vous devez lancer cette commande depuis la racine de votre copie de travail."
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:377
|
|
|
|
msgid "Unable to determine absolute path of git directory"
|
|
|
|
msgstr "Impossible de déterminer le chemin absolu du répertoire git"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
|
|
|
|
#: git-add--interactive.perl:238
|
|
|
|
#, perl-format
|
|
|
|
msgid "%12s %12s %s"
|
|
|
|
msgstr "%12s %s12s %s"
|
|
|
|
|
|
|
|
#: git-add--interactive.perl:239
|
|
|
|
msgid "staged"
|
|
|
|
msgstr "indexé"
|
|
|
|
|
|
|
|
#: git-add--interactive.perl:239
|
|
|
|
msgid "unstaged"
|
|
|
|
msgstr "non-indexé"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:288 git-add--interactive.perl:313
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "binary"
|
|
|
|
msgstr "binaire"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:297 git-add--interactive.perl:351
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "nothing"
|
|
|
|
msgstr "rien"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:333 git-add--interactive.perl:348
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "unchanged"
|
|
|
|
msgstr "inchangé"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:644
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "added %d path\n"
|
|
|
|
msgid_plural "added %d paths\n"
|
|
|
|
msgstr[0] "%d chemin ajouté\n"
|
|
|
|
msgstr[1] "%d chemins ajoutés\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:647
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "updated %d path\n"
|
|
|
|
msgid_plural "updated %d paths\n"
|
|
|
|
msgstr[0] "%d chemin mis à jour\n"
|
|
|
|
msgstr[1] "%d chemins mis à jour\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:650
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "reverted %d path\n"
|
|
|
|
msgid_plural "reverted %d paths\n"
|
|
|
|
msgstr[0] "%d chemin inversé\n"
|
|
|
|
msgstr[1] "%d chemins inversés\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:653
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "touched %d path\n"
|
|
|
|
msgid_plural "touched %d paths\n"
|
|
|
|
msgstr[0] "%d chemin touché\n"
|
|
|
|
msgstr[1] "%d chemins touchés\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:662
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Update"
|
|
|
|
msgstr "Mise à jour"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:674
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Revert"
|
|
|
|
msgstr "Inverser"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:697
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "note: %s is untracked now.\n"
|
|
|
|
msgstr "note : %s n'est plus suivi à présent.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:708
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Add untracked"
|
|
|
|
msgstr "Ajouter un fichier non-suivi"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:714
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "No untracked files.\n"
|
|
|
|
msgstr "Aucun Fichier non suivi.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1030
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
"marked for staging."
|
|
|
|
msgstr ""
|
|
|
|
"Si le patch s'applique proprement, la section éditée sera\n"
|
|
|
|
"immédiatement marquée comme indexée."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1033
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
"marked for stashing."
|
|
|
|
msgstr ""
|
|
|
|
"Si le patch s'applique proprement, la section éditée sera\n"
|
|
|
|
"immédiatement marquée comme remisée."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1036
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
"marked for unstaging."
|
|
|
|
msgstr ""
|
|
|
|
"Si le patch s'applique proprement, la section éditée sera\n"
|
|
|
|
"immédiatement marquée comme desindexée."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
"marked for applying."
|
|
|
|
msgstr ""
|
|
|
|
"Si le patch s'applique proprement, la section éditée sera\n"
|
|
|
|
"immediatement marquée comme appliquée."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
"marked for discarding."
|
|
|
|
msgstr ""
|
|
|
|
"Si le patch s'applique proprement, la section éditée sera\n"
|
|
|
|
"immediatement marquée comme éliminée."
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1058
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "failed to open hunk edit file for writing: %s"
|
|
|
|
msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1059
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1065
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid ""
|
|
|
|
"---\n"
|
|
|
|
"To remove '%s' lines, make them ' ' lines (context).\n"
|
|
|
|
"To remove '%s' lines, delete them.\n"
|
|
|
|
"Lines starting with %s will be removed.\n"
|
|
|
|
msgstr ""
|
|
|
|
"---\n"
|
|
|
|
"Pour éliminer les lignes '%s', rendez-les ' ' (contexte).\n"
|
|
|
|
"Pour éliminer les lignes '%s', effacez-les.\n"
|
|
|
|
"Les lignes commençant par %s seront éliminées.\n"
|
|
|
|
|
|
|
|
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1073
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"If it does not apply cleanly, you will be given an opportunity to\n"
|
|
|
|
"edit again. If all lines of the hunk are removed, then the edit is\n"
|
|
|
|
"aborted and the hunk is left unchanged.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Si ça ne s'applique pas proprement, vous aurez la possibilité de\n"
|
|
|
|
"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
|
|
|
|
"alors l'édition sera abandonnée et la section conservée.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1087
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "failed to open hunk edit file for reading: %s"
|
|
|
|
msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
|
|
|
|
|
|
|
|
#. TRANSLATORS: do not translate [y/n]
|
|
|
|
#. The program will only accept that input
|
|
|
|
#. at this point.
|
|
|
|
#. Consider translating (saying "no" discards!) as
|
|
|
|
#. (saying "n" for "no" discards!) if the translation
|
|
|
|
#. of the word "no" does not start with n.
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1178
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
|
|
|
|
"l'élimine !) [y|n] ? "
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1187
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"y - stage this hunk\n"
|
|
|
|
"n - do not stage this hunk\n"
|
|
|
|
"q - quit; do not stage this hunk or any of the remaining ones\n"
|
|
|
|
"a - stage this hunk and all later hunks in the file\n"
|
|
|
|
"d - do not stage this hunk or any of the later hunks in the file"
|
|
|
|
msgstr ""
|
|
|
|
"y - indexer cette section\n"
|
|
|
|
"n - ne pas indexer cette section\n"
|
|
|
|
"q - quitter ; ne pas indexer cette section ni les autres restantes\n"
|
|
|
|
"a - indexer cette section et toutes les suivantes de ce fichier\n"
|
|
|
|
"d - ne pas indexer cette section ni les suivantes de ce fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1193
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"y - stash this hunk\n"
|
|
|
|
"n - do not stash this hunk\n"
|
|
|
|
"q - quit; do not stash this hunk or any of the remaining ones\n"
|
|
|
|
"a - stash this hunk and all later hunks in the file\n"
|
|
|
|
"d - do not stash this hunk or any of the later hunks in the file"
|
|
|
|
msgstr ""
|
|
|
|
"y - remiser cette section\n"
|
|
|
|
"n - ne pas remiser cette section\n"
|
|
|
|
"q - quitter ; ne pas remiser cette section ni les autres restantes\n"
|
|
|
|
"a - remiser cette section et toutes les suivantes de ce fichier\n"
|
|
|
|
"d - ne pas remiser cette section ni les suivantes de ce fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1199
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"y - unstage this hunk\n"
|
|
|
|
"n - do not unstage this hunk\n"
|
|
|
|
"q - quit; do not unstage this hunk or any of the remaining ones\n"
|
|
|
|
"a - unstage this hunk and all later hunks in the file\n"
|
|
|
|
"d - do not unstage this hunk or any of the later hunks in the file"
|
|
|
|
msgstr ""
|
|
|
|
"y - désindexer cette section\n"
|
|
|
|
"n - ne pas désindexer cette section\n"
|
|
|
|
"q - quitter ; ne pas désindexer cette section ni les autres restantes\n"
|
|
|
|
"a - désindexer cette section et toutes les suivantes de ce fichier\n"
|
|
|
|
"d - ne pas désindexer cette section ni les suivantes de ce fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1205
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"y - apply this hunk to index\n"
|
|
|
|
"n - do not apply this hunk to index\n"
|
|
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
|
|
"d - do not apply this hunk or any of the later hunks in the file"
|
|
|
|
msgstr ""
|
|
|
|
"y - appliquer cette section\n"
|
|
|
|
"n - ne pas appliquer cette section\n"
|
|
|
|
"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
|
|
|
|
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
|
|
|
|
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1211
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"y - discard this hunk from worktree\n"
|
|
|
|
"n - do not discard this hunk from worktree\n"
|
|
|
|
"q - quit; do not discard this hunk or any of the remaining ones\n"
|
|
|
|
"a - discard this hunk and all later hunks in the file\n"
|
|
|
|
"d - do not discard this hunk or any of the later hunks in the file"
|
|
|
|
msgstr ""
|
|
|
|
"y - supprimer cette section\n"
|
|
|
|
"n - ne pas supprimer cette section\n"
|
|
|
|
"q - quitter ; ne pas supprimer cette section ni les autres restantes\n"
|
|
|
|
"a - supprimer cette section et toutes les suivantes de ce fichier\n"
|
|
|
|
"d - ne pas supprimer cette section ni les suivantes de ce fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1217
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"y - discard this hunk from index and worktree\n"
|
|
|
|
"n - do not discard this hunk from index and worktree\n"
|
|
|
|
"q - quit; do not discard this hunk or any of the remaining ones\n"
|
|
|
|
"a - discard this hunk and all later hunks in the file\n"
|
|
|
|
"d - do not discard this hunk or any of the later hunks in the file"
|
|
|
|
msgstr ""
|
|
|
|
"y - éliminer cette section de l'index et de l'arbre de travail\n"
|
|
|
|
"n - ne pas éliminer cette section\n"
|
|
|
|
"q - quitter ; ne pas éliminer cette section ni les autres restantes\n"
|
|
|
|
"a - éliminer cette section et toutes les suivantes de ce fichier\n"
|
|
|
|
"d - ne pas éliminer cette section ni les suivantes de ce fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1223
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"y - apply this hunk to index and worktree\n"
|
|
|
|
"n - do not apply this hunk to index and worktree\n"
|
|
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
|
|
"d - do not apply this hunk or any of the later hunks in the file"
|
|
|
|
msgstr ""
|
|
|
|
"y - appliquer cette section à l'index et à l'arbre de travail\n"
|
|
|
|
"n - ne pas appliquer cette section\n"
|
|
|
|
"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
|
|
|
|
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
|
|
|
|
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1232
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"g - select a hunk to go to\n"
|
|
|
|
"/ - search for a hunk matching the given regex\n"
|
|
|
|
"j - leave this hunk undecided, see next undecided hunk\n"
|
|
|
|
"J - leave this hunk undecided, see next hunk\n"
|
|
|
|
"k - leave this hunk undecided, see previous undecided hunk\n"
|
|
|
|
"K - leave this hunk undecided, see previous hunk\n"
|
|
|
|
"s - split the current hunk into smaller hunks\n"
|
|
|
|
"e - manually edit the current hunk\n"
|
|
|
|
"? - print help\n"
|
|
|
|
msgstr ""
|
|
|
|
"g - selectionner une section et s'y rendre\n"
|
|
|
|
"/ - rechercher une section correspondant à une regex donnée\n"
|
|
|
|
"j - laisser cette section non décidée et aller à la suivante non-décidée\n"
|
|
|
|
"J - laisser cette section non décidée et aller à la suivante\n"
|
|
|
|
"k - laisser cette section non décidée et aller à la précédente non-décidée\n"
|
|
|
|
"K - laisser cette section non décidée et aller à la précédente\n"
|
|
|
|
"s - découper la section en sections plus petites\n"
|
|
|
|
"e - éditer manuellement la section actuelle\n"
|
|
|
|
"? - afficher l'aide\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1263
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "The selected hunks do not apply to the index!\n"
|
|
|
|
msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1264
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Apply them to the worktree anyway? "
|
|
|
|
msgstr "Les appliquer quand même à l'arbre de travail ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1267
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Nothing was applied.\n"
|
|
|
|
msgstr "Rien n'a été appliqué.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1278
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "ignoring unmerged: %s\n"
|
|
|
|
msgstr "fichier non-fusionné ignoré : %s\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1287
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Only binary files changed.\n"
|
|
|
|
msgstr "Seuls des fichiers binaires ont changé.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1289
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "No changes.\n"
|
|
|
|
msgstr "Aucune modification.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1297
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Patch update"
|
|
|
|
msgstr "Mise à jour par patch"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1349
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Indexer le changement de mode [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1350
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Indexer la suppression [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1351
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Indexer cette section [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1354
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Remiser le changement de mode [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1355
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Remiser la suppression [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1356
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Remiser cette section [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1359
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Désindexer le changement de mode [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1360
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Désindexer la suppression [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1361
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Désindexer cette section [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1364
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1365
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Appliquer la suppression à l'index [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1366
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Appliquer cette section à l'index [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1369
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1370
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1371
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
|
|
|
|
msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d,/%s,?] ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1374
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d,/%s,?] ? "
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1375
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d,/%s,?] ? "
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1376
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? "
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1379
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,"
|
|
|
|
"d,/%s,?] ? "
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1380
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d,/"
|
|
|
|
"%s,?] ? "
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1381
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? "
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1484
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "go to which hunk (<ret> to see more)? "
|
|
|
|
msgstr "aller à quelle section (<ret> pour voir plus) ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1486
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "go to which hunk? "
|
|
|
|
msgstr "aller à quelle section ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1495
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Invalid number: '%s'\n"
|
|
|
|
msgstr "Nombre invalide : '%s'\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1500
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Sorry, only %d hunk available.\n"
|
|
|
|
msgid_plural "Sorry, only %d hunks available.\n"
|
|
|
|
msgstr[0] "Désolé, %d seule section disponible.\n"
|
|
|
|
msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1526
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "search for regex? "
|
|
|
|
msgstr "rechercher la regex ? "
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1539
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Malformed search regexp %s: %s\n"
|
|
|
|
msgstr "Regex de recherche malformée %s : %s\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1549
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "No hunk matches the given pattern\n"
|
|
|
|
msgstr "Aucune section ne correspond au motif donné\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "No previous hunk\n"
|
|
|
|
msgstr "Pas de section précédente\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "No next hunk\n"
|
|
|
|
msgstr "Pas de section suivante\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1597
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "Split into %d hunk.\n"
|
|
|
|
msgid_plural "Split into %d hunks.\n"
|
|
|
|
msgstr[0] "Découpée en %d section.\n"
|
|
|
|
msgstr[1] "Découpée en %d sections.\n"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1649
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "Review diff"
|
|
|
|
msgstr "Réviser la différence"
|
|
|
|
|
|
|
|
#. TRANSLATORS: please do not translate the command names
|
|
|
|
#. 'status', 'update', 'revert', etc.
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1668
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid ""
|
|
|
|
"status - show paths with changes\n"
|
|
|
|
"update - add working tree state to the staged set of changes\n"
|
|
|
|
"revert - revert staged set of changes back to the HEAD version\n"
|
|
|
|
"patch - pick hunks and update selectively\n"
|
2017-04-23 23:29:44 +02:00
|
|
|
"diff - view diff between HEAD and index\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
"add untracked - add contents of untracked files to the staged set of "
|
|
|
|
"changes\n"
|
|
|
|
msgstr ""
|
|
|
|
"status - montrer les chemins modifiés\n"
|
2017-05-05 11:55:14 +02:00
|
|
|
"update - ajouter l'état de l'arbre de travail aux modifications à "
|
|
|
|
"indexer\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
"revert - faire revenir les modifications à indexer à la version HEAD\n"
|
|
|
|
"patch - sélectionner les sections et mettre à jour sélectivement\n"
|
2017-04-23 23:29:44 +02:00
|
|
|
"diff - visualiser les diff entre HEAD et l'index\n"
|
|
|
|
"add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1685 git-add--interactive.perl:1690
|
|
|
|
#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
|
|
|
|
#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
|
2017-02-08 21:36:33 +01:00
|
|
|
msgid "missing --"
|
|
|
|
msgstr "-- manquant"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1706
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "unknown --patch mode: %s"
|
|
|
|
msgstr "mode de --patch inconnu : %s"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
|
2017-02-08 21:36:33 +01:00
|
|
|
#, perl-format
|
|
|
|
msgid "invalid argument %s, expecting --"
|
|
|
|
msgstr "argument invalide %s, -- attendu"
|
|
|
|
|
|
|
|
#: git-send-email.perl:121
|
|
|
|
msgid "local zone differs from GMT by a non-minute interval\n"
|
|
|
|
msgstr "la zone locale diffère du GMT par un interval supérieur à une minute\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:128 git-send-email.perl:134
|
|
|
|
msgid "local time offset greater than or equal to 24 hours\n"
|
|
|
|
msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:202 git-send-email.perl:208
|
|
|
|
msgid "the editor exited uncleanly, aborting everything"
|
|
|
|
msgstr "l'éditeur est sorti en erreur, abandon total"
|
|
|
|
|
|
|
|
#: git-send-email.perl:282
|
|
|
|
#, perl-format
|
|
|
|
msgid ""
|
|
|
|
"'%s' contains an intermediate version of the email you were composing.\n"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"'%s' contient une version intermédiaire du courriel que vous composiez.\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:287
|
|
|
|
#, perl-format
|
|
|
|
msgid "'%s.final' contains the composed email.\n"
|
|
|
|
msgstr "'%s.final' contient le courriel composé.\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:305
|
|
|
|
msgid "--dump-aliases incompatible with other options\n"
|
|
|
|
msgstr "--dump-aliases est incompatible avec d'autres options\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:368 git-send-email.perl:623
|
|
|
|
msgid "Cannot run git format-patch from outside a repository\n"
|
|
|
|
msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:437
|
|
|
|
#, perl-format
|
|
|
|
msgid "Unknown --suppress-cc field: '%s'\n"
|
|
|
|
msgstr "Champ de --suppress-cc inconnu : '%s'\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:466
|
|
|
|
#, perl-format
|
|
|
|
msgid "Unknown --confirm setting: '%s'\n"
|
|
|
|
msgstr "Paramètre de --confirm inconnu : '%s'\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:498
|
|
|
|
#, perl-format
|
|
|
|
msgid "warning: sendmail alias with quotes is not supported: %s\n"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:500
|
|
|
|
#, perl-format
|
|
|
|
msgid "warning: `:include:` not supported: %s\n"
|
|
|
|
msgstr "attention : `:include:` n'est pas supporté : %s\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:502
|
|
|
|
#, perl-format
|
|
|
|
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:507
|
|
|
|
#, perl-format
|
|
|
|
msgid "warning: sendmail line is not recognized: %s\n"
|
|
|
|
msgstr "attention : ligne sendmail non reconnue : %s\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:589
|
|
|
|
#, perl-format
|
|
|
|
msgid ""
|
|
|
|
"File '%s' exists but it could also be the range of commits\n"
|
|
|
|
"to produce patches for. Please disambiguate by...\n"
|
|
|
|
"\n"
|
|
|
|
" * Saying \"./%s\" if you mean a file; or\n"
|
|
|
|
" * Giving --format-patch option if you mean a range.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Le fichier '%s' existe mais ce pourrait aussi être la plage de commmits\n"
|
|
|
|
"pour lequel les patches sont à produire. Veuillez préciser...\n"
|
|
|
|
"\n"
|
|
|
|
" * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
|
|
|
|
" * en fournissant l'option --format-patch pour une plage.\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:610
|
|
|
|
#, perl-format
|
|
|
|
msgid "Failed to opendir %s: %s"
|
|
|
|
msgstr "Échec à l'ouverture du répertoire %s : %s"
|
|
|
|
|
|
|
|
#: git-send-email.perl:634
|
|
|
|
#, perl-format
|
|
|
|
msgid ""
|
|
|
|
"fatal: %s: %s\n"
|
|
|
|
"warning: no patches were sent\n"
|
|
|
|
msgstr ""
|
|
|
|
"fatal : %s : %s\n"
|
|
|
|
"attention : aucun patch envoyé\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:645
|
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"No patch files specified!\n"
|
|
|
|
"\n"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Aucun fichier patch spécifié !\n"
|
|
|
|
"\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:658
|
|
|
|
#, perl-format
|
|
|
|
msgid "No subject line in %s?"
|
|
|
|
msgstr "Ligne de sujet non trouvée dans %s ?"
|
|
|
|
|
|
|
|
#: git-send-email.perl:668
|
|
|
|
#, perl-format
|
|
|
|
msgid "Failed to open for writing %s: %s"
|
|
|
|
msgstr "Impossible d'ouvrir %s en écriture : %s"
|
|
|
|
|
|
|
|
#: git-send-email.perl:678
|
|
|
|
msgid ""
|
|
|
|
"Lines beginning in \"GIT:\" will be removed.\n"
|
|
|
|
"Consider including an overall diffstat or table of contents\n"
|
|
|
|
"for the patch you are writing.\n"
|
|
|
|
"\n"
|
|
|
|
"Clear the body content if you don't wish to send a summary.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Les lignes commençant par \"GIT:\" seront supprimées.\n"
|
|
|
|
"Envisagez d'inclure un diffstat global ou une table des matières\n"
|
|
|
|
"pour le patch que vous êtes en train d'écrire.\n"
|
|
|
|
"\n"
|
|
|
|
"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:701
|
|
|
|
#, perl-format
|
|
|
|
msgid "Failed to open %s.final: %s"
|
|
|
|
msgstr "Échec à l'ouverture de %s.final : %s"
|
|
|
|
|
|
|
|
#: git-send-email.perl:704
|
|
|
|
#, perl-format
|
|
|
|
msgid "Failed to open %s: %s"
|
|
|
|
msgstr "Échec à l'ouverture de %s : %s"
|
|
|
|
|
|
|
|
#: git-send-email.perl:739
|
|
|
|
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:748
|
|
|
|
msgid "Summary email is empty, skipping it\n"
|
|
|
|
msgstr "Le courriel de résumé etant vide, il a été ignoré\n"
|
|
|
|
|
|
|
|
#. TRANSLATORS: please keep [y/N] as is.
|
|
|
|
#: git-send-email.perl:780
|
|
|
|
#, perl-format
|
|
|
|
msgid "Are you sure you want to use <%s> [y/N]? "
|
|
|
|
msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
|
|
|
|
|
|
|
|
#: git-send-email.perl:809
|
|
|
|
msgid ""
|
|
|
|
"The following files are 8bit, but do not declare a Content-Transfer-"
|
|
|
|
"Encoding.\n"
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
|
|
|
|
"Transfer-Encoding.\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:814
|
|
|
|
msgid "Which 8bit encoding should I declare [UTF-8]? "
|
|
|
|
msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
|
|
|
|
|
|
|
|
#: git-send-email.perl:822
|
|
|
|
#, perl-format
|
|
|
|
msgid ""
|
|
|
|
"Refusing to send because the patch\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
|
|
|
|
"want to send.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Envoi refusé parce que le patch\n"
|
|
|
|
"\t%s\n"
|
2017-02-18 00:10:04 +01:00
|
|
|
"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
|
|
|
|
"vraiment envoyer.\n"
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:841
|
|
|
|
msgid "To whom should the emails be sent (if anyone)?"
|
|
|
|
msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
|
|
|
|
|
|
|
|
#: git-send-email.perl:859
|
|
|
|
#, perl-format
|
|
|
|
msgid "fatal: alias '%s' expands to itself\n"
|
|
|
|
msgstr "fatal : l'alias '%s' se développe en lui-même\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:871
|
|
|
|
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Message-ID à utiliser comme In-Reply-to pour le premier courriel (s'il y en "
|
|
|
|
"a) ? "
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:921 git-send-email.perl:929
|
|
|
|
#, perl-format
|
|
|
|
msgid "error: unable to extract a valid address from: %s\n"
|
|
|
|
msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
|
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
#. at this point.
|
|
|
|
#: git-send-email.perl:933
|
|
|
|
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
|
|
|
|
msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
|
|
|
|
|
|
|
|
#: git-send-email.perl:1234
|
|
|
|
#, perl-format
|
|
|
|
msgid "CA path \"%s\" does not exist"
|
|
|
|
msgstr "le chemin vers la CA \"%s\" n'existe pas"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1309
|
|
|
|
msgid ""
|
|
|
|
" The Cc list above has been expanded by additional\n"
|
|
|
|
" addresses found in the patch commit message. By default\n"
|
|
|
|
" send-email prompts before sending whenever this occurs.\n"
|
|
|
|
" This behavior is controlled by the sendemail.confirm\n"
|
|
|
|
" configuration setting.\n"
|
|
|
|
"\n"
|
|
|
|
" For additional information, run 'git send-email --help'.\n"
|
|
|
|
" To retain the current behavior, but squelch this message,\n"
|
|
|
|
" run 'git config --global sendemail.confirm auto'.\n"
|
|
|
|
"\n"
|
|
|
|
msgstr ""
|
|
|
|
" La liste CC ci-dessus a été étendue avec des adresses\n"
|
|
|
|
" supplémentaires trouvées dans le message de validation.\n"
|
|
|
|
" Par défaut dans ce cas, send-email demande confirmation avant envoi.\n"
|
|
|
|
" Ce comportement est géré par le paramètre de configuration\n"
|
|
|
|
" sendemail.confirm.\n"
|
|
|
|
"\n"
|
|
|
|
" Pour tout information complémentaire, lancez 'git send-email --help'.\n"
|
|
|
|
" Pour conserver le comportement actuel, mais éliminer ce message,\n"
|
|
|
|
" lancez 'git config --global sendemail.confirm auto'.\n"
|
|
|
|
"\n"
|
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
#. at this point.
|
|
|
|
#: git-send-email.perl:1324
|
|
|
|
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
|
|
|
|
msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : "
|
|
|
|
|
|
|
|
#: git-send-email.perl:1327
|
|
|
|
msgid "Send this email reply required"
|
|
|
|
msgstr "Une réponse est nécessaire"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1353
|
|
|
|
msgid "The required SMTP server is not properly defined."
|
|
|
|
msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
|
|
|
|
|
|
|
|
#: git-send-email.perl:1397
|
|
|
|
#, perl-format
|
|
|
|
msgid "Server does not support STARTTLS! %s"
|
|
|
|
msgstr "Le serveur ne supporte pas STARTTLS ! %s"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1403
|
|
|
|
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
|
2017-02-18 00:10:04 +01:00
|
|
|
msgstr ""
|
|
|
|
"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
|
|
|
|
"debug."
|
2017-02-08 21:36:33 +01:00
|
|
|
|
|
|
|
#: git-send-email.perl:1421
|
|
|
|
#, perl-format
|
|
|
|
msgid "Failed to send %s\n"
|
|
|
|
msgstr "échec de l'envoi de %s\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1424
|
|
|
|
#, perl-format
|
|
|
|
msgid "Dry-Sent %s\n"
|
|
|
|
msgstr "Envoi simulé de %s\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1424
|
|
|
|
#, perl-format
|
|
|
|
msgid "Sent %s\n"
|
|
|
|
msgstr "%s envoyé\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1426
|
|
|
|
msgid "Dry-OK. Log says:\n"
|
|
|
|
msgstr "Simulation OK. Le journal indique :\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1426
|
|
|
|
msgid "OK. Log says:\n"
|
|
|
|
msgstr "OK. Le journal indique :\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1438
|
|
|
|
msgid "Result: "
|
|
|
|
msgstr "Résultat : "
|
|
|
|
|
|
|
|
#: git-send-email.perl:1441
|
|
|
|
msgid "Result: OK\n"
|
|
|
|
msgstr "Résultat : OK\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1454
|
|
|
|
#, perl-format
|
|
|
|
msgid "can't open file %s"
|
|
|
|
msgstr "impossible d'ouvrir le fichier %s"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1501 git-send-email.perl:1521
|
|
|
|
#, perl-format
|
|
|
|
msgid "(mbox) Adding cc: %s from line '%s'\n"
|
|
|
|
msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1507
|
|
|
|
#, perl-format
|
|
|
|
msgid "(mbox) Adding to: %s from line '%s'\n"
|
|
|
|
msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1555
|
|
|
|
#, perl-format
|
|
|
|
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
|
|
|
|
msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1578
|
|
|
|
#, perl-format
|
|
|
|
msgid "(body) Adding cc: %s from line '%s'\n"
|
|
|
|
msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1676
|
|
|
|
#, perl-format
|
|
|
|
msgid "(%s) Could not execute '%s'"
|
|
|
|
msgstr "(%s) Impossible d'exécuter '%s'"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1683
|
|
|
|
#, perl-format
|
|
|
|
msgid "(%s) Adding %s: %s from: '%s'\n"
|
|
|
|
msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1687
|
|
|
|
#, perl-format
|
|
|
|
msgid "(%s) failed to close pipe to '%s'"
|
|
|
|
msgstr "(%s) échec de la fermeture du pipe vers '%s'"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1714
|
|
|
|
msgid "cannot send message as 7bit"
|
|
|
|
msgstr "impossible d'envoyer un message comme 7bit"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1722
|
|
|
|
msgid "invalid transfer encoding"
|
|
|
|
msgstr "codage de transfert invalide"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
|
|
|
|
#, perl-format
|
|
|
|
msgid "unable to open %s: %s\n"
|
|
|
|
msgstr "impossible d'ouvrir %s :%s\n"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1744
|
|
|
|
#, perl-format
|
|
|
|
msgid "%s: patch contains a line longer than 998 characters"
|
|
|
|
msgstr "%s : le patch contient une ligne plus longue que 998 caractères"
|
|
|
|
|
|
|
|
#: git-send-email.perl:1760
|
|
|
|
#, perl-format
|
|
|
|
msgid "Skipping %s with backup suffix '%s'.\n"
|
|
|
|
msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
|
|
|
|
|
|
|
|
#. TRANSLATORS: please keep "[y|N]" as is.
|
|
|
|
#: git-send-email.perl:1764
|
|
|
|
#, perl-format
|
|
|
|
msgid "Do you really want to send %s? [y|N]: "
|
|
|
|
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
|
|
|
|
|
2017-05-05 11:55:14 +02:00
|
|
|
#~ msgid "could not stat '%s"
|
|
|
|
#~ msgstr "stat impossible de '%s'"
|
|
|
|
|
|
|
|
#~ msgid "tag: tagging "
|
|
|
|
#~ msgstr "étiquette: étiquetage de "
|
|
|
|
|
|
|
|
#~ msgid "object of unknown type"
|
|
|
|
#~ msgstr "objet de type inconnu"
|
|
|
|
|
|
|
|
#~ msgid "commit object"
|
|
|
|
#~ msgstr "objet commit"
|
|
|
|
|
|
|
|
#~ msgid "tree object"
|
|
|
|
#~ msgstr "objet arbre"
|
|
|
|
|
|
|
|
#~ msgid "blob object"
|
|
|
|
#~ msgstr "objet blob"
|
|
|
|
|
|
|
|
#~ msgid "other tag object"
|
|
|
|
#~ msgstr "objet étiquette autre"
|
|
|
|
|
2017-04-23 23:29:44 +02:00
|
|
|
#~ msgid ""
|
|
|
|
#~ "There is nothing to exclude from by :(exclude) patterns.\n"
|
|
|
|
#~ "Perhaps you forgot to add either ':/' or '.' ?"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
|
|
|
|
#~ "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
|
|
|
|
|
|
|
|
#~ msgid "unrecognized format: %%(%s)"
|
|
|
|
#~ msgstr "format non reconnu %%(%s)"
|
|
|
|
|
|
|
|
#~ msgid ":strip= requires a positive integer argument"
|
|
|
|
#~ msgstr ":strip= requiert un argument entier positif"
|
|
|
|
|
|
|
|
#~ msgid "ref '%s' does not have %ld components to :strip"
|
|
|
|
#~ msgstr "la réf '%s' n'a pas %ld composants à :strip"
|
|
|
|
|
|
|
|
#~ msgid "unknown %.*s format %s"
|
|
|
|
#~ msgstr "format de %.*s inconnu %s"
|
|
|
|
|
|
|
|
# féminin pour une branche
|
|
|
|
#~ msgid "[%s: gone]"
|
|
|
|
#~ msgstr "[%s: disparue]"
|
|
|
|
|
|
|
|
#~ msgid "[%s]"
|
|
|
|
#~ msgstr "[%s]"
|
|
|
|
|
|
|
|
#~ msgid "[%s: behind %d]"
|
|
|
|
#~ msgstr "[%s: en retard de %d]"
|
|
|
|
|
|
|
|
#~ msgid "[%s: ahead %d]"
|
|
|
|
#~ msgstr "[%s : en avance de %d]"
|
|
|
|
|
|
|
|
#~ msgid "[%s: ahead %d, behind %d]"
|
|
|
|
#~ msgstr "[%s : en avance de %d, en retard de %d]"
|
|
|
|
|
|
|
|
#~ msgid " **** invalid ref ****"
|
|
|
|
#~ msgstr " **** référence invalide ****"
|
|
|
|
|
|
|
|
#~ msgid "insanely long object directory %.*s"
|
|
|
|
#~ msgstr "objet répertoire démentiellement long %.*s"
|
|
|
|
|
|
|
|
#~ msgid "git merge [<options>] <msg> HEAD <commit>"
|
|
|
|
#~ msgstr "git merge [<options>] <message> HEAD <commit>"
|
|
|
|
|
|
|
|
#~ msgid "'%s' is not a commit"
|
|
|
|
#~ msgstr "'%s' n'est pas une validation"
|
|
|
|
|
|
|
|
#~ msgid "cannot open file '%s'"
|
|
|
|
#~ msgstr "impossible d'ouvrir le fichier '%s'"
|
|
|
|
|
|
|
|
#~ msgid "could not close file %s"
|
|
|
|
#~ msgstr "impossible de fermer le fichier %s"
|
|
|
|
|
|
|
|
#~ msgid "tag name too long: %.*s..."
|
|
|
|
#~ msgstr "nom d'étiquette trop long : %.*s..."
|
|
|
|
|
|
|
|
#~ msgid "tag header too big."
|
|
|
|
#~ msgstr "en-tête d'étiquette trop gros."
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
|
|
#~ "marked for discarding"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Si le patch s'applique proprement, la section éditée sera\n"
|
|
|
|
#~ "immediatement marquée comme éliminée"
|
|
|
|
|
2017-02-08 21:36:33 +01:00
|
|
|
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
|
|
|
|
#~ "améliorer le diffs"
|
|
|
|
|
|
|
|
#~ msgid "Clever... amending the last one with dirty index."
|
|
|
|
#~ msgstr "Malin... correction du dernier avec un index sale."
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "the following submodule (or one of its nested submodules)\n"
|
|
|
|
#~ "uses a .git directory:"
|
|
|
|
#~ msgid_plural ""
|
|
|
|
#~ "the following submodules (or one of their nested submodules)\n"
|
|
|
|
#~ "use a .git directory:"
|
|
|
|
#~ msgstr[0] ""
|
|
|
|
#~ "le sous-module suivant (ou un de ses sous-modules imbriqués)\n"
|
|
|
|
#~ "utilise un répertoire .git :"
|
|
|
|
#~ msgstr[1] ""
|
|
|
|
#~ "les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n"
|
|
|
|
#~ "utilisent un répertoire .git :"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "\n"
|
|
|
|
#~ "(use 'rm -rf' if you really want to remove it including all of its "
|
|
|
|
#~ "history)"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "\n"
|
|
|
|
#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
|
|
|
|
#~ "son historique)"
|
|
|
|
|
2016-11-05 21:43:53 +01:00
|
|
|
#~ msgid "Could not write to %s"
|
|
|
|
#~ msgstr "Impossible d'écrire dans %s"
|
|
|
|
|
|
|
|
#~ msgid "Error wrapping up %s."
|
|
|
|
#~ msgstr "Erreur lors de l'emballage de %s."
|
|
|
|
|
|
|
|
#~ msgid "Your local changes would be overwritten by cherry-pick."
|
|
|
|
#~ msgstr "Vos modifications locales seraient écrasées par cherry-pick."
|
|
|
|
|
|
|
|
#~ msgid "Cannot revert during another revert."
|
|
|
|
#~ msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."
|
|
|
|
|
|
|
|
#~ msgid "Cannot cherry-pick during another cherry-pick."
|
|
|
|
#~ msgstr "Impossible de picorer pendant un autre picorage."
|
|
|
|
|
|
|
|
#~ msgid "Could not parse line %d."
|
|
|
|
#~ msgstr "Impossible d'analyser la ligne %d."
|
|
|
|
|
|
|
|
#~ msgid "Could not open %s"
|
|
|
|
#~ msgstr "Impossible d'ouvrir %s"
|
|
|
|
|
|
|
|
#~ msgid "Could not read %s."
|
|
|
|
#~ msgstr "Impossible de lire %s."
|
|
|
|
|
|
|
|
#~ msgid "Could not format %s."
|
|
|
|
#~ msgstr "Impossible de formater %s."
|
|
|
|
|
|
|
|
#~ msgid "%s: %s"
|
|
|
|
#~ msgstr "%s : %s"
|
|
|
|
|
|
|
|
#~ msgid "cannot open %s: %s"
|
|
|
|
#~ msgstr "impossible d'ouvrir %s : %s"
|
|
|
|
|
|
|
|
#~ msgid "You need to set your committer info first"
|
|
|
|
#~ msgstr "Vous devez d'abord définir vos informations de validateur"
|
|
|
|
|
2016-08-20 16:20:17 +02:00
|
|
|
#~ msgid "This is the 2nd commit message:"
|
|
|
|
#~ msgstr "Ceci est le deuxième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the 3rd commit message:"
|
|
|
|
#~ msgstr "Ceci est le troisième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the 4th commit message:"
|
|
|
|
#~ msgstr "Ceci est le quatrième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the 5th commit message:"
|
|
|
|
#~ msgstr "Ceci est le cinquième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the 6th commit message:"
|
|
|
|
#~ msgstr "Ceci est le sixième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the 7th commit message:"
|
|
|
|
#~ msgstr "Ceci est le septième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the 8th commit message:"
|
|
|
|
#~ msgstr "Ceci est le huitième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the 9th commit message:"
|
|
|
|
#~ msgstr "Ceci est le neuvième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the 10th commit message:"
|
|
|
|
#~ msgstr "Ceci est le dixième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the ${n}th commit message:"
|
|
|
|
#~ msgstr "Ceci est le ${n}ième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the ${n}st commit message:"
|
|
|
|
#~ msgstr "Ceci est le ${n}ième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the ${n}nd commit message:"
|
|
|
|
#~ msgstr "Ceci est le ${n}ième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "This is the ${n}rd commit message:"
|
|
|
|
#~ msgstr "Ceci est le ${n}ième message de validation :"
|
|
|
|
|
|
|
|
#~ msgid "The 1st commit message will be skipped:"
|
|
|
|
#~ msgstr "Le premier message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 2nd commit message will be skipped:"
|
|
|
|
#~ msgstr "Le deuxième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 3rd commit message will be skipped:"
|
|
|
|
#~ msgstr "Le troisième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 4th commit message will be skipped:"
|
|
|
|
#~ msgstr "Le quatrième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 5th commit message will be skipped:"
|
|
|
|
#~ msgstr "Le cinquième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 6th commit message will be skipped:"
|
|
|
|
#~ msgstr "Le sixième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 7th commit message will be skipped:"
|
|
|
|
#~ msgstr "Le septième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 8th commit message will be skipped:"
|
|
|
|
#~ msgstr "Le huitième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 9th commit message will be skipped:"
|
|
|
|
#~ msgstr "Le neuvième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The 10th commit message will be skipped:"
|
|
|
|
#~ msgstr "Le dixième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The ${n}th commit message will be skipped:"
|
|
|
|
#~ msgstr "le ${n}ième message de validation sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The ${n}st commit message will be skipped:"
|
|
|
|
#~ msgstr "Le message de validation ${n} sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The ${n}nd commit message will be skipped:"
|
|
|
|
#~ msgstr "Le message de validation ${n} sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "The ${n}rd commit message will be skipped:"
|
|
|
|
#~ msgstr "Le message de validation ${n} sera ignoré :"
|
|
|
|
|
|
|
|
#~ msgid "could not run gpg."
|
|
|
|
#~ msgstr "impossible de lancer gpg."
|
|
|
|
|
|
|
|
#~ msgid "gpg did not accept the data"
|
|
|
|
#~ msgstr "gpg n'a pas accepté les données"
|
|
|
|
|
|
|
|
#~ msgid "unsupported object type in the tree"
|
|
|
|
#~ msgstr "type d'objet non supporté dans l'arbre"
|
|
|
|
|
|
|
|
#~ msgid "Fatal merge failure, shouldn't happen."
|
|
|
|
#~ msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
|
|
|
|
|
|
|
|
#~ msgid "Unprocessed path??? %s"
|
|
|
|
#~ msgstr "Chemin non traité ??? %s"
|
|
|
|
|
|
|
|
#~ msgid "Error wrapping up %s"
|
|
|
|
#~ msgstr "Erreur à l'emballage de %s"
|
|
|
|
|
|
|
|
#~ msgid "Cannot %s during a %s"
|
|
|
|
#~ msgstr "Impossible de %s pendant un %s"
|
|
|
|
|
|
|
|
#~ msgid "Can't cherry-pick into empty head"
|
|
|
|
#~ msgstr "Impossible de picorer vers une HEAD vide"
|
|
|
|
|
|
|
|
#~ msgid "could not open %s for writing"
|
|
|
|
#~ msgstr "Impossible d'ouvrir '%s' en écriture"
|
|
|
|
|
|
|
|
#~ msgid "bug: unhandled unmerged status %x"
|
|
|
|
#~ msgstr "bogue : état de non-fusion non géré %x"
|
|
|
|
|
|
|
|
#~ msgid "bug: unhandled diff status %c"
|
|
|
|
#~ msgstr "bogue : état de diff non géré %c"
|
|
|
|
|
|
|
|
#~ msgid "could not write branch description template"
|
|
|
|
#~ msgstr "impossible d'écrire le modèle de description de branche"
|
|
|
|
|
|
|
|
#~ msgid "corrupt index file"
|
|
|
|
#~ msgstr "fichier d'index corrompu"
|
|
|
|
|
|
|
|
#~ msgid "detach the HEAD at named commit"
|
|
|
|
#~ msgstr "détacher la HEAD à la validation nommée"
|
|
|
|
|
|
|
|
#~ msgid "Checking connectivity... "
|
|
|
|
#~ msgstr "Vérification de la connectivité... "
|
|
|
|
|
|
|
|
#~ msgid " (unable to update local ref)"
|
|
|
|
#~ msgstr " (impossible de mettre à jour la référence locale)"
|
|
|
|
|
|
|
|
#~ msgid "Reinitialized existing"
|
|
|
|
#~ msgstr "existant réinitialisé"
|
|
|
|
|
|
|
|
#~ msgid "Initialized empty"
|
|
|
|
#~ msgstr "vide initialisé"
|
|
|
|
|
|
|
|
#~ msgid " shared"
|
|
|
|
#~ msgstr " partagé"
|
|
|
|
|
|
|
|
#~ msgid "Verify that the named commit has a valid GPG signature"
|
|
|
|
#~ msgstr "Vérifier que la validation a une signature GPG valide"
|
|
|
|
|
|
|
|
#~ msgid "Writing SQUASH_MSG"
|
|
|
|
#~ msgstr "Écriture de SQUASH_MSG"
|
|
|
|
|
|
|
|
#~ msgid "Finishing SQUASH_MSG"
|
|
|
|
#~ msgstr "Finition de SQUASH_MSG"
|
|
|
|
|
|
|
|
#~ msgid " and with remote"
|
|
|
|
#~ msgstr " et avec la distante"
|
|
|
|
|
|
|
|
#~ msgid "removing '%s' failed"
|
|
|
|
#~ msgstr "la suppression de '%s' a échoué"
|
|
|
|
|
|
|
|
#~ msgid "program error"
|
|
|
|
#~ msgstr "erreur du programme"
|
|
|
|
|
|
|
|
#~ msgid "Please call 'bisect_state' with at least one argument."
|
|
|
|
#~ msgstr "Veuillez appeler 'bisect_state' avec au moins un argument."
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "If you want to reuse this local git directory instead of cloning again "
|
|
|
|
#~ "from"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
|
|
|
|
#~ "nouveau depuis"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "use the '--force' option. If the local git directory is not the correct "
|
|
|
|
#~ "repo"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "utilisez l'option '--force'. Si le répertoire local git n'est pas le "
|
|
|
|
#~ "dépôt correct"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "or you are unsure what this means choose another name with the '--name' "
|
|
|
|
#~ "option."
|
|
|
|
#~ msgstr ""
|
2016-12-18 02:16:06 +01:00
|
|
|
#~ "ou si vous ne savez pas ce que cela signifie, choisissez un autre nom "
|
|
|
|
#~ "avec l'option '--name'."
|
2016-08-20 16:20:17 +02:00
|
|
|
|
|
|
|
#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "La copie de travail du sous-module '$displaypath' contient un répertoire ."
|
|
|
|
#~ "git"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "(use 'rm -rf' if you really want to remove it including all of its "
|
|
|
|
#~ "history)"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
|
|
|
|
#~ "son historique)"
|
|
|
|
|
2016-05-26 22:46:41 +02:00
|
|
|
#~ msgid "'%s': %s"
|
|
|
|
#~ msgstr "'%s' : %s"
|
|
|
|
|
|
|
|
#~ msgid "unable to access '%s': %s"
|
|
|
|
#~ msgstr "impossible d'accéder à '%s' : %s"
|
|
|
|
|
|
|
|
#~ msgid " git branch -d %s\n"
|
|
|
|
#~ msgstr " git branch -d %s\n"
|
|
|
|
|
|
|
|
#~ msgid " git branch --set-upstream-to %s\n"
|
|
|
|
#~ msgstr " git branch --set-upstream-to %s\n"
|
|
|
|
|
|
|
|
#~ msgid "cannot open %s: %s\n"
|
|
|
|
#~ msgstr "impossible d'ouvrir %s : %s\n"
|
|
|
|
|
|
|
|
#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour "
|
|
|
|
#~ "continuer"
|
|
|
|
|
|
|
|
#~ msgid "could not verify the tag '%s'"
|
|
|
|
#~ msgstr "impossible de vérifier l'étiquette '%s'"
|
|
|
|
|
|
|
|
#~ msgid "failed to remove: %s"
|
|
|
|
#~ msgstr "échec de la suppression de %s"
|
|
|
|
|
|
|
|
#~ msgid "The --exec option must be used with the --interactive option"
|
|
|
|
#~ msgstr "L'option --exec doit être utilisée avec l'option --interactive"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "Submodule path '$displaypath' not initialized\n"
|
|
|
|
#~ "Maybe you want to use 'update --init'?"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Chemin de sous-module '$displaypath' non initialisé\n"
|
|
|
|
#~ "Peut-être souhaitez-vous utiliser 'update --init' ?"
|
|
|
|
|
2016-03-14 20:26:53 +01:00
|
|
|
#~ msgid "Forward-port local commits to the updated upstream head"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
|
|
|
|
#~ "amont"
|
|
|
|
|
2016-02-28 22:44:35 +01:00
|
|
|
#~ msgid "unable to parse format"
|
|
|
|
#~ msgstr "impossible d'analyser le format"
|
|
|
|
|
|
|
|
#~ msgid "improper format entered align:%s"
|
|
|
|
#~ msgstr "format non convenable align:%s"
|
|
|
|
|
|
|
|
#~ msgid "Could not set core.worktree in %s"
|
|
|
|
#~ msgstr "Impossible de paramétrer core.worktree dans %s"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "push.default is unset; its implicit value has changed in\n"
|
|
|
|
#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
|
|
|
|
#~ "and maintain the traditional behavior, use:\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ " git config --global push.default matching\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "To squelch this message and adopt the new behavior now, use:\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ " git config --global push.default simple\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "When push.default is set to 'matching', git will push local branches\n"
|
|
|
|
#~ "to the remote branches that already exist with the same name.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
|
|
|
|
#~ "behavior, which only pushes the current branch to the corresponding\n"
|
|
|
|
#~ "remote branch that 'git pull' uses to update the current branch.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "See 'git help config' and search for 'push.default' for further "
|
|
|
|
#~ "information.\n"
|
|
|
|
#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
|
|
|
|
#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "push.default n'est pas défini ; sa valeur implicite a changé dans Git "
|
|
|
|
#~ "2.0\n"
|
|
|
|
#~ "de 'matching' vers 'simple'. Pour supprimer ce message et maintenir\n"
|
|
|
|
#~ "le comportement actuel après la modification de la valeur de défaut, "
|
|
|
|
#~ "utilisez :\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ " git config --global push.default matching\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "Pour supprimer ce message et adopter le nouveau comportement maintenant, "
|
|
|
|
#~ "utilisez :\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ " git config --global push.default simple\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "Quand push.default vaudra 'matching', git poussera les branches locales\n"
|
|
|
|
#~ "sur les branches distantes qui existent déjà avec le même nom.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "Depuis Git 2.0, Git utilise par défaut le comportement plus conservatif "
|
|
|
|
#~ "'simple'\n"
|
|
|
|
#~ "qui ne pousse la branche courante que vers la branche distante "
|
|
|
|
#~ "correspondante\n"
|
|
|
|
#~ "que 'git pull' utilise pour mettre à jour la branche courante.\n"
|
|
|
|
#~ " \n"
|
|
|
|
#~ "Voir 'git help config' et chercher 'push.default' pour plus "
|
|
|
|
#~ "d'information.\n"
|
|
|
|
#~ "(le mode 'simple' a été introduit dans Git 1.7.11. Utilisez le mode "
|
|
|
|
#~ "similaire\n"
|
|
|
|
#~ "'current' au lieu de 'simple' si vous utilisez de temps en temps "
|
|
|
|
#~ "d'anciennes versions de Git)"
|
|
|
|
|
|
|
|
#~ msgid "check|on-demand|no"
|
|
|
|
#~ msgstr "check|on-demand|no"
|
|
|
|
|
|
|
|
#~ msgid "Could not append '%s'"
|
|
|
|
#~ msgstr "Impossible d'ajouter '%s'"
|
|
|
|
|
|
|
|
#~ msgid "Missing author: %s"
|
|
|
|
#~ msgstr "Auteur manquant : %s"
|
|
|
|
|
|
|
|
#~ msgid "Testing "
|
|
|
|
#~ msgstr "Test en cours "
|
|
|
|
|
2015-12-24 07:38:22 +01:00
|
|
|
#~ 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"
|
|
|
|
|
|
|
|
#~ msgid "no such user"
|
|
|
|
#~ msgstr "utilisateur inconnu"
|
|
|
|
|
2015-12-18 22:00:37 +01:00
|
|
|
#~ msgid "branch '%s' does not point at a commit"
|
|
|
|
#~ msgstr "la branche '%s' ne pointe pas sur un commit"
|
|
|
|
|
|
|
|
#~ msgid "object '%s' does not point to a commit"
|
|
|
|
#~ msgstr "l'objet '%s' ne pointe pas sur un commit"
|
|
|
|
|
|
|
|
#~ msgid "some refs could not be read"
|
|
|
|
#~ msgstr "des références n'ont pas pu être lues"
|
|
|
|
|
|
|
|
#~ msgid "print only merged branches"
|
|
|
|
#~ msgstr "afficher seulement les branches fusionnées"
|
|
|
|
|
|
|
|
#~ msgid "--dissociate given, but there is no --reference"
|
|
|
|
#~ msgstr "--dissociate est spécifié, mais --reference est absent"
|
|
|
|
|
|
|
|
#~ msgid "show usage"
|
|
|
|
#~ msgstr "afficher l'usage"
|
|
|
|
|
|
|
|
#~ msgid "insanely long template name %s"
|
|
|
|
#~ msgstr "nom de modèle démentiellement long %s"
|
|
|
|
|
|
|
|
#~ msgid "insanely long symlink %s"
|
|
|
|
#~ msgstr "lien symbolique démentiellement long %s"
|
|
|
|
|
|
|
|
#~ msgid "insanely long template path %s"
|
|
|
|
#~ msgstr "chemin de modèle %s démentiellement long"
|
|
|
|
|
|
|
|
#~ msgid "insane git directory %s"
|
|
|
|
#~ msgstr "répertoire git démentiel %s"
|
|
|
|
|
|
|
|
#~ msgid "unsupported sort specification '%s'"
|
|
|
|
#~ msgstr "spécification de tri non supportée '%s'"
|
|
|
|
|
|
|
|
#~ msgid "unsupported sort specification '%s' in variable '%s'"
|
|
|
|
#~ msgstr "spécification de tri non supportée '%s' dans le variable '%s'"
|
|
|
|
|
|
|
|
#~ msgid "switch 'points-at' requires an object"
|
|
|
|
#~ msgstr "le commutateur 'points-at' a besoin d'un objet"
|
|
|
|
|
|
|
|
#~ msgid "sort tags"
|
|
|
|
#~ msgstr "trier les étiquettes"
|
|
|
|
|
|
|
|
#~ msgid "--sort and -n are incompatible"
|
|
|
|
#~ msgstr "--sort et -n sont incompatibles"
|
|
|
|
|
|
|
|
#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-"
|
|
|
|
#~ "versa"
|
|
|
|
|
2015-09-15 20:22:52 +02:00
|
|
|
#~ msgid "false|true|preserve"
|
|
|
|
#~ msgstr "false|true|preserve"
|
|
|
|
|
2015-09-09 22:55:10 +02:00
|
|
|
#~ msgid "BUG: reopen a lockfile that is still open"
|
|
|
|
#~ msgstr "BUG: réouverture d'un fichier verrou déjà ouvert"
|
|
|
|
|
|
|
|
#~ msgid "BUG: reopen a lockfile that has been committed"
|
|
|
|
#~ msgstr "BUG: réouverture d'un fichier verrou validé"
|
|
|
|
|
|
|
|
#~ msgid "option %s does not accept negative form"
|
|
|
|
#~ msgstr "l'option %s n'accepte pas de valeur négative"
|
|
|
|
|
|
|
|
#~ msgid "unable to parse value '%s' for option %s"
|
|
|
|
#~ msgstr "impossible d'analyser la valeur '%s' pour l'option %s"
|
|
|
|
|
|
|
|
#~ msgid "-b and -B are mutually exclusive"
|
|
|
|
#~ msgstr "-b et -B sont mutuellement exclusifs"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
|
|
|
|
#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
|
|
|
|
#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
|
|
|
|
#~ "\"."
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Lorsque vous aurez résolu ce problème, lancez \"$cmdline --continue\".\n"
|
|
|
|
#~ "Si vous préférez sauter ce patch, lancez \"$cmdline --skip\" à la place.\n"
|
|
|
|
#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez "
|
|
|
|
#~ "\"$cmdline --abort\"."
|
|
|
|
|
|
|
|
#~ msgid "Patch format $patch_format is not supported."
|
|
|
|
#~ msgstr "Le format de patch $patch_format n'est pas supporté."
|
|
|
|
|
|
|
|
#~ msgid "Please make up your mind. --skip or --abort?"
|
|
|
|
#~ msgstr "Décidez-vous. --skip ou --abort ?"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "Patch is empty. Was it split wrong?\n"
|
|
|
|
#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
|
|
|
|
#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Le patch est vide. Était-il mal découpé ?\n"
|
|
|
|
#~ "Si vous préférez sauter ce patch, lancez plutôt \"$cmdline --skip\".\n"
|
|
|
|
#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez "
|
|
|
|
#~ "\"$cmdline --abort\"."
|
|
|
|
|
|
|
|
#~ msgid "Patch does not have a valid e-mail address."
|
|
|
|
#~ msgstr "Le patch n'a pas d'adresse e-mail valide."
|
|
|
|
|
|
|
|
#~ msgid "Applying: $FIRSTLINE"
|
|
|
|
#~ msgstr "Application : $FIRSTLINE"
|
|
|
|
|
|
|
|
#~ msgid "Patch failed at $msgnum $FIRSTLINE"
|
|
|
|
#~ msgstr "Le patch a échoué à $msgnum $FIRSTLINE"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "Pull is not possible because you have unmerged files.\n"
|
|
|
|
#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
|
|
|
#~ "as appropriate to mark resolution and make a commit."
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Le tirage n'est pas possible car vous avez des fichiers non fusionnés.\n"
|
|
|
|
#~ "Veuillez les corriger dans votre copie de travail, utiliser alors 'git "
|
|
|
|
#~ "add/rm <fichier>'\n"
|
|
|
|
#~ "si nécessaire pour marquer comme résolu et valider."
|
|
|
|
|
2015-07-14 12:25:06 +02:00
|
|
|
#~ msgid "no branch specified"
|
|
|
|
#~ msgstr "aucune branche spécifiée"
|
|
|
|
|
|
|
|
#~ msgid "check a branch out in a separate working directory"
|
|
|
|
#~ msgstr "extraire une branche dans un répertoire de travail séparé"
|
|
|
|
|
|
|
|
#~ msgid "prune .git/worktrees"
|
|
|
|
#~ msgstr "éliminer .git/worktrees"
|
|
|
|
|
2015-06-29 21:05:18 +02:00
|
|
|
#~ msgid "The most commonly used git commands are:"
|
|
|
|
#~ msgstr "Les commandes git les plus utilisées sont :"
|
|
|
|
|
|
|
|
#~ msgid "No such branch: '%s'"
|
|
|
|
#~ msgstr "Branche inconnue : '%s'"
|
|
|
|
|
|
|
|
#~ msgid "Could not create git link %s"
|
|
|
|
#~ msgstr "Impossible de créer le lien git %s"
|
|
|
|
|
|
|
|
#~ msgid "Invalid gc.pruneexpire: '%s'"
|
|
|
|
#~ msgstr "gc.pruneexpire invalide : '%s'"
|
|
|
|
|
2015-03-29 09:54:56 +02:00
|
|
|
#~ msgid "(detached from %s)"
|
|
|
|
#~ msgstr "(détaché de %s)"
|
|
|
|
|
|
|
|
#~ msgid "No existing author found with '%s'"
|
|
|
|
#~ msgstr "Aucun auteur existant trouvé avec '%s'"
|
|
|
|
|
|
|
|
#~ msgid "search also in ignored files"
|
|
|
|
#~ msgstr "rechercher aussi dans les fichiers ignorés"
|
|
|
|
|
|
|
|
#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
|
|
|
|
#~ msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)"
|
|
|
|
|
2015-01-13 20:22:58 +01:00
|
|
|
#~ msgid "no files added"
|
|
|
|
#~ msgstr "aucun fichier ajouté"
|
|
|
|
|
|
|
|
#~ msgid "force creation (when already exists)"
|
|
|
|
#~ msgstr "forcer la création (même si la cible existe)"
|
|
|
|
|
|
|
|
#~ msgid "slot"
|
|
|
|
#~ msgstr "emplacement"
|
|
|
|
|
2014-11-01 16:29:19 +01:00
|
|
|
#~ msgid "Failed to lock ref for update"
|
|
|
|
#~ msgstr "Échec du verrouillage de la référence pour mise à jour"
|
|
|
|
|
|
|
|
#~ msgid "Failed to write ref"
|
|
|
|
#~ msgstr "Échec de l'écriture de la référence"
|
|
|
|
|
|
|
|
#~ msgid "Failed to lock HEAD during fast_forward_to"
|
|
|
|
#~ msgstr "Échec du verrouillage de HEAD pendant l'avance rapide"
|
|
|
|
|
|
|
|
#~ msgid "cannot lock HEAD ref"
|
|
|
|
#~ msgstr "impossible de verrouiller la référence HEAD"
|
|
|
|
|
|
|
|
#~ msgid "cannot update HEAD ref"
|
|
|
|
#~ msgstr "impossible de mettre à jour la référence HEAD"
|
|
|
|
|
|
|
|
#~ msgid "%s: cannot lock the ref"
|
|
|
|
#~ msgstr "%s : impossible de verrouiller la référence"
|
|
|
|
|
|
|
|
#~ msgid "%s: cannot update the ref"
|
|
|
|
#~ msgstr "%s : impossible de mettre à jour la référence"
|
|
|
|
|
2014-08-05 19:23:50 +02:00
|
|
|
#~ msgid "commit has empty message"
|
|
|
|
#~ msgstr "le commit a un message vide"
|
|
|
|
|
|
|
|
#~ msgid "Failed to chdir: %s"
|
|
|
|
#~ msgstr "Échec de chdir: %s"
|
|
|
|
|
2014-02-26 21:27:14 +01:00
|
|
|
#~ msgid "Tracking not set up: name too long: %s"
|
|
|
|
#~ msgstr "Suivi de branche non paramétré : le nom est trop long : %s"
|
|
|
|
|
|
|
|
#~ msgid "could not find .gitmodules in index"
|
|
|
|
#~ msgstr "impossible de trouver .gitmodules dans l'index"
|
|
|
|
|
|
|
|
#~ msgid "reading updated .gitmodules failed"
|
|
|
|
#~ msgstr "échec de la lecture du .gitmodules mis à jour"
|
|
|
|
|
|
|
|
#~ msgid "unable to stat updated .gitmodules"
|
|
|
|
#~ msgstr "échec de stat du .gitmodules mis à jour"
|
|
|
|
|
|
|
|
#~ msgid "unable to remove .gitmodules from index"
|
|
|
|
#~ msgstr "suppression du .gitmodules dans l'index impossible"
|
|
|
|
|
|
|
|
#~ msgid "adding updated .gitmodules failed"
|
|
|
|
#~ msgstr "échec de l'ajout du .gitmodules mis à jour"
|
|
|
|
|
|
|
|
#~ msgid "bug"
|
|
|
|
#~ msgstr "bogue"
|
|
|
|
|
|
|
|
#~ msgid ", behind "
|
|
|
|
#~ msgstr ", derrière "
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
|
|
|
|
#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
|
|
|
|
#~ "anymore.\n"
|
|
|
|
#~ "To add content for the whole tree, run:\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ " git add %s :/\n"
|
|
|
|
#~ " (or git add %s :/)\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "To restrict the command to the current directory, run:\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ " git add %s .\n"
|
|
|
|
#~ " (or git add %s .)\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "With the current Git version, the command is restricted to the current "
|
|
|
|
#~ "directory.\n"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Le comportement de 'git add %s (ou %s)' sans argument de chemin depuis "
|
|
|
|
#~ "un\n"
|
|
|
|
#~ "sous-répertoire du projet va changer dans Git 2.0 et ne doit plus être "
|
|
|
|
#~ "utilisé.\n"
|
|
|
|
#~ "Pour ajouter le contenu de toute l'arborescence, lancez :\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ " git add %s :/\n"
|
|
|
|
#~ " (ou git add %s :/)\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "Pour restreindre la commande au répertoire courant, lancez :\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ " git add %s .\n"
|
|
|
|
#~ " (ou git add %s .)\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "Avec la version actuelle de Git, la commande est restreinte au répertoire "
|
|
|
|
#~ "courant.\n"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
|
|
|
|
#~ "whose behaviour will change in Git 2.0 with respect to paths you "
|
|
|
|
#~ "removed.\n"
|
|
|
|
#~ "Paths like '%s' that are\n"
|
|
|
|
#~ "removed from your working tree are ignored with this version of Git.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
|
|
|
|
#~ " ignores paths you removed from your working tree.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "Run 'git status' to check the paths you removed from your working tree.\n"
|
2014-02-02 14:36:32 +01:00
|
|
|
#~ msgstr ""
|
2014-02-26 21:27:14 +01:00
|
|
|
#~ "Vous avez lancé 'git add' sans '-A (--all)' ni '--ignore-removal',\n"
|
|
|
|
#~ "dont le comportement va changer dans Git 2.0 avec le respect des chemins "
|
|
|
|
#~ "que vous supprimez.\n"
|
|
|
|
#~ "Les chemins tels que '%s' qui ont été\n"
|
|
|
|
#~ "retirés de votre copie de travail sont ignorés avec cette version de "
|
|
|
|
#~ "Git.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "* 'git add --ignore-removal <chemin>', qui est l'option par défaut "
|
|
|
|
#~ "actuelle,\n"
|
|
|
|
#~ " ignore les chemins que vous avez supprimés de votre copie de travail.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "* 'git add --all <chemin>' permet d'enregistrer aussi les suppressions.\n"
|
|
|
|
#~ "\n"
|
|
|
|
#~ "Lancez 'git status' pour vérifier les chemins que vous avez supprimés de "
|
|
|
|
#~ "votre copie de travail.\n"
|
|
|
|
|
|
|
|
#~ msgid "key id"
|
|
|
|
#~ msgstr "identifiant de clé"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "Auto packing the repository for optimum performance. You may also\n"
|
|
|
|
#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Compression automatique du dépôt pour une performance optimum. Vous "
|
|
|
|
#~ "pouvez aussi\n"
|
|
|
|
#~ "lancer \"git gc\" manuellement. Voir \"git help gc\" pour plus "
|
|
|
|
#~ "d'information.\n"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
|
|
|
|
#~ "counterpart. If you did not intend to push that branch, you may want to\n"
|
|
|
|
#~ "specify branches to push or set the 'push.default' configuration "
|
|
|
|
#~ "variable\n"
|
|
|
|
#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "Les mises à jour ont été rejetées car la pointe de la branche poussée est "
|
|
|
|
#~ "derrière\n"
|
|
|
|
#~ "son homologue distant. Si vous ne vouliez pas pousser cette branche, vous "
|
|
|
|
#~ "pourriez\n"
|
|
|
|
#~ "vouloir spécifier les branches à pousser ou définir la variable de "
|
|
|
|
#~ "configuration\n"
|
|
|
|
#~ "'push.default' à 'simple', 'current' ou 'upstream' pour pousser seulement "
|
|
|
|
#~ "la branche courante."
|
2014-01-18 14:36:19 +01:00
|
|
|
|
|
|
|
#~ msgid "deleted: %s"
|
|
|
|
#~ msgstr "supprimé : %s"
|
|
|
|
|
|
|
|
#~ msgid "modified: %s"
|
|
|
|
#~ msgstr "modifié : %s"
|
|
|
|
|
|
|
|
#~ msgid "renamed: %s -> %s"
|
|
|
|
#~ msgstr "renommé : %s -> %s"
|
|
|
|
|
|
|
|
#~ msgid "unmerged: %s"
|
|
|
|
#~ msgstr "non fus. : %s"
|
|
|
|
|
2013-11-01 15:35:08 +01:00
|
|
|
#~ msgid "input paths are terminated by a null character"
|
|
|
|
#~ msgstr "les chemins en entrée sont terminés par le caractère nul"
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "Aborting. Consider using either the --force or --include-untracked option."
|
|
|
|
#~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked."
|