mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
l10n: fr.po v2.6.0 round 2 (2440t)
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
This commit is contained in:
Jean-Noel Avila
Jiang Xin
parent
03ea3327da
commit
84486b1ebe
260
po/fr.po
260
po/fr.po
|
|
@ -73,8 +73,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-09-05 09:16+0800\n"
|
||||
"PO-Revision-Date: 2015-09-10 20:48+0200\n"
|
||||
"POT-Creation-Date: 2015-09-15 06:45+0800\n"
|
||||
"PO-Revision-Date: 2015-09-15 20:20+0200\n"
|
||||
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
|
||||
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
|
||||
"Language: fr\n"
|
||||
|
|
@ -148,11 +148,11 @@ msgstr "préfixe"
|
|||
msgid "prepend prefix to each pathname in the archive"
|
||||
msgstr "préfixer chaque chemin de fichier dans l'archive"
|
||||
|
||||
#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
|
||||
#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
|
||||
#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
|
||||
#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
|
||||
#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
|
||||
#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 builtin/blame.c:2517
|
||||
#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
|
||||
#: builtin/grep.c:712 builtin/hash-object.c:99 builtin/ls-files.c:446
|
||||
#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
|
||||
#: builtin/read-tree.c:109 parse-options.h:153
|
||||
msgid "file"
|
||||
msgstr "fichier"
|
||||
|
||||
|
|
@ -415,8 +415,8 @@ msgstr "l'index de groupe a disparu"
|
|||
msgid "invalid color value: %.*s"
|
||||
msgstr "Valeur invalide de couleur : %.*s"
|
||||
|
||||
#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489
|
||||
#: builtin/am.c:2101
|
||||
#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
|
||||
#: builtin/am.c:2128
|
||||
#, c-format
|
||||
msgid "could not parse %s"
|
||||
msgstr "impossible d'analyser %s"
|
||||
|
|
@ -740,7 +740,7 @@ msgstr "%s: %s - %s"
|
|||
msgid "failed to read the cache"
|
||||
msgstr "impossible de lire le cache"
|
||||
|
||||
#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375
|
||||
#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
|
||||
#: builtin/checkout.c:586 builtin/clone.c:715
|
||||
msgid "unable to write new index file"
|
||||
msgstr "impossible d'écrire le nouveau fichier d'index"
|
||||
|
|
@ -1328,7 +1328,9 @@ msgstr "Le receveur ne gère pas les poussées avec --signed"
|
|||
msgid ""
|
||||
"not sending a push certificate since the receiving end does not support --"
|
||||
"signed push"
|
||||
msgstr "pas d'envoi de certificat de poussée car le receveur ne gère pas les poussées avec --signed"
|
||||
msgstr ""
|
||||
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
|
||||
"poussées avec --signed"
|
||||
|
||||
#: send-pack.c:418
|
||||
msgid "the receiving end does not support --atomic push"
|
||||
|
|
@ -2386,8 +2388,7 @@ msgstr "Impossible d'écrire le nouveau fichier d'index"
|
|||
msgid "could not stat %s"
|
||||
msgstr "stat impossible de %s"
|
||||
|
||||
#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737
|
||||
#: builtin/merge.c:1079
|
||||
#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 builtin/merge.c:1079
|
||||
#, c-format
|
||||
msgid "could not read '%s'"
|
||||
msgstr "impossible de lire '%s'"
|
||||
|
|
@ -2476,34 +2477,36 @@ msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
|
|||
#: builtin/am.c:1204
|
||||
#, c-format
|
||||
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\"."
|
||||
msgstr ""
|
||||
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
|
||||
"abort\"."
|
||||
|
||||
#: builtin/am.c:1312
|
||||
#: builtin/am.c:1339
|
||||
msgid "Patch is empty. Was it split wrong?"
|
||||
msgstr "Le patch est vide. Le découpage était-il bon ?"
|
||||
|
||||
#: builtin/am.c:1386 builtin/log.c:1345
|
||||
#: builtin/am.c:1413 builtin/log.c:1345
|
||||
#, c-format
|
||||
msgid "invalid ident line: %s"
|
||||
msgstr "ligne d'identification invalide : %s"
|
||||
|
||||
#: builtin/am.c:1413
|
||||
#: builtin/am.c:1440
|
||||
#, c-format
|
||||
msgid "unable to parse commit %s"
|
||||
msgstr "impossible d'analyser le commit %s"
|
||||
|
||||
#: builtin/am.c:1587
|
||||
#: builtin/am.c:1614
|
||||
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
||||
msgstr ""
|
||||
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
|
||||
"points."
|
||||
|
||||
#: builtin/am.c:1589
|
||||
#: builtin/am.c:1616
|
||||
msgid "Using index info to reconstruct a base tree..."
|
||||
msgstr ""
|
||||
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
|
||||
|
||||
#: builtin/am.c:1608
|
||||
#: builtin/am.c:1635
|
||||
msgid ""
|
||||
"Did you hand edit your patch?\n"
|
||||
"It does not apply to blobs recorded in its index."
|
||||
|
|
@ -2511,38 +2514,38 @@ msgstr ""
|
|||
"Avez-vous édité le patch à la main ?\n"
|
||||
"Il ne s'applique pas aux blobs enregistrés dans son index."
|
||||
|
||||
#: builtin/am.c:1614
|
||||
#: builtin/am.c:1641
|
||||
msgid "Falling back to patching base and 3-way merge..."
|
||||
msgstr "Retour à un patch de la base et fusion à 3 points..."
|
||||
|
||||
#: builtin/am.c:1639
|
||||
#: builtin/am.c:1666
|
||||
msgid "Failed to merge in the changes."
|
||||
msgstr "Échec d'intégration des modifications."
|
||||
|
||||
#: builtin/am.c:1664 builtin/merge.c:632
|
||||
#: builtin/am.c:1691 builtin/merge.c:632
|
||||
msgid "git write-tree failed to write a tree"
|
||||
msgstr "git write-tree a échoué à écrire un arbre"
|
||||
|
||||
#: builtin/am.c:1671
|
||||
#: builtin/am.c:1698
|
||||
msgid "applying to an empty history"
|
||||
msgstr "application à un historique vide"
|
||||
|
||||
#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829
|
||||
#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
|
||||
#: builtin/merge.c:854
|
||||
msgid "failed to write commit object"
|
||||
msgstr "échec de l'écriture de l'objet commit"
|
||||
|
||||
#: builtin/am.c:1716 builtin/am.c:1720
|
||||
#: builtin/am.c:1743 builtin/am.c:1747
|
||||
#, c-format
|
||||
msgid "cannot resume: %s does not exist."
|
||||
msgstr "impossible de continuer : %s n'existe pas."
|
||||
|
||||
#: builtin/am.c:1736
|
||||
#: builtin/am.c:1763
|
||||
msgid "cannot be interactive without stdin connected to a terminal."
|
||||
msgstr ""
|
||||
"impossible d'être interactif sans entrée standard connectée à un terminal."
|
||||
|
||||
#: builtin/am.c:1741
|
||||
#: builtin/am.c:1768
|
||||
msgid "Commit Body is:"
|
||||
msgstr "Le corps de la validation est :"
|
||||
|
||||
|
|
@ -2550,35 +2553,35 @@ msgstr "Le corps de la validation est :"
|
|||
#. in your translation. The program will only accept English
|
||||
#. input at this point.
|
||||
#.
|
||||
#: builtin/am.c:1751
|
||||
#: builtin/am.c:1778
|
||||
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 : "
|
||||
|
||||
#: builtin/am.c:1801
|
||||
#: builtin/am.c:1828
|
||||
#, c-format
|
||||
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
||||
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
|
||||
|
||||
#: builtin/am.c:1836 builtin/am.c:1907
|
||||
#: builtin/am.c:1863 builtin/am.c:1934
|
||||
#, c-format
|
||||
msgid "Applying: %.*s"
|
||||
msgstr "Application de %.*s"
|
||||
|
||||
#: builtin/am.c:1852
|
||||
#: builtin/am.c:1879
|
||||
msgid "No changes -- Patch already applied."
|
||||
msgstr "Pas de changement -- Patch déjà appliqué."
|
||||
|
||||
#: builtin/am.c:1860
|
||||
#: builtin/am.c:1887
|
||||
#, c-format
|
||||
msgid "Patch failed at %s %.*s"
|
||||
msgstr "le patch a échoué à %s %.*s"
|
||||
|
||||
#: builtin/am.c:1866
|
||||
#: builtin/am.c:1893
|
||||
#, c-format
|
||||
msgid "The copy of the patch that failed is found in: %s"
|
||||
msgstr "La copie du patch qui a échoué se trouve dans : %s"
|
||||
|
||||
#: builtin/am.c:1910
|
||||
#: builtin/am.c:1937
|
||||
msgid ""
|
||||
"No changes - did you forget to use 'git add'?\n"
|
||||
"If there is nothing left to stage, chances are that something else\n"
|
||||
|
|
@ -2589,7 +2592,7 @@ msgstr ""
|
|||
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
|
||||
"patch."
|
||||
|
||||
#: builtin/am.c:1917
|
||||
#: builtin/am.c:1944
|
||||
msgid ""
|
||||
"You still have unmerged paths in your index.\n"
|
||||
"Did you forget to use 'git add'?"
|
||||
|
|
@ -2597,17 +2600,17 @@ msgstr ""
|
|||
"Vous avez toujours des chemins non fusionnés dans votre index\n"
|
||||
"Auriez-vous oublié de faire 'git add' ?"
|
||||
|
||||
#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308
|
||||
#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
|
||||
#: builtin/reset.c:316
|
||||
#, c-format
|
||||
msgid "Could not parse object '%s'."
|
||||
msgstr "Impossible d'analyser l'objet '%s'."
|
||||
|
||||
#: builtin/am.c:2077
|
||||
#: builtin/am.c:2104
|
||||
msgid "failed to clean index"
|
||||
msgstr "échec du nettoyage de l'index"
|
||||
|
||||
#: builtin/am.c:2111
|
||||
#: builtin/am.c:2138
|
||||
msgid ""
|
||||
"You seem to have moved HEAD since the last 'am' failure.\n"
|
||||
"Not rewinding to ORIG_HEAD"
|
||||
|
|
@ -2615,89 +2618,90 @@ msgstr ""
|
|||
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
|
||||
"Pas de retour à ORIG_HEAD"
|
||||
|
||||
#: builtin/am.c:2172
|
||||
#: builtin/am.c:2199
|
||||
#, c-format
|
||||
msgid "Invalid value for --patch-format: %s"
|
||||
msgstr "Valeur invalide pour --patch-format : %s"
|
||||
|
||||
#: builtin/am.c:2194
|
||||
#: builtin/am.c:2221
|
||||
msgid "git am [options] [(<mbox>|<Maildir>)...]"
|
||||
msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"
|
||||
|
||||
#: builtin/am.c:2195
|
||||
#: builtin/am.c:2222
|
||||
msgid "git am [options] (--continue | --skip | --abort)"
|
||||
msgstr "git am [options] (--continue | --quit | -- abort)\""
|
||||
|
||||
#: builtin/am.c:2201
|
||||
#: builtin/am.c:2228
|
||||
msgid "run interactively"
|
||||
msgstr "exécution interactive"
|
||||
|
||||
#: builtin/am.c:2203
|
||||
#: builtin/am.c:2230
|
||||
msgid "historical option -- no-op"
|
||||
msgstr "option historique -- no-op"
|
||||
|
||||
#: builtin/am.c:2205
|
||||
#: builtin/am.c:2232
|
||||
msgid "allow fall back on 3way merging if needed"
|
||||
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
|
||||
|
||||
#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57
|
||||
#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
|
||||
#: builtin/repack.c:171
|
||||
msgid "be quiet"
|
||||
msgstr "être silencieux"
|
||||
|
||||
#: builtin/am.c:2208
|
||||
#: builtin/am.c:2235
|
||||
msgid "add a Signed-off-by line to the commit message"
|
||||
msgstr "ajouter une ligne Signed-off-by au message de validation"
|
||||
|
||||
#: builtin/am.c:2211
|
||||
#: builtin/am.c:2238
|
||||
msgid "recode into utf8 (default)"
|
||||
msgstr "recoder en utf-8 (par défaut)"
|
||||
|
||||
#: builtin/am.c:2213
|
||||
#: builtin/am.c:2240
|
||||
msgid "pass -k flag to git-mailinfo"
|
||||
msgstr "passer l'option -k à git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2215
|
||||
#: builtin/am.c:2242
|
||||
msgid "pass -b flag to git-mailinfo"
|
||||
msgstr "passer l'option -b à git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2217
|
||||
#: builtin/am.c:2244
|
||||
msgid "pass -m flag to git-mailinfo"
|
||||
msgstr "passer l'option -m à git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2219
|
||||
#: builtin/am.c:2246
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
|
||||
|
||||
#: builtin/am.c:2222
|
||||
#: builtin/am.c:2249
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
|
||||
msgstr ""
|
||||
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
|
||||
|
||||
#: builtin/am.c:2225
|
||||
#: builtin/am.c:2252
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "retirer tout le contenu avant la ligne des ciseaux"
|
||||
|
||||
#: builtin/am.c:2226 builtin/apply.c:4563
|
||||
#: builtin/am.c:2253 builtin/apply.c:4563
|
||||
msgid "action"
|
||||
msgstr "action"
|
||||
|
||||
#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236
|
||||
#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
|
||||
#: builtin/am.c:2254
|
||||
#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
|
||||
#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
|
||||
#: builtin/am.c:2281
|
||||
msgid "pass it through git-apply"
|
||||
msgstr "le passer jusqu'à git-apply"
|
||||
|
||||
#: builtin/am.c:2235 builtin/apply.c:4587
|
||||
#: builtin/am.c:2262 builtin/apply.c:4587
|
||||
msgid "root"
|
||||
msgstr "racine"
|
||||
|
||||
#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525
|
||||
#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
|
||||
#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
|
||||
#: builtin/pull.c:167
|
||||
msgid "path"
|
||||
msgstr "chemin"
|
||||
|
||||
#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
|
||||
#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
|
||||
#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
|
||||
#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
|
||||
#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
|
||||
|
|
@ -2705,60 +2709,61 @@ msgstr "chemin"
|
|||
msgid "n"
|
||||
msgstr "n"
|
||||
|
||||
#: builtin/am.c:2247 builtin/apply.c:4531
|
||||
#: builtin/am.c:2274 builtin/apply.c:4531
|
||||
msgid "num"
|
||||
msgstr "num"
|
||||
|
||||
#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438
|
||||
#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
|
||||
msgid "format"
|
||||
msgstr "format"
|
||||
|
||||
#: builtin/am.c:2251
|
||||
#: builtin/am.c:2278
|
||||
msgid "format the patch(es) are in"
|
||||
msgstr "format de présentation des patchs"
|
||||
|
||||
#: builtin/am.c:2257
|
||||
#: builtin/am.c:2284
|
||||
msgid "override error message when patch failure occurs"
|
||||
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
|
||||
|
||||
#: builtin/am.c:2259
|
||||
#: builtin/am.c:2286
|
||||
msgid "continue applying patches after resolving a conflict"
|
||||
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
|
||||
|
||||
#: builtin/am.c:2262
|
||||
#: builtin/am.c:2289
|
||||
msgid "synonyms for --continue"
|
||||
msgstr "synonymes de --continue"
|
||||
|
||||
#: builtin/am.c:2265
|
||||
#: builtin/am.c:2292
|
||||
msgid "skip the current patch"
|
||||
msgstr "sauter le patch courant"
|
||||
|
||||
#: builtin/am.c:2268
|
||||
#: builtin/am.c:2295
|
||||
msgid "restore the original branch and abort the patching operation."
|
||||
msgstr "restaurer la branche originale et abandonner les applications de patch."
|
||||
msgstr ""
|
||||
"restaurer la branche originale et abandonner les applications de patch."
|
||||
|
||||
#: builtin/am.c:2272
|
||||
#: builtin/am.c:2299
|
||||
msgid "lie about committer date"
|
||||
msgstr "mentir sur la date de validation"
|
||||
|
||||
#: builtin/am.c:2274
|
||||
#: builtin/am.c:2301
|
||||
msgid "use current timestamp for author date"
|
||||
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
|
||||
|
||||
#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225
|
||||
#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
|
||||
#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
|
||||
msgid "key-id"
|
||||
msgstr "id de clé"
|
||||
|
||||
#: builtin/am.c:2277
|
||||
#: builtin/am.c:2304
|
||||
msgid "GPG-sign commits"
|
||||
msgstr "signer les commits avec GPG"
|
||||
|
||||
#: builtin/am.c:2280
|
||||
#: builtin/am.c:2307
|
||||
msgid "(internal use for git-rebase)"
|
||||
msgstr "(utilisation interne pour git-rebase)"
|
||||
|
||||
#: builtin/am.c:2295
|
||||
#: builtin/am.c:2322
|
||||
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."
|
||||
|
|
@ -2766,16 +2771,17 @@ msgstr ""
|
|||
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
|
||||
"et elle sera supprimée. Veuillez ne plus l'utiliser."
|
||||
|
||||
#: builtin/am.c:2302
|
||||
#: builtin/am.c:2329
|
||||
msgid "failed to read the index"
|
||||
msgstr "échec à la lecture de l'index"
|
||||
|
||||
#: builtin/am.c:2317
|
||||
#: builtin/am.c:2344
|
||||
#, 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."
|
||||
msgstr ""
|
||||
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
|
||||
|
||||
#: builtin/am.c:2341
|
||||
#: builtin/am.c:2368
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Stray %s directory found.\n"
|
||||
|
|
@ -2784,7 +2790,7 @@ msgstr ""
|
|||
"Répertoire abandonné %s trouvé.\n"
|
||||
"Utilisez \"git am --abort\" pour le supprimer."
|
||||
|
||||
#: builtin/am.c:2347
|
||||
#: builtin/am.c:2374
|
||||
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 "
|
||||
|
|
@ -4641,8 +4647,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
|
|||
msgid "path to git-upload-pack on the remote"
|
||||
msgstr "chemin vers git-upload-pack sur le serveur distant"
|
||||
|
||||
#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
|
||||
#: builtin/pull.c:186
|
||||
#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 builtin/pull.c:186
|
||||
msgid "depth"
|
||||
msgstr "profondeur"
|
||||
|
||||
|
|
@ -8524,12 +8529,16 @@ msgstr "Sous-commande inconnue : %s"
|
|||
#: builtin/pack-objects.c:28
|
||||
msgid ""
|
||||
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
|
||||
msgstr "git pack-objects --stdout [options...] [< <liste-références> | < <liste-objets>]"
|
||||
msgstr ""
|
||||
"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
|
||||
"objets>]"
|
||||
|
||||
#: builtin/pack-objects.c:29
|
||||
msgid ""
|
||||
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
|
||||
msgstr "git pack-objects [options...] base-name [< <liste-références> | < <liste-objets>]"
|
||||
msgstr ""
|
||||
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
|
||||
"objets>]"
|
||||
|
||||
#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
|
||||
#, c-format
|
||||
|
|
@ -8752,10 +8761,6 @@ msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
|
|||
msgid "Options related to merging"
|
||||
msgstr "Options relatives à la fusion"
|
||||
|
||||
#: builtin/pull.c:115
|
||||
msgid "false|true|preserve"
|
||||
msgstr "false|true|preserve"
|
||||
|
||||
#: builtin/pull.c:116
|
||||
msgid "incorporate changes by rebasing rather than merging"
|
||||
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
|
||||
|
|
@ -8779,7 +8784,8 @@ msgstr "Valeur invalide pour pull.ff : %s"
|
|||
|
||||
#: builtin/pull.c:352
|
||||
msgid "Cannot pull with rebase: You have unstaged changes."
|
||||
msgstr "impossible de tirer avec rebasage. Vous avez des modifications non indexées."
|
||||
msgstr ""
|
||||
"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
|
||||
|
||||
#: builtin/pull.c:358
|
||||
msgid "Additionally, your index contains uncommitted changes."
|
||||
|
|
@ -8787,18 +8793,24 @@ msgstr "De plus, votre index contient des modifications non validées."
|
|||
|
||||
#: builtin/pull.c:360
|
||||
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
|
||||
msgstr "impossible de tirer avec rebasage : votre index contient des modifications non validées."
|
||||
msgstr ""
|
||||
"impossible de tirer avec rebasage : votre index contient des modifications "
|
||||
"non validées."
|
||||
|
||||
#: builtin/pull.c:436
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
"fetched."
|
||||
msgstr "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous venez de récupérer."
|
||||
msgstr ""
|
||||
"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
|
||||
"venez de récupérer."
|
||||
|
||||
#: builtin/pull.c:438
|
||||
msgid ""
|
||||
"There are no candidates for merging among the refs that you just fetched."
|
||||
msgstr "Il n'y a pas de candidate avec laquelle fusionner parmi les références que vous venez de récupérer."
|
||||
msgstr ""
|
||||
"Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
|
||||
"vous venez de récupérer."
|
||||
|
||||
#: builtin/pull.c:439
|
||||
msgid ""
|
||||
|
|
@ -8816,7 +8828,8 @@ msgid ""
|
|||
"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"
|
||||
"la branche. Comme ce n'est pas le dépôt distant par défaut dans la configuration\n"
|
||||
"la branche. Comme ce n'est pas le dépôt distant par défaut dans la "
|
||||
"configuration\n"
|
||||
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
|
||||
|
||||
#: builtin/pull.c:447
|
||||
|
|
@ -8846,7 +8859,8 @@ msgid ""
|
|||
"\n"
|
||||
" git branch --set-upstream-to=%s/<branch> %s\n"
|
||||
msgstr ""
|
||||
"Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec :\n"
|
||||
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
|
||||
"branche, vous pouvez le faire avec :\n"
|
||||
"\n"
|
||||
"git branch --set-uptream-to=%s/<branche> %s\n"
|
||||
|
||||
|
|
@ -8856,12 +8870,15 @@ msgid ""
|
|||
"Your configuration specifies to merge with the ref '%s'\n"
|
||||
"from the remote, but no such ref was fetched."
|
||||
msgstr ""
|
||||
"Votre information de configuration indique de fusionner avec la référence '%s'\n"
|
||||
"Votre information de configuration indique de fusionner avec la référence "
|
||||
"'%s'\n"
|
||||
"du serveur distant, mais cette référence n'a pas été récupérée."
|
||||
|
||||
#: builtin/pull.c:830
|
||||
msgid "Updating an unborn branch with changes added to the index."
|
||||
msgstr "Mise à jour d'une branche non encore créée avec les changements ajoutés dans l'index."
|
||||
msgstr ""
|
||||
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
|
||||
"l'index."
|
||||
|
||||
#: builtin/pull.c:859
|
||||
#, c-format
|
||||
|
|
@ -8885,7 +8902,8 @@ msgid ""
|
|||
"to recover."
|
||||
msgstr ""
|
||||
"Avance rapide de votre arbre de travail impossible.\n"
|
||||
"Après vous être assuré que toute modification précieuse a été sauvegardée avec\n"
|
||||
"Après vous être assuré que toute modification précieuse a été sauvegardée "
|
||||
"avec\n"
|
||||
"$ git diff %s\n"
|
||||
"lancez\n"
|
||||
"$ git reset --hard\n"
|
||||
|
|
@ -9255,7 +9273,11 @@ msgid ""
|
|||
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
|
||||
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
|
||||
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
|
||||
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>]])"
|
||||
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>]])"
|
||||
|
||||
#: builtin/read-tree.c:110
|
||||
msgid "write resulting index to <file>"
|
||||
|
|
@ -10358,8 +10380,11 @@ msgid ""
|
|||
"[<ref>...]\n"
|
||||
" --all and explicit <ref> specification are mutually exclusive."
|
||||
msgstr ""
|
||||
"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."
|
||||
"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."
|
||||
|
||||
#: builtin/send-pack.c:160
|
||||
msgid "remote name"
|
||||
|
|
@ -10499,8 +10524,8 @@ msgstr ""
|
|||
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
|
||||
|
||||
#: builtin/show-ref.c:11
|
||||
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
|
||||
msgstr "git show-ref --exclude-existing[=motif] < liste-références"
|
||||
msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
|
||||
msgstr "git show-ref --exclude-existing[=<motif>] < liste-références"
|
||||
|
||||
#: builtin/show-ref.c:170
|
||||
msgid "only show tags (can be combined with heads)"
|
||||
|
|
@ -10730,8 +10755,8 @@ msgid "replace the tag if exists"
|
|||
msgstr "remplacer l'étiquette si elle existe"
|
||||
|
||||
#: builtin/tag.c:609 builtin/update-ref.c:368
|
||||
msgid "create_reflog"
|
||||
msgstr "créer le reflog"
|
||||
msgid "create a reflog"
|
||||
msgstr "créer un reflog"
|
||||
|
||||
#: builtin/tag.c:611
|
||||
msgid "Tag listing options"
|
||||
|
|
@ -11390,8 +11415,10 @@ msgid ""
|
|||
"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.)"
|
||||
msgstr ""
|
||||
"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.)"
|
||||
"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.)"
|
||||
|
||||
#: git-bisect.sh:320
|
||||
#, sh-format
|
||||
|
|
@ -11401,8 +11428,10 @@ msgid ""
|
|||
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
|
||||
msgstr ""
|
||||
"Vous devez démarrer avec \"git bisect start\".\n"
|
||||
"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.)"
|
||||
"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.)"
|
||||
|
||||
#: git-bisect.sh:391 git-bisect.sh:521
|
||||
msgid "We are not bisecting."
|
||||
|
|
@ -11469,7 +11498,9 @@ msgstr "succès de la bissection"
|
|||
#: git-bisect.sh:548
|
||||
#, sh-format
|
||||
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
|
||||
msgstr "Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/$TERM_GOOD."
|
||||
msgstr ""
|
||||
"Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/"
|
||||
"$TERM_GOOD."
|
||||
|
||||
#: git-rebase.sh:57
|
||||
msgid ""
|
||||
|
|
@ -12028,7 +12059,9 @@ msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
|
|||
#, sh-format
|
||||
msgid ""
|
||||
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
|
||||
msgstr "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module '$prefix$sm_path'"
|
||||
msgstr ""
|
||||
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
|
||||
"'$prefix$sm_path'"
|
||||
|
||||
#: git-submodule.sh:908
|
||||
#, sh-format
|
||||
|
|
@ -12080,6 +12113,9 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
|
|||
msgid "Synchronizing submodule url for '$displaypath'"
|
||||
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
|
||||
|
||||
#~ msgid "false|true|preserve"
|
||||
#~ msgstr "false|true|preserve"
|
||||
|
||||
#~ msgid "BUG: reopen a lockfile that is still open"
|
||||
#~ msgstr "BUG: réouverture d'un fichier verrou déjà ouvert"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue